diff --git a/install.sh b/install.sh index 362dabdc..084e612b 100755 --- a/install.sh +++ b/install.sh @@ -71,9 +71,11 @@ Pictures/wallpaper" if [ -f "$wall" ]; then wall_base="$(basename "$wall")" echo " $ARROW Converting $wall_base..." - $MAGICK -quiet -regard-warnings\ - "$WALL_ASSETS/$wall_base" -resize 1500 -filter Gaussian -resize 25% \ - -define filter:sigma=3 -resize 400% "$WALL_ASSETS/blurred/$wall_base" + $MAGICK -quiet -regard-warnings \ + "$WALL_ASSETS/$wall_base" -resize 1500 \ + -filter Gaussian -resize '50%' \ + -define filter:sigma=6 -resize '200%' \ + "$WALL_ASSETS/blurred/$wall_base" fi done @@ -82,7 +84,6 @@ Pictures/wallpaper" echo " You might need to give your password for this one." sudo cp -rf "$WALL_ASSETS"/* /usr/share/backgrounds - IFS="$IFS_OLD" fi @@ -100,6 +101,8 @@ if [ ! -d ./node_modules ]; then echo "$ARROW \`node_modules\` not found, installing packages..." $NPM install echo "Done." +else + echo "$ARROW \`node_moudles\` found, skipping running \`npm install\`." fi # `npm` build. @@ -111,7 +114,7 @@ echo "Done" # Build archive. echo "$ARROW Building directory..." cd ./dist || exit 1 -tar zcvf ../lightdm-saluto.tar.gz ./* +tar zcf ../lightdm-saluto.tar.gz ./* cd ../ || exit 1 sudo mkdir -p "$THEME_INSTALL_DIR" sudo mv ./lightdm-saluto.tar.gz "$THEME_INSTALL_DIR" @@ -120,7 +123,7 @@ echo "Done" # Decompressing. echo "$ARROW Entering directory and running final decompression..." cd "$THEME_INSTALL_DIR" || exit 1 -sudo tar xvf lightdm-saluto.tar.gz +sudo tar xf lightdm-saluto.tar.gz echo "Done" echo diff --git a/package-lock.json b/package-lock.json index c79b1f1e..91d4f1ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9703,6 +9703,11 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "simple-keyboard": { + "version": "2.27.77", + "resolved": "https://registry.npmjs.org/simple-keyboard/-/simple-keyboard-2.27.77.tgz", + "integrity": "sha512-yfos+fCe4tVP8XCsCYf4WPcGb3NLtFuKR4twU2e4DyxoUN1l1qpLubQcq5qet2oxB6AbAXycHrAE5LIaimx9IQ==" + }, "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", diff --git a/package.json b/package.json index 52c9e6a2..b674081d 100644 --- a/package.json +++ b/package.json @@ -1,33 +1,34 @@ { - "name": "lightdm-saluto", - "version": "1.0.0", - "license": "MIT", - "author": "Demonstrandum", - "homepage": "https://github.com/Demonstrandum/Saluto", - "repository": "https://github.com/Demonstrandum/Saluto", - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build" - }, - "dependencies": { - "vue": "^2.6.10", - "vue-router": "^3.1.3" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "^4.0.5", - "@vue/cli-service": "^4.0.5", - "node-sass": "^4.13.0", - "sass-loader": "^8.0.0", - "vue-template-compiler": "^2.6.10" - }, - "postcss": { - "plugins": { - "autoprefixer": {} - } - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" - ] + "name": "lightdm-saluto", + "version": "1.0.0", + "license": "MIT", + "author": "Demonstrandum", + "homepage": "https://github.com/Demonstrandum/Saluto", + "repository": "https://github.com/Demonstrandum/Saluto", + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build" + }, + "dependencies": { + "vue": "^2.6.10", + "vue-router": "^3.1.3", + "simple-keyboard": "latest" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "^4.0.5", + "@vue/cli-service": "^4.0.5", + "node-sass": "^4.13.0", + "sass-loader": "^8.0.0", + "vue-template-compiler": "^2.6.10" + }, + "postcss": { + "plugins": { + "autoprefixer": {} + } + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 8" + ] } diff --git a/src/App.vue b/src/App.vue index b30810d9..fd688285 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,5 @@ diff --git a/src/assets/default_images/onboard.svg b/src/assets/default_images/onboard.svg new file mode 100644 index 00000000..6ed887a3 --- /dev/null +++ b/src/assets/default_images/onboard.svg @@ -0,0 +1,201 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Checkbox.vue b/src/components/Checkbox.vue index f31c8944..8f8a3899 100644 --- a/src/components/Checkbox.vue +++ b/src/components/Checkbox.vue @@ -4,51 +4,48 @@ diff --git a/src/components/Clock.vue b/src/components/Clock.vue index 0db7e839..901f50f3 100644 --- a/src/components/Clock.vue +++ b/src/components/Clock.vue @@ -1,6 +1,10 @@ - diff --git a/src/components/Onboard.vue b/src/components/Onboard.vue new file mode 100644 index 00000000..419ebf47 --- /dev/null +++ b/src/components/Onboard.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/components/PowerButton.vue b/src/components/PowerButton.vue index 6e03ba49..09370722 100644 --- a/src/components/PowerButton.vue +++ b/src/components/PowerButton.vue @@ -1,74 +1,95 @@ diff --git a/src/components/SelectItem.vue b/src/components/SelectItem.vue index 11f41453..cba278a7 100644 --- a/src/components/SelectItem.vue +++ b/src/components/SelectItem.vue @@ -1,168 +1,156 @@ diff --git a/src/lightdm.js b/src/lightdm.js index 4474aba5..4acc7cff 100644 --- a/src/lightdm.js +++ b/src/lightdm.js @@ -1,6 +1,6 @@ 'use strict'; -const DEBUG_PASSWORD = 'test'; +const DEBUG_PASSWORD = 'password'; window.lightdm_debug = window.lightdm === undefined; @@ -19,6 +19,7 @@ if (window.lightdm_debug) { window.lightdm = { is_authenticated: false, + hostname: 'malorum', authentication_user: undefined, default_session: 'plasma-shell', can_suspend: true, diff --git a/src/settings.js b/src/settings.js index a6a18111..e91d2bc7 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,33 +1,38 @@ let local = localStorage.getItem("settings"); if (local === "undefined") { - local = null; + local = null; } export let settings = local ? JSON.parse(local) : { - first: true, - - mode: "classic", - - disableSplash: false, - disableSplashText: false, - disableIntro: false, - disableFade: false, - roundAvatar: true, - disableAvatar: false, - disableZoom: false, - clock12: false, - randomizeBG: false, - - user: lightdm.users[0], - desktop: lightdm.sessions[0] + first: true, + + mode: "classic", + + disableSplash: false, + disableSplashText: false, + disableIntro: false, + disableFade: false, + roundAvatar: true, + disableAvatar: false, + disableZoom: false, + clock12: false, + randomizeBG: false, + + hostname: lightdm.hostname, + user: lightdm.users[0], + desktop: lightdm.sessions[0] }; -// Handle display name/avatar change. +// Handle display name/avatar/hostname change. +if (lightdm.hostname !== settings.hostname) + settings.hostname = lightdm.hostname; + lightdm.users.forEach(u => { if (settings.user.username === u.username) settings.user = u; }); + lightdm.sessions.forEach(s => { if (settings.desktop.username === s.key) settings.desktop = s; @@ -36,28 +41,28 @@ lightdm.sessions.forEach(s => { save(); export function save(s) { - localStorage.setItem( - "settings", - JSON.stringify(s ? (settings = s) : settings) - ); + localStorage.setItem( + "settings", + JSON.stringify(s ? (settings = s) : settings) + ); } export function avatar(avi) { - if (!avi || avi === "") { - return require("./assets/images/eh8.png"); - } + if (!avi || avi === "") { + return require("./assets/images/eh8.png"); + } - if (avi === "cicero") { - return require("./assets/images/cicero.png") - } + if (avi === "cicero") { + return require("./assets/images/cicero.png") + } - if (avi === "eh8") { - return require("./assets/images/eh8.png"); - } + if (avi === "eh8") { + return require("./assets/images/eh8.png"); + } - if (avi === "litarvan") { - return require("./assets/images/litarvan.png"); - } + if (avi === "litarvan") { + return require("./assets/images/litarvan.png"); + } - return avi; + return avi; } diff --git a/src/translations.js b/src/translations.js index dfdc084e..d14f67f4 100644 --- a/src/translations.js +++ b/src/translations.js @@ -94,12 +94,12 @@ const translations = { trigger: 'Presiona Espacio o Enter para iniciar sesión', password: 'Contraseña...' }, - + // Hebrew (TODO) 'he': { trigger: 'לחץ על רווח או Enter כדי להכנס', password: 'ססמה...', - + shutdown: 'מכבה...', suspend: 'משהה...', restart: 'מפעיל מחדש...', diff --git a/src/views/Base.vue b/src/views/Base.vue index 433b2a9e..cea7a0d2 100644 --- a/src/views/Base.vue +++ b/src/views/Base.vue @@ -1,57 +1,51 @@ diff --git a/src/views/Intro.vue b/src/views/Intro.vue index ed9e64fa..e027b1f4 100644 --- a/src/views/Intro.vue +++ b/src/views/Intro.vue @@ -1,15 +1,14 @@ diff --git a/src/views/Login.vue b/src/views/Login.vue index c0d571c6..b4f7061d 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -1,63 +1,70 @@ diff --git a/src/views/Select.vue b/src/views/Select.vue index e9da7d31..f9200060 100644 --- a/src/views/Select.vue +++ b/src/views/Select.vue @@ -1,16 +1,14 @@ diff --git a/src/views/Setup.vue b/src/views/Setup.vue index d86ba607..77a16725 100644 --- a/src/views/Setup.vue +++ b/src/views/Setup.vue @@ -1,74 +1,64 @@ diff --git a/src/views/Splash.vue b/src/views/Splash.vue index f9fb1cba..205f7d0d 100644 --- a/src/views/Splash.vue +++ b/src/views/Splash.vue @@ -1,10 +1,10 @@ diff --git a/src/views/Theming.vue b/src/views/Theming.vue index a4063fec..cedccf2e 100644 --- a/src/views/Theming.vue +++ b/src/views/Theming.vue @@ -1,393 +1,354 @@ diff --git a/vue.config.js b/vue.config.js index 537fbe1e..289d0241 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,9 +1,12 @@ module.exports = { - publicPath: '', - productionSourceMap: false, - outputDir: undefined, - assetsDir: undefined, - runtimeCompiler: undefined, - parallel: undefined, - css: undefined + publicPath: '', + productionSourceMap: false, + outputDir: undefined, + assetsDir: undefined, + runtimeCompiler: undefined, + parallel: undefined, + css: undefined, + configureWebpack: { + target: 'node-webkit' + } }; diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 00000000..5abb0c49 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,3 @@ +module.exports = { + target: 'node-webkit'; +};