From aaa423a1250e1fb93b60e313ca8eda9346476c2b Mon Sep 17 00:00:00 2001
From: lb01545 <lb01545@surrey.ac.uk>
Date: Tue, 6 Dec 2022 13:30:04 +0000
Subject: [PATCH] Finished homepage
---
db.sqlite3 | Bin 155648 -> 155648 bytes
homeapp/templates/homeapp/contact.html | 2 +-
homeapp/templates/homeapp/home.html | 14 +++++++++++++-
static/css/base.css | 21 ++++++++++++++++++++-
static/css/base.css.map | 2 +-
static/css/base.scss | 25 +++++++++++++++++++++----
6 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/db.sqlite3 b/db.sqlite3
index 789ba060aa40bd0296cd7427340ced34a50581e7..7cd9db7003fab0ae692de4b2bb2aeb0eb6487008 100644
GIT binary patch
delta 46
zcmZoTz}awsbAmMEzlk!=jQ<)FS`!$zCNNdYGjeXfBhRE^z{s?nHGpX+|8&6sCMN)i
CjSkNM
delta 68
zcmZoTz}awsbAmMEpNTTgjDH#vS`!$zCNNdYGjeRdBhRE^z{tFvHGpX+KcnJAM_DE%
YvFQ%+OrpGo@o7<BPQF#edRYbO00aIMxc~qF
diff --git a/homeapp/templates/homeapp/contact.html b/homeapp/templates/homeapp/contact.html
index eeaccb7..39d6641 100644
--- a/homeapp/templates/homeapp/contact.html
+++ b/homeapp/templates/homeapp/contact.html
@@ -5,7 +5,7 @@
{% endblock title%}
{% block content %}
-<h1 style="text-align: center;">Contact Us</h1><br><br>
+<br><h1 style="text-align: center;">Contact Us</h1><br><br>
<form method="post", class="myborder">
{% csrf_token %}
diff --git a/homeapp/templates/homeapp/home.html b/homeapp/templates/homeapp/home.html
index fde2638..6bbcb06 100644
--- a/homeapp/templates/homeapp/home.html
+++ b/homeapp/templates/homeapp/home.html
@@ -5,5 +5,17 @@
{% endblock title%}
{% block content %}
- <h1>This is My Home Page</h1>
+ <br><h1 style="text-align:center">Home Page</h1><br><br>
+
+ <h3>Hello!</h3>
+ <h4 class="description">Welcome to my <em>Music Collection App.</em></h4><br><br>
+ <div class="homeborder">
+ <p>Here, you can store all your music in one place!
+ Simply add your chosen albums and songs, and keep track of all information.</p>
+ <br><br><p>Have favourites? No trouble! You can click on all
+ your favourite tracks so you know exactly what song to play next.</p>
+ <br><br><p>There is also the freedom to add your own notes for each album if you wish.</p>
+ <br><p>Please contact us with any queries you may have.</p><br><br>
+
+ </div>
{% endblock content %}
\ No newline at end of file
diff --git a/static/css/base.css b/static/css/base.css
index b9ba164..c649c1c 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -8,9 +8,15 @@ h1 {
text-transform: uppercase;
color: white; }
-h2, h3, p, td {
+h2, h3, h4, h5, p, td {
color: white; }
+.description {
+ color: white; }
+
+.description em {
+ color: #00FF00; }
+
.footer {
font-family: "Lucida Grande", monospace;
position: fixed;
@@ -30,6 +36,9 @@ h2, h3, p, td {
.success {
background-color: #00FF00; }
+.error, .errorlist {
+ background-color: #FF0000; }
+
.myborder {
width: 500px;
margin: 0 auto;
@@ -39,6 +48,16 @@ h2, h3, p, td {
border-color: #2c2c2c;
background: #2c2c2c; }
+.homeborder {
+ width: 1000px;
+ margin: 0 auto;
+ padding: 20px;
+ font-size: 21px;
+ border-style: solid;
+ border-radius: 10px;
+ border-color: #2c2c2c;
+ background: #2c2c2c; }
+
.contactbutton {
color: #fff;
background-color: #1DB954;
diff --git a/static/css/base.css.map b/static/css/base.css.map
index 47a0038..39f338c 100644
--- a/static/css/base.css.map
+++ b/static/css/base.css.map
@@ -5,5 +5,5 @@
"base.scss"
],
"names": [],
- "mappings": "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"
+ "mappings": "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"
}
\ No newline at end of file
diff --git a/static/css/base.scss b/static/css/base.scss
index f176f64..2f2d8a6 100644
--- a/static/css/base.scss
+++ b/static/css/base.scss
@@ -13,10 +13,16 @@ h1 {
color: white;
}
-h2, h3, p, td {
+h2, h3, h4, h5, p, td {
color:white;
}
+.description {
+ color:white;
+}
+.description em {
+ color:#00FF00;
+}
.footer {
font-family: $font;
@@ -40,9 +46,9 @@ h2, h3, p, td {
background-color: #00FF00
}
-// .error, .errorlist{
-// background-color: #FF0000
-// }
+.error, .errorlist{
+ background-color: #FF0000
+}
.myborder{
width:500px;
@@ -54,6 +60,17 @@ h2, h3, p, td {
background: #2c2c2c;
}
+.homeborder{
+ width:1000px;
+ margin:0 auto;
+ padding: 20px;
+ font-size: 21px;
+ border-style:solid;
+ border-radius: 10px;
+ border-color:#2c2c2c;
+ background: #2c2c2c;
+}
+
.contactbutton {
color: #fff;
background-color: #1DB954;
--
GitLab