refs #4922 deps fixed, utils moved to back

.npmrc

@@ -1,3 +0,0 @@
-# pnpm-related options
-shamefully-hoist=true
-strict-peer-dependencies=false

README.md

@@ -6,30 +6,31 @@ Hedera is the main web page for Verdnatura.
 
 Required dependencies.
 
--   PHP >= 7.0
+ * PHP >= 7.0
--   Node.js >= 18.0
+ * Node.js >= 18.0
 
 Launch application for development.
-
 ```
 $ quasar dev
 ```
 
-Launch project backend.
+Launch Salix backend.
-
 ```
-cd back
+npm run salix
-php -S 127.0.0.1:3002 -t . index.php
+```
+
+Launch legacy PHP backend.
+```
+npm run back
 ```
 
 Run server side method from command line.
-
 ```
 php hedera-web.php -m method_path
 ```
 
 ## Built with
 
--   [Webpack](https://webpack.js.org/)
+ * [Webpack](https://webpack.js.org/)
--   [MooTools](https://mootools.net/)
+ * [MooTools](https://mootools.net/)
--   [TinyMCE](https://www.tinymce.com/)
+ * [TinyMCE](https://www.tinymce.com/)

debian/install

@@ -8,6 +8,6 @@ back/rest                   usr/share/hedera-web/back
 back/package.json           usr/share/hedera-web/back
 dist/spa/*                  usr/share/hedera-web/spa
 build-deps/node_modules     usr/share/hedera-web/spa
-utils                       usr/share/hedera-web
+back/utils                  usr/share/hedera-web
 README.md                   usr/share/hedera-web
 doc/*                       usr/share/doc/hedera-web

debian/links

@@ -1,3 +1,3 @@
-usr/share/hedera-web/hedera-web.php  usr/bin/hedera-web.php
+usr/share/hedera-web/back/hedera-web.php  usr/bin/hedera-web.php
 etc/hedera-web/apache.conf                etc/apache2/conf-available/hedera-web.conf
 etc/hedera-web/php.ini                    etc/php/7.0/apache2/conf.d/99-hedera-web.ini

import.js

@@ -1,85 +0,0 @@
-export const locales = {
-	ca: cb => require([], 
-		() => cb(require.context('js', true, /locale\/ca.yml$/))),
-	es: cb => require([], 
-		() => cb(require.context('js', true, /locale\/es.yml$/))),
-	fr: cb => require([], 
-		() => cb(require.context('js', true, /locale\/fr.yml$/))),
-	mn: cb => require([], 
-		() => cb(require.context('js', true, /locale\/mn.yml$/))),
-	pt: cb => require([], 
-		() => cb(require.context('js', true, /locale\/pt.yml$/)))
-};
-
-export const routes = {
-	account: {
-		address:
-			() => import('account/address'),
-		addressList:
-			() => import('account/address-list'),
-		conf:
-			() => import('account/conf')
-	},
-	admin: {
-		accessLog:
-			() => import('admin/access-log'),
-		connections:
-			() => import('admin/connections'),
-		items:
-			() => import('admin/items'),
-		links:
-			() => import('admin/links'),
-		photos:
-			() => import('admin/photos'),
-		queries:
-			() => import('admin/queries'),
-		users:
-			() => import('admin/users'),
-		visits:
-			() => import('admin/visits')
-	},
-	agencies: {
-		packages:
-			() => import('agencies/packages'),
-		provinces:
-			() => import('agencies/provinces')
-	},
-	cms: {
-		about:
-			() => import('cms/about'),
-		contact:
-			() => import('cms/contact'),
-		home:
-			() => import('cms/home'),
-		location:
-			() => import('cms/location'),
-		why:
-			() => import('cms/why')
-	},
-	ecomerce: {
-		basket:
-			() => import('ecomerce/basket'),
-		catalog:
-			() => import('ecomerce/catalog'),
-		checkout:
-			() => import('ecomerce/checkout'),
-		confirm:
-			() => import('ecomerce/confirm'),
-		invoices:
-			() => import('ecomerce/invoices'),
-		orders:
-			() => import('ecomerce/orders'),
-		ticket:
-			() => import('ecomerce/ticket')
-	},
-	news: {
-		new:
-			() => import('news/new'),
-		news:
-			() => import('news/news')
-	},
-	reports: {
-		shelves:
-			() => import('reports/shelves')
-	}
-};

package.json

@@ -10,17 +10,18 @@
         "type": "git",
         "url": "https://git.verdnatura.es/hedera-web"
     },
-    "packageManager": "pnpm@8.15.1",
     "devDependencies": {
         "@babel/eslint-parser": "^7.13.14",
         "@babel/preset-env": "^7.20.2",
         "@intlify/vue-i18n-loader": "^4.2.0",
         "@quasar/app-webpack": "^3.0.0",
+        "@quasar/cli": "^2.4.1",
+        "cypress": "^13.6.6",
         "cypress-mochawesome-reporter": "^3.8.2",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-config-standard": "^17.0.0",
-        "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-cypress": "^2.13.3",
         "eslint-plugin-import": "^2.19.1",
         "eslint-plugin-n": "^15.0.0",
         "eslint-plugin-prettier": "^5.1.3",
@@ -29,16 +30,16 @@
         "eslint-webpack-plugin": "^3.1.1",
         "file-loader": "^6.2.0",
         "json-loader": "^0.5.7",
+        "tinymce": "^6.3.0",
         "yaml-loader": "^0.5.0"
     },
     "dependencies": {
-        "@quasar/cli": "^2.3.0",
         "@quasar/extras": "^1.16.9",
         "axios": "^0.21.1",
         "core-js": "^3.6.5",
         "pinia": "^2.0.11",
         "quasar": "^2.14.5",
-        "require-yaml": "0.0.1",
+        "require-yaml": "^0.0.1",
         "vue": "^3.3.4",
         "vue-i18n": "^9.2.2",
         "vue-router": "^4.0.0"
@@ -47,11 +48,9 @@
         "front": "quasar dev",
         "back": "cd back && php -S 127.0.0.1:3002 -t . index.php",
         "salix": "cd ../salix && gulp back",
-        "resetDatabase": "cd ../salix && gulp docker",
+        "db": "cd ../salix && gulp docker",
-        "cy:open": "npm run resetDatabase && cd ../hedera-web && cypress open",
+        "cy:open": "npm run db && cypress open",
-        "test:e2e": "npm run resetDatabase && cd ../hedera-web && cypress run",
+        "test:e2e": "npm run db && cypress run",
-        "cy:open-mindshore": "npm run resetDatabase && cd ../hedera-web-mindshore && cypress open",
-        "test:e2e-mindshore": "npm run resetDatabase && cd ../hedera-web-mindshore && cypress run",
         "build": "rm -rf dist/ ; quasar build",
         "clean": "rm -rf dist/",
         "lint": "eslint --ext .js,.vue ./"