diff --git a/db.sqlite3 b/db.sqlite3 index 789ba060aa40bd0296cd7427340ced34a50581e7..7cd9db7003fab0ae692de4b2bb2aeb0eb6487008 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/homeapp/templates/homeapp/contact.html b/homeapp/templates/homeapp/contact.html index eeaccb7bb205c9c18e7c2a7329dfbb1f8dc5ef67..39d664104d045c60cfd9e6be4cef61549c2d4d95 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 fde2638bb66000f101665563e99d6ebb5dd3b87d..6bbcb06cb77ae59f71a753d48c3d9ee6b0a12640 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 b9ba1643213e79d423ecbb16848f687a9e9b8fc8..c649c1cec08e87d2cd9510a609d0559e15b9b331 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 47a00385765f322ccb60615f41be1ca35c8246ab..39f338ccf01dad14053788b148b66444c5775c74 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": "AAGA,AAAA,IAAI,CAAC;EACJ,WAAW,EAJL,eAAe,EAAE,SAAS;EAKhC,gBAAgB,EAJT,OAAO;EAKd,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI,GACb;;AAED,AAAA,EAAE,CAAC;EACF,cAAc,EAAE,SAAS;EACzB,KAAK,EAAE,KAAK,GACZ;;AAED,AAAA,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;EAClB,KAAK,EAAC,KAAK,GACd;;AAED,AAAA,YAAY,CAAC;EACT,KAAK,EAAC,KAAK,GACd;;AACD,AAAA,YAAY,CAAC,EAAE,CAAC;EACZ,KAAK,EAAC,OAAO,GAChB;;AAED,AAAA,OAAO,CAAC;EACJ,WAAW,EA3BR,eAAe,EAAE,SAAS;EA4B7B,QAAQ,EAAC,KAAK;EACd,KAAK,EAAE,CAAC;EACR,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,KAAK;EACZ,SAAS,EAAC,IAAI;EACd,UAAU,EAAE,KAAK;EACjB,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,IAAI,GACd;;AAEH,AAAA,UAAU,CAAC;EACP,OAAO,EAAE,KAAK;EACd,KAAK,EAAE,IAAI,GACd;;AAED,AAAA,QAAQ,CAAA;EACJ,gBAAgB,EAAE,OACtB,GAAC;;AAED,AAAA,MAAM,EAAE,UAAU,CAAA;EACd,gBAAgB,EAAE,OACtB,GAAC;;AAED,AAAA,SAAS,CAAA;EACL,KAAK,EAAC,KAAK;EACX,MAAM,EAAC,MAAM;EACb,OAAO,EAAE,IAAI;EACb,YAAY,EAAC,KAAK;EAClB,aAAa,EAAE,IAAI;EACnB,YAAY,EAAC,OAAO;EACpB,UAAU,EAAE,OAAO,GACtB;;AAED,AAAA,WAAW,CAAA;EACP,KAAK,EAAC,MAAM;EACZ,MAAM,EAAC,MAAM;EACb,OAAO,EAAE,IAAI;EACb,SAAS,EAAE,IAAI;EACf,YAAY,EAAC,KAAK;EAClB,aAAa,EAAE,IAAI;EACnB,YAAY,EAAC,OAAO;EACpB,UAAU,EAAE,OAAO,GACtB;;AAED,AAAA,cAAc,CAAC;EACX,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,OAAO,EAAE,WAAW;EACpB,SAAS,EAAE,OAAO;EAClB,aAAa,EAAE,MAAM;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,qBAAqB;EAC7B,UAAU,EAAE,yHAAyH,GACxI;;AAED,AAAA,cAAc,CAAC,KAAK,CAAC;EACjB,gBAAgB,EAAE,SAAS;EAC3B,YAAY,EAAE,SAAS;EACvB,MAAM,EAAE,qBAAqB,GAChC;;AAED,AAAA,SAAS,CAAC;EACN,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,OAAO,EAAE,WAAW;EACpB,SAAS,EAAE,OAAO;EAClB,aAAa,EAAE,MAAM;EACrB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,qBAAqB;EAC7B,UAAU,EAAE,yHAAyH,GACxI;;AAED,AAAA,SAAS,CAAC,KAAK,CAAC;EACZ,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,MAAM,EAAE,qBAAqB,GAChC;;AAED,AAAA,aAAa,CAAC;EACV,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,OAAO,EAAE,WAAW;EACpB,SAAS,EAAE,OAAO;EAClB,aAAa,EAAE,MAAM;EACrB,KAAK,EAAC,KAAK;EACX,MAAM,EAAE,qBAAqB;EAC7B,UAAU,EAAE,yHAAyH,GACxI;;AAED,AAAA,aAAa,CAAC,KAAK,CAAC;EAChB,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,MAAM,EAAE,qBAAqB,GAChC;;AAED,AAAA,aAAa,CAAC;EACV,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,UAAU;EAC5B,YAAY,EAAE,UAAU;EACxB,OAAO,EAAE,WAAW;EACpB,SAAS,EAAE,MAAM;EACjB,aAAa,EAAE,MAAM;EACrB,KAAK,EAAC,IAAI;EACV,MAAM,EAAE,qBAAqB;EAC7B,UAAU,EAAE,yHAAyH,GACxI;;AAED,AAAA,aAAa,CAAC,KAAK,CAAC;EAChB,gBAAgB,EAAE,OAAgB;EAClC,YAAY,EAAE,OAAgB;EAC9B,MAAM,EAAE,qBAAqB,GAChC;;AAED,AAAA,WAAW,CAAC;EACR,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,OAAO,EAAE,WAAW;EACpB,WAAW,EAAC,IAAI;EAChB,YAAY,EAAC,IAAI;EACjB,SAAS,EAAE,MAAM;EACjB,aAAa,EAAE,MAAM;EACrB,KAAK,EAAC,IAAI;EACV,MAAM,EAAE,qBAAqB;EAC7B,UAAU,EAAE,yHAAyH,GACxI;;AAED,AAAA,WAAW,CAAC,KAAK,CAAC;EACd,gBAAgB,EAAE,OAAO;EACzB,YAAY,EAAE,OAAO;EACrB,MAAM,EAAE,qBAAqB,GAChC;;AAED,AAAA,YAAY,CAAC;EACT,QAAQ,EAAE,QAAQ;EAClB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,IAAI,GACtB;;AAED,AAAA,UAAU,CAAA;EACN,gBAAgB,EAAE,OAAO,GAC5B;;AAED,AAAA,YAAY,CAAC;EACT,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,IAAI,GACd" } \ No newline at end of file diff --git a/static/css/base.scss b/static/css/base.scss index f176f6480c0ef8161c708b1292ecc7169ef993fc..2f2d8a687a37be5a1f548817b8784947787fb98b 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;