From b51f82cd3a9913507c9138ffd74597ca6edbdfe9 Mon Sep 17 00:00:00 2001 From: frits000000 <45283950+frits000000@users.noreply.github.com> Date: Sat, 21 Nov 2020 11:33:58 +0100 Subject: [PATCH] profile ppages implemented --- ReactJS/alfaprentice/package-lock.json | 16 +++++ ReactJS/alfaprentice/package.json | 2 + .../src/Components/Cards/CompanyResult.js | 16 +++-- .../Components/Cards/FinishedInternCard.js | 28 ++++++++ .../src/Components/Footer/Footer.js | 8 ++- .../src/Components/GlobalStyles.css | 29 ++++++++ .../src/Components/Header/Header.css | 9 +++ .../src/Components/Header/Header.js | 12 +++- .../Components/Pages/{ => Home}/HomePage.css | 4 +- .../src/Components/Pages/Home/HomePage.js | 63 +++++++++++++++++ .../src/Components/Pages/HomePage.js | 57 --------------- .../Pages/Profile/CompanyProfile.js | 58 ++++++++++++++++ .../src/Components/Pages/Profile/Profile.css | 24 +++++++ .../Components/Pages/Profile/UserProfile.js | 65 ++++++++++++++++++ .../src/Components/Routing/Router.js | 6 +- .../src/Components/images/doos.jpg | Bin 0 -> 221627 bytes ReactJS/alfaprentice/src/Components/index.js | 8 ++- 17 files changed, 336 insertions(+), 69 deletions(-) create mode 100644 ReactJS/alfaprentice/src/Components/Cards/FinishedInternCard.js rename ReactJS/alfaprentice/src/Components/Pages/{ => Home}/HomePage.css (90%) create mode 100644 ReactJS/alfaprentice/src/Components/Pages/Home/HomePage.js delete mode 100644 ReactJS/alfaprentice/src/Components/Pages/HomePage.js create mode 100644 ReactJS/alfaprentice/src/Components/Pages/Profile/CompanyProfile.js create mode 100644 ReactJS/alfaprentice/src/Components/Pages/Profile/Profile.css create mode 100644 ReactJS/alfaprentice/src/Components/Pages/Profile/UserProfile.js create mode 100644 ReactJS/alfaprentice/src/Components/images/doos.jpg diff --git a/ReactJS/alfaprentice/package-lock.json b/ReactJS/alfaprentice/package-lock.json index 08c3e26..3b2315a 100644 --- a/ReactJS/alfaprentice/package-lock.json +++ b/ReactJS/alfaprentice/package-lock.json @@ -3129,6 +3129,14 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.1.0.tgz", "integrity": "sha512-9atDIOTDLsWL+1GbBec6omflaT5Cxh88J0GtJtGfCVIXpI02rXHkju59W5mMqWa7eiC5OR168v3TK3kUKBW98g==" }, + "axios": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz", + "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==", + "requires": { + "follow-redirects": "^1.10.0" + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -12516,6 +12524,14 @@ "warning": "^4.0.3" } }, + "react-paginate": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/react-paginate/-/react-paginate-6.5.0.tgz", + "integrity": "sha512-H7xSi9jyiJzgfaj+2nNhQcjZfwzJ/Mxb64V2RiyDctjZyCWojwsaGwMqhLBpQ58iAuMVtBMRQ7ECqMcUKG9QSQ==", + "requires": { + "prop-types": "^15.6.1" + } + }, "react-refresh": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", diff --git a/ReactJS/alfaprentice/package.json b/ReactJS/alfaprentice/package.json index fbcfa55..0bccfa3 100644 --- a/ReactJS/alfaprentice/package.json +++ b/ReactJS/alfaprentice/package.json @@ -6,10 +6,12 @@ "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.1", "@testing-library/user-event": "^12.2.2", + "axios": "^0.21.0", "react": "^17.0.1", "react-cookie": "^4.0.3", "react-dom": "^17.0.1", "react-modal": "^3.11.2", + "react-paginate": "^6.5.0", "react-router-dom": "^5.2.0", "react-scripts": "4.0.0", "react-toggle-display": "^2.2.1", diff --git a/ReactJS/alfaprentice/src/Components/Cards/CompanyResult.js b/ReactJS/alfaprentice/src/Components/Cards/CompanyResult.js index c9cc6b7..dc341c8 100644 --- a/ReactJS/alfaprentice/src/Components/Cards/CompanyResult.js +++ b/ReactJS/alfaprentice/src/Components/Cards/CompanyResult.js @@ -4,6 +4,14 @@ import React from 'react'; //Style import "./Cards.css"; +//Components +import { + BrowserRouter as Router, + Switch, + Route, + Link + } from "react-router-dom"; + class CompanyResult extends React.Component { render() { return( @@ -17,7 +25,7 @@ class CompanyResult extends React.Component { Wij bij bedrijf 1 zijn bezig met bla bla en zoeken altijd naar bla bla bla. Wij zijn bla bla en bla bla maar altijd bla bla. bla bla bla tolereren wij echten niet. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla …….
- Bekijk bedrijf + Bekijk bedrijf
@@ -49,7 +57,7 @@ class CompanyResult extends React.Component { Wij bij bedrijf 2 zijn bezig met bla bla en zoeken altijd naar bla bla bla. Wij zijn bla bla en bla bla maar altijd bla bla. bla bla bla tolereren wij echten niet. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla …….
- Bekijk bedrijf + Bekijk bedrijf
@@ -81,7 +89,7 @@ class CompanyResult extends React.Component { Wij bij bedrijf 3 zijn bezig met bla bla en zoeken altijd naar bla bla bla. Wij zijn bla bla en bla bla maar altijd bla bla. bla bla bla tolereren wij echten niet. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla …….
- Bekijk bedrijf + Bekijk bedrijf
@@ -113,7 +121,7 @@ class CompanyResult extends React.Component { Wij bij bedrijf 4 zijn bezig met bla bla en zoeken altijd naar bla bla bla. Wij zijn bla bla en bla bla maar altijd bla bla. bla bla bla tolereren wij echten niet. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla …….
- Bekijk bedrijf + Bekijk bedrijf
diff --git a/ReactJS/alfaprentice/src/Components/Cards/FinishedInternCard.js b/ReactJS/alfaprentice/src/Components/Cards/FinishedInternCard.js new file mode 100644 index 0000000..68d2a2a --- /dev/null +++ b/ReactJS/alfaprentice/src/Components/Cards/FinishedInternCard.js @@ -0,0 +1,28 @@ +//Modules +import React from 'react'; + +//Stlyes +import "./Cards.css"; + +class FinishedInternShip extends React.Component { + render() { + return ( +
+
+

Bedrijf 1

+

Wij bij bedrijf 1 zijn bezig met bla bla en zoeken altijd naar bla bla bla. Wij zijn bla bla en bla bla maar altijd bla bla. bla bla bla tolereren wij echten niet. bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla …….

+
+
+ Gespecialiseerd in ICT communicatie +
+
+ Bekijk bedrijf +
+
+
+
+ ) + } +} + +export default FinishedInternShip; \ No newline at end of file diff --git a/ReactJS/alfaprentice/src/Components/Footer/Footer.js b/ReactJS/alfaprentice/src/Components/Footer/Footer.js index a5a2ea7..2fbcf73 100644 --- a/ReactJS/alfaprentice/src/Components/Footer/Footer.js +++ b/ReactJS/alfaprentice/src/Components/Footer/Footer.js @@ -6,6 +6,12 @@ import "./Footer.css"; //Components import Logo from "../images/logo-licht.png"; +import { + BrowserRouter as Router, + Switch, + Route, + Link + } from "react-router-dom"; class Footer extends React.Component { render(){ @@ -15,7 +21,7 @@ class Footer extends React.Component {
- +
diff --git a/ReactJS/alfaprentice/src/Components/GlobalStyles.css b/ReactJS/alfaprentice/src/Components/GlobalStyles.css index e5e43dd..a097f09 100644 --- a/ReactJS/alfaprentice/src/Components/GlobalStyles.css +++ b/ReactJS/alfaprentice/src/Components/GlobalStyles.css @@ -40,4 +40,33 @@ .GlobalHR{ border: 2px solid #DE0000; +} + +.AP-h1{ + font-size: 3.5rem; +} + +.AP-h1-l{ + color:#ffffff; + font-size: 3.5rem !important; + font-weight: 350 !important; +} + +.AP-h1, .AP-h2, .AP-h3, .AP-h4, .AP-h5{ + color:#DE0000; + font-weight: 350 !important; +} + +.hr-1{ + border: 1px solid #DE0000; + margin-left: 0px !important; +} + +.hr-2{ + border: 2px solid #DE0000; + margin-left: 0px !important; +} + +.p0{ + padding: 0px !important; } \ No newline at end of file diff --git a/ReactJS/alfaprentice/src/Components/Header/Header.css b/ReactJS/alfaprentice/src/Components/Header/Header.css index 4307214..0c63b6b 100644 --- a/ReactJS/alfaprentice/src/Components/Header/Header.css +++ b/ReactJS/alfaprentice/src/Components/Header/Header.css @@ -20,3 +20,12 @@ opacity: 0.7; color: #DE0000; } + +.Nav-link{ + color: black; +} + +.Nav-link:hover{ + color: #DE0000; + text-decoration: none; +} \ No newline at end of file diff --git a/ReactJS/alfaprentice/src/Components/Header/Header.js b/ReactJS/alfaprentice/src/Components/Header/Header.js index b9e0483..a47b7c8 100644 --- a/ReactJS/alfaprentice/src/Components/Header/Header.js +++ b/ReactJS/alfaprentice/src/Components/Header/Header.js @@ -8,6 +8,12 @@ import "./Header.css"; //Components import Logo from '../images/logo.png'; import LogoLight from '../images/logo-licht.png' +import { + BrowserRouter as Router, + Switch, + Route, + Link + } from "react-router-dom"; class Header extends React.Component { @@ -26,14 +32,14 @@ class Header extends React.Component { return (