From c04d5c279430eaadc4017e142f77663673403964 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 7 Aug 2018 21:58:47 +1000 Subject: [PATCH] Clean up main frontend code Removes fonts that should never be utilised --- src/assets.rs | 5 +- static/css/main.css | 5 +- static/fonts/roboto-v18-latin-regular.svg | 308 ---------------------- static/fonts/roboto-v18-latin-regular.ttf | Bin 35408 -> 0 bytes static/index.html | 212 +-------------- static/js/main.js | 54 ++++ static/js/views.js | 2 +- 7 files changed, 66 insertions(+), 520 deletions(-) delete mode 100644 static/fonts/roboto-v18-latin-regular.svg delete mode 100644 static/fonts/roboto-v18-latin-regular.ttf create mode 100644 static/js/main.js diff --git a/src/assets.rs b/src/assets.rs index 8f311fb..c181676 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -37,8 +37,6 @@ pub fn file_from_string(file_path: &str) -> Option<(String, &'static [u8])> { "/css/bulma.min.css", "/css/main.css", "/fonts/roboto-v18-latin-regular.eot", - "/fonts/roboto-v18-latin-regular.svg", - "/fonts/roboto-v18-latin-regular.ttf", "/fonts/roboto-v18-latin-regular.woff", "/fonts/roboto-v18-latin-regular.woff2", "/js/vue.min.js", @@ -46,7 +44,8 @@ pub fn file_from_string(file_path: &str) -> Option<(String, &'static [u8])> { "/js/vue-router.min.js", "/js/vue-router.js", "/js/helpers.js", - "/js/views.js" + "/js/views.js", + "/js/main.js" )?; Some((string_mime, contents)) diff --git a/static/css/main.css b/static/css/main.css index 248ec8c..b95523f 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -5,11 +5,8 @@ font-weight: 400; src: url('../fonts/roboto-v18-latin-regular.eot'); /* IE9 Compat Modes */ src: local('Roboto'), local('Roboto-Regular'), - url('../fonts/roboto-v18-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-v18-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/roboto-v18-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('../fonts/roboto-v18-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/roboto-v18-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */ + url('../fonts/roboto-v18-latin-regular.woff') format('woff'); } html, body { diff --git a/static/fonts/roboto-v18-latin-regular.svg b/static/fonts/roboto-v18-latin-regular.svg deleted file mode 100644 index 627f5a3..0000000 --- a/static/fonts/roboto-v18-latin-regular.svg +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/fonts/roboto-v18-latin-regular.ttf b/static/fonts/roboto-v18-latin-regular.ttf deleted file mode 100644 index b91bf3f7e31942ea4c6b0f0fb68bf1bab8d76d6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35408 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 MojfE0EQf#q0LFnShX4Qo diff --git a/static/index.html b/static/index.html index 4b7243d..d0beaf9 100644 --- a/static/index.html +++ b/static/index.html @@ -1,5 +1,5 @@ - +
-
-
+

Welcome to the {{ attrs.name }} installer!

@@ -29,211 +28,16 @@
- -
- -
- - - - - - + + + + + + diff --git a/static/js/main.js b/static/js/main.js new file mode 100644 index 0000000..b026980 --- /dev/null +++ b/static/js/main.js @@ -0,0 +1,54 @@ +// Overwrite loggers with the logging backend +window.onerror = function(msg, url, line) { + window.external.invoke(JSON.stringify({ + Log: { + kind: "error", + msg: msg + " @ " + url + ":" + line + } + })); +}; + +// Borrowed from http://tobyho.com/2012/07/27/taking-over-console-log/ +function intercept(method){ + console[method] = function(){ + var message = Array.prototype.slice.apply(arguments).join(' '); + window.external.invoke(JSON.stringify({ + Log: { + kind: method, + msg: message + } + })); + } +} + +var methods = ['log', 'warn', 'error']; +for (var i = 0; i < methods.length; i++) { + intercept(methods[i]); +} + +document.getElementById("window-title").innerText = base_attributes.name + " Installer"; + +function selectFileCallback(name) { + app.install_location = name; +} + +var app = new Vue({ + router: router, + data: { + attrs: base_attributes, + config : {}, + install_location : "", + // If the option to pick an install location should be provided + show_install_location : true, + metadata : { + database : [], + install_path : "", + preexisting_install : false + } + }, + methods: { + "exit": function() { + ajax("/api/exit", function() {}); + } + } +}).$mount("#app"); diff --git a/static/js/views.js b/static/js/views.js index bf93c1f..d419bd6 100644 --- a/static/js/views.js +++ b/static/js/views.js @@ -34,7 +34,7 @@ const DownloadConfig = { console.error("Got error while downloading config: " + e); - if (app.is_launcher) { + if (app.metadata.is_launcher) { // Just launch the target application app.exit(); } else {