From d9dbf8e4622e4c0471450a45bd9cdbdf24a2624c Mon Sep 17 00:00:00 2001 From: Fabio Date: Sat, 30 May 2020 12:54:05 +0200 Subject: [PATCH] Added setting modal --- src/main/index.js | 2 +- src/renderer/App.vue | 12 +- src/renderer/components/BaseConfirmModal.vue | 2 +- .../components/ModalAskCredentials.vue | 2 +- .../components/ModalEditConnection.vue | 6 +- .../components/ModalNewConnection.vue | 4 +- src/renderer/components/ModalSettings.vue | 145 ++++++++++++++++++ src/renderer/components/SettingBarContext.vue | 2 +- src/renderer/components/TheSettingBar.vue | 9 +- src/renderer/i18n/en-US.js | 8 +- src/renderer/i18n/it-IT.js | 8 +- src/renderer/scss/main.scss | 36 +++++ .../store/modules/application.store.js | 50 +++++- .../store/modules/connections.store.js | 36 +---- src/renderer/store/modules/settings.store.js | 2 +- 15 files changed, 270 insertions(+), 54 deletions(-) create mode 100644 src/renderer/components/ModalSettings.vue diff --git a/src/main/index.js b/src/main/index.js index bcab7887..fd517848 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -18,7 +18,7 @@ function createMainWindow () { width: 1600, height: 1000, minHeight: 550, - minWidth: 450, + minWidth: 900, title: 'Antares', autoHideMenuBar: true, icon: path.join(__static, 'logo-32.png'), diff --git a/src/renderer/App.vue b/src/renderer/App.vue index c6d4f5df..0988b274 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -15,6 +15,7 @@ + @@ -27,6 +28,7 @@ import TheAppWelcome from '@/components/TheAppWelcome'; import DatabaseWorkspace from '@/components/DatabaseWorkspace'; import ModalNewConnection from '@/components/ModalNewConnection'; import ModalEditConnection from '@/components/ModalEditConnection'; +import ModalSettings from '@/components/ModalSettings'; export default { name: 'App', @@ -37,7 +39,8 @@ export default { TheAppWelcome, DatabaseWorkspace, ModalNewConnection, - ModalEditConnection + ModalEditConnection, + ModalSettings }, data () { return { @@ -46,14 +49,15 @@ export default { computed: { ...mapGetters({ isLoading: 'application/isLoading', - isNewConnModal: 'connections/isNewModal', - isEditModal: 'connections/isEditModal', + isNewConnModal: 'application/isNewModal', + isEditModal: 'application/isEditModal', + isSettingModal: 'application/isSettingModal', connections: 'connections/getConnections' }) }, methods: { ...mapActions({ - showNewConnModal: 'connections/showNewConnModal' + showNewConnModal: 'application/showNewConnModal' }) } }; diff --git a/src/renderer/components/BaseConfirmModal.vue b/src/renderer/components/BaseConfirmModal.vue index af0a0529..20746177 100644 --- a/src/renderer/components/BaseConfirmModal.vue +++ b/src/renderer/components/BaseConfirmModal.vue @@ -2,7 +2,7 @@
-
+
diff --git a/src/renderer/components/ModalAskCredentials.vue b/src/renderer/components/ModalAskCredentials.vue index 9976cdf7..7e60dee5 100644 --- a/src/renderer/components/ModalAskCredentials.vue +++ b/src/renderer/components/ModalAskCredentials.vue @@ -2,7 +2,7 @@
-
+
{{ $t('word.credentials') }}
diff --git a/src/renderer/components/ModalEditConnection.vue b/src/renderer/components/ModalEditConnection.vue index ea36aedb..6a8d4ce9 100644 --- a/src/renderer/components/ModalEditConnection.vue +++ b/src/renderer/components/ModalEditConnection.vue @@ -2,7 +2,7 @@
-
+
{{ $t('message.editConnection') }}
@@ -151,7 +151,7 @@ export default { }, computed: { ...mapGetters({ - connection: 'connections/getSelectedConnection' + connection: 'application/getSelectedConnection' }) }, created () { @@ -159,7 +159,7 @@ export default { }, methods: { ...mapActions({ - closeModal: 'connections/hideEditConnModal', + closeModal: 'application/hideEditConnModal', editConnection: 'connections/editConnection' }), async startTest () { diff --git a/src/renderer/components/ModalNewConnection.vue b/src/renderer/components/ModalNewConnection.vue index 9a35fbd4..9963db6f 100644 --- a/src/renderer/components/ModalNewConnection.vue +++ b/src/renderer/components/ModalNewConnection.vue @@ -2,7 +2,7 @@
-
+
{{ $t('message.createNewConnection') }}
@@ -164,7 +164,7 @@ export default { }, methods: { ...mapActions({ - closeModal: 'connections/hideNewConnModal', + closeModal: 'application/hideNewConnModal', addConnection: 'connections/addConnection' }), setDefaults () { diff --git a/src/renderer/components/ModalSettings.vue b/src/renderer/components/ModalSettings.vue new file mode 100644 index 00000000..6ffd9551 --- /dev/null +++ b/src/renderer/components/ModalSettings.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/renderer/components/SettingBarContext.vue b/src/renderer/components/SettingBarContext.vue index 62e7ef20..29c3cf54 100644 --- a/src/renderer/components/SettingBarContext.vue +++ b/src/renderer/components/SettingBarContext.vue @@ -50,7 +50,7 @@ export default { methods: { ...mapActions({ deleteConnection: 'connections/deleteConnection', - showEditModal: 'connections/showEditConnModal' + showEditModal: 'application/showEditConnModal' }), showConfirmModal () { this.isConfirmModal = true; diff --git a/src/renderer/components/TheSettingBar.vue b/src/renderer/components/TheSettingBar.vue index 2e35818c..e1d45c47 100644 --- a/src/renderer/components/TheSettingBar.vue +++ b/src/renderer/components/TheSettingBar.vue @@ -34,7 +34,11 @@
    -
  • +
  • settings
@@ -79,7 +83,8 @@ export default { methods: { ...mapActions({ updateConnections: 'connections/updateConnections', - showNewConnModal: 'connections/showNewConnModal', + showNewConnModal: 'application/showNewConnModal', + showSettingModal: 'application/showSettingModal', selectWorkspace: 'workspaces/selectWorkspace' }), contextMenu (event, connection) { diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js index 644435c7..0c4ca098 100644 --- a/src/renderer/i18n/en-US.js +++ b/src/renderer/i18n/en-US.js @@ -18,7 +18,13 @@ module.exports = { disconnect: 'Disconnect', disconnected: 'Disconnected', refresh: 'Refresh', - settings: 'Settings' + settings: 'Settings', + general: 'General', + themes: 'Themes', + update: 'Update', + about: 'About', + language: 'Language', + version: 'Version' }, message: { appWelcome: 'Welcome to Antares SQL Client!', diff --git a/src/renderer/i18n/it-IT.js b/src/renderer/i18n/it-IT.js index 1cd64132..54c41a71 100644 --- a/src/renderer/i18n/it-IT.js +++ b/src/renderer/i18n/it-IT.js @@ -18,7 +18,13 @@ module.exports = { disconnect: 'Disconnetti', disconnected: 'Disconnesso', refresh: 'Aggiorna', - settings: 'Impostazioni' + settings: 'Impostazioni', + general: 'Generale', + themes: 'Temi', + update: 'Aggiornamento', + about: 'Informazioni', + language: 'Lingua', + version: 'Versione' }, message: { appWelcome: 'Benvenuto in Antares SQL Client!', diff --git a/src/renderer/scss/main.scss b/src/renderer/scss/main.scss index ab6791a4..28bf87ae 100644 --- a/src/renderer/scss/main.scss +++ b/src/renderer/scss/main.scss @@ -50,6 +50,24 @@ body{ } } +// Scrollbars +::-webkit-scrollbar { + width: 10px; + height: 10px; +} + +::-webkit-scrollbar-track { + background: $bg-color-light; +} + + ::-webkit-scrollbar-thumb { + background: rgba($color: #FFF, $alpha: .5); + + &:hover { + background: rgba($color: #FFF, $alpha: 1); + } +} + // Animations @keyframes rotation { from { @@ -84,6 +102,24 @@ body{ display: flex; justify-content: space-between; align-items: center; + color: #FFF; + } + } +} + +.tab{ + border-color: #272727; +} + +.panel{ + border: none; +} + +.badge{ + &[data-badge], + &:not([data-badge]){ + &::after { + box-shadow: none; } } } diff --git a/src/renderer/store/modules/application.store.js b/src/renderer/store/modules/application.store.js index 38cc03c9..c7e2b774 100644 --- a/src/renderer/store/modules/application.store.js +++ b/src/renderer/store/modules/application.store.js @@ -4,20 +4,66 @@ export default { strict: true, state: { app_name: 'Antares - SQL Client', - is_loading: false + is_loading: false, + is_new_modal: false, + is_edit_modal: false, + is_setting_modal: false, + selected_conection: {} }, getters: { isLoading: state => state.is_loading, - appName: state => state.app_name + appName: state => state.app_name, + getSelectedConnection: state => state.selected_conection, + isNewModal: state => state.is_new_modal, + isEditModal: state => state.is_edit_modal, + isSettingModal: state => state.is_setting_modal }, mutations: { SET_LOADING_STATUS (state, payload) { state.is_loading = payload; + }, + SHOW_NEW_CONNECTION_MODAL (state) { + state.is_new_modal = true; + }, + HIDE_NEW_CONNECTION_MODAL (state) { + state.is_new_modal = false; + }, + SHOW_EDIT_CONNECTION_MODAL (state, connection) { + state.is_edit_modal = true; + state.selected_conection = connection; + }, + HIDE_EDIT_CONNECTION_MODAL (state) { + state.is_edit_modal = false; + }, + SHOW_SETTING_MODAL (state) { + state.is_setting_modal = true; + }, + HIDE_SETTING_MODAL (state) { + state.is_setting_modal = false; } }, actions: { setLoadingStatus ({ commit }, payload) { commit('SET_LOADING_STATUS', payload); + }, + // Modals + showNewConnModal ({ commit }) { + commit('SHOW_NEW_CONNECTION_MODAL'); + }, + hideNewConnModal ({ commit }) { + commit('HIDE_NEW_CONNECTION_MODAL'); + }, + showEditConnModal ({ commit }, connection) { + commit('SHOW_EDIT_CONNECTION_MODAL', connection); + }, + hideEditConnModal ({ commit }) { + commit('HIDE_EDIT_CONNECTION_MODAL'); + }, + showSettingModal ({ commit }) { + commit('SHOW_SETTING_MODAL'); + }, + hideSettingModal ({ commit }) { + commit('HIDE_SETTING_MODAL'); } } }; diff --git a/src/renderer/store/modules/connections.store.js b/src/renderer/store/modules/connections.store.js index bf339658..22e15099 100644 --- a/src/renderer/store/modules/connections.store.js +++ b/src/renderer/store/modules/connections.store.js @@ -4,16 +4,10 @@ export default { namespaced: true, strict: true, state: { - connections: [], - is_new_modal: false, - is_edit_modal: false, - selected_conection: {} + connections: [] }, getters: { - getConnections: state => state.connections, - getSelectedConnection: state => state.selected_conection, - isNewModal: state => state.is_new_modal, - isEditModal: state => state.is_edit_modal + getConnections: state => state.connections }, mutations: { ADD_CONNECTION (state, connection) { @@ -32,19 +26,6 @@ export default { }, UPDATE_CONNECTIONS (state, connections) { state.connections = connections; - }, - SHOW_NEW_CONNECTION_MODAL (state) { - state.is_new_modal = true; - }, - HIDE_NEW_CONNECTION_MODAL (state) { - state.is_new_modal = false; - }, - SHOW_EDIT_CONNECTION_MODAL (state, connection) { - state.is_edit_modal = true; - state.selected_conection = connection; - }, - HIDE_EDIT_CONNECTION_MODAL (state) { - state.is_edit_modal = false; } }, actions: { @@ -59,19 +40,6 @@ export default { }, updateConnections ({ commit }, connections) { commit('UPDATE_CONNECTIONS', connections); - }, - // Modals - showNewConnModal ({ commit }) { - commit('SHOW_NEW_CONNECTION_MODAL'); - }, - hideNewConnModal ({ commit }) { - commit('HIDE_NEW_CONNECTION_MODAL'); - }, - showEditConnModal ({ commit }, connection) { - commit('SHOW_EDIT_CONNECTION_MODAL', connection); - }, - hideEditConnModal ({ commit }) { - commit('HIDE_EDIT_CONNECTION_MODAL'); } } }; diff --git a/src/renderer/store/modules/settings.store.js b/src/renderer/store/modules/settings.store.js index 4e863889..fe518e65 100644 --- a/src/renderer/store/modules/settings.store.js +++ b/src/renderer/store/modules/settings.store.js @@ -5,7 +5,7 @@ export default { namespaced: true, strict: true, state: { - locale: 'it-IT' + locale: 'en-US' }, getters: { getLocale: state => state.locale