From 8325759c2f726bc55b3f9e0a392bcfefc1b16a1b Mon Sep 17 00:00:00 2001 From: Jonasz Bigda Date: Sat, 24 Oct 2020 19:25:36 +0200 Subject: [PATCH] Fixed backend URL | Some features --- src/components/Dialogs/EditDish.js | 2 +- src/components/Dialogs/NewDish.js | 2 +- src/components/Dialogs/NewRestaurant.js | 2 +- .../EditRestaurant/EditRestaurantInfo.js | 2 +- .../EditRestaurant/EditRestaurantLocation.js | 2 +- .../EditRestaurant/EditRestaurantMenu.js | 4 +- .../EditRestaurant/EditRestaurantPhoto.js | 2 +- .../EditRestaurantSubscription.js | 57 +++++++++++++------ src/components/EditRestaurant/LunchMenu.js | 2 +- src/components/Input/ImageUpload.js | 2 +- src/components/Input/ImageUploadWide.js | 2 +- src/styles/EditRestaurant.scss | 40 ++++++++++--- src/styles/Home.scss | 12 ++++ 13 files changed, 95 insertions(+), 36 deletions(-) diff --git a/src/components/Dialogs/EditDish.js b/src/components/Dialogs/EditDish.js index 30f56c5..6da7ea6 100644 --- a/src/components/Dialogs/EditDish.js +++ b/src/components/Dialogs/EditDish.js @@ -205,7 +205,7 @@ export default function EditDish() { }; dispatch(showBackdrop()); axios({ - url: backend + "/dish", + url: backend + "dish", method: "PUT", data: data, headers: { diff --git a/src/components/Dialogs/NewDish.js b/src/components/Dialogs/NewDish.js index bf6a179..876f8b2 100644 --- a/src/components/Dialogs/NewDish.js +++ b/src/components/Dialogs/NewDish.js @@ -196,7 +196,7 @@ export default function NewRestaurant() { }; dispatch(showBackdrop()); axios({ - url: backend + "/dish", + url: backend + "dish", method: "POST", data: data, headers: { diff --git a/src/components/Dialogs/NewRestaurant.js b/src/components/Dialogs/NewRestaurant.js index eb95974..fb398c2 100644 --- a/src/components/Dialogs/NewRestaurant.js +++ b/src/components/Dialogs/NewRestaurant.js @@ -187,7 +187,7 @@ export default function NewRestaurant() { }; dispatch(showBackdrop()); axios({ - url: backend + "/restaurant", + url: backend + "restaurant", method: "POST", data: data, headers: { diff --git a/src/components/EditRestaurant/EditRestaurantInfo.js b/src/components/EditRestaurant/EditRestaurantInfo.js index 50c9e0a..709a7bb 100644 --- a/src/components/EditRestaurant/EditRestaurantInfo.js +++ b/src/components/EditRestaurant/EditRestaurantInfo.js @@ -214,7 +214,7 @@ export default function EditRestaurantInfo(props) { }; dispatch(showBackdrop()); axios({ - url: backend + "/restaurant", + url: backend + "restaurant", method: "PUT", data: data, headers: { diff --git a/src/components/EditRestaurant/EditRestaurantLocation.js b/src/components/EditRestaurant/EditRestaurantLocation.js index 7dcf95a..e5db897 100644 --- a/src/components/EditRestaurant/EditRestaurantLocation.js +++ b/src/components/EditRestaurant/EditRestaurantLocation.js @@ -53,7 +53,7 @@ export default function EditRestaurantLocation(props) { hidden: hidden, }; axios({ - url: backend + "/restaurant", + url: backend + "restaurant", method: "PUT", data: data, headers: { diff --git a/src/components/EditRestaurant/EditRestaurantMenu.js b/src/components/EditRestaurant/EditRestaurantMenu.js index e709ba5..00ef62e 100644 --- a/src/components/EditRestaurant/EditRestaurantMenu.js +++ b/src/components/EditRestaurant/EditRestaurantMenu.js @@ -59,7 +59,7 @@ export default function EditRestaurantMenu(props) { action: "add", }; axios({ - url: backend + "/restaurant/category", + url: backend + "restaurant/category", method: "POST", data: data, headers: { @@ -86,7 +86,7 @@ export default function EditRestaurantMenu(props) { action: "delete", }; axios({ - url: "http://localhost:4000/restaurant/category", + url: backend + "restaurant/category", method: "POST", data: data, headers: { diff --git a/src/components/EditRestaurant/EditRestaurantPhoto.js b/src/components/EditRestaurant/EditRestaurantPhoto.js index 1df2b39..13d778e 100644 --- a/src/components/EditRestaurant/EditRestaurantPhoto.js +++ b/src/components/EditRestaurant/EditRestaurantPhoto.js @@ -50,7 +50,7 @@ export default function EditRestaurantPhoto(props) { hidden: hidden, }; axios({ - url: backend + "/restaurant", + url: backend + "restaurant", method: "PUT", data: data, headers: { diff --git a/src/components/EditRestaurant/EditRestaurantSubscription.js b/src/components/EditRestaurant/EditRestaurantSubscription.js index a6c4bb4..ebeefc3 100644 --- a/src/components/EditRestaurant/EditRestaurantSubscription.js +++ b/src/components/EditRestaurant/EditRestaurantSubscription.js @@ -8,6 +8,7 @@ import { backend } from "../../config.js"; import { showBackdrop, hideBackdrop } from "../../actions/toggles"; import PaymentDialog from "../Dialogs/PaymentDialog"; import { openInNewTab, formatDateBasic } from "../../Services.js"; +import LocalOfferIcon from '@material-ui/icons/LocalOffer'; export default function EditRestaurantSubscription(props) { const { subscriptionActive, subscriptionDue } = props.restaurant; @@ -37,7 +38,7 @@ export default function EditRestaurantSubscription(props) { dispatch(showBackdrop()); axios({ method: "POST", - url: backend + "/restaurant/subscription", + url: backend + "restaurant/subscription", data: data, headers: { "x-auth-token": token, @@ -78,38 +79,62 @@ export default function EditRestaurantSubscription(props) { )} {!subscriptionActive && ( -
+
+

+ Aktywuj subskrypcję, aby Twoja restauracja była widoczna. Na tydzień + przed końcem subskrypcji wyślemy Ci email z możliwością opłacenia + subskrypcji na kolejny okres. +

-

1 rok

+
+ +

Za darmo

+
-

- 600zł 500zł (netto) -

-

Aktywuj subskrypcję na 12 miesięcy i zapłać mniej.

+

3 miesiące

+
+

Możesz jednorazowo aktywować darmowe 3 miesiące subskrypcji, by móc spokojnie uzupełnić menu.

+
handleActivateSubscription(12)} + onClick={() => handleActivateSubscription(3)} />
-

1 miesiąc

+
+ +

50zł

+
-

50zł (netto)

-

Aktywuj subskrypcję na jeden miesiąc.

+

1 miesiąc

+
+

Aktywuj subskrypcję na jeden miesiąc.

+
handleActivateSubscription(1)} />
+
+
+ +

500zł

+
+ +

1 rok

+
+

Zapłać z góry za cały rok, a otrzymasz dwa miesiące w prezencie.

+
+ + handleActivateSubscription(12)} + /> +
-

- Aktywuj subskrypcję, aby Twoja restauracja była widoczna. Na tydzień - przed końcem subskrypcji wyślemy Ci email z możliwością opłacenia - subskrypcji na kolejny okres. -

)} {subscriptionActive && ( diff --git a/src/components/EditRestaurant/LunchMenu.js b/src/components/EditRestaurant/LunchMenu.js index 12de9fb..4c58459 100644 --- a/src/components/EditRestaurant/LunchMenu.js +++ b/src/components/EditRestaurant/LunchMenu.js @@ -150,7 +150,7 @@ export default function EditCategoriesList(props) { dispatch(showBackdrop()); axios({ method: "POST", - url: backend + "/restaurant/lunchSet", + url: backend + "restaurant/lunchSet", data: data, headers: { "x-auth-token": token, diff --git a/src/components/Input/ImageUpload.js b/src/components/Input/ImageUpload.js index 98da71c..74346fc 100644 --- a/src/components/Input/ImageUpload.js +++ b/src/components/Input/ImageUpload.js @@ -14,7 +14,7 @@ export default function ImageUpload(props) { data.append("menuiImage", event.target.files[0]); setLoading(true); axios({ - url: backend + "/img", + url: backend + "img", method: "POST", data: data, headers: { diff --git a/src/components/Input/ImageUploadWide.js b/src/components/Input/ImageUploadWide.js index 68e20b8..1d4c2ae 100644 --- a/src/components/Input/ImageUploadWide.js +++ b/src/components/Input/ImageUploadWide.js @@ -14,7 +14,7 @@ export default function ImageUpload(props) { data.append("menuiImage", event.target.files[0]); setLoading(true); axios({ - url: backend + "/img", + url: backend + "img", method: "POST", data: data, headers: { diff --git a/src/styles/EditRestaurant.scss b/src/styles/EditRestaurant.scss index 98b92b7..53d3423 100644 --- a/src/styles/EditRestaurant.scss +++ b/src/styles/EditRestaurant.scss @@ -131,6 +131,7 @@ display: flex; flex-flow: column; align-items: center; + height: 100%; width: 100%; overflow: auto; } @@ -156,24 +157,26 @@ .subscription-cards { display: flex; justify-content: space-around; - margin-top: 18px; + margin-top: 48px; } .subscription-card { - background-color: #242424; + background-color: #474747; display: flex; flex-direction: column; justify-content: space-between; align-items: center; - min-width: 260px; - max-width: 300px; - border-radius: 8px; + width: 220px; + border-radius: 18px; + box-shadow: #0000002d 2px 2px 5px; h1 { - font-weight: 200; + font-weight: 500; + margin-left: 8px; + font-size: 1.5rem; } h2 { - font-weight: 300; - font-size: 1.2rem; + font-weight: 400; + font-size: 1.1rem; color: #c0c0c0; } p { @@ -181,6 +184,25 @@ font-size: 14px; padding-left: 16px; padding-right: 16px; - color: #838383; + color: $secondary-color; } + transition: background-color 0.2s; +} + +.subscription-card:hover { + cursor: pointer; + background-color: #575757; +} + +.subscription-desc { + background-color: #333333; + height: 100px; + display: flex; + flex-direction: column; + justify-content: center; +} + +.subscription-title { + display: flex; + align-items: center; } diff --git a/src/styles/Home.scss b/src/styles/Home.scss index eb4e47f..b381a44 100644 --- a/src/styles/Home.scss +++ b/src/styles/Home.scss @@ -29,8 +29,20 @@ margin: 18px; } +.hs-bottom { + h4 { + font-size: 14px; + } +} + .hs-bottom-icon { + opacity: 0.6; height: 3rem; margin: 10px; cursor: pointer; + transition: opacity 0.2s; +} + +.hs-bottom-icon:hover { + opacity: 1; }