diff --git a/store/forms.py b/store/forms.py index a2f835d935733d997a8e30e3aface496171a8487..bac0b8ed02277a6a8685f3ebff6ad7418377d2f7 100644 --- a/store/forms.py +++ b/store/forms.py @@ -6,7 +6,7 @@ from wtforms.validators import DataRequired # Basic example.# class RegistrationForm(FlaskForm): username = StringField("Username", [validators.Length(min=4, max=25)]) email = StringField("Email Address", [validators.Length(min=6, max=320)]) - securityQ1 = StringField("Enter your Favourite Colour", [validators.Length(min=6, max=35)]) + securityQ1 = StringField("Enter your Favourite Colour", [validators.Length(min=4, max=35)]) phone_number = StringField("Phone Number", [validators.Length(min=6, max=35)]) password = PasswordField( "New Password", @@ -17,5 +17,5 @@ class RegistrationForm(FlaskForm): ], ) confirm = PasswordField("Repeat Password") - accept_tos = BooleanField("I accept the TOS", [validators.DataRequired()]) - submit = SubmitField("Sign Up") + accept_tos = BooleanField("I accept the Terms of Service", [validators.DataRequired()]) + submit = SubmitField("Sign Up",render_kw={'class':'button'}) diff --git a/store/static/_main.css b/store/static/_main.css index 40a9a35d3a36b7a4f537d1ff06c86835ef9c418e..dda97b9dd2db93b81fe3bf4bf053ec53f6238a37 100644 --- a/store/static/_main.css +++ b/store/static/_main.css @@ -59,7 +59,7 @@ footer, header, hgroup, menu, nav, section { body { line-height: 1; - background-color: black; + background-color: #272221; color: white; } ol, ul { @@ -86,6 +86,13 @@ table { margin-bottom: auto; } +.header{ + font-size: 50px; + text-decoration: none; + color: white; + background-color: #272221; +} + h1{ color: white; font-size: 20px; @@ -119,7 +126,7 @@ div{ .navbar li a { color:white; - background-color: darkred; + background-color: #131313; display: block; text-align: center; text-decoration: none; @@ -137,7 +144,7 @@ div{ .search button { color:white; - background-color: darkred; + background-color: #131313; display: block; text-align: center; text-decoration: none; @@ -147,12 +154,30 @@ div{ } .search button:hover { - background-color: black; + background-color: #272221; +} + +.button { + color:white; + background-color: #131313; + text-align: center; + text-decoration: none; + padding: 14px 16px; + border:none; + border-radius: 10px; +} + +.SubmitField{ + background-color: pink; +} + +.button:hover { + background-color: #272221; } .navbar ul { list-style-type: none; - background-color: darkred; + background-color: #131313; margin: 0; padding: 0; overflow: hidden; @@ -163,7 +188,7 @@ div{ } .navbar li a:hover { - background-color: black; + background-color: #272221; color:white; } @@ -172,15 +197,6 @@ div{ font-family: sans-serif; } - - -.header{ - font-size: 50px; - text-decoration: none; - color: white; - background-color: black; -} - .error{ text-decoration: none; color:red; @@ -194,10 +210,16 @@ li { .loginTable { margin-left: auto; margin-right: auto; + margin-top: 5%; +} + +.container { + height: 400px; + width:100%; } footer { - background-color: darkred; + background-color: #131313; color: white; position: fixed; bottom:0; diff --git a/store/templates/userContent/login.html b/store/templates/userContent/login.html index de81a881c1db6910522e34a3e759fb14b301564c..54ee52afec0d8ba6241ad0e72bd9e8cb3da7231e 100644 --- a/store/templates/userContent/login.html +++ b/store/templates/userContent/login.html @@ -1,32 +1,34 @@ {%extends 'base.html' %} {% block title %} Login | Antiques Online {% endblock %} {% block content %} +<br> +<h1>Login</h1> +<br> <form method="POST" action="{{ url_for('login') }}" style="float: center; text-align: center;"> <div class="container"> <table class="loginTable"> <tr> <td><label for="username">Username</label></td> + </tr> + <tr> <td><input type="username" placeholder="Enter Username..." name="username" id="username" required></td> </tr> <tr> <td><label for="password">Password</label></td> - <td><input type="password" placeholder="Enter Password..." name="password" id="password" required></td> </tr> <tr> - <td><label for="securityQ1">Favourite Colour</label></td> - <td><input type="securityQ1" placeholder="Enter Favourite Colour..." name="securityQ1" id="securityQ1" required> - </td> + <td><input type="password" placeholder="Enter Password..." name="password" id="password" required></td> </tr> <tr> - <td></td> - <td><a href="{{ url_for('reset_password')}}">I Forgot my Password!</a></td> + <td><label for="securityQ1">Favourite Colour</label></td> </tr> <tr> - <td></td> - <td><a href="{{ url_for('reset_security1')}}">I Forgot my Favourite Color!</a></td> + <td><input type="securityQ1" placeholder="Enter Favourite Colour..." name="securityQ1" id="securityQ1" required></td> </tr> </table> - + <br> + <td><a href="{{ url_for('reset_password')}}">I Forgot my Password!</a></td><br><br> + <td><a href="{{ url_for('reset_security1')}}">I Forgot my Favourite Color!</a></td><br><br> <input class="button" type="submit" value="Login"> </div> </form> diff --git a/store/templates/userContent/register.html b/store/templates/userContent/register.html index 4276512b3b3ffbff233ec96521fd0d84ffa404d8..e73f340b49f5cd9fb57391a2ff1d1a386e71d461 100644 --- a/store/templates/userContent/register.html +++ b/store/templates/userContent/register.html @@ -2,35 +2,42 @@ {%extends 'base.html' %} {% block title %} Register | Antiques Online {% endblock %} {% block content %} -<form method="POST"> - {{form.hidden_tag()}} - <dl> - <table class="loginTable"> - <tr> - <td>{{ render_field(form.username) }} </td> - </tr> - <tr> - <td>{{ render_field(form.email) }} </td> - </tr> - <tr> - <td>{{ render_field(form.phone_number) }}</td> - </tr> - <tr> - <td> {{ render_field(form.securityQ1) }}</td> - </tr> - <tr> - <td>{{ render_field(form.password) }}</td> - </tr> - <tr> - <td>{{ render_field(form.confirm) }}</td> - </tr> - <tr> - <td>{{ render_field(form.accept_tos) }}</td> - </tr> - </table> - </dl> - {{form.submit()}} -</form> +{{form.hidden_tag()}} +<br> +<h1>Register</h1> +<br> +<div class="container"> + <form method="POST"> + <dl> + <table class="loginTable"> + <tr> + <td>{{ render_field(form.username) }} </td> + </tr> + <tr> + <td>{{ render_field(form.email) }} </td> + </tr> + <tr> + <td>{{ render_field(form.phone_number) }}</td> + </tr> + <tr> + <td> {{ render_field(form.securityQ1) }}</td> + </tr> + <tr> + <td>{{ render_field(form.password) }}</td> + </tr> + <tr> + <td>{{ render_field(form.confirm) }}</td> + </tr> + </table> + </dl> + <br> + {{ render_field(form.accept_tos) }}<br> + {{form.submit()}} + <br> + </form> + <br> +</div> + {% endblock %} \ No newline at end of file