From 387f0ce6dace53886da668ba9264b13a51a591cd Mon Sep 17 00:00:00 2001 From: eithan Date: Thu, 8 Oct 2020 21:23:39 -0500 Subject: [PATCH 1/5] componente direcciones solo para reemplazar --- src/components/Directions.vue | 234 ++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100644 src/components/Directions.vue diff --git a/src/components/Directions.vue b/src/components/Directions.vue new file mode 100644 index 0000000..1e9c6c3 --- /dev/null +++ b/src/components/Directions.vue @@ -0,0 +1,234 @@ + + + + + \ No newline at end of file From 9f2f2ef7b0d8f9be4e21885eb33f7d88573d9f5a Mon Sep 17 00:00:00 2001 From: KIKIN Date: Wed, 21 Oct 2020 16:17:18 -0500 Subject: [PATCH 2/5] confi --- src/routes.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/routes.js b/src/routes.js index 158b1c9..af8b93b 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2,11 +2,8 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Home from './view/Home.vue' -<<<<<<< HEAD import PersonalData from './view/PersonalData.vue' -======= import Cart from './view/Cart.vue' ->>>>>>> origin const routes = [ { @@ -20,15 +17,14 @@ const routes = [ name: 'home' }, { -<<<<<<< HEAD path: '/datosPersonales', component: PersonalData, name: 'personalData' -======= + }, + { path: '/cart', component: Cart, name: 'cart' ->>>>>>> origin } ] From 189b78ebeae4e4d6a3f213d55283f6704ea4edb5 Mon Sep 17 00:00:00 2001 From: KIKIN Date: Wed, 21 Oct 2020 17:53:22 -0500 Subject: [PATCH 3/5] cart comp --- src/components/Cart.vue | 132 ++++++++++++++++++++++++++++++++++++++++ src/routes.js | 6 -- src/view/Cart.vue | 99 ------------------------------ src/view/Home.vue | 9 ++- 4 files changed, 139 insertions(+), 107 deletions(-) create mode 100644 src/components/Cart.vue delete mode 100644 src/view/Cart.vue diff --git a/src/components/Cart.vue b/src/components/Cart.vue new file mode 100644 index 0000000..bc68127 --- /dev/null +++ b/src/components/Cart.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/src/routes.js b/src/routes.js index 71e35e1..d4bf0a4 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2,7 +2,6 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Home from './view/Home.vue' -import Cart from './view/Cart.vue' const routes = [ { @@ -15,11 +14,6 @@ const routes = [ component: Home, name: 'home' }, - { - path: '/cart', - component: Cart, - name: 'cart' - } ] Vue.use(VueRouter) diff --git a/src/view/Cart.vue b/src/view/Cart.vue deleted file mode 100644 index a855054..0000000 --- a/src/view/Cart.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/view/Home.vue b/src/view/Home.vue index c26d756..ea12e9d 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -1,12 +1,17 @@ From 667d6e34a4e7ab1abf8ef61320adc5d81fd7186e Mon Sep 17 00:00:00 2001 From: KIKIN Date: Thu, 22 Oct 2020 20:58:26 -0500 Subject: [PATCH 4/5] navbar component --- package-lock.json | 40 ------------- src/components/Header.vue | 16 +----- src/components/MainMenu.vue | 110 ++++++++++++++++++++++++++++++++++++ src/icons.js | 4 +- src/view/Home.vue | 5 +- 5 files changed, 118 insertions(+), 57 deletions(-) create mode 100644 src/components/MainMenu.vue diff --git a/package-lock.json b/package-lock.json index e794fe0..8c7d815 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10968,30 +10968,6 @@ } }, "vue-loader-v16": { -<<<<<<< HEAD - "version": "npm:vue-loader@16.0.0-beta.7", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.7.tgz", - "integrity": "sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==", - "dev": true, - "optional": true, - "requires": { - "@types/mini-css-extract-plugin": "^0.9.1", - "chalk": "^3.0.0", - "hash-sum": "^2.0.0", - "loader-utils": "^1.2.3", - "merge-source-map": "^1.1.0", - "source-map": "^0.6.1" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", -======= "version": "npm:vue-loader@16.0.0-beta.8", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", @@ -11010,20 +10986,13 @@ "dev": true, "optional": true, "requires": { ->>>>>>> origin "color-convert": "^2.0.1" } }, "chalk": { -<<<<<<< HEAD - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", -======= "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", ->>>>>>> origin "dev": true, "optional": true, "requires": { @@ -11055,14 +11024,6 @@ "dev": true, "optional": true }, -<<<<<<< HEAD - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true -======= "loader-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", @@ -11074,7 +11035,6 @@ "emojis-list": "^3.0.0", "json5": "^2.1.2" } ->>>>>>> origin }, "supports-color": { "version": "7.2.0", diff --git a/src/components/Header.vue b/src/components/Header.vue index f6edb79..e60b6bf 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -27,18 +27,7 @@ -
-
-
- -
- -
-
+ @@ -63,9 +52,6 @@ export default { background: #1b3d70; } -.header-f { - background-color: #bb8800; -} .cart-icon-custom-properties { font-size: 20px; } diff --git a/src/components/MainMenu.vue b/src/components/MainMenu.vue new file mode 100644 index 0000000..2bbde96 --- /dev/null +++ b/src/components/MainMenu.vue @@ -0,0 +1,110 @@ + + + + diff --git a/src/icons.js b/src/icons.js index 1fcb93c..2d2c1a5 100644 --- a/src/icons.js +++ b/src/icons.js @@ -11,7 +11,8 @@ import { faShoppingCart, faTrash, faMapMarkerAlt, - faPhoneAlt + faPhoneAlt, + faBars } from '@fortawesome/free-solid-svg-icons' @@ -27,4 +28,5 @@ library.add(faShoppingCart) library.add(faTrash) library.add(faMapMarkerAlt) library.add(faPhoneAlt) +library.add(faBars) diff --git a/src/view/Home.vue b/src/view/Home.vue index 28106e5..ecf0ab6 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -1,6 +1,7 @@