diff --git a/package-lock.json b/package-lock.json index 9ff6702c7..fc11712d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "outside", - "version": "1.1.0", + "version": "2.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "outside", - "version": "1.1.0", + "version": "2.0.0", "license": "ISC", "devDependencies": { "eslint": "^8.26.0", diff --git a/package.json b/package.json index 829e444f5..1e71840aa 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "lint": "eslint *.js src/**/*.js", "format": "prettier --ignore-path ./.gitignore --write \"./**/*.{html,json,js,ts,css}\"", "test": "jest" - }, "author": "Shane Thompson", "license": "ISC", diff --git a/src/cart/index.html b/src/cart/index.html index 659c2bb4b..7f01e3054 100644 --- a/src/cart/index.html +++ b/src/cart/index.html @@ -1,9 +1,7 @@ - - @@ -13,31 +11,22 @@ - -
-
- - - @@ -64,23 +53,16 @@ - - -
-
-
-

My Cart

-
-
- - - diff --git a/src/checkout/index.html b/src/checkout/index.html index 876458650..60615e730 100644 --- a/src/checkout/index.html +++ b/src/checkout/index.html @@ -1,9 +1,7 @@ - - @@ -11,30 +9,22 @@ Sleep Outside | Checkout - -
-
- - - @@ -61,28 +51,17 @@ - - -
-
-
-

Review & Place your Order

-
-
- - - diff --git a/src/index.html b/src/index.html index 35ac63ce6..1b84b061c 100644 --- a/src/index.html +++ b/src/index.html @@ -9,20 +9,31 @@
- - - - - - - - + + + + + + + @@ -37,7 +48,7 @@ alt="image of a high mountain lake" />
@@ -55,48 +66,47 @@

Top Products

diff --git a/src/js/cart.js b/src/js/cart.js index a2fb3d8ef..09eb7f8a0 100644 --- a/src/js/cart.js +++ b/src/js/cart.js @@ -7,19 +7,19 @@ function renderCartContents() { } function cartItemTemplate(item) { - const newItem = `
  • - + const newItem = `
  • + ${item.Name} - -

    ${item.Name}

    +
    +

    ${item.Name}

    -

    ${item.Colors[0].ColorName}

    -

    qty: 1

    -

    $${item.FinalPrice}

    +

    ${item.Colors[0].ColorName}

    +

    qty: 1

    +

    $${item.FinalPrice}

  • `; return newItem; diff --git a/src/json/sleeping-bags.json b/src/json/sleeping-bags.json index 6bf7a1243..5d015123c 100644 --- a/src/json/sleeping-bags.json +++ b/src/json/sleeping-bags.json @@ -35,9 +35,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -93,9 +91,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "LH" - ] + "ZIPPER": ["LH"] }, "Colors": [ { @@ -196,12 +192,8 @@ ] }, "SizesAvailable": { - "LENGTH": [ - "REG" - ], - "ZIPPER": [ - "R" - ] + "LENGTH": ["REG"], + "ZIPPER": ["R"] }, "Colors": [ { @@ -323,9 +315,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -370,9 +360,7 @@ "ExtraImages": null }, "SizesAvailable": { - "HAND": [ - "LH" - ] + "HAND": ["LH"] }, "Colors": [ { @@ -422,9 +410,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -474,9 +460,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -526,9 +510,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -578,9 +560,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -630,9 +610,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -730,9 +708,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -1018,9 +994,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "L" - ] + "ZIPPER": ["L"] }, "Colors": [ { @@ -1070,9 +1044,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "R" - ] + "ZIPPER": ["R"] }, "Colors": [ { @@ -1122,9 +1094,7 @@ ] }, "SizesAvailable": { - "ZIPPER": [ - "RH" - ] + "ZIPPER": ["RH"] }, "Colors": [ { diff --git a/src/json/tents.json b/src/json/tents.json index 98029223e..d24bd8bcb 100644 --- a/src/json/tents.json +++ b/src/json/tents.json @@ -99,7 +99,7 @@ { "ColorCode": "01", "ColorName": "Pale Pumpkin/Terracotta" - } + } ], "DescriptionHtmlSimple": "Excess. Get out and enjoy nature with Marmot's Ajax tent, featuring a smart design with durable, waterproof construction and two doors for easy access.", "SuggestedRetailPrice": 275.0, diff --git a/team.txt b/team.txt new file mode 100644 index 000000000..c974df467 --- /dev/null +++ b/team.txt @@ -0,0 +1,5 @@ +Trello link: https://trello.com/b/KflaqxFD/wdd-330 + +Josue Centurion +Diana Quispe +Zeir Braidi \ No newline at end of file diff --git a/zeirbraidi.txt b/zeirbraidi.txt new file mode 100644 index 000000000..992e2de16 --- /dev/null +++ b/zeirbraidi.txt @@ -0,0 +1 @@ +Zeir Braidi \ No newline at end of file