diff --git a/package-lock.json b/package-lock.json index 2af1c9a..a6886bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10969,6 +10969,7 @@ }, "vue-loader-v16": { <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD "version": "npm:vue-loader@16.0.0-beta.7", @@ -10994,6 +10995,8 @@ "requires": { "@types/color-name": "^1.1.1", ======= +>>>>>>> origin +======= >>>>>>> origin "version": "npm:vue-loader@16.0.0-beta.8", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", @@ -11014,13 +11017,17 @@ "optional": true, "requires": { <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> origin +>>>>>>> origin +======= >>>>>>> origin "color-convert": "^2.0.1" } }, "chalk": { +<<<<<<< HEAD <<<<<<< HEAD "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -11035,6 +11042,11 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", >>>>>>> origin +>>>>>>> origin +======= + "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, @@ -11068,6 +11080,7 @@ "optional": true }, <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD "source-map": { @@ -11077,6 +11090,8 @@ "dev": true, "optional": true ======= +>>>>>>> origin +======= >>>>>>> origin "loader-utils": { "version": "2.0.0", @@ -11090,8 +11105,11 @@ "json5": "^2.1.2" } <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> origin +>>>>>>> origin +======= >>>>>>> origin }, "supports-color": { 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/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 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/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 41f2cd3..d882edb 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -9,11 +9,11 @@