diff --git a/app/services/chimeverse-service.js b/app/services/chimeverse-service.js index 0d6cad3..6e64c87 100644 --- a/app/services/chimeverse-service.js +++ b/app/services/chimeverse-service.js @@ -19,7 +19,6 @@ angApp.factory('ChimeVerseService', ($window, SettingsServise, SystemService, Ap let remove = SettingsServise.removeCredentials(result.login) console.log('Remove credential on logout') remove.then(() => { - console.log('Switch to the login state') AppStateService.set(AppStateService.APP_STATE_LOGIN) }) }) diff --git a/app/views/default/page.html b/app/views/default/page.html index f4e27ee..8582424 100644 --- a/app/views/default/page.html +++ b/app/views/default/page.html @@ -1,8 +1,8 @@
- -

Chimeverse

-
v0.1.52
+ +

Chimeverse

+
v0.1.52
diff --git a/app/views/login/page.html b/app/views/login/page.html new file mode 100644 index 0000000..17032f4 --- /dev/null +++ b/app/views/login/page.html @@ -0,0 +1,32 @@ + \ No newline at end of file diff --git a/index.html b/index.html index e59e873..4394b65 100644 --- a/index.html +++ b/index.html @@ -4,45 +4,21 @@ Chimeverse + + -
-
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
- Credentials stored via Keychain -
-
+
+
settings diff --git a/package-lock.json b/package-lock.json index ffb010e..52833c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2399,6 +2399,11 @@ "mimic-fn": "^1.0.0" } }, + "open-iconic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/open-iconic/-/open-iconic-1.1.1.tgz", + "integrity": "sha1-nc/Ix808Yc20ojaxo0eJTJetwMY=" + }, "ora": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz", diff --git a/package.json b/package.json index 254e3f7..ac38312 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "converse.js": "^6.0.0", "electron-settings": "^3.2.0", "keytar": "^4.13.0", - "n": "^6.5.1" + "n": "^6.5.1", + "open-iconic": "^1.1.1" } } diff --git a/renderer.js b/renderer.js index 411d212..b30804d 100644 --- a/renderer.js +++ b/renderer.js @@ -20,6 +20,7 @@ angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService const { ipcRenderer } = require('electron') ipcRenderer.on('force-logout-event', () => { + ChimeVerseService.logout() let event = new CustomEvent("converse-force-logout") // Dispatch to the plugin document.dispatchEvent(event) //remote.getCurrentWindow().reload() @@ -31,7 +32,7 @@ angApp.controller('AppController', function ($scope, $timeout, ChimeVerseService // @see https://docs.angularjs.org/error/$rootScope/inprog $timeout(() => { $scope.state = data - console.log($scope.state) + console.log('Switch to the "' + $scope.state +'" state') }, 0) }); diff --git a/resources/css/app.css b/resources/css/app.css index 305d7a1..42f6626 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -12,6 +12,8 @@ body { background: #f8f8f8; + font: normal 14px/20px "Helvetica Neue",Helvetica,Arial,sans-serif; + -webkit-text-size-adjust: 100%; } .main-background { diff --git a/resources/css/login-form.css b/resources/css/login-form.css new file mode 100644 index 0000000..b3df71c --- /dev/null +++ b/resources/css/login-form.css @@ -0,0 +1,77 @@ +.login-form { + color: #777; + left: 50%; + position: absolute; + top: 50%; + transform: translate(-50%, -50%); +} + +.login-form__title { + font-size: 28px; + text-align: center; + font-weight: normal; + margin: 0px 0px 15px 0px; +} + +.login-form__description { + text-align: center; +} + +.login-form__card { + background: #fff; + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1); + margin-top: 30px; + padding: 30px; +} + +.login-form__wrapper { + margin-bottom: 15px;; +} + +.login-form__input-group { + border: 1px solid #ddd; + border-radius: 0px; + padding: 0px 0px 0px 30px; + position: relative; +} + +.login-form__input-group:active, +.login-form__input-group:focus, +.login-form__input-group:hover { + border: 1px solid #aaa; +} + +.login-form__input-group span { + position: absolute; + left: 15px; + top: 12px; +} + +.login-form__input { + border: 0px; + color: #222; + font-size: 18px; + outline: none; + padding: 10px; + width: 290px; +} + +.login-form__input::placeholder { /* Most modern browsers support this now. */ + color: #ddd; + } + + .login-form__button { + border: 1px solid #ddd; + background: rgb(5,93,228); + background: linear-gradient(0deg, rgba(5,93,228,1) 0%, rgba(76,145,255,1) 100%); + color: #fff; + display: inline-block; + font-size: 18px; + outline: none; + padding: 10px 30px; + width: 100%; + } + + .login-form__button:disabled { + background: #eee; + } diff --git a/resources/css/page-default.css b/resources/css/page-default.css index 8c0d27c..d7aae92 100644 --- a/resources/css/page-default.css +++ b/resources/css/page-default.css @@ -2,5 +2,23 @@ left: 50%; position: absolute; top: 50%; - width: 300px; + transform: translate(-50%, -50%); + text-align: center; +} + +.chimeverse-branding__img { + margin-left: 20px; +} + +.chimeverse-branding__header { + font-size: 34px; + font-weight: normal; + color: #999; + margin: 0px; +} + +.chimeverse-branding__version { + font-size: 12px; + color: #999; + margin-top: 10px; } \ No newline at end of file