From f54b66de6b569f96841f3685ffda215485136f0a Mon Sep 17 00:00:00 2001 From: WhyteAsamoah Date: Tue, 5 Jan 2021 23:59:48 -0800 Subject: [PATCH 1/6] Added CSS design icons to the navigation bar and changed the color of the navigation bar. --- templates/template.html | 260 ++++++++++++++++++++++++++++------------ 1 file changed, 181 insertions(+), 79 deletions(-) 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 From 18f353ed483e3bad5993bf5522707115e4305845 Mon Sep 17 00:00:00 2001 From: WhyteAsamoah Date: Wed, 6 Jan 2021 00:33:01 -0800 Subject: [PATCH 2/6] Adding CSS icons to the login page --- templates/login.html | 46 +++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) 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 From 8f119c9bfec84ee260f7ed799db6bd12e9abd120 Mon Sep 17 00:00:00 2001 From: WhyteAsamoah Date: Wed, 6 Jan 2021 00:44:25 -0800 Subject: [PATCH 3/6] Added a missing opening angle bracket on the body tag in line 3 --- templates/donation.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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 From 6a7d0bf756fac0b10384adeb6090f311631e606e Mon Sep 17 00:00:00 2001 From: WhyteAsamoah <48984303+WhyteAsamoah@users.noreply.github.com> Date: Wed, 6 Jan 2021 00:53:12 -0800 Subject: [PATCH 4/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 95c84d8..e929516 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 From 3c4a1bb96e0fb6c565e9724ace2509ecf3a7d819 Mon Sep 17 00:00:00 2001 From: WhyteAsamoah <48984303+WhyteAsamoah@users.noreply.github.com> Date: Wed, 6 Jan 2021 00:54:13 -0800 Subject: [PATCH 5/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e929516..97039a5 100644 --- a/README.md +++ b/README.md @@ -98,5 +98,7 @@ 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 From 4e4ad32b9514d3afa6dea799e2d2df17d6363ad3 Mon Sep 17 00:00:00 2001 From: WhyteAsamoah <48984303+WhyteAsamoah@users.noreply.github.com> Date: Wed, 6 Jan 2021 00:55:06 -0800 Subject: [PATCH 6/6] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 97039a5..e0fcd07 100644 --- a/README.md +++ b/README.md @@ -98,7 +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 +- Yeboah Martha Asamoah - 201732120135 +- Tanaka Michelle Sandati -201732120134