diff --git a/.env.development.lite b/.env.development.lite deleted file mode 100644 index e62645d4..00000000 --- a/.env.development.lite +++ /dev/null @@ -1,4 +0,0 @@ -NODE_ENV=development -VUE_APP_PLATFORM=web -VUE_APP_TARGET=web -VUE_APP_LITEMODE=true \ No newline at end of file diff --git a/.env.production.lite b/.env.production.lite deleted file mode 100644 index c58a53e1..00000000 --- a/.env.production.lite +++ /dev/null @@ -1,4 +0,0 @@ -NODE_ENV=production -VUE_APP_PLATFORM=web -VUE_APP_TARGET=web -VUE_APP_LITEMODE=true \ No newline at end of file diff --git a/app/builder-config-base.yaml b/app/builder-config-base.yaml index d471a661..1a1e9fe8 100644 --- a/app/builder-config-base.yaml +++ b/app/builder-config-base.yaml @@ -26,6 +26,5 @@ files: - '!**/app/installers${/*}' - '!**/hooks${/*}' - '!**/platforms${/*}' - - '!**/dist-lite*${/*}' - '!**/release-builds${/*}' - '!src${/*}' diff --git a/package.json b/package.json index 068e9f88..f539465d 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,8 @@ "main": "./app/app.js", "scripts": { "build:web": "vue-cli-service build --mode production.web", - "build:lite": "vue-cli-service build --mode production.lite", "build:app": "vue-cli-service build --mode production.app", "serve:web": "vue-cli-service serve --mode development.web", - "serve:lite": "vue-cli-service serve --mode development.lite", "start": "npm run build:app && electron app/app.js", "dist:linux": "electron-builder --linux --config app/builder-config-x86_64.yaml", "dist:raspi": "electron-builder --linux --config app/builder-config-raspi.yaml", diff --git a/src/App.vue b/src/App.vue index 7a75455a..2fbdb660 100644 --- a/src/App.vue +++ b/src/App.vue @@ -48,7 +48,6 @@ export default { keysDown: {}, systemDark: undefined, themeObserver: undefined, - liteMode: process.env.VUE_APP_LITEMODE == "true" ? true : false, isElectron: isElectron(), tourCallbacks: { onStop: () => { @@ -95,18 +94,15 @@ export default { placement: "bottom" } }, - ...(!this.liteMode - ? [ - { - target: "#new-connection-card", - header: { - title: "New connection" - }, - content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope` - } - ] - : []), - ...(this.isElectron && !this.liteMode + + { + target: "#new-connection-card", + header: { + title: "New connection" + }, + content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope` + }, + ...(this.isElectron ? [ { target: "#nearby-connections-grid", @@ -117,17 +113,14 @@ export default { } ] : []), - ...(!this.liteMode - ? [ - { - target: "#saved-connections-grid", - header: { - title: "Saved microscopes" - }, - content: `Connect to your saved microscopes for faster access` - } - ] - : []), + + { + target: "#saved-connections-grid", + header: { + title: "Saved microscopes" + }, + content: `Connect to your saved microscopes for faster access` + }, { target: "#gallery-tab-icon", header: { @@ -168,9 +161,6 @@ export default { }, mounted() { - if (process.env.VUE_APP_LITEMODE == "true") { - console.log("Built lite-mode"); - } // Query CSS dark theme preference var mql = window.matchMedia("(prefers-color-scheme: dark)"); // Check for system dark theme when mounted diff --git a/src/components/appContent.vue b/src/components/appContent.vue index 61c990c5..811561a7 100644 --- a/src/components/appContent.vue +++ b/src/components/appContent.vue @@ -15,7 +15,6 @@ class="uk-flex uk-flex-column uk-padding-remove uk-width-auto uk-height-1-1 uk-text-center" >
- - +
@@ -19,9 +18,7 @@ export default { }, data: function() { - return { - liteMode: process.env.VUE_APP_LITEMODE == "true" ? true : false - }; + return {}; } }; diff --git a/src/components/viewComponents/connectDisplayLite.vue b/src/components/viewComponents/connectDisplayLite.vue deleted file mode 100644 index ecf67b86..00000000 --- a/src/components/viewComponents/connectDisplayLite.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - diff --git a/src/components/viewComponents/settingsComponents/statusPane.vue b/src/components/viewComponents/settingsComponents/statusPane.vue index 2a43388b..f5c94138 100644 --- a/src/components/viewComponents/settingsComponents/statusPane.vue +++ b/src/components/viewComponents/settingsComponents/statusPane.vue @@ -94,8 +94,7 @@ export default { configuration: null, settings: null, systemActionLinks: {}, - clientVersion: process.env.PACKAGE.version, - liteMode: process.env.VUE_APP_LITEMODE == "true" ? true : false + clientVersion: process.env.PACKAGE.version }; }, @@ -110,9 +109,7 @@ export default { return `${this.$store.getters.baseUri}/api/v2/actions`; }, clientVersionName: function() { - const liteMode = process.env.VUE_APP_LITEMODE == "true" ? true : false; - const suffix = liteMode ? "-Lite" : ""; - return `${process.env.PACKAGE.version}${suffix}`; + return `${process.env.PACKAGE.version}`; } }, diff --git a/vue.config.js b/vue.config.js index 892aff82..eb4d6f83 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,8 +23,6 @@ module.exports = { outputDir: (function() { if (process.env.VUE_APP_TARGET == "electron-renderer") { return "./app/dist"; - } else if (process.env.VUE_APP_LITEMODE == "true") { - return "./dist-lite"; } else { return "./dist"; }