From e5a68f4b854df7a50c60158e8844f060c870dbf5 Mon Sep 17 00:00:00 2001 From: Jonasz Bigda Date: Sat, 1 Aug 2020 17:11:43 +0200 Subject: [PATCH] UI Mechanics / New Look (orange - gray) --- src/App.js | 8 ++ src/App.scss | 21 +++- src/Design.scss | 18 +-- src/Services.js | 13 +- src/actions/index.js | 13 ++ src/actions/toggles.js | 25 ++++ src/components/ButtonPrimary.js | 5 +- src/components/ButtonSecondary.js | 6 +- src/components/CardDish.js | 21 +++- src/components/CardRestaurant.js | 2 +- src/components/Dialogs.js | 98 +++++++++++++++ src/components/DishesCategory.js | 18 ++- src/components/Pictograms.js | 26 ++-- src/components/PictogramsSeparate.js | 104 ++++++++++++++++ src/components/Restaurant.js | 58 +++++---- src/components/SearchPanel.js | 19 +++ src/components/TopBar.js | 171 +++++++++++++++++++++++++-- src/public/bg.jpg | Bin 0 -> 137176 bytes src/public/bg_tile.jpg | Bin 0 -> 106376 bytes src/public/cat.jpg | Bin 14850 -> 0 bytes src/public/photo.jpg | Bin 178171 -> 0 bytes src/reducers/appMode.js | 2 - src/reducers/data.js | 36 ++++++ src/reducers/index.js | 4 +- src/reducers/toggles.js | 16 --- src/styles/Dialogs.scss | 7 ++ src/styles/DishList.scss | 30 ++++- src/styles/Footer.scss | 6 +- src/styles/Pictograms.scss | 22 ++++ src/styles/Restaurant.scss | 67 +++++++++-- src/styles/SearchResults.scss | 25 ++-- src/styles/TopBar.scss | 43 +++++++ 32 files changed, 766 insertions(+), 118 deletions(-) create mode 100644 src/components/Dialogs.js create mode 100644 src/components/PictogramsSeparate.js create mode 100644 src/public/bg.jpg create mode 100644 src/public/bg_tile.jpg delete mode 100644 src/public/cat.jpg delete mode 100644 src/public/photo.jpg create mode 100644 src/reducers/data.js delete mode 100644 src/reducers/toggles.js create mode 100644 src/styles/Dialogs.scss diff --git a/src/App.js b/src/App.js index 2d7c013..1e1d2d4 100644 --- a/src/App.js +++ b/src/App.js @@ -6,6 +6,7 @@ import Footer from "./components/Footer"; import SearchPanel from "./components/SearchPanel"; import SearchResults from "./components/SearchResults"; import Restaurant from "./components/Restaurant"; +import Dialogs from "./components/Dialogs"; import { createMuiTheme, ThemeProvider } from "@material-ui/core/styles"; import { useSelector } from "react-redux"; @@ -14,6 +15,12 @@ const theme = createMuiTheme({ primary: { main: "#0e8496", }, + secondary: { + light: "#ffffff", + main: "#ffffff", + dark: "#ffffff", + contrastText: "#ffffff", + }, }, }); @@ -37,6 +44,7 @@ function App() { {appMode === "search results" && } {appMode === "restaurant" && } +