nahakubuilder/flask_url_shortener
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up the templates

Browse Source
This commit is contained in:
xemeds
2020-08-19 16:31:22 +03:00
parent 789afe8554
commit 59cbba9d03
7 changed files with 93 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tiny0/forms.py
+1 -1
View File
@@ -32,7 +32,7 @@ def validate_URL(form, field):
# If the url contains the websites domain # If the url contains the websites domain
if WEBSITE_DOMAIN in field.data.lower(): if WEBSITE_DOMAIN in field.data.lower():
# Raise a ValidationError # Raise a ValidationError
raise ValidationError("Yeah, that's definitely a valid URL") raise ValidationError("Invalid URL")
# If the URL does not start with http:// and https:// # If the URL does not start with http:// and https://
if not(field.data.lower().startswith("http://")) and not(field.data.lower().startswith("https://")): if not(field.data.lower().startswith("http://")) and not(field.data.lower().startswith("https://")):
tiny0/static/style.css
+1 -1
View File
@@ -119,7 +119,7 @@ body {
margin-bottom: 2vh; margin-bottom: 2vh;
} }
.donation h3 { .donation h4 {
margin-bottom: 4vh; margin-bottom: 4vh;
} }
tiny0/templates/donate.html
+1 -8
View File
@@ -1,17 +1,10 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block body %} {% block body %}
<body>
<div class="headers">
<a class="title" href="{{ url_for('index') }}">tiny0</a>
<h1 class="desc">Custom URL Shortener</h1>
</div>
<ul class="donation"> <ul class="donation">
<li><h1>Bitcoin Address</h1></li> <li><h1>Bitcoin Address</h1></li>
<li><h3>1Mg55rPVuQ2P8zKsCcLdsmgqH24uLXfLbR</h3></li> <li><h4>1Mg55rPVuQ2P8zKsCcLdsmgqH24uLXfLbR</h4></li>
<li><h1>Patreon</h1></li> <li><h1>Patreon</h1></li>
<li><a href="https://www.patreon.com/xemeds" target="_blank"><h3>patreon.com/xemeds</h3></a></li> <li><a href="https://www.patreon.com/xemeds" target="_blank"><h3>patreon.com/xemeds</h3></a></li>
</ul> </ul>
</body>
{% endblock %} {% endblock %}
tiny0/templates/error.html
-7
View File
@@ -1,15 +1,8 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block body %} {% block body %}
<body>
<div class="headers">
<a class="title" href="{{ url_for('index') }}">tiny0</a>
<h1 class="desc">Custom URL Shortener</h1>
</div>
<ul class="error-message"> <ul class="error-message">
<li><h1>{{ error_code }}</h1></li> <li><h1>{{ error_code }}</h1></li>
<li><h1>{{ error_message }}</h1></li> <li><h1>{{ error_message }}</h1></li>
</ul> </ul>
</body>
{% endblock %} {% endblock %}
tiny0/templates/index.html
-44
View File
@@ -1,20 +1,6 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block body %} {% block body %}
{% if form.url.errors %}
<body>
<div class="headers">
<a class="title" href="{{ url_for('index') }}">tiny0</a>
<h1 class="desc">Custom URL Shortener</h1>
</div>
{% else %}
<body onload="typeTitle()">
<div class="headers">
<a class="title" id="title" href="{{ url_for('index') }}"></a>
<h1 id="desc" class="desc"></h1>
</div>
{% endif %}
<div class="container"> <div class="container">
<form method="POST" action=""> <form method="POST" action="">
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
@@ -29,34 +15,4 @@
{% endif %} {% endif %}
</form> </form>
</div> </div>
{% if not form.url.errors %}
<script>
var i = 0;
var title_text = "tiny0";
var desc_text = "Custom URL Shortener";
var speed = 120;
function typeTitle() {
if (i < title_text.length) {
document.getElementById("title").innerHTML += title_text.charAt(i);
i++;
setTimeout(typeTitle, speed);
}
else {
i = 0;
setTimeout(typeDesc, 200)
}
}
function typeDesc() {
if (i < desc_text.length) {
document.getElementById("desc").innerHTML += desc_text.charAt(i);
i++;
setTimeout(typeDesc, speed);
}
}
</script>
{% endif %}
</body>
{% endblock %} {% endblock %}
tiny0/templates/layout.html
+63
View File
@@ -13,7 +13,70 @@
<div id="page-container"> <div id="page-container">
<div id="content-wrap"> <div id="content-wrap">
{% if form %}
{% if not form.url.errors %}
<body onload="typeTitle()">
<div class="headers">
<a class="title" id="title" href="{{ url_for('index') }}"></a>
<h1 id="desc" class="desc"></h1>
</div>
{% else %}
<body>
<div class="headers">
<a class="title" href="{{ url_for('index') }}">tiny0</a>
<h1 class="desc">Custom URL Shortener</h1>
</div>
{% endif %}
{% else %}
<body>
<div class="headers">
<a class="title" href="{{ url_for('index') }}">tiny0</a>
<h1 class="desc">Custom URL Shortener</h1>
</div>
{% endif %}
{% block body %}{% endblock %} {% block body %}{% endblock %}
{% if form %}
{% if not form.url.errors %}
<script>
var i = 0;
var title_text = "tiny0";
var desc_text = "Custom URL Shortener";
var speed = 120;
function typeTitle() {
if (i < title_text.length) {
document.getElementById("title").innerHTML += title_text.charAt(i);
i++;
setTimeout(typeTitle, speed);
}
else {
i = 0;
setTimeout(typeDesc, 200)
}
}
function typeDesc() {
if (i < desc_text.length) {
document.getElementById("desc").innerHTML += desc_text.charAt(i);
i++;
setTimeout(typeDesc, speed);
}
}
</script>
{% endif %}
{% elif url %}
<script>
function copyURL() {
var url = document.getElementById("url");
url.select();
url.setSelectionRange(0, 99999)
document.execCommand("copy");
}
</script>
{% endif %}
</body>
</div> </div>
</div> </div>
tiny0/templates/url.html
-16
View File
@@ -1,26 +1,10 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block body %} {% block body %}
<body>
<div class="headers">
<a class="title" href="{{ url_for('index') }}">tiny0</a>
<h1 class="desc">Custom URL Shortener</h1>
</div>
<div class="container"> <div class="container">
<div class="inputs"> <div class="inputs">
<input type="text" value="{{ url }}" id="url" class="url" readonly> <input type="text" value="{{ url }}" id="url" class="url" readonly>
<button onclick="copyURL()" class="button">Copy</button> <button onclick="copyURL()" class="button">Copy</button>
</div> </div>
</div> </div>
<script>
function copyURL() {
var url = document.getElementById("url");
url.select();
url.setSelectionRange(0, 99999)
document.execCommand("copy");
}
</script>
</body>
{% endblock %} {% endblock %}