From 1504265fb15458c0c15192b11abb01634a676bbc Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Fri, 3 Sep 2021 19:22:28 +0100
Subject: [PATCH 1/5] Tweaks to make Snapcrafts Build

---
 snapcraft.yaml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 72fcb0be..781fdd86 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,28 +1,31 @@
 name: statping-ng
-version-script: cat version.txt
 version: "stable"
+version-script: cat version.txt
 summary: Statping-ng Server Monitoring with Status Page
-description: >
+description: |
   An easy to use Status Page for your websites and applications.
   Statping will automatically fetch the application and render a beautiful
   status page with tons of features for you to build an even better status page.
   This Status Page generator allows you to use MySQL, Postgres, or SQLite
   on multiple operating systems.
-base: base
+
+base: bare
+build-base: core18
 type: app
 confinement: strict
 grade: stable
-issues: https://github.com/statping-ng/statping-ng/issues
+license: GPL-3.0
 
 architectures:
+  - build-on: i386
   - build-on: amd64
   - build-on: armhf
   - build-on: arm64
-  - build-on: i386
 
 apps:
   statping:
-    command: statping
+    command: bin/statping
+    daemon: simple
     plugs:
       - home
       - network
@@ -33,8 +36,10 @@ parts:
     source: .
     plugin: nil
     override-build: |
-      apt-get update
-      apt-get install -y curl tar
-      curl -o- -L https://raw.githubusercontent.com/statping-ng/statping-ng/stable/install.sh | bash
-      cp /usr/local/bin/statping statping
-      cp /usr/local/bin/statping /build/statping-ng/prime/./statping
+      curl -o- -L https://raw.githubusercontent.com/adamboutcher/statping-ng/dev/install.sh | bash
+    build-packages:
+      - tar
+      - curl
+      - bash
+    organize:
+      /usr/local/bin/statping: bin/

From 66df2f116afdcde4522ba50bf37c3cc02b2ec569 Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Fri, 3 Sep 2021 19:35:23 +0100
Subject: [PATCH 2/5] Remove snapcraft as a statping service

---
 snapcraft.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 781fdd86..4afea18f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -25,7 +25,6 @@ architectures:
 apps:
   statping:
     command: bin/statping
-    daemon: simple
     plugs:
       - home
       - network

From dedfbaca9d2ccfdfc07fc38ddde79d97204267ad Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Fri, 3 Sep 2021 20:15:15 +0100
Subject: [PATCH 3/5] Snap now a service and works correctly

---
 snapcraft.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4afea18f..96ae07fc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -9,7 +9,7 @@ description: |
   This Status Page generator allows you to use MySQL, Postgres, or SQLite
   on multiple operating systems.
 
-base: bare
+base: core18
 build-base: core18
 type: app
 confinement: strict
@@ -25,6 +25,7 @@ architectures:
 apps:
   statping:
     command: bin/statping
+    daemon: simple
     plugs:
       - home
       - network

From 819c0bf3752c94db36d2b310e5620dd447db066f Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Sat, 11 Sep 2021 21:04:10 +0100
Subject: [PATCH 4/5] Moved reliance on assets.statping.com to our github site.

---
 frontend/public/base.gohtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/public/base.gohtml b/frontend/public/base.gohtml
index 696d733f..3cae161e 100644
--- a/frontend/public/base.gohtml
+++ b/frontend/public/base.gohtml
@@ -25,7 +25,7 @@
     <meta property="twitter:description" content="{{CoreApp.Description}} {{CoreApp.Name}}">
 
     {{if USE_CDN}}
-    <link rel="stylesheet" href="https://assets.statping.com/css/vendor.css">
+    <link rel="stylesheet" href="https://statping-ng.github.io/assets/hosted/vendor.css" />
     {{else}}
     <% _.each(htmlWebpackPlugin.tags.headTags, function(headTag) { %>
     <%= headTag %> <% }) %>
@@ -39,10 +39,10 @@
 <div id="app" class="statping_container"></div>
 
 {{if USE_CDN}}
-<script src="https://assets.statping.com/js/bundle.js"></script>
-<script src="https://assets.statping.com/js/vendor.chunk.js"></script>
-<script src="https://assets.statping.com/js/polyfill.chunk.js"></script>
-<script src="https://assets.statping.com/js/main.chunk.js"></script>
+<script src="https://statping-ng.github.io/assets/hosted/bundle.js"></script>
+<script src="https://statping-ng.github.io/assets/hosted/vendor.chunk.js"></script>
+<script src="https://statping-ng.github.io/assets/hosted/polyfill.chunk.js"></script>
+<script src="https://statping-ng.github.io/assets/hosted/main.chunk.js"></script>
 {{else}}
 <% _.each(htmlWebpackPlugin.tags.bodyTags, function(bodyTag) { %>
 <%= bodyTag %> <% }) %>

From 6aa229c0aafe61798fd611166fada641dc009a1f Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Sat, 11 Sep 2021 21:04:33 +0100
Subject: [PATCH 5/5] Branding changes

---
 frontend/src/components/Dashboard/TopNav.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Dashboard/TopNav.vue b/frontend/src/components/Dashboard/TopNav.vue
index 8136fff8..c8692de6 100644
--- a/frontend/src/components/Dashboard/TopNav.vue
+++ b/frontend/src/components/Dashboard/TopNav.vue
@@ -1,6 +1,6 @@
 <template>
     <nav class="navbar navbar-expand-lg">
-        <router-link to="/" class="navbar-brand">Statping</router-link>
+        <router-link to="/" class="navbar-brand">Statping-ng</router-link>
         <button @click="navopen = !navopen" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
             <font-awesome-icon v-if="!navopen" icon="bars"/>
             <font-awesome-icon v-if="navopen" icon="times"/>