From 003f42dd039c3b81168a1224088516385897607e Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 18 Jul 2024 08:51:11 -0300 Subject: [PATCH] Home view adjustments --- .eslintrc.js | 18 +++---- README.md | 18 +++++-- quasar.config.js | 2 +- src/boot/axios.js | 35 +++++++------- src/pages/Cms/HomeView.vue | 99 ++++++++++++++++++++++++++++++++++++++ src/router/routes.js | 8 +-- 6 files changed, 145 insertions(+), 35 deletions(-) create mode 100644 src/pages/Cms/HomeView.vue diff --git a/.eslintrc.js b/.eslintrc.js index 56f4da50..dabf8ae7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,12 +7,12 @@ module.exports = { parserOptions: { parser: '@babel/eslint-parser', ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features - sourceType: 'module', // Allows for the use of imports + sourceType: 'module' // Allows for the use of imports }, env: { browser: true, - 'vue/setup-compiler-macros': true, + 'vue/setup-compiler-macros': true }, extends: [ @@ -26,7 +26,7 @@ module.exports = { // 'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability) // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead) - 'standard', + 'standard' ], plugins: ['vue', 'prettier'], @@ -41,7 +41,7 @@ module.exports = { __QUASAR_SSR_PWA__: 'readonly', process: 'readonly', Capacitor: 'readonly', - chrome: 'readonly', + chrome: 'readonly' }, // add your custom rules here @@ -66,7 +66,7 @@ module.exports = { 'prefer-promise-reject-errors': 'off', semi: 'off', // allow debugger during development only - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' }, overrides: [ { @@ -75,8 +75,8 @@ module.exports = { rules: { semi: 'off', indent: ['error', 4, { SwitchCase: 1 }], - 'space-before-function-paren': 'off', - }, - }, - ], + 'space-before-function-paren': 'off' + } + } + ] }; diff --git a/README.md b/README.md index fee55494..c5032e41 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,26 @@ Hedera is the main web page for Verdnatura. ## Getting Started Required dependencies. - * PHP >= 7.0 - * Node.js >= 8.0 + +- PHP >= 7.0 +- Node.js >= 8.0 Launch application for development. + ``` -$ npm run dev +$ npm run dev ``` +Launch project backend. + +``` +$ php -S 127.0.0.1:3002 -t . index.php + Run server side method from command line. ``` -$ php hedera-web.php -m method_path + +$ php hedera-web.php -m method_path + ``` ## Built with @@ -23,3 +32,4 @@ $ php hedera-web.php -m method_path * [Webpack](https://webpack.js.org/) * [MooTools](https://mootools.net/) * [TinyMCE](https://www.tinymce.com/) +``` diff --git a/quasar.config.js b/quasar.config.js index 1fb70d5e..6c4bc930 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -111,7 +111,7 @@ module.exports = configure(function (ctx) { proxy: { '/api': 'http://localhost:3000', '/': { - target: 'http://localhost:3001', + target: 'http://localhost:3002', bypass: (req) => req.path !== '/' ? req.path : null } } diff --git a/src/boot/axios.js b/src/boot/axios.js index b09fccc0..b5758897 100644 --- a/src/boot/axios.js +++ b/src/boot/axios.js @@ -1,7 +1,7 @@ -import { boot } from 'quasar/wrappers' -import { Connection } from '../js/db/connection' -import { userStore } from 'stores/user' -import axios from 'axios' +import { boot } from 'quasar/wrappers'; +import { Connection } from '../js/db/connection'; +import { userStore } from 'stores/user'; +import axios from 'axios'; // Be careful when using SSR for cross-request state pollution // due to creating a Singleton instance here; @@ -11,32 +11,33 @@ import axios from 'axios' // for each client) const api = axios.create({ baseURL: `//${location.hostname}:${location.port}/api/` -}) +}); -const jApi = new Connection() +const jApi = new Connection(); export default boot(({ app }) => { - const user = userStore() - function addToken (config) { + const user = userStore(); + function addToken(config) { if (user.token) { - config.headers.Authorization = user.token + config.headers.Authorization = user.token; } - return config + return config; } - api.interceptors.request.use(addToken) - jApi.use(addToken) + api.interceptors.request.use(addToken); + jApi.use(addToken); // for use inside Vue files (Options API) through this.$axios and this.$api - app.config.globalProperties.$axios = axios + app.config.globalProperties.$axios = axios; // ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form) // so you won't necessarily have to import axios in each vue file - app.config.globalProperties.$api = api + app.config.globalProperties.$api = api; // ^ ^ ^ this will allow you to use this.$api (for Vue Options API form) // so you can easily perform requests against your app's API - app.config.globalProperties.$jApi = jApi -}) + app.config.globalProperties.$jApi = jApi; + app.provide('jApi', jApi); +}); -export { api, jApi } +export { api, jApi }; diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue new file mode 100644 index 00000000..ba7983e1 --- /dev/null +++ b/src/pages/Cms/HomeView.vue @@ -0,0 +1,99 @@ + + + + + + + +en-US: + startOrder: Start order +es-ES: + startOrder: Empezar pedido +ca-ES: + startOrder: Començar comanda +fr-FR: + startOrder: Lancer commande +pt-PT: + startOrder: Comece uma encomenda + diff --git a/src/router/routes.js b/src/router/routes.js index 0a8dd7fd..e593edfd 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -27,12 +27,12 @@ const routes = [ { name: '', path: '', - component: () => import('src/pages/Cms/Home.vue') + component: () => import('src/pages/Cms/HomeView.vue') }, { name: 'home', path: '/cms/home', - component: () => import('src/pages/Cms/Home.vue') + component: () => import('src/pages/Cms/HomeView.vue') }, { name: 'orders', @@ -63,6 +63,6 @@ const routes = [ path: '/:catchAll(.*)*', component: () => import('pages/ErrorNotFound.vue') } -] +]; -export default routes +export default routes;