From 64d78004380f1711a27b3be2b4094157dec0b1e5 Mon Sep 17 00:00:00 2001 From: dmvillasenor <46989848+dmvillasenor@users.noreply.github.com> Date: Tue, 8 Mar 2022 21:13:44 -0800 Subject: [PATCH 1/9] Unit testing + Project restructure --- app.py | 9 ++ main.py | 112 ------------------ ratemybronco/__init__.py | 110 +++++++++++++++++ .../templates}/index.html | 0 .../templates}/layout.html | 0 .../templates}/result.html | 0 .../templates}/search.html | 0 test_app.py | 17 +++ 8 files changed, 136 insertions(+), 112 deletions(-) create mode 100644 app.py delete mode 100644 main.py create mode 100644 ratemybronco/__init__.py rename {templates => ratemybronco/templates}/index.html (100%) rename {templates => ratemybronco/templates}/layout.html (100%) rename {templates => ratemybronco/templates}/result.html (100%) rename {templates => ratemybronco/templates}/search.html (100%) create mode 100644 test_app.py diff --git a/app.py b/app.py new file mode 100644 index 0000000..972be32 --- /dev/null +++ b/app.py @@ -0,0 +1,9 @@ +from ratemybronco import create_app + +def main(): + app = create_app() + app.run() + + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/main.py b/main.py deleted file mode 100644 index 356ceea..0000000 --- a/main.py +++ /dev/null @@ -1,112 +0,0 @@ -from crypt import methods -from flask import Flask, redirect, render_template, request -import base64 -from io import BytesIO -from matplotlib.figure import Figure -from IPython.display import display -from pymongo import MongoClient -import numpy as np -from sklearn.datasets import load_iris -import pandas as pd -import matplotlib as plt -import mysql.connector -from flask_debugtoolbar import DebugToolbarExtension -import os - - - -app = Flask(__name__) - - -### MySQL connector and set up -ratemybroncoDB = mysql.connector.connect(host="localhost", user="root", database="ratemybronco") -mycursor = ratemybroncoDB.cursor() - - -### Landing page routing -@app.route("/") -def landing(): - return render_template("index.html") - - - - -### Search page routing and support -names = [] # To be replaced with database access -@app.route("/search", methods=["GET","POST"]) -def search(): - if request.method == "GET": - return render_template("search.html", professors=names) - - # check the if there is a number in the query then search the courses - professor = request.form.get("professor") - if not professor: - return "output blank" - - names.append(professor) - - return redirect("/search") - -@app.route("/professor/") -def professor_page (name, course): - pass - - -### add raiting to the database with a SQL -@app.route("/review", methods=["POST", "GET"]) -def add_rating(): - - if request.method == "GET": - return render_template("addRating.html") - - # Add server side checking - # get all the data from the field - ProfessorName = request.form.get("ProfessorName") - courseName = request.form.get("courseName") - Semester = request.form.get("Semester") - Rating = request.form.get("Rating") - Comment = request.form.get("Comment") - - # no need to call an html or redirect - # compile it into a csv - user_rating = f'"{ProfessorName}" , "{courseName}", "{Semester}", "{Rating}", "{Comment}"' # put in format with commas so we can add it as an sql_command - sql_command = f"INSERT INTO cards (ProfessorName, Class, Semester, Rating, Comment) VALUES ({user_rating});" # add a new row into cards table which we will need to create. - - # Execute this command, expecting no returns. - mycursor.execute(sql_command) - -### Thank you page or the submitted page -@app.route("/submitted", method=["GET"]) -def submitted(): - return "Thank You" - - - -### Return the grade disbursement for the displaying of the data -@app.route("/grade-disbursements") -def grades(): - # Loading irirs dataset - data = load_iris() - df = pd.DataFrame(data.data,columns = data.feature_names) - - # Generate the matplot figure **without using pyplot**. - fig = Figure() - ax = fig.subplots() - grades = ['A', 'B', 'C', 'D', 'F'] - disbursements = [10, 18, 8, 5, 3] - ax.bar(grades, disbursements, color=['red', 'orange', 'yellow', 'green', 'blue']) - ax.set_xlabel("Grade Received") - ax.set_ylabel("Number of Students") - ax.set_title("[Prof Name], [Course Number], [Semester], [Year] Grade Disbursement") - # Save it to a temporary buffer. - buf = BytesIO() - fig.savefig(buf, format="png") - # Embed the result in the html output. - data = base64.b64encode(buf.getbuffer()).decode("ascii") - - return f"Grade Disbursement Page {display(df)} " - - -### Run if main -if __name__ == "__main__": - app.run(DEBUG=True) diff --git a/ratemybronco/__init__.py b/ratemybronco/__init__.py new file mode 100644 index 0000000..30f4b21 --- /dev/null +++ b/ratemybronco/__init__.py @@ -0,0 +1,110 @@ +from crypt import methods +from flask import Flask, redirect, render_template, request +import base64 +from io import BytesIO +from matplotlib.figure import Figure +from IPython.display import display +from pymongo import MongoClient +import numpy as np +from sklearn.datasets import load_iris +import pandas as pd +import matplotlib as plt +import mysql.connector +from flask_debugtoolbar import DebugToolbarExtension +import os + + +def create_app(): + app = Flask(__name__) + + + ### MySQL connector and set up + ratemybroncoDB = mysql.connector.connect(host="localhost", user="root", database="ratemybronco") + mycursor = ratemybroncoDB.cursor() + + + ### Landing page routing + @app.route("/") + def landing(): + return render_template("index.html") + + + + + ### Search page routing and support + names = [] # To be replaced with database access + @app.route("/search", methods=["GET","POST"]) + def search(): + if request.method == "GET": + return render_template("search.html", professors=names) + + # check the if there is a number in the query then search the courses + professor = request.form.get("professor") + if not professor: + return "output blank" + + names.append(professor) + + return redirect("/search") + + @app.route("/professor/") + def professor_page (name, course): + pass + + + ### add raiting to the database with a SQL + @app.route("/review", methods=["POST", "GET"]) + def add_rating(): + + if request.method == "GET": + return render_template("addRating.html") + + # Add server side checking + # get all the data from the field + ProfessorName = request.form.get("ProfessorName") + courseName = request.form.get("courseName") + Semester = request.form.get("Semester") + Rating = request.form.get("Rating") + Comment = request.form.get("Comment") + + # no need to call an html or redirect + # compile it into a csv + user_rating = f'"{ProfessorName}" , "{courseName}", "{Semester}", "{Rating}", "{Comment}"' # put in format with commas so we can add it as an sql_command + sql_command = f"INSERT INTO cards (ProfessorName, Class, Semester, Rating, Comment) VALUES ({user_rating});" # add a new row into cards table which we will need to create. + + # Execute this command, expecting no returns. + mycursor.execute(sql_command) + + ### Thank you page or the submitted page + @app.route("/submitted", method=["GET"]) + def submitted(): + return "Thank You" + + + + ### Return the grade disbursement for the displaying of the data + @app.route("/grade-disbursements") + def grades(): + # Loading irirs dataset + data = load_iris() + df = pd.DataFrame(data.data,columns = data.feature_names) + + # Generate the matplot figure **without using pyplot**. + fig = Figure() + ax = fig.subplots() + grades = ['A', 'B', 'C', 'D', 'F'] + disbursements = [10, 18, 8, 5, 3] + ax.bar(grades, disbursements, color=['red', 'orange', 'yellow', 'green', 'blue']) + ax.set_xlabel("Grade Received") + ax.set_ylabel("Number of Students") + ax.set_title("[Prof Name], [Course Number], [Semester], [Year] Grade Disbursement") + # Save it to a temporary buffer. + buf = BytesIO() + fig.savefig(buf, format="png") + # Embed the result in the html output. + data = base64.b64encode(buf.getbuffer()).decode("ascii") + + return f"Grade Disbursement Page {display(df)} " + + return app + diff --git a/templates/index.html b/ratemybronco/templates/index.html similarity index 100% rename from templates/index.html rename to ratemybronco/templates/index.html diff --git a/templates/layout.html b/ratemybronco/templates/layout.html similarity index 100% rename from templates/layout.html rename to ratemybronco/templates/layout.html diff --git a/templates/result.html b/ratemybronco/templates/result.html similarity index 100% rename from templates/result.html rename to ratemybronco/templates/result.html diff --git a/templates/search.html b/ratemybronco/templates/search.html similarity index 100% rename from templates/search.html rename to ratemybronco/templates/search.html diff --git a/test_app.py b/test_app.py new file mode 100644 index 0000000..19d3961 --- /dev/null +++ b/test_app.py @@ -0,0 +1,17 @@ +import pytest +from ratemybronco import create_app + + +@pytest.fixture +def app(): + app = create_app() + return app + + +@pytest.fixture +def client(app): + return app.test_client() + + +def test_landing(client): + assert client.get("/").status_code == 200 \ No newline at end of file From a130a278eacfd2e59482a6ea48eaa4c60488f327 Mon Sep 17 00:00:00 2001 From: dmvillasenor <46989848+dmvillasenor@users.noreply.github.com> Date: Tue, 8 Mar 2022 22:17:43 -0800 Subject: [PATCH 2/9] Unit testing + Project restructure --- app.py | 8 ++++++++ main.py => ratemybronco/__init__.py | 0 {templates => ratemybronco/templates}/index.html | 0 {templates => ratemybronco/templates}/layout.html | 0 {templates => ratemybronco/templates}/result.html | 0 {templates => ratemybronco/templates}/search.html | 0 test_app.py | 11 +++++++++++ 7 files changed, 19 insertions(+) create mode 100644 app.py rename main.py => ratemybronco/__init__.py (100%) rename {templates => ratemybronco/templates}/index.html (100%) rename {templates => ratemybronco/templates}/layout.html (100%) rename {templates => ratemybronco/templates}/result.html (100%) rename {templates => ratemybronco/templates}/search.html (100%) create mode 100644 test_app.py diff --git a/app.py b/app.py new file mode 100644 index 0000000..3ea37d4 --- /dev/null +++ b/app.py @@ -0,0 +1,8 @@ +from ratemybronco import app + +def main(): + app.run(debug=True) + + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/main.py b/ratemybronco/__init__.py similarity index 100% rename from main.py rename to ratemybronco/__init__.py diff --git a/templates/index.html b/ratemybronco/templates/index.html similarity index 100% rename from templates/index.html rename to ratemybronco/templates/index.html diff --git a/templates/layout.html b/ratemybronco/templates/layout.html similarity index 100% rename from templates/layout.html rename to ratemybronco/templates/layout.html diff --git a/templates/result.html b/ratemybronco/templates/result.html similarity index 100% rename from templates/result.html rename to ratemybronco/templates/result.html diff --git a/templates/search.html b/ratemybronco/templates/search.html similarity index 100% rename from templates/search.html rename to ratemybronco/templates/search.html diff --git a/test_app.py b/test_app.py new file mode 100644 index 0000000..0a073da --- /dev/null +++ b/test_app.py @@ -0,0 +1,11 @@ +import pytest +from ratemybronco import app + + +@pytest.fixture +def client(): + return app.test_client() + + +def test_landing(client): + assert client.get("/").status_code == 200 \ No newline at end of file From 9893ff00dd9977068191b1409122f5719d1bb2d2 Mon Sep 17 00:00:00 2001 From: jessicamargala <56134693+jessicamargala@users.noreply.github.com> Date: Thu, 10 Mar 2022 21:33:03 -0800 Subject: [PATCH 3/9] test POST 405 response --- ratemybronco/__init__.py | 12 ++++++------ test_app.py | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ratemybronco/__init__.py b/ratemybronco/__init__.py index 356ceea..fd8e44c 100644 --- a/ratemybronco/__init__.py +++ b/ratemybronco/__init__.py @@ -1,4 +1,4 @@ -from crypt import methods +# from crypt import methods from flask import Flask, redirect, render_template, request import base64 from io import BytesIO @@ -9,7 +9,7 @@ from sklearn.datasets import load_iris import pandas as pd import matplotlib as plt -import mysql.connector +# import mysql.connector from flask_debugtoolbar import DebugToolbarExtension import os @@ -19,8 +19,8 @@ ### MySQL connector and set up -ratemybroncoDB = mysql.connector.connect(host="localhost", user="root", database="ratemybronco") -mycursor = ratemybroncoDB.cursor() +# ratemybroncoDB = mysql.connector.connect(host="localhost", user="root", database="ratemybronco") +# mycursor = ratemybroncoDB.cursor() ### Landing page routing @@ -76,7 +76,7 @@ def add_rating(): mycursor.execute(sql_command) ### Thank you page or the submitted page -@app.route("/submitted", method=["GET"]) +@app.route("/submitted", methods=["GET"]) def submitted(): return "Thank You" @@ -109,4 +109,4 @@ def grades(): ### Run if main if __name__ == "__main__": - app.run(DEBUG=True) + app.run(debug=True) diff --git a/test_app.py b/test_app.py index 0a073da..5a91ed1 100644 --- a/test_app.py +++ b/test_app.py @@ -8,4 +8,7 @@ def client(): def test_landing(client): - assert client.get("/").status_code == 200 \ No newline at end of file + assert client.get("/").status_code == 200 + +def test_landing_post(client): + assert client.post('/').status_code == 405 \ No newline at end of file From e71aa38c767e6b62a576490e308a865a7e4e569f Mon Sep 17 00:00:00 2001 From: jessicamargala <56134693+jessicamargala@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:45:57 -0700 Subject: [PATCH 4/9] add frontend --- ratemybronco/static/css/addRatingStyle.css | 101 +++++++++++++++++++ ratemybronco/static/css/search.css | 51 ++++++++++ ratemybronco/static/css/style.css | 60 +++++++++++ ratemybronco/static/js/rating.js | 26 +++++ ratemybronco/templates/addRating.html | 111 +++++++++++++++++++++ ratemybronco/templates/index.html | 70 ++++++++++--- ratemybronco/templates/search.html | 90 +++++++++++++---- 7 files changed, 475 insertions(+), 34 deletions(-) create mode 100644 ratemybronco/static/css/addRatingStyle.css create mode 100644 ratemybronco/static/css/search.css create mode 100644 ratemybronco/static/css/style.css create mode 100644 ratemybronco/static/js/rating.js create mode 100644 ratemybronco/templates/addRating.html diff --git a/ratemybronco/static/css/addRatingStyle.css b/ratemybronco/static/css/addRatingStyle.css new file mode 100644 index 0000000..93c83c2 --- /dev/null +++ b/ratemybronco/static/css/addRatingStyle.css @@ -0,0 +1,101 @@ +body { + background-color: white; + font-family: "Roboto", sans-serif; + font-size: 14px; +} + +h1 { + font-weight: 20; + font-size: 4em; + line-height: 1.3em; +} + +.navbar-nav { + margin-left: auto; +} +/* .right-title { + color: #70ba8f; + position: absolute; + top: 15%; + left: 5%; + text-align: center; +} */ + +/* ul.nav-bar { + background-color: #2c583e41; + position: fixed; + z-index: 3; + right: 0; + margin-top: -8px; + height: 3vh; + overflow: hidden; + display: inline-block; + width: 100%; + vertical-align: middle; + } */ + +/* .link { + padding-left: 2vh; + color: white; + font-size: 2vh; + text-decoration: none; + vertical-align: middle; +} + +.secondary-link { + padding-left: 5%; +} + +.pad { + padding-left: 60%; +} */ + +.legend { + font-size: 3rem; +} + +.form-content { + padding: 25px 50px 75px; +} + +.form-label { + font-size: 1.5rem; +} + +.fieldset { + box-shadow: 0 0 10px grey; + background-color: #70ba8f; + margin-top: 10%; + margin-bottom: 10%; + margin-left: 10%; + margin-right: 10%; + border-radius: 30px; +} + +.form-control { + border-radius: 20px !important; +} + +/* rating */ + +.control-label { + padding-bottom: 30px; +} +.field-label-header { + font-size: 1.5rem; +} + +#rating-ability-wrapper { + margin-top: 50px; + margin-bottom: 50px; +} + +#comment { + margin-top: 0.5em; +} + +.submitRating-button { + margin-top: 20px; + height: 4rem; + box-shadow: 0 0 10px grey; +} diff --git a/ratemybronco/static/css/search.css b/ratemybronco/static/css/search.css new file mode 100644 index 0000000..a25cb44 --- /dev/null +++ b/ratemybronco/static/css/search.css @@ -0,0 +1,51 @@ +body { + background-color: white; + font-family: 'Roboto', sans-serif !important; + font-weight: 700 !important; + /* font-size: 14px; */ +} + +h1 { + font-weight: 20; + font-size: 4em !important; + line-height: 1.3em; +} + +a { + text-decoration: none !important; +} + +.row { + min-height: 100vh; +} + +.col-12 { + background-color: #70ba8f; +} + +.left-title { + display: inline-block; + color: white; + margin-top: 8%; + margin-left: 3%; + text-align: center; +} + +.navbar-nav { + margin-left: auto; +} + +.title { + display: inline-block; +} + +.container { + margin: 2em; + margin-left: 3% !important; + padding: 1em; + height: 20vh; + width: 60em !important; + background-color: white; + border-radius: 2em; + color: gray; +} \ No newline at end of file diff --git a/ratemybronco/static/css/style.css b/ratemybronco/static/css/style.css new file mode 100644 index 0000000..adc30eb --- /dev/null +++ b/ratemybronco/static/css/style.css @@ -0,0 +1,60 @@ +body { + background-color: white; + font-family: 'Roboto', sans-serif !important; + font-weight: 700 !important; + /* font-size: 14px; */ +} + +h1 { + font-weight: 20; + font-size: 4em !important; + line-height: 1.3em; +} + +a { + text-decoration: none !important; +} + +.row { + min-height: 100vh; +} + +.col-12 { + background-color: #70ba8f; +} + +.left-title { + display: inline-block; + color: white; + margin-top: 20%; + margin-left: 5%; + text-align: center; +} + +.navbar-nav { + margin-left: auto; +} + +.title { + display: inline-block; +} + +.right-title { + color: #70ba8f; + margin-top: 20%; + margin-left: 5%; +} + +@media (min-width: 576px) { + .grow{ + -webkit-transition:width 500ms; + -moz-transition:width 500ms; + transition:width 500ms; + } + #row:hover .grow{ + width:40%; + } + #row:hover .grow:hover { + width:60%; + } +} diff --git a/ratemybronco/static/js/rating.js b/ratemybronco/static/js/rating.js new file mode 100644 index 0000000..3b1b013 --- /dev/null +++ b/ratemybronco/static/js/rating.js @@ -0,0 +1,26 @@ +jQuery(document).ready(function($){ + + $(".btnrating").on('click',(function(e) { + + var previous_value = $("#selected_rating").val(); + + var selected_value = $(this).attr("data-attr"); + $("#selected_rating").val(selected_value); + + $(".selected-rating").empty(); + $(".selected-rating").html(selected_value); + + for (i = 1; i <= selected_value; ++i) { + $("#rating-star-"+i).toggleClass('btn-warning'); + $("#rating-star-"+i).toggleClass('btn-default'); + } + + for (ix = 1; ix <= previous_value; ++ix) { + $("#rating-star-"+ix).toggleClass('btn-warning'); + $("#rating-star-"+ix).toggleClass('btn-default'); + } + + })); + + +}); diff --git a/ratemybronco/templates/addRating.html b/ratemybronco/templates/addRating.html new file mode 100644 index 0000000..667c0e6 --- /dev/null +++ b/ratemybronco/templates/addRating.html @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + Rate My Bronco + + + +
+ Add Rating +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +

0 / 5

+ + + + + +
+ +
+ + +
+
+ +
+
+
+ + + diff --git a/ratemybronco/templates/index.html b/ratemybronco/templates/index.html index 47f5a0a..3772137 100644 --- a/ratemybronco/templates/index.html +++ b/ratemybronco/templates/index.html @@ -1,17 +1,57 @@ - + - - - - - Document - - -

YO!!!

-
- -
- + + + + + + + + + + + Rate My Bronco + + + + + - diff --git a/ratemybronco/templates/search.html b/ratemybronco/templates/search.html index 188571d..b6ac2d4 100644 --- a/ratemybronco/templates/search.html +++ b/ratemybronco/templates/search.html @@ -1,19 +1,71 @@ -{% extends "layout.html" %} - -{% block title %} - Search -{% endblock %} - -{% block body %} -

Search Professors

-
- - -
- - -{% endblock %} \ No newline at end of file + + + + + + + + + + + + Rate My Bronco + + + +
+
+
+
+

Search Ratings

+
+
+ +
+
+
+

[Professor Name]

+

[Course Name]

+

[Rating]

+
+
+

[Professor Name]

+

[Course Name]

+

[Rating]

+
+
+

[Professor Name]

+

[Course Name]

+

[Rating]

+
+
+

[Professor Name]

+

[Course Name]

+

[Rating]

+
+
+
+ + From d9ac3d75c3e0d385575d806ae29313934da3e628 Mon Sep 17 00:00:00 2001 From: Darrell Villasenor Date: Mon, 14 Mar 2022 19:13:50 -0700 Subject: [PATCH 5/9] Added url_for() --- ratemybronco/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ratemybronco/templates/index.html b/ratemybronco/templates/index.html index 3772137..2381e13 100644 --- a/ratemybronco/templates/index.html +++ b/ratemybronco/templates/index.html @@ -27,7 +27,7 @@
- +

Search Ratings

From 48a0f934a12f21299b499b45521974e9276581c1 Mon Sep 17 00:00:00 2001 From: jessicamargala <56134693+jessicamargala@users.noreply.github.com> Date: Mon, 14 Mar 2022 19:34:49 -0700 Subject: [PATCH 6/9] adds link references --- ratemybronco/templates/addRating.html | 6 +++--- ratemybronco/templates/index.html | 6 +++--- ratemybronco/templates/search.html | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ratemybronco/templates/addRating.html b/ratemybronco/templates/addRating.html index 667c0e6..245361b 100644 --- a/ratemybronco/templates/addRating.html +++ b/ratemybronco/templates/addRating.html @@ -31,17 +31,17 @@
- +

Add Rating

diff --git a/ratemybronco/templates/search.html b/ratemybronco/templates/search.html index b6ac2d4..6ef5d60 100644 --- a/ratemybronco/templates/search.html +++ b/ratemybronco/templates/search.html @@ -19,24 +19,24 @@
-
+

Search Ratings

From ed4af1e182058d6e16763cfade80e77612d1ebcb Mon Sep 17 00:00:00 2001 From: Sara Nersisian Date: Fri, 18 Mar 2022 12:00:57 -0700 Subject: [PATCH 7/9] added react --- .DS_Store | Bin 6148 -> 6148 bytes frontend-testing | 1 + ratemybronco/.DS_Store | Bin 0 -> 6148 bytes .../__pycache__/__init__.cpython-39.pyc | Bin 0 -> 2881 bytes ratemybronco/static/.DS_Store | Bin 0 -> 6148 bytes ratemybronco/static/css/style.css | 60 ------------ ratemybronco/static/public/.DS_Store | Bin 0 -> 6148 bytes .../{ => public}/css/addRatingStyle.css | 21 ++++- .../static/{ => public}/css/search.css | 23 ++++- ratemybronco/static/public/css/style.css | 87 ++++++++++++++++++ ratemybronco/templates/.DS_Store | Bin 0 -> 6148 bytes ratemybronco/templates/addRating.html | 27 +++++- ratemybronco/templates/index.html | 32 ++++++- ratemybronco/templates/search.html | 25 ++++- ratemybronco/templates/src/.DS_Store | Bin 0 -> 6148 bytes ratemybronco/templates/src/components/App.jsx | 12 +++ .../templates/src/components/Footer.jsx | 12 +++ .../js => templates/src/components}/rating.js | 0 ratemybronco/templates/src/index.js | 9 ++ 19 files changed, 242 insertions(+), 67 deletions(-) create mode 160000 frontend-testing create mode 100644 ratemybronco/.DS_Store create mode 100644 ratemybronco/__pycache__/__init__.cpython-39.pyc create mode 100644 ratemybronco/static/.DS_Store delete mode 100644 ratemybronco/static/css/style.css create mode 100644 ratemybronco/static/public/.DS_Store rename ratemybronco/static/{ => public}/css/addRatingStyle.css (81%) rename ratemybronco/static/{ => public}/css/search.css (65%) create mode 100644 ratemybronco/static/public/css/style.css create mode 100644 ratemybronco/templates/.DS_Store create mode 100644 ratemybronco/templates/src/.DS_Store create mode 100644 ratemybronco/templates/src/components/App.jsx create mode 100644 ratemybronco/templates/src/components/Footer.jsx rename ratemybronco/{static/js => templates/src/components}/rating.js (100%) create mode 100644 ratemybronco/templates/src/index.js diff --git a/.DS_Store b/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..3c3927205ecc81b850fd619dbe753ed752d5b241 100644 GIT binary patch literal 6148 zcmeHKO^?$s5FK|*H&sE(0i?YkS>jqPg@p>lC6wI*SAyUGs3hA6B2v3FDP>hv%9;H! zd);5c-+?!_7o{qdI3a{Q(fExg^YZa*#W4|y(PDCsC?ui)&e-ar`Hk^;_AP6(-e3GH$?dx1k^m3#ZYEl|*Y)=H;pgRr^R;%G~*q28SAFcax z_4xjvFCQEY*XwR@>(1RLFUFsWsnXxfo0GsCH+I9}6`Uj3smqsmt_rO_poaM&6wBx{ zEhsn96g>q!OQ>JbSE@F36t}@?>fbZkmuSbkM@{e(HCgC-^9pzcyaEjc-1jW#HF7@m z3U~#)0;~XkAEd*`VQtZTI?$Lc0I-d;F~t1)$6V%|N8c0*qOPj>JBH%Y$d74QoDR|<&s zaeO?&E4j6G>*aW@mGJj)Hm<8J{-Pi-OEGGBDL#N3Ltb(Kj2zY$k%9Ri0V9KNyaIn! FfuED{iyi;~ delta 69 zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yFhyEXJ~lWft>hb`E|Hpgd6EJM(0I5k*d* SG(!SN-DDFU<;^i7E0_Tq_YVO8 diff --git a/frontend-testing b/frontend-testing new file mode 160000 index 0000000..5fc3e77 --- /dev/null +++ b/frontend-testing @@ -0,0 +1 @@ +Subproject commit 5fc3e77c48933846c6072954b0aac070980f7e14 diff --git a/ratemybronco/.DS_Store b/ratemybronco/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..258bb4b4250766684a6fa33ce02fb36848e8bebe GIT binary patch literal 6148 zcmeHKO>fgc5S?v9>oh{j0i<4#R^l49DW#@}i%Hu9SB&65QLqz>TDaaQc8IDdlF#sC zdgYh!cgmaHjnsU=B~n4vPBi<*yYtrBmw47oM4~h59}qQ($b&Q1cF?Ra9%o;&4co(m zLeG&>NnL#QXt0#+I-CMdf&Wbbes&xBnN2CD+t2USn@siMOvT9H^6(nIccTr_j5VMu z>QMy0poHgHU|lb;wx~djh~O#p=5xi9zvaf`Vqm|`&v=lfMcHou5*wSf2V2|Tw%71J zg%@fZmQgt>I??bWU%gW*i)V2ZzfY5KxB2Kq>*X%M^-&q!vLexTS4=v8% z2ZFive+!3srt&Z7XHFfeBy@?|nQ4U*Di##t8E*duD;WP;C*Sv5^6=<*O`TS(Y(XtZ z;cP7h?ElnjtTl@xI|ZBq_fY|^4-(E8SgZ`{(t$=F0f04hYeUR03(S!g1B;bGjKGAU z0u5EzBZe?^^h=u;SgZ^hIthFD5cbZ(o=}9oJLZ=JwN3%2z`O#R=CaBA|Jk3< z|MMhwhB3(jFtAt| SL=Vip2xu8x;}p141%3mzq`=7l literal 0 HcmV?d00001 diff --git a/ratemybronco/__pycache__/__init__.cpython-39.pyc b/ratemybronco/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d24c95d4e70af38e64909b6ab90185e57a301976 GIT binary patch literal 2881 zcmZWrOK%%T5}uwH$)QL+EX(qHtQbhR(3;+jVFVk;*hI1e1BonHN`Q0{5JPs89%+Wd zbPpYopikao1nhlbKnfNM>|dJeo^;!@Px-1z$x=dMs%xsdtE<2Ix_Y8oEwJ$W;ol#( z|37D0|D%`lKNl~5$D{8v%MzAgiIpV|&IjVQ2oD)zwRfz> zofE>c;TGQ0B+~muSxFHq*~yD}CHq3ERxZ;)66LZeDf!b->U^ugiqaROTwF9<7ESnE<@x8P!;ekW@xY)%b3Id*fgqt%N0ao%d(8;pul z67@yg?_H<3C_u|r^N{aKO)VqUd09ALKH25&_Vb-x!X%aX%S`ACdjnA|3fk=L5tQ88 zV}kA5Y9+UYojbxgL~>wtk38WXv)9(d(ti>jY|fECv5t|xyd->sM`=qf!pFEeU4MoO z53t9s)H+kTsGRBJxonsZhI!b=KK9iDCN|2-LsR(EPz{`g*N;-E3%8r8v~YSdFZ^gQ z03(z`Q<%Dh<~`)9ZahpQxC>pA!LkE3=gcvexprWytFVk$2>WSV%|~bIKG0Hg?}fEc~J zBay#cs=}YnC`ubyn&LRVV{2n?EnE-R#_k%)ubyq~JbAGjKHJ)T9(E!nbokK)$Lrw+ zYJ*-6PkpY3Q=jOV`fP;Xe*V=rPjQ@kV( zWM`O5jJ`qLH%Z(gahpU4!K*{$w}nHBE%U1WDQR`EAP(T~lO6z>*|<+IQPa|v6R@&7 z$7X-`F1V=HU>^rfJ#43Oo=b6o1vKd*?`HL;vilOJCHxMAd(XD_njwGX%;$5sIi=hO zwBB;Fry?Q$jQZFn%2FCGRs`Z79YVvu|3JyDHx_ut_Us9GhsPD{&<5K)*zJjZl?m_AVb;VsDhtCUXcYlI8e1UBrixVI&!5)9E=}RJu8io;X;D?vim1TLAk!ep za?KrFl048dZyh92TP9O|G}S9)&*MCi%BN{19les>xL5eo)p@1;@PWkLCS*}T5pNH> zT`CDel1WiYaQvu5a$9t{gQ?t(4hrA!RrA^f#v+zs_uK&>+N*~U-{R49h%LuwOL)rW zzsv&q+diw?%eEO=lv}Mdiu(>=VRnjh6qXI>QP`QLeNp;at-`@Q$vuT@R+S5T0#on^J@v6nYGJE!z516)&;YgI6PZP^nE*G#Im`Y3-pDa@H5}Nqilh z+1(1EdJ~Z{1GC>`b|%Sw8+I}PAX?*~0bm1wg-Vz!lBpH~!e)9)Wn2hT6cah5%R*EI7 zWL2zN??FzyQFk;>THWC_U0p~S`E$GLUxxij$6h;;@u(Zd{h>+-gFc4bT!nEUCoMUS zgGA+edcrDO<&IsQPWKxJHD`CPIjcF-!|giSJI&dwY^`r>9i4X`qo-KDsJ8}z-=~sQ zgL8OABeSMwZx}~1zDNH&XCBMQ3@`)Cz_Ku4&Nr*FEDPdwFaylMuQ5R9gM&)w8ca2+ zqXP%k0w5O9tpsiQZKNE>pldMIh%+ccry}Z9VOk8K)6wskIM-mRQKy42&4(~g7N$cH z>gjlYM}>oMHS)*|FauczsP{v$ss5k--2bZ}9+&}UU^y8Og|^pj;o3}XU05a6S_kzG qm4xC_jbABfs8WovREn#pO3?3+f#@1cHKGTFe*_c_JTL=)%D^YhG*}M+ literal 0 HcmV?d00001 diff --git a/ratemybronco/static/css/style.css b/ratemybronco/static/css/style.css deleted file mode 100644 index adc30eb..0000000 --- a/ratemybronco/static/css/style.css +++ /dev/null @@ -1,60 +0,0 @@ -body { - background-color: white; - font-family: 'Roboto', sans-serif !important; - font-weight: 700 !important; - /* font-size: 14px; */ -} - -h1 { - font-weight: 20; - font-size: 4em !important; - line-height: 1.3em; -} - -a { - text-decoration: none !important; -} - -.row { - min-height: 100vh; -} - -.col-12 { - background-color: #70ba8f; -} - -.left-title { - display: inline-block; - color: white; - margin-top: 20%; - margin-left: 5%; - text-align: center; -} - -.navbar-nav { - margin-left: auto; -} - -.title { - display: inline-block; -} - -.right-title { - color: #70ba8f; - margin-top: 20%; - margin-left: 5%; -} - -@media (min-width: 576px) { - .grow{ - -webkit-transition:width 500ms; - -moz-transition:width 500ms; - transition:width 500ms; - } - #row:hover .grow{ - width:40%; - } - #row:hover .grow:hover { - width:60%; - } -} diff --git a/ratemybronco/static/public/.DS_Store b/ratemybronco/static/public/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c42cb633e61dfb95cc7bbf8aca27a19af08f6d83 GIT binary patch literal 6148 zcmeHKO;5r=5Zwio5@NzZ6OK*15(Pg{mTx$_;>Wp z?qWjFiw6_QOfvhXvoqVw+h(^TgpiG4wy z`1fk$588ua(rEXu=;>UkD45#q;3DjeTBX%v6%X2B-0SOvu-ik(^<@}$)u^F{aW~Pq zzL{_ePN7vQkH>qp{ffJ@Tc1?i@xfLV_I7K{Wwzb9X!+MX%r(fzzi@0i_3sL@toq~mdKSc1I)lL8KCpQg%WxeQ-k{Gz@S?I zU=D6Au=USB&?N`ZvzQu$2O>=>(4q2j#Bovn# l{7QkLuVTc~Ra}N@f!`$q=vhn+!UN$S0ZjuB%)p;A@CnbSQu6=+ literal 0 HcmV?d00001 diff --git a/ratemybronco/static/css/addRatingStyle.css b/ratemybronco/static/public/css/addRatingStyle.css similarity index 81% rename from ratemybronco/static/css/addRatingStyle.css rename to ratemybronco/static/public/css/addRatingStyle.css index 93c83c2..d2beeef 100644 --- a/ratemybronco/static/css/addRatingStyle.css +++ b/ratemybronco/static/public/css/addRatingStyle.css @@ -1,7 +1,7 @@ body { background-color: white; font-family: "Roboto", sans-serif; - font-size: 14px; + /* font-size: 14px; */ } h1 { @@ -99,3 +99,22 @@ h1 { height: 4rem; box-shadow: 0 0 10px grey; } + +.footer-copyright { + font-size: large; + margin-bottom: 20px; + color: white; +} + +.about-us { + font-size: 25px; + font-weight: 300; + font-family: "Roboto", sans-serif; +} + +.footer-green { + padding-top: 10px; + height: 130px; + background-color: #70ba8f; + /* border-top: 10px solid white; */ +} diff --git a/ratemybronco/static/css/search.css b/ratemybronco/static/public/css/search.css similarity index 65% rename from ratemybronco/static/css/search.css rename to ratemybronco/static/public/css/search.css index a25cb44..ca19522 100644 --- a/ratemybronco/static/css/search.css +++ b/ratemybronco/static/public/css/search.css @@ -1,6 +1,6 @@ body { background-color: white; - font-family: 'Roboto', sans-serif !important; + font-family: "Roboto", sans-serif !important; font-weight: 700 !important; /* font-size: 14px; */ } @@ -48,4 +48,23 @@ a { background-color: white; border-radius: 2em; color: gray; -} \ No newline at end of file +} + +.footer-copyright { + font-size: large; + margin-bottom: 20px; + color: grey; +} + +.about-us { + font-size: 25px; + font-weight: 600; + font-family: "Roboto", sans-serif; +} + +.footer-white { + padding-top: 10px; + height: 130px; + background-color: white; + border-top: 10px solid #70ba8f; +} diff --git a/ratemybronco/static/public/css/style.css b/ratemybronco/static/public/css/style.css new file mode 100644 index 0000000..6278cf2 --- /dev/null +++ b/ratemybronco/static/public/css/style.css @@ -0,0 +1,87 @@ +body { + background-color: white; + font-family: "Roboto", sans-serif !important; + font-weight: 700 !important; + /* font-size: 14px; */ +} + +h1 { + font-weight: 20; + font-size: 4em !important; + line-height: 1.3em; +} + +a { + text-decoration: none !important; +} + +.row { + min-height: 100vh; +} + +.col-12 { + background-color: #70ba8f; +} + +.left-title { + display: inline-block; + color: white; + margin-top: 20%; + margin-left: 5%; + text-align: center; +} + +.navbar-nav { + margin-left: auto; +} + +.title { + display: inline-block; +} + +.right-title { + color: #70ba8f; + margin-top: 20%; + margin-left: 5%; +} + +@media (min-width: 576px) { + .grow { + -webkit-transition: width 500ms; + -moz-transition: width 500ms; + transition: width 500ms; + } + #row:hover .grow { + width: 40%; + } + #row:hover .grow:hover { + width: 60%; + } +} + +.footer-white { + padding-top: 10px; + height: 130px; + background-color: white; + border-top: 3px solid #70ba8f; +} + +.footer-copyright { + font-size: large; + font-weight: bold; + margin-bottom: 20px; + color: grey; +} + +.about-us { + font-size: 30px; + font-weight: 600; + font-family: "Roboto", sans-serif; +} + +/* .footer-green { + padding-top: 10px; + height: 130px; + background-color: #70ba8f; + border-top: 10px solid white; +} */ diff --git a/ratemybronco/templates/.DS_Store b/ratemybronco/templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ca26479b178c572897a3c6f2fb0261a12c69c1fe GIT binary patch literal 6148 zcmeHKO>fgc5S>i|bsB+kXr*3|R^l3!Kp_J4VnR7^tq~jm1-p(~3)frOP6LV}`3ygX zYkx`q3nzH9yAevAa6$-0JJIahk9i*Ni+0ybL}ECJ9};zm$b&Pswo$Aw9%rvv!}jo? z(9Z~|q=Yg$rTtp8>u?G<1^zb$c z8qv01?=g+(GuHfS&i5Of4yDNSg%nMYV+~8(tFdxqDZokp!1`8W6<~#w(+S>gU9KND zSWV;sV|nh4)74SYw79SeT}2mZQk4DvwP-Y3w{CBFTVBWe5S*!LP=@8C7>4;fZoO72 zjTZGVdXtQ&qwdZNm6c(VjdM*%;xR(rzfH1OO^0fd#f9buX25HE?NN7cHX95EJ$dlt z>AWXr&mQ%A^6|l7K5u)w_a7V{k3Oa6nfi)1hY9S`+U{6f0IO!_d>Q0fsxqGIB6<A0(X7w^$j}TL%h#1pv0ttqpblOkj?*=v%A|Vgx1( z6= - + @@ -26,6 +26,9 @@ integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" /> + + + Rate My Bronco @@ -106,6 +109,26 @@

0 - + + + + diff --git a/ratemybronco/templates/index.html b/ratemybronco/templates/index.html index e494b6f..0a1d9aa 100644 --- a/ratemybronco/templates/index.html +++ b/ratemybronco/templates/index.html @@ -4,7 +4,7 @@ - + @@ -15,6 +15,9 @@ crossorigin="anonymous" /> + + + Rate My Bronco @@ -53,5 +56,32 @@

Add Rating

+ + + + + + + + + + diff --git a/ratemybronco/templates/search.html b/ratemybronco/templates/search.html index 6ef5d60..73939d9 100644 --- a/ratemybronco/templates/search.html +++ b/ratemybronco/templates/search.html @@ -4,7 +4,7 @@ - + @@ -14,6 +14,9 @@ integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" /> + + + Rate My Bronco @@ -67,5 +70,25 @@

[Rating]

+ + + diff --git a/ratemybronco/templates/src/.DS_Store b/ratemybronco/templates/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..773e44587292f442904b55dbdb12266bab075bd3 GIT binary patch literal 6148 zcmeHKO>fgc5S>i}-B2Or08)=D^%|8xAp&u6Lwo48uHZmXi0cRpt~ZLE1}TcOlfry;_Bh}b{6cW69%u2S$Zhcj{mj*rL8}zA{ReH+H!A

l`_M>xHVA zC?E=m0xP3HSOfLO%8W<`A_|BCtD*p}4+hQ{1*|=~r2~b#0s#3K=?pO+7nx%MMgeP& z=z%Fu1$wFqR}AIpXg47*3RrvebW-8+p~9P0xS=Tbc0Av>bW)K=DMbNM;HCm=zS`#f zfB)|L|4owAL;+FYzfwRo_u{=iJ}K<2OCQI3t$}}rvvFSS@tT6bZN~hywSjz#o6yX;J_H literal 0 HcmV?d00001 diff --git a/ratemybronco/templates/src/components/App.jsx b/ratemybronco/templates/src/components/App.jsx new file mode 100644 index 0000000..2066ea6 --- /dev/null +++ b/ratemybronco/templates/src/components/App.jsx @@ -0,0 +1,12 @@ +import React from "react"; +import Footer from "./Footer"; + +function App() { + return ( +

+
+
+ ); +} + +export default App; \ No newline at end of file diff --git a/ratemybronco/templates/src/components/Footer.jsx b/ratemybronco/templates/src/components/Footer.jsx new file mode 100644 index 0000000..c44d3c0 --- /dev/null +++ b/ratemybronco/templates/src/components/Footer.jsx @@ -0,0 +1,12 @@ +import React from "react"; + + + +function Footer () { + const currentYear = new Date().getFullYear(); + return ( +

Copyright © {currentYear}

+ ); +} + +export default Footer; \ No newline at end of file diff --git a/ratemybronco/static/js/rating.js b/ratemybronco/templates/src/components/rating.js similarity index 100% rename from ratemybronco/static/js/rating.js rename to ratemybronco/templates/src/components/rating.js diff --git a/ratemybronco/templates/src/index.js b/ratemybronco/templates/src/index.js new file mode 100644 index 0000000..2d3619d --- /dev/null +++ b/ratemybronco/templates/src/index.js @@ -0,0 +1,9 @@ +import React from "react"; +import ReactDOM from "react-dom"; +import App from "./components/App"; + +ReactDOM.render ( + , + document.getElementById("root") + +); \ No newline at end of file From 1a21172c829b187107c55d496c16fea7f47c3dc9 Mon Sep 17 00:00:00 2001 From: jessicamargala <56134693+jessicamargala@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:54:41 -0700 Subject: [PATCH 8/9] make search page responsive utilizing bootstrap --- ratemybronco/static/public/css/search.css | 2 -- ratemybronco/templates/search.html | 25 ++++++++++------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ratemybronco/static/public/css/search.css b/ratemybronco/static/public/css/search.css index ca19522..e3c58d4 100644 --- a/ratemybronco/static/public/css/search.css +++ b/ratemybronco/static/public/css/search.css @@ -41,10 +41,8 @@ a { .container { margin: 2em; - margin-left: 3% !important; padding: 1em; height: 20vh; - width: 60em !important; background-color: white; border-radius: 2em; color: gray; diff --git a/ratemybronco/templates/search.html b/ratemybronco/templates/search.html index 73939d9..575bb36 100644 --- a/ratemybronco/templates/search.html +++ b/ratemybronco/templates/search.html @@ -73,22 +73,19 @@

[Rating]

+ ReactDOM.render(
, document.getElementById("footer")); + From 65229e566eefeaa17b3f683671528ba28122029f Mon Sep 17 00:00:00 2001 From: jessicamargala <56134693+jessicamargala@users.noreply.github.com> Date: Thu, 24 Mar 2022 13:38:56 -0700 Subject: [PATCH 9/9] add aboutUs page and organize code --- .../static/public/css/addRatingStyle.css | 12 +- .../static/public/css/contactUsStyle.css | 101 ++++++++++++ ratemybronco/static/public/css/search.css | 23 +-- ratemybronco/static/public/css/style.css | 12 +- ratemybronco/templates/addRating.html | 30 ++-- ratemybronco/templates/contactUs.html | 148 ++++++++++++++++++ ratemybronco/templates/index.html | 43 +++-- ratemybronco/templates/search.html | 34 +++- 8 files changed, 355 insertions(+), 48 deletions(-) create mode 100644 ratemybronco/static/public/css/contactUsStyle.css create mode 100644 ratemybronco/templates/contactUs.html diff --git a/ratemybronco/static/public/css/addRatingStyle.css b/ratemybronco/static/public/css/addRatingStyle.css index d2beeef..9d8570e 100644 --- a/ratemybronco/static/public/css/addRatingStyle.css +++ b/ratemybronco/static/public/css/addRatingStyle.css @@ -101,15 +101,17 @@ h1 { } .footer-copyright { - font-size: large; - margin-bottom: 20px; - color: white; + font-size: 1vh; + font-weight: bold; + /* margin-bottom: 20px; */ + color: grey; } .about-us { - font-size: 25px; - font-weight: 300; + font-size: 2vh; + font-weight: 600; font-family: "Roboto", sans-serif; + color:grey; } .footer-green { diff --git a/ratemybronco/static/public/css/contactUsStyle.css b/ratemybronco/static/public/css/contactUsStyle.css new file mode 100644 index 0000000..f907888 --- /dev/null +++ b/ratemybronco/static/public/css/contactUsStyle.css @@ -0,0 +1,101 @@ +body { + background-color: #70ba8f !important; + font-family: "Roboto", sans-serif !important; + font-weight: 700 !important; + /* font-size: 14px; */ + } + +h1 { + font-weight: 20; + font-size: 4em !important; + line-height: 1.3em; + color: white; +} + +p { + color: white; +} + +/* navigation bar */ +.navbar { + position: fixed; +} +.navbar-nav { + margin-left: auto; +} + +/* content */ +.col { + padding-top: 8vh; + margin: 10%; +} + +/* footer */ +.footer-white { + padding: 1vh; + height: 7vh; + background-color: white; +} + +.footer-copyright { + font-size: 1vh; + font-weight: bold; + /* margin-bottom: 20px; */ + color: grey; +} + +.about-us { + font-size: 2vh; + font-weight: 600; + font-family: "Roboto", sans-serif; + color:grey; +} + +/* buttons */ + +.button{ + display: inline-block; + text-decoration: none !important; + color: white; + position: relative; + padding-left: 20px; + padding-right: 20px; + font-size: 18px; +} + +a.button:before, +a.button:after { + content: ""; + position: absolute; + width: 10px; + height: 10px; + transition: all 0.3s ease; +} +a.button:before { + top: -2.5%; + left: -1%; + border-top: 2px solid white; + border-left: 2px solid white; +} +a.button:after { + bottom: -2.5%; + right: -1%; + border-bottom: 2px solid white; + border-right: 2px solid white; +} +a.button:hover:before, +a.button:hover:after { + width: 102%; + height: 100%; + transition: all 0.3s ease; + text-decoration: none !important; +} + +a:link, +a:visited, +a:hover, +a:active { + text-decoration: none !important; + color: #fff; +} + \ No newline at end of file diff --git a/ratemybronco/static/public/css/search.css b/ratemybronco/static/public/css/search.css index e3c58d4..5e54e20 100644 --- a/ratemybronco/static/public/css/search.css +++ b/ratemybronco/static/public/css/search.css @@ -48,21 +48,22 @@ a { color: gray; } +.footer-white { + padding: 1vh; + height: 7vh; + background-color: white; +} + .footer-copyright { - font-size: large; - margin-bottom: 20px; + font-size: 1vh; + font-weight: bold; + /* margin-bottom: 20px; */ color: grey; } .about-us { - font-size: 25px; + font-size: 2vh; font-weight: 600; font-family: "Roboto", sans-serif; -} - -.footer-white { - padding-top: 10px; - height: 130px; - background-color: white; - border-top: 10px solid #70ba8f; -} + color:grey; +} \ No newline at end of file diff --git a/ratemybronco/static/public/css/style.css b/ratemybronco/static/public/css/style.css index 6278cf2..065e1d8 100644 --- a/ratemybronco/static/public/css/style.css +++ b/ratemybronco/static/public/css/style.css @@ -60,23 +60,23 @@ a { } .footer-white { - padding-top: 10px; - height: 130px; + padding: 1vh; + height: 7vh; background-color: white; - border-top: 3px solid #70ba8f; } .footer-copyright { - font-size: large; + font-size: 1vh; font-weight: bold; - margin-bottom: 20px; + /* margin-bottom: 20px; */ color: grey; } .about-us { - font-size: 30px; + font-size: 2vh; font-weight: 600; font-family: "Roboto", sans-serif; + color:grey; } /* .footer-green { diff --git a/ratemybronco/templates/addRating.html b/ratemybronco/templates/addRating.html index f8e429c..321f145 100644 --- a/ratemybronco/templates/addRating.html +++ b/ratemybronco/templates/addRating.html @@ -4,32 +4,39 @@ + Rate My Bronco + + - - - - - + + + - - + + + + + + + + + + - Rate My Bronco +
+ + + - + + + - - - - - + + diff --git a/ratemybronco/templates/search.html b/ratemybronco/templates/search.html index 575bb36..fe9ece6 100644 --- a/ratemybronco/templates/search.html +++ b/ratemybronco/templates/search.html @@ -4,22 +4,42 @@ + Rate My Bronco + + - - - + + + + + + + + + + + + + + - Rate My Bronco + +
+ + +
@@ -70,7 +93,9 @@

[Rating]

+ + +