diff --git a/package-lock.json b/package-lock.json index 825dec1..e794fe0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1392,16 +1392,6 @@ "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==", "dev": true }, - "@types/mini-css-extract-plugin": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.1.tgz", - "integrity": "sha512-+mN04Oszdz9tGjUP/c1ReVwJXxSniLd7lF++sv+8dkABxVNthg6uccei+4ssKxRHGoMmPxdn7uBdJWONSJGTGQ==", - "dev": true, - "optional": true, - "requires": { - "@types/webpack": "*" - } - }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -1796,17 +1786,6 @@ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "dev": true }, - "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", - "color-convert": "^2.0.1" - } - }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -1833,34 +1812,6 @@ "unique-filename": "^1.1.1" } }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, "find-cache-dir": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", @@ -1882,13 +1833,6 @@ "path-exists": "^4.0.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -1953,16 +1897,6 @@ "minipass": "^3.1.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", @@ -1979,21 +1913,6 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } - }, - "vue-loader-v16": { - "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" - } } } }, @@ -6830,6 +6749,11 @@ } } }, + "jquery": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", + "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" + }, "js-message": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz", @@ -11043,6 +10967,127 @@ } } }, + "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==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "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": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "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", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } +>>>>>>> origin + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-router": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.3.tgz", diff --git a/package.json b/package.json index a378b12..09517d0 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "bootstrap": "^4.5.2", "bootstrap-vue": "^2.17.1", "core-js": "^3.6.5", + "jquery": "^3.5.1", "sweetalert2": "^10.1.0", "vue": "^2.6.11", "vue-router": "^3.4.3" diff --git a/src/App.vue b/src/App.vue index 2a0b147..ecbf7db 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,14 +1,11 @@ - + + \ No newline at end of file diff --git a/src/assets/DHL-Logo.png b/src/assets/DHL-Logo.png new file mode 100644 index 0000000..ef786a8 Binary files /dev/null and b/src/assets/DHL-Logo.png differ diff --git a/src/components/Payment.vue b/src/components/Payment.vue new file mode 100644 index 0000000..718b07f --- /dev/null +++ b/src/components/Payment.vue @@ -0,0 +1,62 @@ + + + + + \ No newline at end of file diff --git a/src/components/ShippingSection.vue b/src/components/ShippingSection.vue new file mode 100644 index 0000000..1d44fde --- /dev/null +++ b/src/components/ShippingSection.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/src/components/ShoppingNav.vue b/src/components/ShoppingNav.vue new file mode 100644 index 0000000..c4bdb70 --- /dev/null +++ b/src/components/ShoppingNav.vue @@ -0,0 +1,70 @@ + + + + diff --git a/src/components/ShoppingStatus.vue b/src/components/ShoppingStatus.vue new file mode 100644 index 0000000..ccda459 --- /dev/null +++ b/src/components/ShoppingStatus.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/components/cartaCarrito.vue b/src/components/cartaCarrito.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/components/dataSection.vue b/src/components/dataSection.vue new file mode 100644 index 0000000..7daf43e --- /dev/null +++ b/src/components/dataSection.vue @@ -0,0 +1,190 @@ + + + diff --git a/src/icons.js b/src/icons.js new file mode 100644 index 0000000..1fcb93c --- /dev/null +++ b/src/icons.js @@ -0,0 +1,30 @@ +import {library} from '@fortawesome/fontawesome-svg-core' +import { + faUserSecret, + faUser, + faLock, + faGraduationCap, + faExternalLinkAlt, + faKey, + faExclamationCircle, + faEnvelope, + faShoppingCart, + faTrash, + faMapMarkerAlt, + faPhoneAlt +} from '@fortawesome/free-solid-svg-icons' + + +library.add(faUserSecret) +library.add(faUser) +library.add(faLock) +library.add(faExternalLinkAlt) +library.add(faGraduationCap) +library.add(faExclamationCircle) +library.add(faKey) +library.add(faEnvelope) +library.add(faShoppingCart) +library.add(faTrash) +library.add(faMapMarkerAlt) +library.add(faPhoneAlt) + diff --git a/src/main.js b/src/main.js index 5cf603c..f2b8c8f 100644 --- a/src/main.js +++ b/src/main.js @@ -1,36 +1,11 @@ import Vue from 'vue' import App from './App.vue' import router from './routes' +import "bootstrap" +import "bootstrap/dist/css/bootstrap.min.css" -import {library} from '@fortawesome/fontawesome-svg-core' -import { - faUserSecret, - faUser, - faLock, - faGraduationCap, - faExternalLinkAlt, - faKey, - faExclamationCircle, - faEnvelope, - faShoppingCart, - faTrash, - faMapMarkerAlt, - faPhoneAlt -} from '@fortawesome/free-solid-svg-icons' import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome' - -library.add(faUserSecret) -library.add(faUser) -library.add(faLock) -library.add(faExternalLinkAlt) -library.add(faGraduationCap) -library.add(faExclamationCircle) -library.add(faKey) -library.add(faEnvelope) -library.add(faShoppingCart) -library.add(faTrash) -library.add(faMapMarkerAlt) -library.add(faPhoneAlt) +import "./icons" Vue.component('font-awesome-icon', FontAwesomeIcon) diff --git a/src/routes.js b/src/routes.js index d4bf0a4..a770734 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2,6 +2,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Home from './view/Home.vue' +import PersonalData from './view/PersonalData.vue' const routes = [ { @@ -14,6 +15,11 @@ const routes = [ component: Home, name: 'home' }, + { + path: '/datosPersonales', + component: PersonalData, + name: 'personalData' + } ] Vue.use(VueRouter) diff --git a/src/view/Home.vue b/src/view/Home.vue index ea12e9d..3e0ae08 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -1,20 +1,22 @@ - - \ No newline at end of file diff --git a/src/view/PersonalData.vue b/src/view/PersonalData.vue new file mode 100644 index 0000000..b653cd0 --- /dev/null +++ b/src/view/PersonalData.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/src/view/cariitoPago.vue b/src/view/cariitoPago.vue new file mode 100644 index 0000000..e69de29