add external ingress

disable button while submitting
major style overhaul
2020-04-24 21:07:34 -04:00 · 2020-04-24 21:05:19 -04:00 · 2020-04-24 21:00:29 -04:00 · 2020-04-24 20:54:05 -04:00 · 2020-04-24 20:51:53 -04:00 · 2020-04-24 20:50:23 -04:00
6 changed files with 94 additions and 30 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,9 @@ build:
    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG

 test:
+  only:
+    variables:
+    - $CI_COMMIT_TAG
  stage: test
  image:
    name: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
--- a/k8s/ingress.yaml
+++ b/k8s/ingress.yaml
@@ -15,4 +15,40 @@ spec:
      paths:
      - backend:
          serviceName: test
-          servicePort: 8000
+          servicePort: 8000
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: test-external-tls
+spec:
+  entryPoints:
+    - websecure
+  tls:
+    secretName: letsencrypt
+  routes:
+  - match: Host(`test.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: test-web
+      port: 80
+
+---
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: test-external-web
+spec:
+  entryPoints:
+    - web
+  routes:
+  - match: Host(`test.ducoterra.net`)
+    kind: Rule
+    services:
+    - name: test-web
+      port: 80
+    middlewares:
+      - name: httpsredirect
--- a/ui/static/ui/button.css
+++ b/ui/static/ui/button.css
--- a/ui/static/ui/button.js
+++ b/ui/static/ui/button.js
@@ -19,6 +19,7 @@ var button = document.getElementById("BUTTON");
 var count = document.getElementById("COUNT");

 button.addEventListener("click", event => {
+    button.disabled = true;
    fetch('/button', {
        method: 'POST',
        headers: {
@@ -31,5 +32,9 @@ button.addEventListener("click", event => {
        })
        .then((data) => {
            count.innerText = data.pressed;
+        }).finally(() => {
+            button.disabled = false;
        });
-})
+});
+
+button.focus();
--- a/ui/templates/ui/base.html
+++ b/ui/templates/ui/base.html
@@ -0,0 +1,24 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>The Button</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.2/css/bulma.min.css">
+    <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
+    {% block css %}
+    {% endblock %}
+</head>
+
+<body>
+    {% csrf_token %}
+
+    {% block body %}
+    {% endblock %}
+
+    {% block js %}
+    {% endblock %}
+</body>
--- a/ui/templates/ui/button.html
+++ b/ui/templates/ui/button.html
@@ -1,33 +1,29 @@
+{% extends 'ui/base.html' %}
+
 {% load static %}

-<!DOCTYPE html>
-<html>
+{% block css %}
+<link rel="stylesheet" href="{% static 'ui/button.css' %}">
+{% endblock %}

-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Hello Bulma!</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.2/css/bulma.min.css">
-    <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
-</head>
+{% block js %}
+<script src="{% static 'ui/button.js' %}"></script>
+{% endblock %}

-<body>
-    {% csrf_token %}
-    <section class="section">
-        <div class="container">
-            <div>
-                <h1 class="title">
-                    The Button
-                </h1>
-                <button class="button" id="BUTTON">Press</button>
-            </div>
-            <div><br></div>
-            <div>
-                <h1 class="title" id="COUNT">{{ pressed }}</h1>
-            </div>
+
+{% block body %}
+<section class="section">
+    <div class="container">
+        <div>
+            <h1 class="title">
+                The Button
+            </h1>
+            <button class="button is-primary" id="BUTTON">Press</button>
        </div>
-    </section>
-    <script src="{% static 'ui/button.js' %}"></script>
-</body>
-
-</html>
+        <div><br></div>
+        <div>
+            <h1 class="title" id="COUNT">{{ pressed }}</h1>
+        </div>
+    </div>
+</section>
+{% endblock %}
Author	SHA1	Message	Date
ducoterra	a6127703e9	add external ingress	2020-04-24 21:07:34 -04:00
ducoterra	6be7034f9b	disable button while submitting	2020-04-24 21:05:19 -04:00
ducoterra	1adaf20f61	major style overhaul	2020-04-24 21:00:29 -04:00
ducoterra	c32ed88713	fix the button	2020-04-24 20:54:05 -04:00
ducoterra	1d572cec43	oops broke the button	2020-04-24 20:51:53 -04:00
ducoterra	fd42b38c23	all focus on button	2020-04-24 20:50:23 -04:00
ducoterra	b8faf538be	don't do anything unless tag	2020-04-24 20:46:03 -04:00