diff --git a/core/css/main.css b/core/css/main.css new file mode 100644 index 000000000..4acddf0dc --- /dev/null +++ b/core/css/main.css @@ -0,0 +1,34 @@ +.navbar { background-color: #5755d9; padding: 0.5em 1em 0.5em 1em; } +.navbar .navbar-brand { + color: #fff; + font-weight: bold; +} +.avatar img { + border-radius: 5px 5px 5px 5px; + background: #ddd; +} +#toastcontainer { + position:fixed; + bottom:8px;left:0px;right:0px; + z-index: 100; +} +.hero { + padding-bottom: 1rem; + padding-top: 1rem; + text-align:center; +} +.chip { + cursor: pointer; +} +.filter-nav { + display: inline-block; +} +.sort-nav { + float: right; +} +.tile-content { position: relative; } +.link-github { + position:absolute; + top: 36px; + left: -24px; +} diff --git a/css/pwa.css b/core/css/pwa.css similarity index 100% rename from css/pwa.css rename to core/css/pwa.css diff --git a/css/spectre-exp.min.css b/core/css/spectre-exp.min.css similarity index 100% rename from css/spectre-exp.min.css rename to core/css/spectre-exp.min.css diff --git a/css/spectre-icons.min.css b/core/css/spectre-icons.min.css similarity index 100% rename from css/spectre-icons.min.css rename to core/css/spectre-icons.min.css diff --git a/css/spectre.min.css b/core/css/spectre.min.css similarity index 100% rename from css/spectre.min.css rename to core/css/spectre.min.css diff --git a/img/github-icon-sml.png b/core/img/github-icon-sml.png similarity index 100% rename from img/github-icon-sml.png rename to core/img/github-icon-sml.png diff --git a/img/github-icon.png b/core/img/github-icon.png similarity index 100% rename from img/github-icon.png rename to core/img/github-icon.png diff --git a/js/.eslintrc.json b/core/js/.eslintrc.json similarity index 100% rename from js/.eslintrc.json rename to core/js/.eslintrc.json diff --git a/js/appinfo.js b/core/js/appinfo.js similarity index 100% rename from js/appinfo.js rename to core/js/appinfo.js diff --git a/js/comms.js b/core/js/comms.js similarity index 100% rename from js/comms.js rename to core/js/comms.js diff --git a/js/index.js b/core/js/index.js similarity index 95% rename from js/index.js rename to core/js/index.js index 93abfd377..11d138b00 100644 --- a/js/index.js +++ b/core/js/index.js @@ -1,7 +1,7 @@ let appJSON = []; // List of apps and info from apps.json let appsInstalled = []; // list of app JSON let appSortInfo = {}; // list of data to sort by, from appdates.csv { created, modified } -let files = []; // list of files on Bangle +let files = []; // list of files on the Espruimo Device let DEFAULTSETTINGS = { pretokenise : true, favourites : ["boot","launch","setting"] @@ -193,7 +193,7 @@ function showTab(tabname) { htmlToArray(document.querySelectorAll("#tab-navigate .tab-item")).forEach(tab => { tab.classList.remove("active"); }); - htmlToArray(document.querySelectorAll(".bangle-tab")).forEach(tab => { + htmlToArray(document.querySelectorAll(".apploader-tab")).forEach(tab => { tab.style.display = "none"; }); document.getElementById("tab-"+tabname).classList.add("active"); @@ -256,10 +256,7 @@ function refreshLibrary() { let readme = `Read more...`; let favourite = favourites.find(e => e == app.id); - let username = "espruino"; - let githubMatch = window.location.href.match(/\/(\w+)\.github\.io/); - if(githubMatch) username = githubMatch[1]; - let url = `https://github.com/${username}/BangleApps/tree/master/apps/${app.id}`; + let url = `${APP_SOURCECODE_URL}/${app.id}`; let appurl = window.location.origin + window.location.pathname + "#" + encodeURIComponent(app.id); return `
@@ -269,7 +266,7 @@ function refreshLibrary() {

${escapeHtml(app.name)} ${versionInfo}

${getAppDescription(app)}${app.readme?`
${readme}`:""}

- See the code on GitHub + See the code on GitHub
@@ -677,19 +674,6 @@ sortContainer.addEventListener('click', ({ target }) => { // =========================================== About -if (window.location.host=="banglejs.com") { - document.getElementById("apploaderlinks").innerHTML = - 'This is the official Bangle.js App Loader - you can also try the Development Version for the most recent apps.'; -} else if (window.location.host=="espruino.github.io") { - document.title += " [Development]"; - document.getElementById("apploaderlinks").innerHTML = - 'This is the development Bangle.js App Loader - you can also try the Official Version for stable apps.'; -} else { - document.title += " [Unofficial]"; - document.getElementById("apploaderlinks").innerHTML = - 'This is not the official Bangle.js App Loader - you can try the Official Version here.'; -} - // Settings let SETTINGS_HOOKS = {}; // stuff to get called when a setting is loaded /// Load settings and update controls diff --git a/js/pwa.js b/core/js/pwa.js similarity index 100% rename from js/pwa.js rename to core/js/pwa.js diff --git a/js/service-worker.js b/core/js/service-worker.js similarity index 100% rename from js/service-worker.js rename to core/js/service-worker.js diff --git a/js/ui.js b/core/js/ui.js similarity index 100% rename from js/ui.js rename to core/js/ui.js diff --git a/js/utils.js b/core/js/utils.js similarity index 100% rename from js/utils.js rename to core/js/utils.js diff --git a/lib/.eslintrc.json b/core/lib/.eslintrc.json similarity index 100% rename from lib/.eslintrc.json rename to core/lib/.eslintrc.json diff --git a/lib/customize.js b/core/lib/customize.js similarity index 100% rename from lib/customize.js rename to core/lib/customize.js diff --git a/lib/espruinotools.js b/core/lib/espruinotools.js similarity index 100% rename from lib/espruinotools.js rename to core/lib/espruinotools.js diff --git a/lib/heatshrink.js b/core/lib/heatshrink.js similarity index 100% rename from lib/heatshrink.js rename to core/lib/heatshrink.js diff --git a/lib/imageconverter.js b/core/lib/imageconverter.js similarity index 100% rename from lib/imageconverter.js rename to core/lib/imageconverter.js diff --git a/lib/interface.js b/core/lib/interface.js similarity index 100% rename from lib/interface.js rename to core/lib/interface.js diff --git a/lib/marked.min.js b/core/lib/marked.min.js similarity index 100% rename from lib/marked.min.js rename to core/lib/marked.min.js diff --git a/lib/qrcode.min.js b/core/lib/qrcode.min.js similarity index 100% rename from lib/qrcode.min.js rename to core/lib/qrcode.min.js diff --git a/index.html b/index.html index f0f54c248..44d2e832c 100644 --- a/index.html +++ b/index.html @@ -3,10 +3,11 @@ - - - - + + + + + @@ -17,42 +18,6 @@ Bangle.js App Loader -
@@ -93,7 +58,7 @@
-
+
@@ -124,7 +89,7 @@
-