diff --git a/store/static/main.css b/store/static/main.css index 6f16fd5c1f0a4b848f4bda04ac0d6404d0f24181..03bf345029a6d1db386e1cd700329a693bd000fe 100644 --- a/store/static/main.css +++ b/store/static/main.css @@ -117,6 +117,32 @@ h1{ font-size: 30px; } +a:link { + text-decoration: none; + color: black; +} + +a:visited { + text-decoration: none; + color: black; +} + +a:hover { + text-decoration: none; + color: black; +} + +a:active { + text-decoration: none; + color: black; +} + +.header{ + font-size: 50px; + text-decoration: none; + color: black; +} + .error{ text-decoration: none; color:red; diff --git a/store/templates/base.html b/store/templates/base.html index 33d83dad77f99d47eac4b4d62044384d8a328ae8..3013367cb2335ab88f8788a4ea796044f9397459 100644 --- a/store/templates/base.html +++ b/store/templates/base.html @@ -8,7 +8,7 @@ <body> <header class="header"> - <h1 class="logo" href="{{ url_for('index')}}">ANTIQUES ONLINE</h1> + <a href="{{ url_for('index')}}">ANTIQUES ONLINE</a> </header> <nav class="navbar"> @@ -50,9 +50,10 @@ {% endblock %} <!-- Where HTML will go when extended. --> <footer class="footer"> - <p>Contact Info: mail@mail.com - <br> - Phone Number 0000 000 0000</p> + <br> + <p>Contact Info: mail@mail.com</p> + <p>Phone Number 0000 000 0000</p> + <br> </footer> </body> </html> diff --git a/store/templates/index.html b/store/templates/index.html index e575dc1d89b054b35e7acbca2c4d4139e6103ad8..1dc5e829b93598987aae3a4398435414b28054c9 100644 --- a/store/templates/index.html +++ b/store/templates/index.html @@ -1,7 +1,19 @@ {%extends 'base.html' %} -{% block title %} Welcome to the Index {% endblock %} +{% block title %} Welcome! {% endblock %} {% block content %} + <br> + <h1>Welcome to the Official Website of Antiques Online</h1> + <br> + <p>We maintain a large collection of fascinating Antiques and Collectibles to view on our Website.</p> + <p>Click <a href="{{ url_for('items')}}">*HERE*</a> to view some of them.</p> + <p>Hurry, they are very popular!</p> + <br><br> + <p>If you are new here, press <a href="{{ url_for('register')}}">*HERE*</a> to Register for an account</p> + <br> + <p>Returning Customers can Login <a href="{{ url_for('login')}}">*HERE*</a></p> + <br> + {% endblock %} diff --git a/store/templates/userContent/login.html b/store/templates/userContent/login.html index 3a1118bad7982f342c1d4439d8dd9439106aa6d7..707f586e3381b707d347b3b478e1d1718872742b 100644 --- a/store/templates/userContent/login.html +++ b/store/templates/userContent/login.html @@ -19,7 +19,7 @@ </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="securityQ1" placeholder="Enter Favourite Colour..." name="securityQ1" id="securityQ1" required></td><br> </tr> <tr> <td></td> @@ -29,9 +29,13 @@ <td></td> <td><a href="{{ url_for('reset_security1')}}">I Forgot my Favourite Color!</a></td> </tr> + <tr> + <td></td> + <td><input class="button" type="submit" value="Login" ></td> + </tr> </table> - - <input class="button" type="submit" value="Login" > + <br> + </div> diff --git a/store/templates/userContent/register.html b/store/templates/userContent/register.html index 525ee6119def1483972b219cb88af99b72f5d2e3..e7963f63e5c342df7aa31688a53b8ab67c9294ea 100644 --- a/store/templates/userContent/register.html +++ b/store/templates/userContent/register.html @@ -11,31 +11,35 @@ {% if error %} <p class=error><strong>Error:</strong> {{ error }} {% endif %} - + <br> <table class="loginTable"> <tr> - <td><label for="username">Username:</label></td> + <td>Username: </td> <td><input type="username" placeholder="Enter Username..." name="username" id="username" required></td> </tr> <tr> - <td><label for="email">E-mail Address:</label></td> + <td>Email Address: </td> <td><input type="email" placeholder="Enter E-mail..." name="email" id="email" required></td> </tr> <tr> - <td><label for="phone_number">Phone Number:</label></td> + <td>Phone Number: </td> <td><input type="phone_number" placeholder="Enter Phone Number..." name="phone_number" id="phone_number" required></td> </tr> <tr> - <td><label for="securityQ1">Favourite Color:</label></td> + <td>Favourite Color: </td> <td><input type="securityQ1" placeholder="Enter a Colour..." name="securityQ1" id="securityQ1" required></td> </tr> <tr> - <td><label for="password">Password:</label></td> + <td>Password: </td> <td><input type="password" placeholder="Enter Password..." name="password" id="password" required></td> </tr> + <tr> + <td></td> + <td><input class="button" type="submit" value="Register" ></td> + </tr> </table> - - <input class="button" type="submit" value="Register" > + <br> + </div>