Merge pull request #58 from Team-Tukka/sprint/4

Sprint 4 til Master

package.json

@@ -9,13 +9,15 @@
  "@fortawesome/free-regular-svg-icons": "^5.11.2",
  "@fortawesome/free-solid-svg-icons": "^5.11.2",
  "@fortawesome/react-fontawesome": "^0.1.7",
+ "@tinymce/tinymce-react": "^3.3.2",
  "apollo-boost": "^0.4.4",
+ "aws-sdk": "^2.590.0",
  "bootstrap": "^4.3.1",
  "graphql": "^14.5.8",
  "react": "^16.11.0",
  "react-dom": "^16.11.0",
  "react-router-dom": "^5.1.2",
- "react-scripts": "3.2.0",
+ "react-scripts": "^3.3.0",
  "reactstrap": "^8.1.1"
  },
  "scripts": {

src/App.js

@@ -15,11 +15,19 @@ import { Container } from 'reactstrap';
 import Header from './components/header/Header';
 import Textarea from './components/textarea/Textarea';
 import LoginForm from './components/loginForm/LoginForm';
+import Scooters from './components/scooters/Scooters';
+import ChooseModel from './components/chooseModel/ChooseModel';
+import ChooseSubCategory from './components/chooseSubCategory/ChooseSubCategory';
+import Contact from './components/contact/Contact';
+import ShowSubCategory from './components/showSubCategory/ShowSubCategory';
+import ShowSparepart from './components/showSparepart/ShowSparepart';
 import NotFound from './components/notFound/NotFound';
 
 // Importér egne komponenter med auth-beskyttelse
 import AdminNav from './components/adminNav/AdminNav';
 import Welcome from './components/welcome/Welcome';
+import Mail from './components/mails/Mail';
+import MailLandingPage from './components/mails/MailLandingPage';
 import EditTextarea from './components/editTextarea/EditTextarea';
 import Products from './components/products/Products';
 import ShowScooter from './components/showScooter/ShowScooter';
@@ -28,6 +36,7 @@ import { GetSparepartById } from './components/editSparepart/EditSparepart';
 import AddNewScooter from './components/addNewScooter/AddNewScooter';
 import AddNewSparepart from './components/addNewSparepart/AddNewSparepart';
 import AddNewUser from './components/addNewUser/AddNewUser';
+import Categories from './components/categories/Categories';
 
 // App komponentet indeholder den samlede app, der renderes i index.js
 function App() {
@@ -54,36 +63,53 @@ function App() {
  {/* Routes til offentligt tilgængeligt indhold */}
  <Route path="/" exact component={Textarea} />
  <Route path="/login" exact component={LoginForm} />
+ <Route path="/scooters" exact component={Scooters} />
+ <Route path="/showScooter/:id" exact component={ShowScooter} />
+ <Route path="/chooseModel" exact component={ChooseModel} />
+ <Route
+ path="/chooseSubCategory/:id"
+ exact
+ component={ChooseSubCategory}
+ />
+ <Route
+ path="/showSubCategory/:id"
+ exact
+ component={ShowSubCategory}
+ />
+ <Route path="/showSparepart/:id" exact component={ShowSparepart} />
+ <Route path="/contact" exact component={Contact} />
  {/* Routes til adgangsbeskyttet indhold */}
  <Auth
  path="/welcome"
  render={() => (
  <Container className="contentWrapper">
  <Welcome />
+ <MailLandingPage />
  </Container>
  )}
  />
  <Auth
- path="/editTextarea"
+ path="/mail/:id"
  render={() => (
  <Container className="contentWrapper">
- <EditTextarea />
+ <Welcome />
+ <Mail />
  </Container>
  )}
  />
  <Auth
- path="/products"
+ path="/editTextarea"
  render={() => (
  <Container className="contentWrapper">
- <Products />
+ <EditTextarea />
  </Container>
  )}
  />
  <Auth
- path="/showScooter/:id"
+ path="/products"
  render={() => (
  <Container className="contentWrapper">
- <ShowScooter />
+ <Products />
  </Container>
  )}
  />
@@ -127,6 +153,14 @@ function App() {
  </Container>
  )}
  />
+ <Auth
+ path="/categories"
+ render={() => (
+ <Container className="contentWrapper">
+ <Categories />
+ </Container>
+ )}
+ />
  {/* Route til alle ugyldige stier */}
  <Route exact component={NotFound} />
  </Switch>

src/assets/css/globalStyles.css

@@ -1,4 +1,6 @@
 @import url("../../assets/css/fadeInStyles.css");
+@import url("../../assets/css/priceStyles.css");
+@import url("../../assets/css/tagCloudStyles.css");
 @import url("../../assets/css/scrollbarStyles.css");
 
 h1,
@@ -20,6 +22,10 @@ h4 {
  background-color: #f6fdf2 !important;
 }
 
+.textStyles {
+ color: #373a3c !important;
+}
+
 .linkStyles {
  color: #373a3c !important;
 }
@@ -78,3 +84,7 @@ h4 {
  max-height: 54vh;
  overflow: auto;
 }
+
+.cardHover:hover {
+ background-color: #f6fdf2 !important;
+}

src/assets/css/priceStyles.css

@@ -0,0 +1,18 @@
+.priceGlow {
+ color: #4b713d !important;
+ font-size: 1.8rem;
+ text-shadow: 2px 1px 6px #d6eec5 !important;
+}
+
+.priceVAT {
+ color: #969696 !important;
+ font-size: 0.9rem;
+ text-shadow: 2px 1px 6px #d7ecc7 !important;
+}
+
+.priceSale {
+ color: #b42727 !important;
+ font-size: 1.8rem;
+ text-decoration: line-through;
+ text-shadow: 2px 1px 6px #d6eec5 !important;
+}

src/assets/css/tagCloudStyles.css

@@ -0,0 +1,14 @@
+.tagCloudItemStyles {
+ padding: 0.1rem 0.4rem;
+ display: inline-block;
+ border: none;
+ color: #373a3c;
+ border-radius: 0.2rem;
+ background-color: #e2eed8;
+ box-shadow: 1px 2px 3px #f1f1f1;
+}
+
+.tagCloudItemStyles:hover {
+ background-color: #f6fdf2;
+ box-shadow: 1px 2px 3px #f1f1f1;
+}