- Iscrizione Conacreis

- Ordini
- Carrello

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;
+}

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',

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,
+    order: 55,
-    path: '/profile',
+    path: '/iscrizione',
-    materialIcon: 'fas fa-user',
+    materialIcon: 'how_to_reg',
-    name: 'pages.profile',
+    name: 'pages.SignUpIscrizione',
-    component: () => import('@/views/user/profile/profile.vue'),
+    component: () => import('@/views/login/iscrizioneconacreis/iscrizioneconacreis.vue'),
-    meta: { requiresAuth: true },
     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,
   {

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
   }

src/root/home/home.vue

@@ -1,6 +1,6 @@
 <template>
   <q-page>
-    <CMyPage title="">
+    <CMyPage title="Home">
       <!--<span>{{
           setmeta({
             title: 'Home',
@@ -21,8 +21,7 @@
 
         <q-banner class="bg-positive text-white boldhigh"
                   style="text-align: center; ">
-          Benvenuti nella Nuova App della Comunità Nuovo Mondo... <br>
+          Benvenuti nella Nuova App della Comunità Nuovo Mondo
-          in costruzione...
         </q-banner>
 
         <div v-if="!tools.sito_online(true)" class="row text-h4 text-center bg-warning">

src/root/intro/intro.vue

@@ -1,6 +1,6 @@
 <template>
   <q-page>
-    <CMyPage title="">
+    <CMyPage title="Intro">
       <div class="q-ma-xs">
         <div class="text-center">
           <q-img src="statics/images/background.jpg" class="logo"></q-img>

src/root/mypage/mypage.ts

@@ -24,15 +24,16 @@ export default class Mypage extends MixinMetaTags {
   public imgback
   public rec: IMyPage = {}
 
-  public mounted() {
+  public async mounted() {
     // console.log('this.$route.path', this.$route.path)
-    this.rec = GlobalStore.getters.getPage(this.$route.path)
+    this.rec = await GlobalStore.actions.loadPage(this.$route.path)
-    console.log(this.rec)
+    // console.log('mounted', this.rec)
   }
 
   @Watch('$route.path')
-  public changepage() {
+  public async changepage() {
-    this.rec = GlobalStore.getters.getPage(this.$route.path)
+    // console.log('changepage')
+    this.rec = await GlobalStore.actions.loadPage(this.$route.path)
   }
 
   public meta() {

src/root/mypage/mypage.vue

@@ -1,21 +1,47 @@
 <template>
-    <div>
+  <div>
-        <CMyPage :title="rec.title" :imgbackground="`statics/` + rec.imgback" :sizes="`max-height: ` + rec.heightimg + `px`">
+    <CMyPage :title="rec.title" :imgbackground="`statics/` + rec.imgback"
-            <span>{{ setmeta({
+             :sizes="`max-height: ` + rec.heightimg + `px`">
-                title: rec.title,
+            <span>{{
-                description: rec.description,
+                setmeta({
-                keywords: rec.keywords } ) }}
+                  title: rec.title,
+                  description: rec.description,
+                  keywords: rec.keywords
+                })
+              }}
             </span>
 
-            <div class="q-ma-sm q-gutter-sm q-pa-xs">
+      <div class="q-ma-sm q-gutter-sm q-pa-xs">
-                <div v-html="rec.content"></div>
+        <div v-if="!!rec.img1" class="text-center">
-            </div>
+          <q-img :src="`statics/`+ rec.img1" class="img"></q-img>
-        </CMyPage>
+        </div>
-    </div>
+
+        <div v-if="!!rec.content" v-html="rec.content"></div>
+        <q-video v-if="!!rec.video1" :src="rec.video1" :ratio="rec.ratio1">
+        </q-video>
+
+        <div v-if="!!rec.img2" class="text-center">
+          <q-img :src="`statics/`+ rec.img2" class="img"></q-img>
+        </div>
+
+        <div v-if="!!rec.content2" v-html="rec.content2"></div>
+        <q-video v-if="!!rec.video2" :src="rec.video2" :ratio="rec.ratio2"></q-video>
+
+        <div v-if="!!rec.img3" class="text-center">
+          <q-img :src="`statics/`+ rec.img2" class="img"></q-img>
+        </div>
+
+        <div v-if="!!rec.content3" v-html="rec.content3"></div>
+        <q-video v-if="!!rec.video3" :src="rec.video3" :ratio="rec.ratio3"></q-video>
+        <div v-if="!!rec.content4" v-html="rec.content4"></div>
+
+      </div>
+    </CMyPage>
+  </div>
 </template>
 <script lang="ts" src="./mypage.ts">
 
 </script>
 <style lang="scss" scoped>
-    @import 'mypage.scss';
+@import 'mypage.scss';
 </style>

src/statics/js/idb.js

@@ -208,6 +208,7 @@
   }
 
   UpgradeDB.prototype.createObjectStore = function() {
+    console.log('createObjectStore');
     return new ObjectStore(this._db.createObjectStore.apply(this._db, arguments));
   };
 

src/statics/js/storage.js

@@ -1,4 +1,4 @@
-const OtherTables = ['categories', 'config', 'swmsg']
+const OtherTables = ['config', 'swmsg']
 const MainTables = ['todos', 'projects']
 const allMethod = ['sync_post_', 'sync_patch_', 'delete_', 'hide_']
 
@@ -25,14 +25,15 @@ let idbKeyval = (() => {
         openreq.onupgradeneeded = () => {
           // First time setup: create an empty object store
           for (let mytab of MainTables) {
-            openreq.result.createObjectStore(mytab, { keyPath: '_id' });
+            openreq.result.createObjectStore(mytab, { keyPath: 'BOMID', autoIncrement: true });
             for (let mymeth of allMethod) {
               const tab = mymeth + mytab
-              openreq.result.createObjectStore(tab, { keyPath: '_id' });
+              openreq.result.createObjectStore(tab, { keyPath: 'BOMID', autoIncrement: true });
             }
           }
           for (let mytab of OtherTables) {
-            openreq.result.createObjectStore(mytab, { keyPath: '_id' });
+            console.log('mytab', mytab);
+            openreq.result.createObjectStore(mytab, { keyPath: 'BOMID', autoIncrement: true });
           }
         };