diff --git a/app/main/routes.py b/app/main/routes.py index 8beda271..2cddf547 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -31,6 +31,11 @@ def index(): return render_template("index.html", title="Mentor matcher") +@main_bp.route("/match", methods=["GET"]) +def match(): + return render_template("match.html", title="Mentor matcher") + + @main_bp.route("/cookies") def cookies(): return render_template("cookies.html", title="Cookies") @@ -63,12 +68,11 @@ def upload(): else: if len(files) != 2: error_message = ( - "Number of files is incorrect. Please only upload two files" + "Number of files is incorrect. Please only upload two files." ) elif not valid_files(filenames): error_message = ( - "Filenames incorrect. Please label your files as 'mentees.csv' and" - " 'mentors.csv'" + "Your filenames are incorrect. Please label your files as 'mentees.csv' and 'mentors.csv'." ) else: error_message = "Unspecified error. Please contact the admin team" diff --git a/app/templates/index.html b/app/templates/index.html index 8e31987c..ec947be1 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -5,34 +5,21 @@ {% endblock %} {% block content %} -
-
-

Tasks

-
-

Pick a task length.

-
- - -
-
-
+
+
+
+

Before you start

+
    +
  1. This tool will only work with data in specific formats. You must have two files – mentees.csv and mentors.csv – to start the matching process. Those files need to be formatted with specific column headings. You can download a template from this website.
    2. +
  2. Do not close your browser window during the matching process. Doing this may cause the matching process to fail and you to lose your matches.
    3. +
  3. The larger the number of matches you need, the longer this takes. Matching mentors to mentees takes around 10 minutes to match 500 participants.
    4. +
+
+
+ Start now +
+
+
- - - -
-

Matching complete

-
-
-

The matching process is complete.

-

Use the Download matches button to get the results.

-
- - -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/app/templates/input.html b/app/templates/input.html index 6b258c92..d8e13ba3 100644 --- a/app/templates/input.html +++ b/app/templates/input.html @@ -3,20 +3,32 @@ {% block head %} {{ super() }} {% endblock %} + +{% block pagecaption %}Mentor matcher{% endblock %} +{% block pageheading %}Upload your data{% endblock %} +{% block pageexcerpt %}Upload the mentors and mentees you want to match.{% endblock %} + {% block content %} -

Upload

-{% if error_message %} -
- Error: {{ error_message }} -
-{% endif %} -
-
- - +
+
+
+ + {% if error_message %} +
+

An error has occurred

+

{{ error_message }}

+
+ {% endif %} +
+ + +
+
+ +
- - +
+
{% endblock %} diff --git a/app/templates/process.html b/app/templates/process.html index 52f37588..5414783e 100644 --- a/app/templates/process.html +++ b/app/templates/process.html @@ -1,27 +1,24 @@ {% extends 'base.html' %} {% block title %}Process matches{% endblock %} {% block head %}{{ super() }}{% endblock %} + +{% block pagecaption %}Mentor matcher{% endblock %} +{% block pageheading %}Match mentors to mentees{% endblock %} +{% block pageexcerpt %}Process the data and match mentors to mentees.{% endblock %} + {% block content %} -
-
-
-

- Process data -

-
-
-
+
-
- +

Matching complete