Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #20

Merged
merged 8 commits into from
Apr 20, 2024
Merged

Dev #20

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.3915afae.css",
"main.js": "/static/js/main.3a0b3651.js",
"main.css": "/static/css/main.48000364.css",
"main.js": "/static/js/main.574d02ec.js",
"static/media/Acorn-Bold.otf": "/static/media/Acorn-Bold.2a82187cdf1b4c80bdff.otf",
"static/media/LeagueSpartan-ExtraBold.ttf": "/static/media/LeagueSpartan-ExtraBold.3273ea0e69650f114210.ttf",
"static/media/LeagueSpartan-Black.ttf": "/static/media/LeagueSpartan-Black.d4303c11df0dad0324cf.ttf",
Expand All @@ -16,11 +16,11 @@
"static/media/slick.ttf": "/static/media/slick.c94f7671dcc99dce43e2.ttf",
"static/media/slick.woff": "/static/media/slick.295183786cd8a1389865.woff",
"index.html": "/index.html",
"main.3915afae.css.map": "/static/css/main.3915afae.css.map",
"main.3a0b3651.js.map": "/static/js/main.3a0b3651.js.map"
"main.48000364.css.map": "/static/css/main.48000364.css.map",
"main.574d02ec.js.map": "/static/js/main.574d02ec.js.map"
},
"entrypoints": [
"static/css/main.3915afae.css",
"static/js/main.3a0b3651.js"
"static/css/main.48000364.css",
"static/js/main.574d02ec.js"
]
}
2 changes: 1 addition & 1 deletion build/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link href="/favicon.ico" rel="icon"/><meta content="width=device-width,initial-scale=1" name="viewport"/><meta content="#000000" name="theme-color"/><meta content="Web site created using create-react-app" name="description"/><link href="/logo192.png" rel="apple-touch-icon"/><link href="/manifest.json" rel="manifest"/><title>Arnaud Michel Portfolio</title><script defer="defer" src="/static/js/main.3a0b3651.js"></script><link href="/static/css/main.3915afae.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link href="/favicon.ico" rel="icon"/><meta content="width=device-width,initial-scale=1" name="viewport"/><meta content="#000000" name="theme-color"/><meta content="Web site created using create-react-app" name="description"/><link href="/logo192.png" rel="apple-touch-icon"/><link href="/manifest.json" rel="manifest"/><title>Arnaud Michel Portfolio</title><script defer="defer" src="/static/js/main.574d02ec.js"></script><link href="/static/css/main.48000364.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
2 changes: 0 additions & 2 deletions build/static/css/main.3915afae.css

This file was deleted.

1 change: 0 additions & 1 deletion build/static/css/main.3915afae.css.map

This file was deleted.

2 changes: 2 additions & 0 deletions build/static/css/main.48000364.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/css/main.48000364.css.map

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions build/static/js/main.3a0b3651.js

This file was deleted.

1 change: 0 additions & 1 deletion build/static/js/main.3a0b3651.js.map

This file was deleted.

3 changes: 3 additions & 0 deletions build/static/js/main.574d02ec.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/js/main.574d02ec.js.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions docs/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.3915afae.css",
"main.js": "/static/js/main.3a0b3651.js",
"main.css": "/static/css/main.48000364.css",
"main.js": "/static/js/main.574d02ec.js",
"static/media/Acorn-Bold.otf": "/static/media/Acorn-Bold.2a82187cdf1b4c80bdff.otf",
"static/media/LeagueSpartan-ExtraBold.ttf": "/static/media/LeagueSpartan-ExtraBold.3273ea0e69650f114210.ttf",
"static/media/LeagueSpartan-Black.ttf": "/static/media/LeagueSpartan-Black.d4303c11df0dad0324cf.ttf",
Expand All @@ -16,11 +16,11 @@
"static/media/slick.ttf": "/static/media/slick.c94f7671dcc99dce43e2.ttf",
"static/media/slick.woff": "/static/media/slick.295183786cd8a1389865.woff",
"index.html": "/index.html",
"main.3915afae.css.map": "/static/css/main.3915afae.css.map",
"main.3a0b3651.js.map": "/static/js/main.3a0b3651.js.map"
"main.48000364.css.map": "/static/css/main.48000364.css.map",
"main.574d02ec.js.map": "/static/js/main.574d02ec.js.map"
},
"entrypoints": [
"static/css/main.3915afae.css",
"static/js/main.3a0b3651.js"
"static/css/main.48000364.css",
"static/js/main.574d02ec.js"
]
}
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link href="/favicon.ico" rel="icon"/><meta content="width=device-width,initial-scale=1" name="viewport"/><meta content="#000000" name="theme-color"/><meta content="Web site created using create-react-app" name="description"/><link href="/logo192.png" rel="apple-touch-icon"/><link href="/manifest.json" rel="manifest"/><title>Arnaud Michel Portfolio</title><script defer="defer" src="/static/js/main.3a0b3651.js"></script><link href="/static/css/main.3915afae.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link href="/favicon.ico" rel="icon"/><meta content="width=device-width,initial-scale=1" name="viewport"/><meta content="#000000" name="theme-color"/><meta content="Web site created using create-react-app" name="description"/><link href="/logo192.png" rel="apple-touch-icon"/><link href="/manifest.json" rel="manifest"/><title>Arnaud Michel Portfolio</title><script defer="defer" src="/static/js/main.574d02ec.js"></script><link href="/static/css/main.48000364.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
2 changes: 2 additions & 0 deletions docs/static/css/main.48000364.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/static/css/main.48000364.css.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/static/css/main.5ed2a71b.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/static/css/main.5ed2a71b.css.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions docs/static/js/main.574d02ec.js

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions docs/static/js/main.574d02ec.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/**
* @license React
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @remix-run/router v1.15.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router DOM v6.22.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router v6.22.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/
1 change: 1 addition & 0 deletions docs/static/js/main.574d02ec.js.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions docs/static/js/main.f2eba61c.js

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions docs/static/js/main.f2eba61c.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/

/**
* @license React
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @remix-run/router v1.15.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router DOM v6.22.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router v6.22.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/
1 change: 1 addition & 0 deletions docs/static/js/main.f2eba61c.js.map

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions src/components/careerPage/AllOccupations.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { useEffect, useRef } from 'react';
import { Link } from 'react-router-dom';
import React, {useEffect, useRef} from 'react';
import {Link} from 'react-router-dom';
import jobsData from '../../locales/jobs.json';
import AOS from "aos";
import "aos/dist/aos.css";
import './css/AllOccupations.css';

function AllOccupations({ t }) {
function AllOccupations({t}) {
const jobItemsRef = useRef([]);

useEffect(() => {
Expand All @@ -23,7 +23,8 @@ function AllOccupations({ t }) {
<h1>{t('AllOccupations')}</h1>
{sortedJobsData.map((job, index) => (
<Link to={`/Career/${job.link}`}>
<div key={index} ref={el => jobItemsRef.current[index] = el} className="career-job-item" data-aos="fade-up">
<div key={index} ref={el => jobItemsRef.current[index] = el} className="career-job-item"
data-aos="fade-up">
<div className="career-job-header">
<h4>{t(job.title)}</h4>
<p className="career-date">{job.date}</p>
Expand Down
23 changes: 18 additions & 5 deletions src/components/careerPage/Occupation.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import './css/Occupation.css';
import {useNavigate, useParams} from 'react-router-dom';
import occupations from "../../locales/jobs.json";

function Occupation({ t }) {
function Occupation({t}) {
const {occupationName} = useParams();
const occupation = occupations.find(o => o.link === occupationName);
const navigate = useNavigate();
Expand All @@ -25,6 +25,12 @@ function Occupation({ t }) {
<p className="colorprimary" dangerouslySetInnerHTML={{__html: t(occupation.company)}}></p>
</div>
)}
{occupation.university && (
<div className="occupation-header-main company" data-aos="fade-up">
<p dangerouslySetInnerHTML={{__html: `<strong>${t("university")}</strong>`}}></p>
<p className="colorprimary" dangerouslySetInnerHTML={{__html: t(occupation.university)}}></p>
</div>
)}
{occupation.location && (
<div className="occupation-header-main location" data-aos="fade-up">
<p dangerouslySetInnerHTML={{__html: `<strong>${t("location")}</strong>`}}></p>
Expand All @@ -40,15 +46,22 @@ function Occupation({ t }) {
</div>
</div>
<div className={"occupation-content"} data-aos="fade-up">
<div className="occupation-description" data-aos="fade-up">
<p dangerouslySetInnerHTML={{__html: t(occupation.description)}}></p>
</div>
{occupation.description && (
<div className="project-description" data-aos="fade-up">
{occupation.description.map((desc, index) =>
<div className={"description"} key={index}>
<h3 dangerouslySetInnerHTML={{__html: t(occupation.titledescription[index])}}></h3>
<p data-aos="fade-up" dangerouslySetInnerHTML={{__html: t(desc)}}></p>
</div>
)}
</div>
)}
{occupation.projects && (
<div className="occupation-projects" data-aos="fade-up">
<h3 dangerouslySetInnerHTML={{__html: `${t("projects")}`}}></h3>
<ul>
{occupation.projects.map((project, index) => (
<li key={index} onClick={() => navigate(`/projects/${project}`)}>{t(project)}</li>
<li className={"project-header-contains-link"} key={index} onClick={() => navigate(`/projects/${project}`)}>{t(project)}</li>
))}
</ul>
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/components/careerPage/css/AllOccupations.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.career-job-item{
.career-job-item {
grid-gap: 1rem;
justify-content: space-between;
background-color: var(--color-backdrop);
Expand All @@ -12,7 +12,7 @@
transition: all 0.3s ease !important;
}

.career-job-header{
.career-job-header {
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -22,6 +22,8 @@
.career-job-item:hover {
background-color: var(--color-backdrop);
backdrop-filter: blur(15px) saturate(1.3) brightness(2);
transform: scale(1.2);
box-shadow: 0 0 10px 0 var(--color-secondary);
}

@media (max-width: 1024px) {
Expand Down
14 changes: 9 additions & 5 deletions src/components/contact/Contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import AOS from "aos";
// }

export default function ContactPage() {
const [formState, setFormState] = useState({ name: '', email: '', message: '' });
const [formState, setFormState] = useState({name: '', email: '', message: ''});

useEffect(() => {
AOS.init({
Expand Down Expand Up @@ -50,10 +50,14 @@ export default function ContactPage() {
<div id={"Contact"} className={"Contact"}>
<h1 data-aos="fade-up">Contact</h1>
<form className="contact-form"> {/*onSubmit={handleSubmit}>*/}
<input data-aos="fade-up" type="text" name="name" placeholder="Your name" value={formState.name} onChange={handleChange} />
<input data-aos="fade-up"type="email" name="email" placeholder="Your email" value={formState.email} onChange={handleChange} />
<input data-aos="fade-up" type="text" name="title" placeholder="Your title" value={formState.title} onChange={handleChange} />
<textarea data-aos="fade-up" name="message" placeholder="Your message" value={formState.message} onChange={handleChange} />
<input data-aos="fade-up" type="text" name="name" placeholder="Your name" value={formState.name}
onChange={handleChange}/>
<input data-aos="fade-up" type="email" name="email" placeholder="Your email" value={formState.email}
onChange={handleChange}/>
<input data-aos="fade-up" type="text" name="title" placeholder="Your title" value={formState.title}
onChange={handleChange}/>
<textarea data-aos="fade-up" name="message" placeholder="Your message" value={formState.message}
onChange={handleChange}/>
<button data-aos="fade-up" type="submit">Send</button>
</form>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/interestsPage/Interests.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ function Interests({t}) {
</div>
<img src={interest.logo} alt={interest.name}/>
</div>
<p className={"description-interets"} dangerouslySetInnerHTML={{__html: t(interest.description)}}></p>
<p className={"description-interets"}
dangerouslySetInnerHTML={{__html: t(interest.description)}}></p>
</div>
)}
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/components/interestsPage/css/Interests.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

.interest {
background-color: var(--color-background-primary);
border-radius:var(--radius-base);
border-radius: var(--radius-base);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
margin: 10px;
padding: 20px;
Expand Down Expand Up @@ -55,23 +55,23 @@

}

.interest:nth-child(1){
.interest:nth-child(1) {
background-color: lightblue;
}

.interest:nth-child(2){
.interest:nth-child(2) {
background-color: var(--color-rust)
}

.interest:nth-child(3){
.interest:nth-child(3) {
background-color: lightgreen;
}

.interest:nth-child(4){
.interest:nth-child(4) {
background-color: pink;
}

.interest:nth-child(5){
.interest:nth-child(5) {
background-color: white;
}

Expand Down
Loading