From b470996ad37d32785461bc44aea62620402383c8 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Tue, 23 Feb 2021 10:30:46 +0000 Subject: [PATCH 01/11] Changing popup message if student has not entered LMS stage --- templates/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base.html b/templates/base.html index c91b1c5b..edf2fec1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -29,8 +29,8 @@
{% if request.user.is_authenticated and not request.user.current_lms_module %} {% endif %} From e8dd32ea7a5ad8e7760726cf106ee9f780adfcb2 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Tue, 23 Feb 2021 10:31:02 +0000 Subject: [PATCH 02/11] Updating FAQs --- templates/faq.html | 60 +++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/templates/faq.html b/templates/faq.html index c3dc9a3c..8708079f 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -3,8 +3,7 @@ {% block content %}

Frequently Asked Questions

- -

+

1. WHAT IS A HACKATHON?

A hackathon (also known as a hack day, hackfest, datathon or codefest) is a @@ -61,7 +60,44 @@

- 4. HOW DO I FORM OR JOIN A TEAM AND WHY? + 4. DO I JUST NEED TO SIGNUP TO THE PLATFORM OR DO I NEED TO DO ANYTHING ELSE? +

+

+ Apart from signing in to the platform with your Slack Account, each time + you want to participate in a Hackathon you will need to enroll to that + specific hackathon. +

+

+ You can do that either from the start page, the + View Hackathons page + or (if you have a direct link) from the detail view of the hackathon directly; + simply click on the "Enroll as participant" button when + the registration is open. +

+

+ 5. HOW DO I KNOW THAT I AM REGISTERED FOR A HACKATHON? +

+

+

    +
  1. + Log in and go to the View Hackathons page +
    2. +
  2. + Find the hackathon you want to check if you are registered to +
    3. +
  3. + Check that the status is "You are enrolled in this hackathon!" +
    4. +
  4. + If it does not say "You are enrolled in this hackathon!", either + click on "Enroll as participant" (if the button is visible) or + contanct {{support_email}} +
    5. +
+

+ +

+ 6. HOW DO I FORM OR JOIN A TEAM AND WHY?

You need a team to participate in a hackathon, otherwise the workload to @@ -75,23 +111,13 @@

assigned to get an even mix of experience in each of the teams.

- 5. I HAVE A TEAM ALREADY, HOW CAN I MAKE SURE WE END UP TOGETHER -

-

- If you want to join a hackathon with a preformed team, make sure that each - of your team members joins individually and send an email to - {% if not support_email %}Student Care{% else %} - {{support_email}}{% endif %} at - least a few days before the hackathon. -

-

- 6. ARE THERE PRIZES FOR THE HACK CATEGORIES? + 7. ARE THERE PRIZES FOR THE HACK CATEGORIES?

Prizes depend on the individual hackathons and sponsorship availability.

- 7. WHO JUDGES THE WINNERS? + 8. WHO JUDGES THE WINNERS?

The winning team will be decided by a jury made up of Code Institute staff @@ -99,7 +125,7 @@

Institute.

- 8. WHAT IS THE EVALUATION CRITERIA FOR THE SELECTION OF THE WINNING TEAM? + 9. WHAT IS THE EVALUATION CRITERIA FOR THE SELECTION OF THE WINNING TEAM?

The jury will analyze and evaluate all works submitted by each team @@ -127,7 +153,7 @@

hackathon itself)

- 9. WHAT IS THE THEME FOR THE HACKATHON? + 10. WHAT IS THE THEME FOR THE HACKATHON?

Hackathon themes vary depending on the hackathon itself. The theme will be From c6bf0d2f1e851029bb1bd89ed7459558e7faa565 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Tue, 23 Feb 2021 10:31:20 +0000 Subject: [PATCH 03/11] Update footer with updated blurb --- templates/includes/footer.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/includes/footer.html b/templates/includes/footer.html index 43f6c5ec..e141ba3a 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -3,9 +3,12 @@

Policies

    +
  • + Community Guidelines +
  • - Privacy Policy + Privacy Policy
  • @@ -22,9 +25,6 @@

    FAQ

    • {% if user.is_authenticated %} -
  • - Judging Criteria -
  • Useful Resources
    • @@ -40,10 +40,10 @@

    About Us

    - Code Institute is the leading global provider - of online coding education. Credit-rated by Edinburgh Napier University and validated by the Higher - Education Authority in Sweden, the Ministry of Communications in Singapore, and the Higher Education - Authority in Ireland. + Code Institute's mission is to change lives and careers by + delivering online, accelerated coding courses that are + University Credit rated and Jobs focused, enhanced by + technology but delivered by people.

From 08dc9f4b3b28133c37dd69a0a8657be742cd1011 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Tue, 23 Feb 2021 10:31:44 +0000 Subject: [PATCH 04/11] Adding mention of the Community Guidelines underneath the signin --- templates/allauth/socialaccount/snippets/slack_signin.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/allauth/socialaccount/snippets/slack_signin.html b/templates/allauth/socialaccount/snippets/slack_signin.html index 6d31c668..84e34d92 100644 --- a/templates/allauth/socialaccount/snippets/slack_signin.html +++ b/templates/allauth/socialaccount/snippets/slack_signin.html @@ -8,5 +8,12 @@ href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"> + {% endif %} {% endfor %} From 4e1946a2a45ddab7a8ed5a2b17c4ab4ad6b0eaf4 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Tue, 23 Feb 2021 10:32:12 +0000 Subject: [PATCH 05/11] Removing links to judging criteria and adding other guidelines --- home/urls.py | 1 - home/views.py | 8 +---- static/css/allauthstyles.css | 6 ++++ templates/includes/navbar.html | 8 +++-- templates/judging-criteria.html | 57 -------------------------------- templates/plagiarism-policy.html | 31 ++++++++++++++++- 6 files changed, 43 insertions(+), 68 deletions(-) delete mode 100644 templates/judging-criteria.html diff --git a/home/urls.py b/home/urls.py index 2cabc2a8..b562eddd 100644 --- a/home/urls.py +++ b/home/urls.py @@ -4,7 +4,6 @@ urlpatterns = [ path("", views.home, name="home"), path("faq/", views.faq, name="faq"), - path("judging_criteria/", views.judging_criteria, name="judging_criteria"), path("plagiarism_policy/", views.plagiarism_policy, name="plagiarism_policy"), path("privacy_policy/", views.privacy_policy, name="privacy_policy"), path("post_login/", views.index, name="post_login"), diff --git a/home/views.py b/home/views.py index d3c2a262..0bbddc63 100644 --- a/home/views.py +++ b/home/views.py @@ -28,7 +28,7 @@ def home(request): """ hackathons = Hackathon.objects.filter( status__in=PUBLIC_STATUSES, - organisation=1).all() + organisation=1).order_by('id') paginator = Paginator(hackathons, 2) page = request.GET.get('page') paged_hackathons = paginator.get_page(page) @@ -43,12 +43,6 @@ def faq(request): return render(request, "faq.html", {'support_email': support_email}) -def judging_criteria(request): - """ A view to return the Judging Criteria page """ - - return render(request, "judging-criteria.html") - - def plagiarism_policy(request): """ A view to return the Plagiarism Policy page """ diff --git a/static/css/allauthstyles.css b/static/css/allauthstyles.css index e70f869c..e4169cc1 100644 --- a/static/css/allauthstyles.css +++ b/static/css/allauthstyles.css @@ -68,3 +68,9 @@ html form button:hover { font-style: italic; color: var(--p-orange); } + +.signin-subheading { + font-style: italic; + margin-top: 50px; + font-size: .85rem; +} \ No newline at end of file diff --git a/templates/includes/navbar.html b/templates/includes/navbar.html index 20982328..9c690b3c 100644 --- a/templates/includes/navbar.html +++ b/templates/includes/navbar.html @@ -14,6 +14,7 @@ Home {% if user.is_authenticated %} + {% if user.is_superuser %}
  • Create Hackathon {% endif %} View Hackathons - Winning Projects
    • + {% else %} +
  • + View Hackathons +
    • + {% endif %}
  • FAQs - Judging Criteria Useful Resources
    • diff --git a/templates/judging-criteria.html b/templates/judging-criteria.html deleted file mode 100644 index 3b1b4f48..00000000 --- a/templates/judging-criteria.html +++ /dev/null @@ -1,57 +0,0 @@ -{% 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 %} - diff --git a/templates/plagiarism-policy.html b/templates/plagiarism-policy.html index 68e9341c..889974a9 100644 --- a/templates/plagiarism-policy.html +++ b/templates/plagiarism-policy.html @@ -3,6 +3,35 @@ {% block content %}

    Plagiarism Policy

    - +

    + Plagiarism, as defined by the Oxford dictionary is “the practice of taking + someone else's work or ideas and passing them off as one's own.” It is a + serious academic offence for which there are serious consequences. +

    +

    + It is acceptable to use and reference others’ code however it is an + academic plagiarism offence if any piece of work which is not entirely the + students own is not correctly referenced or acknowledged. All student + projects submitted will be reviewed for plagiarism. This includes checking + code comparison tools, plagiarism software, review of git commit history + and other mechanisms. +

    +

    + It is the responsibility of each student to ensure that any direct or + indirect inclusion of the work of others is fully and adequately + acknowledged. We appreciate that plagiarism may be unintentional however + it will still be treated as an offence. The Tutoring team can answer any + plagiarism related queries, but as a general rule, if in doubt, include + attribution of all sources. +

    +

    + Students are encouraged to ask mentors, tutors and their peers for advice + about their project work but any submission should not include any code + written by others unless it is explicitly credited to them. Failure to + correctly credit code that a student hasn’t created themselves will be + considered plagiarism and will result in a failing grade. Blatant or + repeat offences of plagiarism will not be tolerated and will result in + stringent penalties being applied, including removal from the course. +

    {% endblock %} From 1bece302e3155758a65e8cd682f7e1322ffa0008 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Tue, 23 Feb 2021 10:34:20 +0000 Subject: [PATCH 06/11] Adding blank line at the end of document --- static/css/allauthstyles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/allauthstyles.css b/static/css/allauthstyles.css index e4169cc1..0a00d6ac 100644 --- a/static/css/allauthstyles.css +++ b/static/css/allauthstyles.css @@ -73,4 +73,4 @@ html form button:hover { font-style: italic; margin-top: 50px; font-size: .85rem; -} \ No newline at end of file +} From 6d2d8cc4ebb7c6b24ba58891c11e5ba3b3733256 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Wed, 24 Feb 2021 12:18:11 +0000 Subject: [PATCH 07/11] Fixing showcase image --- teams/templates/includes/showcase_member.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams/templates/includes/showcase_member.html b/teams/templates/includes/showcase_member.html index d26e8482..e34494a2 100644 --- a/teams/templates/includes/showcase_member.html +++ b/teams/templates/includes/showcase_member.html @@ -12,6 +12,6 @@
    {% if not member.full_name %}{{member.sla {% else %} Profile Image + src="{% static 'img/profiles/profile.png' %}" alt="Profile Image"> {% endif %} From f96665b40b58c483063eeb5d01339c70e2af832e Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Wed, 24 Feb 2021 14:33:09 +0000 Subject: [PATCH 08/11] Changing some wording --- hackathon/templates/hackathon/hackathon_view.html | 2 +- hackathon/templates/hackathon/includes/enrollpart.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hackathon/templates/hackathon/hackathon_view.html b/hackathon/templates/hackathon/hackathon_view.html index be06efc3..2e99f7d7 100644 --- a/hackathon/templates/hackathon/hackathon_view.html +++ b/hackathon/templates/hackathon/hackathon_view.html @@ -124,7 +124,7 @@

    {% endfor %} {% else %}
    -

    No teams have registered for this yet! Be the first?

    +

    Teams have not been distributed yet.

    {% endif %} diff --git a/hackathon/templates/hackathon/includes/enrollpart.html b/hackathon/templates/hackathon/includes/enrollpart.html index 740de027..2ef3c289 100644 --- a/hackathon/templates/hackathon/includes/enrollpart.html +++ b/hackathon/templates/hackathon/includes/enrollpart.html @@ -20,7 +20,7 @@ {% if hackathon.status == 'hack_in_progress' or hackathon.status == 'judging' %} You are participanting in this hackathon. {% elif hackathon.status == 'finished' %} - You are participated in this hackathon. + You participated in this hackathon. {% endif %} {% else %} Registrations for this hackathon are currently not open. From 4285fcc0dc25b241a2345affa057cef5ad898164 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Wed, 24 Feb 2021 14:35:20 +0000 Subject: [PATCH 09/11] Adding sentry integration --- main/settings.py | 10 ++++++++++ requirements.txt | 1 + 2 files changed, 11 insertions(+) diff --git a/main/settings.py b/main/settings.py index f0d78f91..921a3eea 100644 --- a/main/settings.py +++ b/main/settings.py @@ -1,5 +1,9 @@ import os + import dj_database_url +import sentry_sdk +from sentry_sdk.integrations.django import DjangoIntegration + if os.path.exists(".env"): from dotenv import load_dotenv load_dotenv() @@ -189,3 +193,9 @@ 'level': 'WARNING', }, } + +if os.environ.get('SENTRY_DSN'): + sentry_sdk.init( + dsn=os.environ.get('SENTRY_DSN'), + integrations=[DjangoIntegration()] + ) diff --git a/requirements.txt b/requirements.txt index 1c29b87a..43b458ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,6 +26,7 @@ python3-openid==3.2.0 pytz==2020.1 requests==2.24.0 requests-oauthlib==1.3.0 +sentry-sdk==0.10.2 six==1.15.0 sqlparse==0.3.1 traitlets==5.0.5 From 4e9b6d0993d787e364a872a29a0ef4f080224df7 Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Wed, 24 Feb 2021 16:06:08 +0000 Subject: [PATCH 10/11] Adding some content changes --- hackathon/templates/hackathon/hackathon_view.html | 3 ++- templates/faq.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hackathon/templates/hackathon/hackathon_view.html b/hackathon/templates/hackathon/hackathon_view.html index 2e99f7d7..4fad7734 100644 --- a/hackathon/templates/hackathon/hackathon_view.html +++ b/hackathon/templates/hackathon/hackathon_view.html @@ -95,7 +95,8 @@

    Team members:

    {% for participant in team.participants.get_queryset %} -

    +

    + {{ participant.slack_display_name }}

    {% endfor %} diff --git a/templates/faq.html b/templates/faq.html index 8708079f..4ba330fa 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -14,7 +14,7 @@

    The goal of a hackathon is to create functioning software or hardware prototype - by the end of the event which usually lasts . Hackathons tend to have a specific + by the end of the event which usually lasts a few days. Hackathons tend to have a specific focus, which can include the programming language used, the operating system, an application, an API, or the subject and the demographic group of the programmers.

    From 4b8025ef0c98f6fdb8f99b527104f3f5455c3fbf Mon Sep 17 00:00:00 2001 From: Stefan Dworschak Date: Wed, 24 Feb 2021 16:13:44 +0000 Subject: [PATCH 11/11] Fixing some last content changes --- templates/faq.html | 4 ++-- templates/includes/footer.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/faq.html b/templates/faq.html index 4ba330fa..37a9e64c 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -69,7 +69,7 @@

    You can do that either from the start page, the - View Hackathons page + View Hackathons page or (if you have a direct link) from the detail view of the hackathon directly; simply click on the "Enroll as participant" button when the registration is open. @@ -91,7 +91,7 @@

  • If it does not say "You are enrolled in this hackathon!", either click on "Enroll as participant" (if the button is visible) or - contanct {{support_email}} + contact {{support_email}}

    • diff --git a/templates/includes/footer.html b/templates/includes/footer.html index e141ba3a..3717b7ac 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -43,7 +43,7 @@

    Code Institute's mission is to change lives and careers by delivering online, accelerated coding courses that are University Credit rated and Jobs focused, enhanced by - technology but delivered by people. + technology, but delivered by people.