diff --git a/README.md b/README.md index 95c84d8..e0fcd07 100644 --- a/README.md +++ b/README.md @@ -98,3 +98,5 @@ Project home page: http://118.25.96.118/gsrycloud/TreeLib/ - karro26-陈冬卉-201732120102 - Joffool-陈金龙-201732120112 - Weichao-Chen-陈伟超-201732120113 +- Yeboah Martha Asamoah - 201732120135 +- Tanaka Michelle Sandati -201732120134 diff --git a/templates/donation.html b/templates/donation.html index 494fe6a..e856bf7 100644 --- a/templates/donation.html +++ b/templates/donation.html @@ -1,16 +1,15 @@ -{% extends "template.html" %} +{% extends "template.html" %} {% block content %} -{% block content %} - body style="background-color:#dadada;"> -
-
-

In the development of the site, you can scan the QR code to support us.

- + +
+
+

In the development of the site, you can scan the QR code to support us.

+ +
-



-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/login.html b/templates/login.html index 99df999..e52ebdf 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,30 +1,28 @@ -{% extends "template.html" %} +{% extends "template.html" %} {% block content %} -{% block content %} +
+ + + + + + + + + + + + + + -
-
Email
Password
{% if error %} +
{{ error }}
+ {% endif %}
- - - - - - - - - - - - - - - -
Email
Password
{% if error %} -
{{ error }}
- {% endif %}
+ +

- +
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/template.html b/templates/template.html index 662c63c..8288181 100644 --- a/templates/template.html +++ b/templates/template.html @@ -1,108 +1,210 @@ + - - + - - + + - - + + - + + - + - - + - - - {% block head %} - - {% endblock %} + {% block head %} {% endblock %} + - +
+
+ +
+
+
+
+
- {% block content %} - - {% endblock %} + {% block content %} {% endblock %}
-
-
-
+
+
+
- + + \ No newline at end of file