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 #18

Merged
merged 5 commits into from
Apr 15, 2024
Merged

Dev #18

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 docs/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.f8caa65a.css",
"main.js": "/static/js/main.31766682.js",
"main.css": "/static/css/main.3915afae.css",
"main.js": "/static/js/main.3a0b3651.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.f8caa65a.css.map": "/static/css/main.f8caa65a.css.map",
"main.31766682.js.map": "/static/js/main.31766682.js.map"
"main.3915afae.css.map": "/static/css/main.3915afae.css.map",
"main.3a0b3651.js.map": "/static/js/main.3a0b3651.js.map"
},
"entrypoints": [
"static/css/main.f8caa65a.css",
"static/js/main.31766682.js"
"static/css/main.3915afae.css",
"static/js/main.3a0b3651.js"
]
}
Binary file added docs/images/projects/MoseArt0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/projects/MoseArt1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/projects/MoseArt2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/projects/MoseArt3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/projects/MoseArt4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/projects/MoseArtLogo.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/projects/Sudoku Solver1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/projects/Sudoku Solver2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.31766682.js"></script><link href="/static/css/main.f8caa65a.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.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>
2 changes: 2 additions & 0 deletions docs/static/css/main.3915afae.css

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions docs/static/js/main.3a0b3651.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.3a0b3651.js.map

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions docs/static/js/main.ba95f525.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.ba95f525.js.map

Large diffs are not rendered by default.

35 changes: 32 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"aos": "^2.3.4",
"axios": "^1.6.8",
"i18next": "^23.9.0",
"i18next-browser-languagedetector": "^7.2.0",
"react": "^18.2.0",
Expand Down
Binary file added public/images/projects/MoseArt0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/projects/MoseArt1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/projects/MoseArt2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/projects/MoseArt3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/projects/MoseArt4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/projects/MoseArtLogo.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/projects/Sudoku Solver1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/projects/Sudoku Solver2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 8 additions & 5 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import ProjectPage from './components/projectsPage/ProjectPage';
import AllOccupations from "./components/careerPage/AllOccupations";
import Occupation from "./components/careerPage/Occupation";
import Interests from "./components/interestsPage/Interests";
import Contact from "./components/contact/Contact";
import Footer from "./components/layoutComponents/Footer";
import ScrollToTop from './ScrollToTop';

Expand Down Expand Up @@ -42,13 +43,15 @@ function App({ t }) {
</>
} />

<Route path="/Career" element={<AllOccupations t={t} />} />
<Route path="/Career/:occupationName" element={<Occupation t={t} />} />
<Route path="/career" element={<AllOccupations t={t} />} />
<Route path="/career/:occupationName" element={<Occupation t={t} />} />

<Route path="/Projects" element={<AllProjects t={t} />} />
<Route path="/Projects/:projectName" element={<ProjectPage t={t}/>} />
<Route path="/projects" element={<AllProjects t={t} />} />
<Route path="/projects/:projectName" element={<ProjectPage t={t}/>} />

<Route path="/Interests" element={<Interests t={t} />} />
<Route path="/interests" element={<Interests t={t} />} />

<Route path="/contact" element={<Contact t={t} />} />
</Routes>
</div>
<div className={"footer"}>
Expand Down
5 changes: 3 additions & 2 deletions src/components/careerPage/Occupation.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ function Occupation({ t }) {
</div>
)}
</div>
<div className={"back"} data-aos="fade-up">
<button onClick={() => navigate(-1)} dangerouslySetInnerHTML={{__html: t("back")}}></button>
<div className={"back-div"} data-aos="fade-up">
<button className={"back"} onClick={() => navigate(-1)}
dangerouslySetInnerHTML={{__html: t("back")}}></button>
</div>
</div>
);
Expand Down
12 changes: 12 additions & 0 deletions src/components/careerPage/css/AllOccupations.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,16 @@
.career-job-item:hover {
background-color: var(--color-backdrop);
backdrop-filter: blur(15px) saturate(1.3) brightness(2);
}

@media (max-width: 1024px) {
.career-job-item {
width: 90vw;
}
}

@media screen and (max-width: 768px) {
.career-job-item {
width: 90vw;
}
}
53 changes: 53 additions & 0 deletions src/components/careerPage/css/Occupation.css
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,57 @@
.back button:hover {
background-color: var(--color-text-primary);
color: var(--color-text-tertiary);
}

@media (max-width: 1024px) {
.occupation-info {
width: 90vw;
}

.occupation-description {
width: 90vw;
}

.occupation-projects ul {
margin-left: 1rem;
}

.occupation-projects ul li {
font-size: var(--font-h5);
}

.back button {
width: 50%;
}
}

@media screen and (max-width: 768px) {
.occupation-info {
flex-direction: column;
gap: 1rem;
}

.occupation-header-main {
max-width: 90vw;
}

.occupation-content {
max-width: 90vw;
}

.occupation-description {
width: 90vw;
}

.occupation-projects ul {
margin-left: 1rem;
}

.occupation-projects ul li {
font-size: var(--font-h5);
}

.back button {
width: 50%;
}
}
Loading