From 3449494240b93f34717ea943e292913dc3321d80 Mon Sep 17 00:00:00 2001 From: Watheq Alshowaiter Date: Wed, 11 Nov 2020 14:41:02 +0300 Subject: [PATCH 01/15] Feat: combine all Home page --- src/App.jsx | 31 ++- src/components/ContactUs/ContactUsForm.jsx | 219 +++++++-------- src/components/Quotes/test.css | 59 +++-- src/components/Statistics/Statistics.js | 4 +- src/components/navbar/NavBar.jsx | 250 +++++++++--------- src/containers/AboutUs/AboutUs.jsx | 2 +- .../ContactUs/ContactUsContainer.jsx | 42 +-- src/containers/Home/SliderCards.jsx | 38 ++- .../WebsiteDescription/WebsiteDescription.jsx | 8 +- src/images/icons/google-icon-new.png | Bin 0 -> 3353 bytes src/images/icons/google-icon2.svg | 47 ++++ src/images/icons/icon-search.svg | 2 +- src/images/icons/icons8-google_logo.png | Bin 0 -> 3220 bytes src/pages/AboutUs.jsx | 3 - src/pages/Contactus.jsx | 18 ++ src/pages/Home.jsx | 27 ++ src/pages/MissingPeople.jsx | 0 src/router/RouterPages.jsx | 54 ++-- yarn.lock | 4 - 19 files changed, 465 insertions(+), 343 deletions(-) create mode 100644 src/images/icons/google-icon-new.png create mode 100644 src/images/icons/google-icon2.svg create mode 100644 src/images/icons/icons8-google_logo.png create mode 100644 src/pages/Contactus.jsx create mode 100644 src/pages/Home.jsx create mode 100644 src/pages/MissingPeople.jsx diff --git a/src/App.jsx b/src/App.jsx index 1e0e27e..e30f1a6 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,25 +1,28 @@ import React from 'react'; import './styles/main.css'; -import ContacUs from './containers/ContactUs/ContactUsContainer'; +import RouterPage from './router/RouterPages'; + +// import ContacUs from './containers/ContactUs/ContactUsContainer'; import Footer from './containers/Home/FooterSection'; import Navbar from './components/navbar/NavBar'; -import SliderCards from './containers/Home/SliderCards'; -import WebsiteDescription from './containers/WebsiteDescription/WebsiteDescription'; -import MissingPeople from './containers/HomePage/MissingPeople'; -import Statistics from './components/Statistics/Statistics.js'; -import info from './components/Statistics/data'; +// import SliderCards from './containers/Home/SliderCards'; +// import WebsiteDescription from './containers/WebsiteDescription/WebsiteDescription'; +// import MissingPeople from './containers/HomePage/MissingPeople'; +// import Statistics from './components/Statistics/Statistics.js'; +// import info from './components/Statistics/data'; + +// test pages +// import C from './pages/Contactus'; + +/* + +