Project e Todos

2021-02-03 01:32:09 +01:00
parent 316ebbb78b
commit b9d451bd49
9 changed files with 140 additions and 28176 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
    "vue-scroll-reveal": "^1.0.11",
    "vue-svgicon": "^3.1.0",
    "vue-tel-input": "^4.1.1",
-    "vue2-dragula": "^2.5.4",
+    "vue2-dragula": "2.5.5",
    "vuelidate": "^0.7.4",
    "vuex": "^3.0.1",
    "vuex-class": "^0.3.1",
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -94,6 +94,7 @@ module.exports = function (ctx) {
      store: 'src/store/index.ts'
    },
    // app plugins (/src/plugins)
+    // app plugins (/src/plugins)
    boot: [
      { path: 'vue-i18n', server: true, client: true },
      { path: 'vue-meta', server: true, client: true },
@@ -104,6 +105,7 @@ module.exports = function (ctx) {
      { path: 'error-handler', server: true, client: true },
      { path: 'globalroutines', server: true, client: true },
      { path: 'vue-idb', server: true, client: true },
+      { path: 'dragula', server: true, client: true },
      { path: 'guard', server: true, client: true },
      { path: 'vuetelinput', server: true, client: true },
      { path: 'mycharts', server: true, client: true }],
--- a/src/App.scss
+++ b/src/App.scss
@@ -942,3 +942,7 @@ $heightBtn: 100%;
 .iconplusminus{
  font-size: 6px;
 }
+
+.clpos{
+  color: gray;
+}
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -15,9 +15,13 @@ const msg_website_it = {
    profile: 'Profilo',
    projects: 'Progetti',
    producer: 'Produttore',
+    orderinfo: 'Ordini Effettuati',
    products: 'Prodotti',
    collabora: 'Collabora',
    storehouses: 'Magazzino',
+    departments: 'Uffici',
+    orders: 'Ordini Ricevuti',
+    orders2: 'Ordini Ricevuti',
    sharewithus: 'Condividi con Noi',
    checkout: 'Carrello',
    payment: 'Pagamenti',
@@ -53,6 +57,7 @@ const msg_website_it = {
    prova: 'prova',
    dbop: 'Operazioni',
    projall: 'Tutti',
+    groups: 'Gruppi',
    projectsShared: 'Miei Condivisi',
    myprojects: 'Miei Personali',
    favproj: 'Favoriti',
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -18,8 +18,8 @@ const functionality: IFunctionality = {
  ENABLE_REG_AYNI: false,
  SHOW_NEWSLETTER: false,
  SHOW_ONLY_POLICY: true,
-  ENABLE_TODOS_LOADING: false,
-  ENABLE_PROJECTS_LOADING: false,
+  ENABLE_TODOS_LOADING: true,
+  ENABLE_PROJECTS_LOADING: true,
  SHOW_IF_IS_SERVER_CONNECTION: true,
  SHOW_MESSAGES: false,
  BOOKING_EVENTS: true,
@@ -72,65 +72,60 @@ const routes_admin: IListRoutes[] = [
 const routes_projects: IListRoutes[] = [
  {
    active: functionality.ENABLE_PROJECTS_LOADING,
-    order: 10,
-    path: '/' + RouteNames.projectsall + '/:idProj',
+    order: 5,
+    path: '/admin/groups',
    materialIcon: 'accessibility_new',
-    name: RouteNames.projectsall,
+    name: 'pages.groups',
+    level_parent: 0.0,
+    level_child: 0.5,
+    component: () => import('@/rootgen/admin/groups/groups.vue'),
+    inmenu: true,
+    onlyManager: true,
+    onlyAdmin: true,
+    infooter: functionality.ENABLE_PROJECTS_LOADING,
+  },
+  {
+    active: functionality.ENABLE_PROJECTS_LOADING,
+    order: 10,
+    path: '/projall/',
+    materialIcon: 'accessibility_new',
+    urlroute: 'projall',
+    name: 'pages.projall',
    level_parent: 0.0,
    level_child: 0.5,
    component: () => import('@/views/projects/proj-list/proj-list.vue'),
    inmenu: functionality.SHOW_MESSAGES,
    infooter: functionality.ENABLE_PROJECTS_LOADING,
-    meta: {
-      requiresAuth: false,
-      async asyncData() {
-        // await Todos.actions.dbLoad({ checkPending: false })
-        await Projects.actions.dbLoad({ checkPending: false, onlyiffirsttime: true })
-      }
-    },
    idelem: process.env.PROJECT_ID_MAIN
  },
  {
    active: functionality.ENABLE_PROJECTS_LOADING,
    order: 20,
-    path: '/' + RouteNames.myprojects + '/:idProj',
+    path: '/myprojects/',
    materialIcon: 'accessibility_new',
-    name: RouteNames.myprojects,
+    name: 'pages.myprojects',
+    urlroute: 'myprojects',
    level_parent: 0.0,
    level_child: 0.5,
    component: () => import('@/views/projects/proj-list/proj-list.vue'),
    inmenu: functionality.SHOW_MESSAGES,
    infooter: functionality.ENABLE_PROJECTS_LOADING,
-    meta: {
-      requiresAuth: false,
-      async asyncData() {
-        // await Todos.actions.dbLoad({ checkPending: false })
-        await Projects.actions.dbLoad({ checkPending: false, onlyiffirsttime: true })
-      }
-    },
    idelem: process.env.PROJECT_ID_MAIN
  },
  {
    active: functionality.ENABLE_PROJECTS_LOADING,
    order: 30,
-    path: '/' + RouteNames.projectsshared + '/:idProj',
+    path: '/projectsShared/',
+    urlroute: 'projectsShared',
    materialIcon: 'accessibility_new',
-    name: RouteNames.projectsshared,
+    name: 'pages.projectsShared',
    level_parent: 0.0,
    level_child: 0.5,
    component: () => import('@/views/projects/proj-list/proj-list.vue'),
    inmenu: functionality.SHOW_MESSAGES,
    infooter: functionality.ENABLE_PROJECTS_LOADING,
-    meta: {
-      requiresAuth: false,
-      async asyncData() {
-        // await Todos.actions.dbLoad({ checkPending: false })
-        await Projects.actions.dbLoad({ checkPending: false, onlyiffirsttime: true })
-      }
-    },
    idelem: process.env.PROJECT_ID_MAIN
  }
-
 ]

 const routes_ecommerce: IListRoutes[] = [
@@ -158,6 +153,19 @@ const routes_ecommerce: IListRoutes[] = [
    level_parent: 0,
    level_child: 0.5,
  },
+  {
+    active: true,
+    order: 35,
+    path: '/admin/ecommerce/orders',
+    materialIcon: 'fas fa-file-alt',
+    name: 'pages.orders',
+    component: () => import('@/rootgen/admin/orders/orders.vue'),
+    inmenu: true,
+    submenu: true,
+    level_parent: 0,
+    level_child: 0.5,
+    onlyDepartment: true
+  },
 ]

 const routes_admin_ecommerce: IListRoutes[] = [
@@ -203,6 +211,20 @@ const routes_admin_ecommerce: IListRoutes[] = [
    onlyManager: true,
    onlyTraduttrici: true
  },
+  {
+    active: true,
+    order: 31,
+    path: '/admin/ecommerce/departments',
+    materialIcon: 'fas fa-file-alt',
+    name: 'pages.departments',
+    component: () => import('@/rootgen/admin/departments/departments.vue'),
+    inmenu: true,
+    submenu: true,
+    level_parent: 0,
+    level_child: 0.5,
+    onlyManager: true,
+    onlyTraduttrici: true
+  },

 ]

@@ -233,6 +255,22 @@ const routes_admin_ecommerce_menu: IListRoutes[] = [
    component: () => import('@/rootgen/admin/storehouses/storehouses.vue'),
    infooter: false,
  },
+  {
+    active: true,
+    order: 32,
+    path: '/admin/ecommerce/departments',
+    name: 'pages.departments',
+    component: () => import('@/rootgen/admin/departments/departments.vue'),
+    infooter: false,
+  },
+  {
+    active: true,
+    order: 35,
+    path: '/admin/ecommerce/orders',
+    name: 'pages.orders2',
+    component: () => import('@/rootgen/admin/orders/orders.vue'),
+    infooter: false,
+  },

 ]

@@ -382,7 +420,8 @@ const routes_manager: IListRoutes[] = [
    level_child: 0.5,
    solotitle: true,
    onlyAdmin: true,
-    onlyManager: true
+    onlyManager: true,
+    onlyDepartment: true
  },
  {
    active: true,
@@ -515,9 +554,10 @@ const baseroutes: IListRoutes[] = [
    routes2: routes_projects,
    inmenu: true,
    solotitle: true,
-    infooter: true
+    infooter: true,
+    onlySocioResidente: true,
+    onlyAdmin: true,
  },
-  ...routes_projects,
  {
    active: functionality.ENABLE_ECOMMERCE,
    path: '',
@@ -650,7 +690,56 @@ const baseroutes: IListRoutes[] = [
    path: '/offline',
    name: 'Offline',
    component: () => import('@/views/offline/offline.vue')
+  },
+  {
+    active: functionality.ENABLE_PROJECTS_LOADING,
+    order: 5,
+    path: '/admin/groups',
+    materialIcon: 'accessibility_new',
+    name: 'pages.groups',
+    component: () => import('@/rootgen/admin/groups/groups.vue'),
+    inmenu: true,
+    onlyManager: true,
+    onlyAdmin: true,
+    infooter: functionality.ENABLE_PROJECTS_LOADING,
+  },
+  {
+    active: functionality.ENABLE_PROJECTS_LOADING,
+    order: 10,
+    path: '/projall/:idProj',
+    materialIcon: 'accessibility_new',
+    name: 'pages.projall',
+    urlroute: 'projall',
+    component: () => import('@/views/projects/proj-list/proj-list.vue'),
+    inmenu: false,
+    infooter: false,
+    // idelem: process.env.PROJECT_ID_MAIN
+  },
+  {
+    active: functionality.ENABLE_PROJECTS_LOADING,
+    order: 20,
+    path: '/myprojects/:idProj',
+    materialIcon: 'accessibility_new',
+    name: 'pages.myprojects',
+    urlroute: 'myprojects',
+    component: () => import('@/views/projects/proj-list/proj-list.vue'),
+    inmenu: false,
+    infooter: false,
+    // idelem: process.env.PROJECT_ID_MAIN
+  },
+  {
+    active: functionality.ENABLE_PROJECTS_LOADING,
+    order: 30,
+    path: '/projectsShared/:idProj',
+    urlroute: 'projectsShared',
+    materialIcon: 'accessibility_new',
+    name: 'pages.projectsShared',
+    component: () => import('@/views/projects/proj-list/proj-list.vue'),
+    inmenu: false,
+    infooter: false,
+    // idelem: process.env.PROJECT_ID_MAIN
  }
+
 ]

 export const routes = baseroutes
--- a/src/index.template.html
+++ b/src/index.template.html
@@ -17,7 +17,7 @@
  <link rel="icon" type="image/png" sizes="16x16"
        href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-16x16.png">

-  <script src="<%= htmlWebpackPlugin.files.publicPath %>statics/js/track.js"></script>
+  <!--<script src="<%= htmlWebpackPlugin.files.publicPath %>statics/js/track.js"></script>-->

  <script src="https://www.gstatic.com/charts/loader.js"></script>

--- a/src/router/route-config.ts
+++ b/src/router/route-config.ts
@@ -32,10 +32,11 @@ export interface IMyRouteRecord extends RouteRecord {
  meta: IMyMeta,
 }

-export interface IMyRouteConfig extends RouteConfig {
+/*export interface IMyRouteConfig extends RouteConfig {
+
  children?: IMyRouteConfig[],
  meta?: IMyMeta
-}
+}*/

 export const cfgrouter = {

--- a/src/statics/js/storage.js
+++ b/src/statics/js/storage.js
@@ -1,6 +1,6 @@
 const OtherTables = ['categories', 'config', 'swmsg']
 const MainTables = ['todos', 'projects']
-const allMethod = ['sync_post_', 'sync_patch_', 'delete_']
+const allMethod = ['sync_post_', 'sync_patch_', 'delete_', 'hide_']


 // -------------------------------------