community_backup/community_backup/settings.py

@@ -116,9 +116,6 @@ STATIC_URL = "static/"
 TASKS = {"default": {"BACKEND": "django.tasks.backends.immediate.ImmediateBackend"}}
 
 STATIC_ROOT = BASE_DIR.parent.parent / "static"
-STATICFILES_DIRS = [
-    BASE_DIR / "static",
-]
 
 RELEASE_VERSION = "0.12"
 

community_backup/static/webui/css/webui.css

@@ -1,3 +0,0 @@
-h1 {
-  font-size: 2rem
-};

community_backup/webui/templates/base.html

@@ -1,48 +1,17 @@
-{% load static %}
 <!doctype html>
 <html lang="en">
   <head>
-        <link rel="stylesheet" href="{% static 'vendored/css/bulma.min.css' %}">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.4/css/bulma.min.css">
-    <link rel="stylesheet" href="{% static 'webui/css/webui.css' %}">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Community Backup</title>
-    <script type="text/javascript">
-        document.addEventListener('DOMContentLoaded', () => {
-
-        // Get all "navbar-burger" elements
-        const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
-
-        // Add a click event on each of them
-        $navbarBurgers.forEach( el => {
-            el.addEventListener('click', () => {
-
-            // Get the target from the "data-target" attribute
-            const target = el.dataset.target;
-            const $target = document.getElementById(target);
-
-            // Toggle the "is-active" class on both the "navbar-burger" and the "navbar-menu"
-            el.classList.toggle('is-active');
-            $target.classList.toggle('is-active');
-
-            });
-        });
-
-        });
-        </script>
   </head>
   <body style="display: flex; flex-direction: column; height: 100vh">
     <nav class="navbar" role="navigation" aria-label="main navigation" >
         <div class="navbar-brand">
             <a class="navbar-item" href="/">Community Backup</a>
-            <a role="button" class="navbar-burger" data-target="navMenu" aria-label="menu" aria-expanded="false">
-                <span aria-hidden="true"></span>
-                <span aria-hidden="true"></span>
-                <span aria-hidden="true"></span>
-                <span aria-hidden="true"></span>
-            </a>
         </div>
-        <div class="navbar-menu" id="navMenu">
+        <div class="navbar-menu">
             <div class="navbar-start"></div>
 
             <div class="navbar-end">

community_backup/webui/templates/borg_edit.html

@@ -3,6 +3,5 @@
 {% block content %}
   <form action="{% url borg_edit %}">
   {{ form }}
-  <a href="{ url 'borg_list'}">Cancel</a>
   </form>
 {% endblock %}

community_backup/webui/templates/borg_list.html

@@ -1,21 +1,19 @@
 {% extends "base.html" %}
 
 {% block content %}
-<nav class="level">
+<div class="d-flex">
-  <div class="level-left">
+  <h1>Your Borg Repositories</h1>
-  <h1 class="level-item">Your Borg Repositories</h1>
+  <div class="p-2 ms-auto">
+    <a class="button is-primary" href="{% url 'borg_add' %}" role="button">Add Repository</a>
   </div>
-  <div class="level-right">
-    <a class="level-item button is-primary" href="{% url 'borg_add' %}" role="button">Add Repository</a>
 </div>
-</nav>
 
-<section class="section">
+<row>
 <p>Create a borg repository by specifying a name and the SSH public key that is allowed to access this repository. The name is only for your convenience. To set up the repository please follow the <a href="https://borgbackup.readthedocs.io/en/stable/">BorgBackup documentation</a>. There is also a <a href="https://borgbackup.readthedocs.io/en/stable/quickstart.html">Quick start guide</a> available.
   <b>Always use encrypted backups!</b></p>
-</section>
+</row>
 
-<section class="section">
+<section>
 <table class="table is-striped is-fullwidth is-hoverable">
   <thead>
     <th>Name</th>
@@ -40,7 +38,7 @@
 </section>
 
 {% if BORG_SERVER_PUBKEYS %}
-<section class="section">
+<section>
 <div class="card">
   <header class="card-header">
     <p class="card-header-title">Borg Server Public Keys</p>

community_backup/webui/templates/landing.html

@@ -1,12 +1,13 @@
 {% extends "base.html" %}
 
 {% block content %}
+<row class="p-2">
+<h1>Welcome to Community Backup!</h1>
+</row>
 
-  <h1 class="has-text-centered">Welcome to Community Backup!</h1>
+<row>
-
-  <section class="section">
   <p>This is a service offering space for backups free of charge. This is a hobby project. It comes with no guarantees for anything, especially availability of the service. This service is in a testing phase at the moment. It might be unavailable at times and features might change quickly.</p>
-  <p>Currently this service offers backups only via <a href="https://www.borgbackup.org/">Borg Backup</a>.</p>
+  <p>Currently this service offers only backups via <a href="https://www.borgbackup.org/">Borg Backup</a>.</p>
   <p>To access this service you need an account. To register for an account you need a voucher. Vouchers are required to control the amount of users, so that there is enough space available for everyone.</p>
-  </section>
+</row>
 {% endblock %}

community_backup/webui/templates/markdown.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-<section class="section">
+<row class="p-2">
   {{ markdown_content|safe }}
-</section >
+</row>
 {% endblock %}

community_backup/webui/templates/register.html

@@ -2,7 +2,7 @@
 {% load crispy_forms_tags %}
 
 {% block content %}
-<section class="section">
+
 {% if form.errors %}
         {% for error in form.errors %}
 <p>{{ error }}</p>
@@ -15,5 +15,4 @@
 <input class="button is-primary" type="submit" value="Register">
 </form>
 
-</section>
 {% endblock %}

community_backup/webui/templates/webui/borgrepository_confirm_delete.html

@@ -2,12 +2,10 @@
 {% load crispy_forms_tags %}
 
 {% block content %}
-<section class="section">
 <form method="post">{% csrf_token %}
     <p>Are you sure you want to delete "{{ object.name }}"?</p>
     {{ form }}
     <input class="button is-danger" type="submit" value="Confirm">
 </form>
-</section>
 {% endblock %}
 

community_backup/webui/templates/webui/borgrepository_form.html

@@ -2,7 +2,6 @@
 
 {% load crispy_forms_tags %}
 {% block content %}
-  <section class="section">
   <form method="post">
   {% csrf_token %}
   {{ form|crispy }}
@@ -11,7 +10,5 @@
     {% else %}
   <input class="button is-primary" type="submit" value="Add">
     {% endif %}
-    <a class="button" href="{% url 'borg_list' %}">Cancel</a>
   </form>
-  </section>
 {% endblock %}