Merge branch 'main' of https://github.com/askotx/comida-cab-f7-v6 into main

package.json

@@ -27,49 +27,49 @@
     "Samsung >= 5"
   ],
   "dependencies": {
-    "alasql": "^3.0.0",
-    "axios": "^1.3.2",
+    "alasql": "^4.1.2",
+    "axios": "^1.4.0",
     "crypto-js": "^4.1.1",
     "dom7": "^4.0.6",
-    "framework7": "^7.1.5",
+    "framework7": "^8.2.0",
     "framework7-icons": "^5.0.5",
     "html2pdf.js": "^0.10.1",
     "localforage": "^1.10.0",
     "skeleton-elements": "^4.0.1",
-    "swiper": "^9.0.3"
+    "swiper": "^10.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/runtime": "^7.20.13",
-    "babel-loader": "^9.1.2",
-    "chalk": "^5.2.0",
-    "concurrently": "^7.6.0",
+    "@babel/core": "^7.22.8",
+    "@babel/plugin-transform-runtime": "^7.22.7",
+    "@babel/preset-env": "^7.22.7",
+    "@babel/preset-react": "^7.22.5",
+    "@babel/runtime": "^7.22.6",
+    "babel-loader": "^8.0.6",
+    "chalk": "^5.3.0",
+    "concurrently": "^8.2.0",
     "copy-webpack-plugin": "^11.0.0",
-    "cpy-cli": "^4.2.0",
+    "cpy-cli": "^5.0.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
+    "css-loader": "^6.8.1",
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "file-loader": "^6.2.0",
     "framework7-loader": "^3.0.2",
-    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-plugin": "^5.5.3",
     "html2canvas": "^1.4.1",
     "jspdf": "^2.5.1",
-    "less": "^4.1.3",
-    "less-loader": "^11.1.0",
-    "mini-css-extract-plugin": "^2.7.2",
-    "ora": "^6.1.2",
-    "postcss-loader": "^7.0.2",
-    "postcss-preset-env": "^8.0.1",
-    "rimraf": "^4.1.2",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.6",
+    "less": "^3.11.1",
+    "less-loader": "^11.1.3",
+    "mini-css-extract-plugin": "^2.7.6",
+    "ora": "^6.3.1",
+    "postcss-loader": "^7.3.3",
+    "postcss-preset-env": "^9.0.0",
+    "rimraf": "^5.0.1",
+    "style-loader": "^3.3.3",
+    "terser-webpack-plugin": "^5.3.9",
     "url-loader": "^4.1.1",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
-    "workbox-webpack-plugin": "^6.5.4"
+    "webpack": "^5.88.1",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1",
+    "workbox-webpack-plugin": "^7.0.0"
   }
 }

src/css/framework7-custom.less

@@ -1,7 +1,7 @@
 
 & {
   @import url('../../node_modules/framework7/framework7.less');
-  @import url('../../node_modules/framework7/components/appbar/appbar.less');
+  //@import url('../../node_modules/framework7/components/appbar/appbar.less');
   @import url('../../node_modules/framework7/components/dialog/dialog.less');
   @import url('../../node_modules/framework7/components/popup/popup.less');
   @import url('../../node_modules/framework7/components/login-screen/login-screen.less');
@@ -35,7 +35,7 @@
   @import url('../../node_modules/framework7/components/picker/picker.less');
   @import url('../../node_modules/framework7/components/infinite-scroll/infinite-scroll.less');
   @import url('../../node_modules/framework7/components/pull-to-refresh/pull-to-refresh.less');
-  @import url('../../node_modules/framework7/components/lazy/lazy.less');
+  //@import url('../../node_modules/framework7/components/lazy/lazy.less');
   @import url('../../node_modules/framework7/components/data-table/data-table.less');
   @import url('../../node_modules/framework7/components/fab/fab.less');
   @import url('../../node_modules/framework7/components/searchbar/searchbar.less');
@@ -48,13 +48,13 @@
   @import url('../../node_modules/framework7/components/tooltip/tooltip.less');
   @import url('../../node_modules/framework7/components/gauge/gauge.less');
   @import url('../../node_modules/framework7/components/skeleton/skeleton.less');
-  @import url('../../node_modules/framework7/components/menu/menu.less');
+  //@import url('../../node_modules/framework7/components/menu/menu.less');
   @import url('../../node_modules/framework7/components/color-picker/color-picker.less');
   @import url('../../node_modules/framework7/components/treeview/treeview.less');
   @import url('../../node_modules/framework7/components/text-editor/text-editor.less');
   @import url('../../node_modules/framework7/components/area-chart/area-chart.less');
   @import url('../../node_modules/framework7/components/pie-chart/pie-chart.less');
-  @import url('../../node_modules/framework7/components/elevation/elevation.less');
+  //@import url('../../node_modules/framework7/components/elevation/elevation.less');
   @import url('../../node_modules/framework7/components/typography/typography.less');
 
   @includeIosTheme: true;

src/js/app.js

@@ -24,12 +24,11 @@ import user from './stores/user.js';
 
 var device = getDevice();
 var app = new Framework7({
-  name: 'Comida Cab',      // App name
+  name: 'Main App',      // App name
   theme: 'auto',           // Automatic theme detection
   el: '#app',              // App root element
   component: App,          // App main component
-  id: 'com.comidacab.app', // App bundle ID
-  version: '2.0.0',        // App version id
+  id: 'com.devmain.app', // App bundle ID
   routes: routes,          // App routes
   // serviceWorker: {         // Register service worker
   //   path: '/service-worker.js',

src/js/framework7-custom.js

@@ -1,6 +1,6 @@
 
-import Framework7, { request, utils, getDevice, createStore } from 'framework7';
-import Appbar from 'framework7/components/appbar';
+import Framework7, { utils, getDevice, createStore } from 'framework7';
+//import Appbar from 'framework7/components/appbar';
 import Dialog from 'framework7/components/dialog';
 import Popup from 'framework7/components/popup';
 import LoginScreen from 'framework7/components/login-screen';
@@ -35,7 +35,7 @@ import Calendar from 'framework7/components/calendar';
 import Picker from 'framework7/components/picker';
 import InfiniteScroll from 'framework7/components/infinite-scroll';
 import PullToRefresh from 'framework7/components/pull-to-refresh';
-import Lazy from 'framework7/components/lazy';
+//import Lazy from 'framework7/components/lazy';
 import DataTable from 'framework7/components/data-table';
 import Fab from 'framework7/components/fab';
 import Searchbar from 'framework7/components/searchbar';
@@ -47,15 +47,15 @@ import Notification from 'framework7/components/notification';
 import Autocomplete from 'framework7/components/autocomplete';
 import Tooltip from 'framework7/components/tooltip';
 import Skeleton from 'framework7/components/skeleton';
-import Menu from 'framework7/components/menu';
+//import Menu from 'framework7/components/menu';
 import ColorPicker from 'framework7/components/color-picker';
 import Treeview from 'framework7/components/treeview';
 import TextEditor from 'framework7/components/text-editor';
-import Elevation from 'framework7/components/elevation';
+//import Elevation from 'framework7/components/elevation';
 import Typography from 'framework7/components/typography';
 
 Framework7.use([
-  Appbar,
+  //Appbar,
   Dialog,
   Popup,
   LoginScreen,
@@ -90,7 +90,7 @@ Framework7.use([
   Picker,
   InfiniteScroll,
   PullToRefresh,
-  Lazy,
+  //Lazy,
   DataTable,
   Fab,
   Searchbar,
@@ -102,13 +102,13 @@ Framework7.use([
   Autocomplete,
   Tooltip,
   Skeleton,
-  Menu,
+  //Menu,
   ColorPicker,
   Treeview,
   TextEditor,
-  Elevation,
+  //Elevation,
   Typography
 ]);
 
 export default Framework7;
-export { request, utils, getDevice, createStore };
+export { utils, getDevice, createStore };

src/pages/about.f7.html

@@ -18,7 +18,7 @@
       <p>Ha sido creada con el fin de facilitar la captura de los datos y llevar un mejor control de este, así como poder ver un listado y ver el concentrado.</p>
     </div>
     <div class="block-footer">
-      <p>© Aplicaciones Digitales Cab, 2019-2021 (v${version})</p>
+      <p>© Aplicaciones Digitales Caborca, 2019-2023 (v2.0)</p>
     </div>
   </div>
 </div>

src/pages/forbidden.f7.html

@@ -20,7 +20,7 @@
       </p>
     </div>
     <div class="block-footer">
-      <p>© Aplicaciones Digitales Cab, 2019-2021 (v${version})</p>
+      <p>© Aplicaciones Digitales Caborca, 2019-2023 (v2.0)</p>
     </div>
   </div>
 </div>

src/pages/login.f7.html

@@ -29,7 +29,7 @@
             <li><a class="login-btn button button-raised button-fill color-blue" href="#" @click="${checkLogin}">Ingresar</a></li>
           </ul>
           <div class="block-footer">
-            <p>© Aplicaciones Digitales Cab, 2019-2021 (v${version})</p>
+            <p>© Aplicaciones Digitales Caborca, 2019-2023 (v2.0)</p>
           </div>
         </div>
       </form>