From 3ed451b81ad0465f01d00ec5164cd4f99936d259 Mon Sep 17 00:00:00 2001 From: gboeker Date: Sat, 24 Feb 2024 21:05:40 -0500 Subject: [PATCH 1/4] finish up home screen --- static/css/style.css | 85 +++++++++++++++++++++++++-------------- templates/login.html | 4 +- templates/mainScreen.html | 16 ++++++-- 3 files changed, 69 insertions(+), 36 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 78e47b6..bba869a 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,31 +1,56 @@ body { - font-family: sans-serif; - background: #5e4d47; - padding: 48px; - } - - h1 { - color: #e1948d; - text-align: center; - font-size: 115px; - } - - h3 { - color: #e1948d; - text-align: center; - font-size: 55px; - } - - .card { - display: flex; - justify-content: center; - align-items: center; - - margin: auto; - width: 90%; - aspect-ratio: 8 / 5; - border-radius: 7rem; - background: #fafafa; - padding: 10px; - } - \ No newline at end of file + font-family: sans-serif; + background: #5e4d47; + padding: 48px; +} + +h1 { + color: #e1948d; + text-align: center; + font-size: 115px; +} + +h3 { + color: #e1948d; + text-align: center; + font-size: 55px; +} + +.card { + display: flex; + justify-content: center; + align-items: center; + margin: auto; + width: 90%; + aspect-ratio: 8 / 5; + border-radius: 7rem; + background: #fafafa; + padding: 10px; + margin-bottom: 10%; +} + +.buttons { + display: flex; + justify-content: space-between; + flex-direction: column; + align-items: center; + margin: auto; + width: 90%; + aspect-ratio: 9 / 5; + +} + +.button { + width: 100%; + height: 25%; + padding: 20px; + margin: 10px 0; + background-color: #E1948D; + border: 1px solid #E1948D; + border-radius: 4px; + cursor: pointer; + box-sizing: border-box; + font-weight: bold; + color: #FAFAFA; + font-size: 50px; +} diff --git a/templates/login.html b/templates/login.html index b679469..40c26a3 100644 --- a/templates/login.html +++ b/templates/login.html @@ -63,12 +63,12 @@ box-sizing: border-box; font-weight: bold; } - + + /* I think hover may not be as important bc its for the phone */ .login-container input[type="submit"]:hover { background-color: #B05E57; border: 1px solid #B05E57; } - diff --git a/templates/mainScreen.html b/templates/mainScreen.html index e7f748c..3ba4742 100644 --- a/templates/mainScreen.html +++ b/templates/mainScreen.html @@ -21,11 +21,19 @@

DIVE DEEPER

-
-
-

build deeper connections with people.

-

+
+

build deeper connections with people.

+

+ +
+
+ + +
+
+ + \ No newline at end of file From d0ad5781162208a6ae4779b4270f56aeacd4d538 Mon Sep 17 00:00:00 2001 From: gboeker Date: Sat, 24 Feb 2024 22:26:29 -0500 Subject: [PATCH 2/4] add routes for login and signup --- app.py | 12 ++++++++++++ templates/{signin.html => signup.html} | 0 2 files changed, 12 insertions(+) rename templates/{signin.html => signup.html} (100%) diff --git a/app.py b/app.py index 99ed3fa..6963283 100644 --- a/app.py +++ b/app.py @@ -26,6 +26,18 @@ def home(): return render_template('mainScreen.html') +@app.route("/login", methods=["GET", "POST"]) +def login(): + # would get form fields + # would check if correct username and password + return render_template('login.html') + +@app.route("/signup", methods=["GET", "POST"]) +def signup(): + #would add user to db + #would redirect to template for login + return render_template('signup.html') + @app.route("//decks") def allDecks(username): # would need to first find user in db, but not set up yet diff --git a/templates/signin.html b/templates/signup.html similarity index 100% rename from templates/signin.html rename to templates/signup.html From 50a8fffe362ace875e40681ce585ce002d076bd5 Mon Sep 17 00:00:00 2001 From: gboeker Date: Sat, 24 Feb 2024 23:26:15 -0500 Subject: [PATCH 3/4] refactor html css consistent components --- app.py | 4 +- static/css/style.css | 16 ++++++- templates/base.html | 28 ++++++++++++ templates/login.html | 91 +++++--------------------------------- templates/mainScreen.html | 39 ----------------- templates/signup.html | 92 +++++---------------------------------- templates/start.html | 17 ++++++++ 7 files changed, 84 insertions(+), 203 deletions(-) create mode 100644 templates/base.html delete mode 100644 templates/mainScreen.html create mode 100644 templates/start.html diff --git a/app.py b/app.py index 6963283..ad578cc 100644 --- a/app.py +++ b/app.py @@ -24,7 +24,9 @@ @app.route("/") def home(): - return render_template('mainScreen.html') + # TODO: redirect to login + # TODO: redirect to sign up + return render_template('start.html') @app.route("/login", methods=["GET", "POST"]) def login(): diff --git a/static/css/style.css b/static/css/style.css index bba869a..fc50566 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -29,7 +29,7 @@ h3 { margin-bottom: 10%; } -.buttons { +.vertical-align { display: flex; justify-content: space-between; flex-direction: column; @@ -54,3 +54,17 @@ h3 { color: #FAFAFA; font-size: 50px; } + +.user-input { + width: 100%; + height: 20%; + padding: 20px; + margin: 10px 0; + background-color: #fafafa; + border: 1px solid #fafafa; + border-radius: 4px; + box-sizing: border-box; + color: #FAFAFA; + font-size: 40px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..c53c09d --- /dev/null +++ b/templates/base.html @@ -0,0 +1,28 @@ + + + + DIVE DEEPER Mobile Web App + + + +
+
+ +
+
+ +
{% block container %} {% endblock %}
+ +
+ otter.gif +
+ + + diff --git a/templates/login.html b/templates/login.html index 40c26a3..a26d9da 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,84 +1,13 @@ - - - - - - Login - - - - -

DIVE DEEPER

- - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/templates/mainScreen.html b/templates/mainScreen.html deleted file mode 100644 index 3ba4742..0000000 --- a/templates/mainScreen.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - DIVE DEEPER Mobile Web App - - - -
-
- -
-
- -
-

build deeper connections with people.

-

- -
-
- - - -
-
- - - - - \ No newline at end of file diff --git a/templates/signup.html b/templates/signup.html index 3f9a600..3ed9425 100644 --- a/templates/signup.html +++ b/templates/signup.html @@ -1,84 +1,14 @@ - - - - - - Sign In - - - - -

DIVE DEEPER

- - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/templates/start.html b/templates/start.html new file mode 100644 index 0000000..92494f6 --- /dev/null +++ b/templates/start.html @@ -0,0 +1,17 @@ +{% extends 'base.html' %} + +{% block container %} + +
+

build deeper connections with people.

+
+ +
+
+ + + +
+
+ +{% endblock %} \ No newline at end of file From 6d64d2c0eb2476c4fec1518b3e83ffe388f3fbc4 Mon Sep 17 00:00:00 2001 From: gboeker Date: Sat, 24 Feb 2024 23:31:17 -0500 Subject: [PATCH 4/4] center otter --- static/css/style.css | 6 ++++++ templates/base.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/static/css/style.css b/static/css/style.css index fc50566..72fe258 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -67,4 +67,10 @@ h3 { color: #FAFAFA; font-size: 40px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); +} + +.image { + display: flex; + justify-content: center; + align-items: center; } \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index c53c09d..0ad6668 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,7 +21,7 @@

DIVE DEEPER

{% block container %} {% endblock %}
- otter.gif + otter.gif