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

Native/AlfaPrentice/App/Layouts/DefaultLayout.js

@@ -3,7 +3,7 @@ import React from 'react';
 import {View, Text, ScrollView} from 'react-native';
 
 //Components
-import {Header, Footer} from '../index';
+import {Header, Footer, Hero} from '../index';
 
 class DefaultLayout extends React.Component {
 constructor(props){
@@ -23,4 +23,23 @@ constructor(props){
     }
 }
 
-export default DefaultLayout;
+class UserProfileLayout extends React.Component {
+    constructor(props){
+        super(props);
+    }
+
+    render() {
+        return (
+            <View>
+            <ScrollView style={{marginBottom: 50,}}>
+                <Header/>
+                <Hero HeroHeading="Frits Haringa" HeroText="Student Applicatie en Mediaontwikkeling jaar 3"/>
+                {this.props.children} 
+            </ScrollView>
+            <Footer/>
+            </View>
+        );
+    }
+}
+
+export { DefaultLayout, UserProfileLayout };

Native/AlfaPrentice/App/Views/Profiles/Userfunctions/InternStatus.js

@@ -1,18 +1,48 @@
 //Modules
 import React from 'react';
-import {View, Text} from 'react-native';
+import {View, Text, StyleSheet} from 'react-native';
 
 //Components
-import { DefaultLayout } from '../../../index';
+import { UserProfileLayout, Hero } from '../../../index';
 
 class InternStatus extends React.Component {
     render() {
         return (
-                <DefaultLayout>
+                <UserProfileLayout>
-                    <Text>Status stage pagina</Text>
+                    <Text style={Styles.H1}>Status stage pagina</Text>
-                </DefaultLayout>
+                    <View>
+                        <View style={Styles.StageInfoContainer}>
+                            <Text style={Styles.StageInfo}>Weekstaten</Text>
+                            <Text style={Styles.StageInfo}>303 van de 720 uur gelopen</Text>
+                        </View>
+                        <View style={Styles.StageInfoContainer}>
+                            <Text style={Styles.StageInfo}>Stage periode</Text>
+                            <Text style={Styles.StageInfo}>Stage eindigt over 79 dagen</Text>
+                        </View>
+                    </View>
+                </UserProfileLayout>
         )
     }
 }
 
+const Styles = StyleSheet.create({
+    H1: {
+        color: "#DE0000",
+        fontSize: 21,
+        textAlign: 'center',
+        marginVertical: 10,
+    },
+    StageInfoContainer: {
+        display: 'flex',
+        flex: 1,
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        paddingHorizontal: 30,
+        marginVertical: 10
+    },
+    StageInfo: {
+        fontSize: 12,
+    }
+})
+
 export default InternStatus;

Native/AlfaPrentice/App/index.js

@@ -1,7 +1,7 @@
 //Components
 import Header from './Header/Header';
 import Routes from './Router/Router';
-import DefaultLayout from './Layouts/DefaultLayout';
+import { DefaultLayout, UserProfileLayout} from './Layouts/DefaultLayout';
 import Hero from './Hero/Hero';
 import {HeroSearch} from './Hero/Hero';
 import CompanyResultcard from './Cards/CompanyResultCard';
@@ -33,6 +33,7 @@ export {
     Footer,
     ProfileLink,
     Cta,
+    UserProfileLayout
 }
 
 //Pages export

Native/AlfaPrentice/package.json

@@ -26,7 +26,7 @@
     "react-native-gesture-handler": "^1.9.0",
     "react-native-reanimated": "^1.13.2",
     "react-native-router-flux": "^4.2.0",
-    "react-native-safe-area-context": "^3.1.9",
+    "react-native-safe-area-context": "3.1.4",
     "react-native-screens": "^2.15.0",
     "react-native-snap-carousel": "^3.9.1",
     "react-native-swiper-hooks": "^1.2.8",

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,
 }