front end html to look like existing capsul site without <pre>

2020-05-10 21:43:06 -05:00 · 2020-05-10 21:43:06 -05:00 · 5d37f26585
commit 5d37f26585
parent d706ae7761
8 changed files with 204 additions and 51 deletions
--- a/capsulflask/console.py
+++ b/capsulflask/console.py
@ -0,0 +1,16 @@
+from flask import Blueprint
+from flask import flash
+from flask import current_app
+from flask import g
+from flask import redirect
+from flask import url_for
+from flask import request
+from flask import session
+from flask import render_template
+from flask_mail import Message
+from werkzeug.exceptions import abort
+
+from capsulflask.db import get_model
+
+bp = Blueprint("console", __name__, url_prefix="/console")
+
--- a/capsulflask/landing.py
+++ b/capsulflask/landing.py
@ -0,0 +1,16 @@
+from flask import Blueprint
+from flask import flash
+from flask import current_app
+from flask import g
+from flask import redirect
+from flask import url_for
+from flask import request
+from flask import session
+from flask import render_template
+from flask_mail import Message
+from werkzeug.exceptions import abort
+
+from capsulflask.db import get_model
+
+bp = Blueprint("landing", __name__, url_prefix="/")
+
--- a/capsulflask/static/style.css
+++ b/capsulflask/static/style.css
@ -1,12 +1,23 @@
-
-body {
-  color: #c5c8c6;
+html {
+  color: #bdc7b8;
  font: calc(0.40rem + 1vmin) monospace;
-  text-align: center;
  overflow-y: scroll;
  background-color: #241e1e;
+}
+
+body {
+  margin-right: auto;
+  margin-left: auto;
+  min-width: 33rem;
+  max-width: 53rem;
 } 

+@media only screen and (max-width: 53rem) {
+  body {
+    margin: 0 2rem;
+  }
+}
+
 a {
  color:#6CF;
 }
@ -17,21 +28,93 @@ a:hover, a:active, a:visited {

 header {
  display: flex;
-}
-span.home {
-  align-self: flex-start;
-}
-span.account {
-  align-self: flex-start;
-}
-
-.float-right {
-  display: inline-block;
-  float: right;
+  justify-content: space-between;
+  margin: 2rem 0;
 }

 .flash {
-  background: red;
+  color: rgb(173, 74, 8);
  font-weight: bold;
  text-align: center;
+  border: 1px dashed rgb(173, 74, 8);
+  border-radius: 2em;
+  margin-bottom: 2em;
+  padding: 1em;
 }
+
+main {
+  border: 1px dashed #bdc7b8;
+  padding: 1rem;
+}
+
+.hero {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.single-content {
+  margin: 4rem 0;
+}
+
+form {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-around;
+}
+
+input, label {
+  margin: 0.5em;
+}
+
+input {
+  background: none;
+  outline: 0;
+  padding: 0.25em 0.5em;
+  border-radius: 0.5em;
+  color: #bdc7b8;
+}
+
+input[type=text] {
+  font: calc(0.40rem + 1vmin) monospace;
+  border: 0;
+  border-bottom: 2px solid #777e73;
+  min-width: 20em;
+  outline: 0;
+}
+
+input[type=submit] {
+  font: calc(0.40rem + 1vmin) monospace;
+  cursor: pointer;
+  border: 1px solid #777e73;
+  background: #bdc7b810;
+
+}
+
+h1, h2, h3, h4, h5 {
+  font-size:calc(0.40rem + 1vmin);
+  margin: initial;
+  padding: initial;
+  text-transform: uppercase;
+}
+
+ul li {
+  margin-bottom: 1em;
+}
+
+footer, p {
+  text-align: left;
+}
+
+footer {
+  margin: 2rem 0;
+}
+
+.bigtext {
+  display: inline-block;
+  position: relative;
+  top: 0.17rem;
+  font-size: 1.8em;
+}
+
--- a/capsulflask/templates/base.html
+++ b/capsulflask/templates/base.html
@ -1,38 +1,39 @@
-<!doctype html>
 <html lang="en">
 <head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>{% block title %}{% endblock %}{% if self.title() %} - {% endif %}capsul💊</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="shortcut icon" href="/favicon.ico" />
-<link rel="apple-touch-icon" href="/icon.png" />
-<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
+  <link href="data:image/gif;base64,R0lGODlhEAAQAMIHAAAAAAAA//8AAP8A/wD/AAD/////AP///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAcALAAAAAAQABAAAANJeLrc/vCNOaKi0x66T/ngd21ZGF6cVyxEU5Wr0h5CPQRdAQDHThCCUU7XawFtAYNBtQP8gJfkwQAChGqCm5Kqs4Iey51mwRsfEgA7" rel="icon">
+  <title>{% block title %}{% endblock %}{% if self.title() %} - {% endif %}Capsul💊</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="Description" content="Cyberia Capsul">
+  <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
 </head>
 <body>
 <header>
-
-    <div class="float-right">
-      {% if session["account"] %}
-        <span>Logged in as {{ session["account"] }}</span>
-        <a href="{{ url_for('auth.logout') }}">Log Out</a>
-      {% else %}
-        <a href="{{ url_for('auth.login') }}">Log In</a>
-      {% endif %}
-    </div>
-    <h1>
-        capsul
-    </h1>
-
+  <div>
+    <a href="/"><b>Capsul</b></a>💊
+  </div>
+  <div>
+    {% if session["account"] %} 
+      { {{ session["account"] }} <a href="{{ url_for('auth.logout') }}">Log Out</a> } 
+    {% else %} 
+      <a href="{{ url_for('auth.login') }}">Login</a>
+    {% endif %}
+  </div>
 </header>
+{% for message in get_flashed_messages() %}
+  <div class="flash">{{ message }}</div>
+{% endfor %}
 <main>
-  {% for message in get_flashed_messages() %}
-    <div class="flash">{{ message }}</div>
-  {% endfor %}
  {% block content %}{% endblock %}
 </main>
 <footer>
-
+  (c) Attribution-ShareAlike 4.0 International <br/>
+  &nbsp;&nbsp;&nbsp;&nbsp;A service by Cyberia Computer Club 2020-<span class="bigtext">∞</span> <br/>
+  <br/>
+  <br/>
+  <a href="https://giit.cyberia.club/~forest/capsul-flask/tree/master/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
 </footer>
 </body>
-</html>
+</html>
+
+
--- a/capsulflask/templates/index.html
+++ b/capsulflask/templates/index.html
@ -2,5 +2,35 @@


 {% block content %}
-  Index Page!
-{% endblock %}
+<div class="hero">
+  <h1>CAPSUL</h1>
+  <pre>
+       .-.  
+      /:::\ 
+     /::::/ 
+    / `-:/  
+   /    /   
+   \   /    
+    `"`     
+  </pre>
+</div>
+
+<p>
+ Simple, fast, private compute by <a href="https://cyberia.club">https://cyberia.club</a><br/><br/>
+
+ Spin up your choice of virtual machine by sending an email. <br/><br/>                              
+
+ <ul>
+   <li>Simply log in with your email address </li>
+   <li>All root disks are backed up at no charge</li>
+   <li>All storage is fast, local, and solid-state</li>
+   <li>All network connections are low latency</li>
+   <li>Supported by amazing volunteers from Cyberia</li>
+   <li>Upfront prices, no confusing billing</li>
+   <li>A Minnesota non-profit organization that will never exploit you</li>
+   <li>We donate a portion of our proceeds to likeminded hacker groups around the globe</li>
+ </ul>           
+</p>
+{% endblock %}
+
+{% block pagesource %}/templates/index.html{% endblock %}
--- a/capsulflask/templates/login-landing.html
+++ b/capsulflask/templates/login-landing.html
@ -3,5 +3,9 @@
 {% block title %}check your email{% endblock %}

 {% block content %}
-  check your email. a login link has been sent to {{ email }}
-{% endblock %}
+<div class="hero">
+  <div class="single-content">check your email. a login link has been sent to {{ email }}</div>
+</div>
+{% endblock %}
+
+{% block pagesource %}/templates/login-landing.html{% endblock %}
--- a/capsulflask/templates/login.html
+++ b/capsulflask/templates/login.html
@ -3,9 +3,14 @@
 {% block title %}login{% endblock %}

 {% block content %}
-  <form method="post">
+<div class="hero">
+  <form method="post" class="single-content">
    <label for="email">Email Address</label>
-    <input name="email" id="email" required>
+    <input type="text" name="email" id="email" required>
    <input type="submit" value="Log In">
  </form>
-{% endblock %}
+</div>
+
+{% endblock %}
+
+{% block pagesource %}/templates/login.html{% endblock %}
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD3XzZTbTteIgnaFY+fiiOl9EnNN+twyNchnWjCkYqv forest@tower
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKD3XzZTbTteIgnaFY+fiiOl9EnNN+twyNchnWjCkYqv forest@tower