From 03b94c52a31f5ea3a23cc2aa829ecff510975189 Mon Sep 17 00:00:00 2001 From: roee zach Date: Mon, 12 Jun 2023 13:42:11 +0300 Subject: [PATCH 1/4] Revert "Merge pull request #37 from CoffeeShopTeam/Etai/static-ui/checkout" This reverts commit d4239476fcbb1f95dd6a44464f9b3f68610e2bc9, reversing changes made to 151a7611747e22feacb48653f1f9c7c82dc418ba. --- src/views/layouts/Cart/Cart.html | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/layouts/Cart/Cart.html b/src/views/layouts/Cart/Cart.html index f309b72..e29855f 100644 --- a/src/views/layouts/Cart/Cart.html +++ b/src/views/layouts/Cart/Cart.html @@ -30,7 +30,7 @@
-

Urusta.

+

Urusta.

@@ -41,17 +41,14 @@

Urusta.

-

Our Story

+

Our Story

-
alt text + class="header0__image10" onclick="alert(`It is clickable`)" />
@@ -61,7 +58,7 @@

Our Story

alt text + class="header0__icon" onclick="alert(`It is clickable`)" />
@@ -168,7 +165,7 @@
+

-
+

UPDATE CART

@@ -178,7 +175,7 @@

UPDATE CART

-
+

APPLY COUPON

@@ -236,7 +233,7 @@

POST CODE / ZIP

-
+

UPDATE TOTALS

@@ -269,11 +266,11 @@

From ba9caee11829e55941596cb001ffbb7763b4fb4d Mon Sep 17 00:00:00 2001 From: roee zach Date: Mon, 12 Jun 2023 13:46:22 +0300 Subject: [PATCH 2/4] Revert "Merge pull request #35 from CoffeeShopTeam/Etai/static-ui/cart" This reverts commit 151a7611747e22feacb48653f1f9c7c82dc418ba, reversing changes made to 69441183a0ba16582efe18f52305ec7f1ab41d55. --- src/views/index.js | 13 ------- src/views/layouts/Cart/Cart.html | 13 +++++-- src/views/layouts/Checkout/Checkout.html | 13 +++++-- src/views/layouts/HomePage/HomePage.css | 31 +++------------ src/views/layouts/OurStory/OurStory.css | 31 +-------------- src/views/layouts/OurStory/OurStory.html | 33 +++++----------- .../layouts/PageNotFound/PageNotFound.css | 22 +---------- .../layouts/PageNotFound/PageNotFound.html | 39 +++++++------------ .../layouts/PrivacyPolicy/PrivacyPolicy.css | 32 +-------------- .../layouts/PrivacyPolicy/PrivacyPolicy.html | 33 +++++----------- .../layouts/ProductPage/ProductPage.html | 31 +++++---------- src/views/layouts/ShopPage/ShopPage.html | 30 +++++--------- src/views/layouts/ViewOrder/ViewOrder.html | 30 ++++---------- src/views/partials/Footer/Footer.css | 16 -------- src/views/partials/Header/Header0.css | 36 +++++------------ 15 files changed, 100 insertions(+), 303 deletions(-) diff --git a/src/views/index.js b/src/views/index.js index 324bbe2..e69de29 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -1,13 +0,0 @@ - -// Smooth scrolling for Back To Top button -document.addEventListener('DOMContentLoaded', function () { - var goUpButton = document.querySelector('.back-to-top'); - goUpButton.addEventListener('click', function (e) { - e.preventDefault(); - var scrollOptions = { - top: 0, - behavior: 'smooth' - }; - window.scrollTo(scrollOptions); - }); -}); diff --git a/src/views/layouts/Cart/Cart.html b/src/views/layouts/Cart/Cart.html index e29855f..70a74db 100644 --- a/src/views/layouts/Cart/Cart.html +++ b/src/views/layouts/Cart/Cart.html @@ -1,3 +1,9 @@ + + @@ -9,17 +15,19 @@ href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" /> + + + - @@ -306,10 +314,9 @@

- Back To Top - @@ -322,10 +330,9 @@

Urusta.

-
Shop
+
Shop
@@ -53,7 +50,7 @@

Our Story

alt text + class="header0__icon1" onclick="alert(`It is clickable`)" />
@@ -142,21 +139,12 @@
@@ -167,10 +155,9 @@

Urusta.

-
- Shop
+
Shop
@@ -53,7 +50,7 @@

Our Story

alt text + class="header0__icon1" onclick="alert(`It is clickable`)" />
@@ -68,10 +65,10 @@

Our Story
-

Oh No!

+

OH No!

- Page not found!
- Go back to home page and start again

+ This page not found!
+ go back to home and start again




HOMEPAGE

@@ -100,21 +97,12 @@
@@ -125,10 +113,9 @@
- Back To Top - + @@ -36,8 +34,7 @@

Urusta.

-
- Shop
+
Shop
@@ -53,7 +50,7 @@

Our Story

alt text + class="header0__icon1" onclick="alert(`It is clickable`)" />
@@ -122,21 +119,12 @@
@@ -147,10 +135,9 @@
- Back To Top - + @@ -37,8 +35,7 @@

Urusta.

-
- Shop
+
Shop
@@ -296,21 +293,12 @@
@@ -322,10 +310,9 @@

Urusta.

-
- Shop
+
Shop
@@ -242,21 +239,12 @@
@@ -267,9 +255,9 @@

Urusta.

-
- Shop
+
Shop
@@ -215,21 +211,12 @@
@@ -240,10 +227,9 @@