From a5df89997929ac1c30cfba8190ec8452d24f6454 Mon Sep 17 00:00:00 2001 From: "Dominik V. Salonen" Date: Thu, 24 Dec 2015 13:46:05 +0100 Subject: [PATCH] Proper pages --- run.py | 4 +- static/regular.css | 94 ++++++++++++++++++++++++++++++++++++++++++ static/style.css | 4 +- templates/about.html | 48 ++++++++++++++++----- templates/regular.html | 17 ++++++++ templates/terms.html | 31 ++++++-------- 6 files changed, 165 insertions(+), 33 deletions(-) create mode 100644 static/regular.css create mode 100644 templates/regular.html diff --git a/run.py b/run.py index 75b9dad..268cad5 100755 --- a/run.py +++ b/run.py @@ -99,11 +99,11 @@ def upload_file(): @app.route('/about') def about(): - return render_template('about.html') + return render_template('about.html', page=config["SITE_DATA"]) @app.route('/terms') def terms(): - return render_template('terms.html') + return render_template('terms.html', page=config["SITE_DATA"]) @app.route('/', methods=['GET']) diff --git a/static/regular.css b/static/regular.css new file mode 100644 index 0000000..efa4f95 --- /dev/null +++ b/static/regular.css @@ -0,0 +1,94 @@ +@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300,700); + +/* Being lazy 101 */ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +body { + font-family: "Open Sans", "Lato", sans-serif; + color: #ffffff; + background-color: #2d2d2d; +} + +@keyframes rise { + from {margin-top: 50px;opacity:0;} + to {margin-top: 0;opacity:1;} +} + +@keyframes appear { + from {opacity:0;} + to {opacity:1;} +} + +.a4 { + width: 100%; + max-width: 920px; + padding: 15px; + margin-left: auto; + margin-right: auto; + animation: appear 0.75s ease-out; +} + +.a4 .title { + font-size: 24pt; + font-weight: 300; + text-align: right; + margin: 0; + animation: rise 0.75s ease-out; +} + +.title { + font-size: 34pt; + font-weight: 300; + margin-bottom: 20px; + text-align: center; + animation: appear 0.75s ease-out; +} + +.links { + font-size: 0; + margin-top: 20px; + text-align: center; + list-style: none; +} + +.links li { + font-size: 12pt; + display: inline-block; + padding: 5px; + width: 25%; + animation: rise 1s ease-out; +} + +.links li a { + color: inherit; + text-decoration: none; +} + +.links li a:hover { + text-decoration: underline; +} + +/* Restyle with custom margins */ + +p { + margin-top: 5px; + margin-bottom: 10px; +} + +h1 { + margin-top: 15px; + margin-bottom: 5px; +} + +a { + color: inherit; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} \ No newline at end of file diff --git a/static/style.css b/static/style.css index d709045..a6993f9 100644 --- a/static/style.css +++ b/static/style.css @@ -15,12 +15,12 @@ body { @keyframes rise { from {margin-top: 50px;opacity:0;} - to {margin-top: 0;opacity1;} + to {margin-top: 0;opacity:1;} } @keyframes appear { from {opacity:0;} - to {opacity1;} + to {opacity:1;} } .page { diff --git a/templates/about.html b/templates/about.html index 151390c..86164fe 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,14 +1,40 @@ +{% extends "regular.html" %} +{% block body %} - - - QuadFile info - - - +

+ Temporary storage +

+

+ {{ page.title }} is now a temporary storage service. +

+

+ I've shifted from permanent storage to temporary storage. The main reason being that about 93% of files uploaded to the old site were never accessed again after the first week. +

+

+ Now hold your horses - We don't delete files one week after upload. We delete them one week after they were last accessed. +

+

+ Meaning that if you upload a file on December 10th and someone accesses that file on the 13th. Then we won't delete the file until the 20th. If someone then visits the file on the 17th, the counter resets again and your file will stay until December 25th. +

-

- This page is not yet done, just know this: Files are cleaned at set interval, do not use this for long time storage. -

+

+ History +

+

+ {{ page.title }} was a file sharing service that ran from 2014 into mid-2015. People loved it. It was fast, free, and extremely dumb-ass-simple to use, everything you'd want. +

+

+ Unfortunately, running a service like that isn't really easy, nor affordable. So it ended up shutting down. +

- - +

+ The new {{ page.title }} +

+

+ Christmas 2015, {{ page.title }} returned, better than ever. +

+

+ It now uses a database (SQLite counts okay, don't hate me), it has been rewritten from scratch using Python, it's multi-threaded, it rocks. Resource usage is approximately one fourth that of the old site - while also being faster +

+ +{% endblock %} \ No newline at end of file diff --git a/templates/regular.html b/templates/regular.html new file mode 100644 index 0000000..3229ed5 --- /dev/null +++ b/templates/regular.html @@ -0,0 +1,17 @@ + + + + {{ page.title }} + + + + + +
+

+ {{ page.title }} +

+ {% block body %}{% endblock %} +
+ + \ No newline at end of file diff --git a/templates/terms.html b/templates/terms.html index 2203f1f..a12499b 100644 --- a/templates/terms.html +++ b/templates/terms.html @@ -1,19 +1,14 @@ - - - - QuadFile info - - - -

This section is currently not complete, more will be added

-

Limits

+{% extends "regular.html" %} +{% block body %} +

Terms

- - - +
  • You are responsible for the file you upload
    • +
  • The max file size is 100 MiB
    • +
  • Files are deleted when they haven't been accessed for a week.
    • +
  • Files may be deleted if requested by the content owner
    • +
  • If I find illegal content (eg. CP, viruses and such) it will instantly be deleted
    • +
  • Only certain filetypes are allowed
    • +
  • More terms may be added to this list without warning
    • +
  • TL;DR Don't be an asshole and blame me for something that happens
    • + +{% endblock %} \ No newline at end of file