From 62ba2f1a1f9983d4aa6716685ed631fa85a48db4 Mon Sep 17 00:00:00 2001 From: Axolotle Date: Sun, 2 Aug 2020 21:22:58 +0200 Subject: [PATCH] add DomainList view and main_domain state --- app/src/helpers/dataStore.js | 5 ++ app/src/locales/en.json | 11 ++-- app/src/routes.js | 15 +++++ app/src/views/Home.vue | 2 +- app/src/views/domain/DomainList.vue | 95 +++++++++++++++++++++++++++++ app/src/views/domain/index.js | 1 + app/src/views/group/GroupList.vue | 3 +- app/src/views/user/UserList.vue | 3 +- 8 files changed, 126 insertions(+), 9 deletions(-) create mode 100644 app/src/views/domain/DomainList.vue create mode 100644 app/src/views/domain/index.js diff --git a/app/src/helpers/dataStore.js b/app/src/helpers/dataStore.js index a8e4578f..c8e6a532 100644 --- a/app/src/helpers/dataStore.js +++ b/app/src/helpers/dataStore.js @@ -4,6 +4,7 @@ import api from './api' export default { state: () => ({ domains: undefined, // Array + main_domain: undefined, users: undefined, // basic user data: Object {username: {data}} users_details: {}, // precise user data: Object {username: {data}} groups: undefined, @@ -15,6 +16,10 @@ export default { state.domains = domains }, + 'SET_MAIN_DOMAIN' (state, response) { + state.main_domain = response.current_main_domain + }, + 'SET_USERS' (state, users) { state.users = Object.keys(users).length === 0 ? null : users }, diff --git a/app/src/locales/en.json b/app/src/locales/en.json index ae80af6e..cc45267c 100644 --- a/app/src/locales/en.json +++ b/app/src/locales/en.json @@ -225,7 +225,8 @@ "username": "johndoe", "firstname": "John", "lastname": "Doe", - "groupname": "My group name" + "groupname": "My group name", + "domain": "my-domain.com" }, "logs": "Logs", "logs_operation": "Operations made on system with YunoHost", @@ -264,6 +265,11 @@ "restart": "Restart", "run": "Run", "save": "Save", + "search": { + "domain": "Search for domains...", + "group": "Search for groups...", + "user": "Search for users..." + }, "search_for_apps": "Search for apps...", "select_all": "Select all", "select_none": "Select none", @@ -319,9 +325,6 @@ "upnp_disabled": "UPnP is disabled.", "upnp_enabled": "UPnP is enabled.", "url": "URL", - "user": { - "search": "User search" - }, "user_email": "Email", "user_emailaliases": "Mail aliases", "user_emailforward": "Mail forward", diff --git a/app/src/routes.js b/app/src/routes.js index ff12c1eb..de5a0204 100644 --- a/app/src/routes.js +++ b/app/src/routes.js @@ -2,6 +2,7 @@ import Home from './views/Home' import Login from './views/Login' import { UserList, UserCreate, UserInfo, UserEdit } from './views/user' import { GroupList, GroupCreate } from './views/group' +import { DomainList } from './views/domain' const routes = [ { name: 'home', path: '/', component: Home }, @@ -78,6 +79,20 @@ const routes = [ { name: 'group-create', trad: 'group_new' } ] } + }, + + /* ─────────╮ + │ DOMAIN │ + ╰───────── */ + { + name: 'domain-list', + path: '/domains', + component: DomainList, + meta: { + breadcrumb: [ + { name: 'domain-list', trad: 'domains' } + ] + } } ] diff --git a/app/src/views/Home.vue b/app/src/views/Home.vue index 262e7c58..ffa2257a 100644 --- a/app/src/views/Home.vue +++ b/app/src/views/Home.vue @@ -21,7 +21,7 @@ export default { return { menu: [ { id: 0, routeName: 'user-list', icon: 'users', translation: 'users' }, - { id: 1, routeName: 'domains', icon: 'globe', translation: 'domains' }, + { id: 1, routeName: 'domain-list', icon: 'globe', translation: 'domains' }, { id: 2, routeName: 'apps', icon: 'cubes', translation: 'applications' }, { id: 3, routeName: 'update', icon: 'refresh', translation: 'system_update' }, { id: 4, routeName: 'services', icon: 'cog', translation: 'services' }, diff --git a/app/src/views/domain/DomainList.vue b/app/src/views/domain/DomainList.vue new file mode 100644 index 00000000..d96e2732 --- /dev/null +++ b/app/src/views/domain/DomainList.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/app/src/views/domain/index.js b/app/src/views/domain/index.js new file mode 100644 index 00000000..ba3df3b9 --- /dev/null +++ b/app/src/views/domain/index.js @@ -0,0 +1 @@ +export { default as DomainList } from './DomainList' diff --git a/app/src/views/group/GroupList.vue b/app/src/views/group/GroupList.vue index 1e885df1..40dab4f0 100644 --- a/app/src/views/group/GroupList.vue +++ b/app/src/views/group/GroupList.vue @@ -3,10 +3,9 @@
- - +
diff --git a/app/src/views/user/UserList.vue b/app/src/views/user/UserList.vue index e3d36a47..0c5893da 100644 --- a/app/src/views/user/UserList.vue +++ b/app/src/views/user/UserList.vue @@ -3,10 +3,9 @@
- - +