Merge branch 'DevFrits' of https://github.com/Xandra10101/AlfaPrentice into DevFrits

ReactJS/alfaprentice/src/Components/Cards/TimeRegister.js

@@ -0,0 +1,23 @@
+import React from 'react';
+
+const HourRegister = (porops) => {
+    return(
+        <div className="container">
+            <h3>Vandaag</h3>
+            <div className="row">
+                <div className="col-md-6">
+                    <p>Omschrijving</p>
+                    <textarea/>
+                </div>
+                <div className="col-md-3">
+                    <p>Aantal uren</p>
+                </div>
+                <div className="col-md-3">
+                    opslaan
+                </div>
+            </div>
+        </div>
+    )
+}
+
+export default HourRegister;

ReactJS/alfaprentice/src/Components/Pages/Profile/UserFunctions/WeekStaten.js

@@ -0,0 +1,22 @@
+//Modules
+import React from 'react';
+
+//Components
+import { HourRegister, HeroOne } from "../../../index";
+
+class Weekstaten extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+
+    render() {
+        return (
+            <div>
+                <HeroOne title="Weekstaten" content="Al je golpen urenj in een overzicht"/>
+                <HourRegister/>
+            </div>
+        )
+    }
+}
+
+export default Weekstaten;

ReactJS/alfaprentice/src/Components/Routing/Router.js

@@ -17,7 +17,7 @@ import {
         CompanyProfile,
         UserProfile,
         ContactPage,
-        Weekstaten,
+        WeekStaten
       } from '../';
 
 //Sub routes
@@ -44,7 +44,7 @@ class GlobalRouter extends React.Component {
                         <Route path="/bedrijfsprofiel" component={CompanyProfile} />
                         <Route path="/gebruikersprofiel" component={UserProfile} />
                         <Route path="/contact" component={ContactPage} />
-                        <Route path="/weekstaten" component={Weekstaten} />
+                        <Route path="/Weekstaten" component={WeekStaten} />
                     </Switch> 
                 </DefaultLayout>
               </Router>     

ReactJS/alfaprentice/src/Components/index.js

@@ -8,6 +8,7 @@ import Dropdown from "./Dropdown/Dropdown";
 import CompanyResults from "./Cards/CompanyResult";
 import FinishedInternShip from "./Cards/FinishedInternCard";
 import WeekStatenCard from "./Cards/WeekStatenCard";
+import HourRegister from "./Cards/TimeRegister";
 
 //Layout imports
 import DefaultLayout from "./Layouts/DefaultLayout";
@@ -18,7 +19,7 @@ import InternSearch from "./Pages/Search/InternSearchPage";
 import CompanyProfile from "./Pages/Profile/CompanyProfile";
 import UserProfile from "./Pages/Profile/UserProfile";
 import ContactPage from "./Pages/Contact/Contact";
-import Weekstaten from "./Pages/Weekstaten/Weekstaten";
+import WeekStaten from "./Pages/Profile/UserFunctions/WeekStaten"
 
 //Style
 import "./GlobalStyles.css";
@@ -34,6 +35,7 @@ export {
     CompanyResults,
     FinishedInternShip,
     WeekStatenCard,
+    HourRegister,
 }
 
 
@@ -50,5 +52,5 @@ export {
     CompanyProfile,
     UserProfile,
     ContactPage,
-    Weekstaten,
+    WeekStaten,
 }