From 1e8f58b9306c4e94f8f704918700bc93ef642e92 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Fri, 30 Apr 2021 01:31:44 +0200 Subject: [PATCH] - Iscrizione Conacreis - Ordini - Carrello --- src/App.scss | 31 ++++++++++- src/db/lang/ws_it.js | 3 + src/db/static_data.ts | 109 +++++++++++++++++++++++++++---------- src/root/home/home.ts | 4 ++ src/root/home/home.vue | 5 +- src/root/intro/intro.vue | 2 +- src/root/mypage/mypage.ts | 11 ++-- src/root/mypage/mypage.vue | 50 +++++++++++++---- src/root/pr.html | 0 src/statics/js/idb.js | 1 + src/statics/js/storage.js | 9 +-- 11 files changed, 171 insertions(+), 54 deletions(-) mode change 100644 => 100755 src/root/pr.html diff --git a/src/App.scss b/src/App.scss index 1026387..73b8d3d 100755 --- a/src/App.scss +++ b/src/App.scss @@ -273,12 +273,32 @@ $heightBtn: 100%; box-shadow: none; } +.myimgtitle { + margin-left: auto; + margin-right: auto; + + width: 400px; + + @media (max-width: 718px) { + margin-left: auto; + margin-right: auto; + width: 300px; + + } +} + .my-card-big { width: 100%; - max-width: 400px; padding: 1rem 1rem; box-shadow: none; + + @media (max-width: 718px) { + // PER VERSIONE MOBILE + max-width: 400px; + padding: 1rem 1rem; + + } } .text-trans { @@ -973,3 +993,12 @@ $heightBtn: 100%; } } +.underline { + text-decoration: underline; + color: blue; +} + +.underline:hover { + font-weight: bold; + cursor: pointer; +} diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 2ba4fef..c846e82 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -26,6 +26,7 @@ const msg_website_it = { producer: 'Produttore', orderinfo: 'Ordini Effettuati', products: 'Prodotti', + productslist: 'Lista Prodotti', collabora: 'Collabora', storehouses: 'Magazzino', departments: 'Uffici', @@ -39,6 +40,7 @@ const msg_website_it = { presentazione2: 'Presentazione', invita: 'Invita Persone', SignUp: 'Nuova Registrazione', + SignUpIscrizione: 'Diventa Socio CNM', SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !', SignUp2: 'Registrazione', SignIn: 'Login', @@ -55,6 +57,7 @@ const msg_website_it = { Test: 'Test', Category: 'Categorie', Admin: 'Admin', + Sites: 'Siti Web', extralist: 'Lista Extra', Test1: 'Test1', Test2: 'Test2', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 4970a3b..061b2ce 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -28,6 +28,19 @@ const functionality: IFunctionality = { } const routes_admin: IListRoutes[] = [ + { + active: true, + order: 10, + path: '/admin/sites', + materialIcon: 'event_seat', + name: 'pages.Sites', + component: () => import('@/rootgen/admin/sites/sites.vue'), + level_parent: 0.0, + level_child: 0.5, + inmenu: true, + submenu: true, + onlyAdmin: true + }, { active: true, order: 1000, @@ -149,6 +162,18 @@ const routes_projects: IListRoutes[] = [ ] const routes_ecommerce: IListRoutes[] = [ + { + active: true, + order: 30, + path: '/products', + materialIcon: 'fas fa-shopping-cart', + name: 'pages.productslist', + component: () => import('@/views/ecommerce/productsList/productsList.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + }, { active: true, order: 30, @@ -201,7 +226,7 @@ const routes_admin_ecommerce: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTraduttrici: true + onlyEditor: true }, { active: true, @@ -215,7 +240,7 @@ const routes_admin_ecommerce: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTraduttrici: true + onlyEditor: true }, { active: true, @@ -229,7 +254,7 @@ const routes_admin_ecommerce: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTraduttrici: true + onlyEditor: true }, { active: true, @@ -243,7 +268,7 @@ const routes_admin_ecommerce: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTraduttrici: true + onlyEditor: true }, ] @@ -354,6 +379,22 @@ const routes_newsletter: IListRoutes[] = [ ] const routes_manager: IListRoutes[] = [ + { + active: functionality.BOOKING_EVENTS, + order: 70, + path: '/admin/usereventlist', + materialIcon: 'edit', + name: 'otherpages.admin.usereventlist', + component: () => import('@/rootgen/admin/eventlist/eventlist.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + infooter: true, + onlyManager: true, + onlyConsiglio: true, + onlyAdmin: true + }, { active: true, order: 10, @@ -368,6 +409,20 @@ const routes_manager: IListRoutes[] = [ onlyManager: true, onlyTutor: true }, + { + active: true, + order: 10, + path: '/admin/iscritticonacreis', + materialIcon: 'fas fa-users', + name: 'otherpages.admin.iscritticonacreis', + component: () => import('@/rootgen/admin/iscritticonacreis/iscritticonacreis.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyManager: true, + onlyTutor: true + }, { active: true, order: 10, @@ -408,7 +463,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTraduttrici: true + onlyEditor: true }, { active: true, @@ -486,21 +541,6 @@ const routes_manager: IListRoutes[] = [ onlyAdmin: true, onlyManager: true }, - { - active: functionality.BOOKING_EVENTS, - order: 70, - path: '/admin/usereventlist', - materialIcon: 'edit', - name: 'otherpages.admin.usereventlist', - component: () => import('@/rootgen/admin/eventlist/eventlist.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - infooter: true, - onlyManager: true, - onlyAdmin: true - } ] const baseroutes: IListRoutes[] = [ @@ -524,14 +564,15 @@ const baseroutes: IListRoutes[] = [ }, { active: true, - order: 120, - path: '/profile', - materialIcon: 'fas fa-user', - name: 'pages.profile', - component: () => import('@/views/user/profile/profile.vue'), - meta: { requiresAuth: true }, + order: 55, + path: '/iscrizione', + materialIcon: 'how_to_reg', + name: 'pages.SignUpIscrizione', + component: () => import('@/views/login/iscrizioneconacreis/iscrizioneconacreis.vue'), inmenu: true, infooter: true, + separator: false, + onlyNotSoci: false, }, { active: true, @@ -544,6 +585,17 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true }, + { + active: true, + order: 120, + path: '/profile', + materialIcon: 'fas fa-user', + name: 'pages.profile', + component: () => import('@/views/user/profile/profile.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, { active: true, order: 90, @@ -618,7 +670,8 @@ const baseroutes: IListRoutes[] = [ name: 'pages.ecommerce', routes2: routes_ecommerce, inmenu: true, - onlySocioResidente: true, + onlyif_logged: true, + // onlySocioResidente: true, solotitle: true, infooter: true }, @@ -649,7 +702,7 @@ const baseroutes: IListRoutes[] = [ onlyAdmin: true, onlyManager: true, onlyTutor: true, - onlyTraduttrici: true + onlyEditor: true }, ...routes_manager, { diff --git a/src/root/home/home.ts b/src/root/home/home.ts index 776a115..c6645d8 100755 --- a/src/root/home/home.ts +++ b/src/root/home/home.ts @@ -182,6 +182,10 @@ export default class Home extends MixinBase { return UserStore.state.my.profile.socioresidente } + get isConsiglio() { + return UserStore.state.my.profile.consiglio + } + get static_data() { return static_data } diff --git a/src/root/home/home.vue b/src/root/home/home.vue index 46b8703..cdcf15c 100755 --- a/src/root/home/home.vue +++ b/src/root/home/home.vue @@ -1,6 +1,6 @@