From 91e0e6c0f937aaf3af2d058cfc66285363d2d10d Mon Sep 17 00:00:00 2001 From: Andrew Dempsey Date: Thu, 15 Oct 2020 22:55:50 +0100 Subject: [PATCH 1/4] P10 Added judging critera page --- .env_sample | 3 -- .gitignore | 3 ++ home/templates/home/criteria.html | 49 +++++++++++++++++++++++++++++++ home/urls.py | 3 +- home/views.py | 5 ++++ templates/includes/navbar.html | 2 +- 6 files changed, 60 insertions(+), 5 deletions(-) delete mode 100644 .env_sample create mode 100644 home/templates/home/criteria.html diff --git a/.env_sample b/.env_sample deleted file mode 100644 index 71234dcd..00000000 --- a/.env_sample +++ /dev/null @@ -1,3 +0,0 @@ -DEVELOPMENT=1 -SECRET_KEY="your_secret_key_here" -SITE_NAME="localhost" diff --git a/.gitignore b/.gitignore index a38642ff..868f4d51 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,8 @@ env.py *.py[cod] __pycache__/ *.sqlite3 +.venv +venv/ +env/ # static/ # media/ diff --git a/home/templates/home/criteria.html b/home/templates/home/criteria.html new file mode 100644 index 00000000..fbb933d5 --- /dev/null +++ b/home/templates/home/criteria.html @@ -0,0 +1,49 @@ +{% extends "base.html" %} +{% load static %} + +{% block content %} + +

Judging Criteria for Hackaton

+
+ +
+

Content

+ +

Content is the information provided on the site. It is not just text, but music, sound, animation, or video – + anything that communicates a site’s body of knowledge. Good content should be engaging, relevant, and appropriate + for the audience; you can tell it’s been developed for the Web because it’s clear and concise and it works in the + medium. Good content takes a stand. It has a voice and a point of view. It may be informative, useful, or funny, but + it always leaves you wanting more.

+
+

Structure and navigation

+ +

Refers to the framework of a site, the organization of content, the prioritization of information, and the method in + which you move through the site. Sites with good structure and navigation are consistent, intuitive, and + transparent. They allow you to form a mental model of the information provided: where to find things and what to + expect when you click. Good navigation gets you where you want to go quickly and offers easy access to the breadth + and depth of the site’s content.

+
+

Visual design

+ +

The appearance of the site. It’s more than just a pretty homepage, and it doesn’t have to be cutting edge or trendy. + Good visual design is high quality, appropriate, and relevant for the audience and the message it is supporting. It + communicates a visual experience and may even take your breath away.

+
+

Functionality

+ +

Good functionality means the site works well. It loads quickly, has live links, and any new technology used is + functional and relevant for the intended audience. The site should work cross-platform and be browser independent. + Highly functional sites anticipate the diversity of user requirements from file size and format to download speed. + The most functional sites also take into consideration those with special access needs. Good functionality makes the + experience center stage and the technology invisible.

+ +{% endblock %} \ No newline at end of file diff --git a/home/urls.py b/home/urls.py index 76f2f662..ca41913c 100644 --- a/home/urls.py +++ b/home/urls.py @@ -2,5 +2,6 @@ from . import views urlpatterns = [ - path("", views.index, name="home") + path("", views.index, name="home"), + path("criteria/", views.criteria, name="criteria"), ] diff --git a/home/views.py b/home/views.py index c26a1391..266457ae 100644 --- a/home/views.py +++ b/home/views.py @@ -5,3 +5,8 @@ def index(request): """ A view to return the index page """ return render(request, "home/index.html") + +def criteria(request): + """ A view to return the judging criteria page """ + + return render(request, "home/criteria.html") diff --git a/templates/includes/navbar.html b/templates/includes/navbar.html index 21f6c94c..c118ba7b 100644 --- a/templates/includes/navbar.html +++ b/templates/includes/navbar.html @@ -18,7 +18,7 @@ From b0fc735d7e73e5fbf2eb6aacf09edc73ac56a82c Mon Sep 17 00:00:00 2001 From: Andrew Dempsey Date: Sat, 17 Oct 2020 17:08:03 +0100 Subject: [PATCH 2/4] Restored .env_sample, added PEP8 space, refactor criteria.html --- .env_sample | 3 +++ git | 0 home/templates/home/criteria.html | 2 +- home/views.py | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .env_sample create mode 100644 git diff --git a/.env_sample b/.env_sample new file mode 100644 index 00000000..8cca200f --- /dev/null +++ b/.env_sample @@ -0,0 +1,3 @@ +DEVELOPMENT=1 +SECRET_KEY="your_secret_key_here" +SITE_NAME="localhost" diff --git a/git b/git new file mode 100644 index 00000000..e69de29b diff --git a/home/templates/home/criteria.html b/home/templates/home/criteria.html index fbb933d5..edf908fe 100644 --- a/home/templates/home/criteria.html +++ b/home/templates/home/criteria.html @@ -3,7 +3,7 @@ {% block content %} -

Judging Criteria for Hackaton

+

Judging Criteria for Hackaton