Skip to content

Commit

Permalink
chore: prettier format tabWidth 4
Browse files Browse the repository at this point in the history
  • Loading branch information
ocruze committed Nov 12, 2023
1 parent 1a8e139 commit 6c8d095
Show file tree
Hide file tree
Showing 22 changed files with 954 additions and 932 deletions.
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"tabWidth": 2,
"tabWidth": 4,
"printWidth": 120,
"trailingComma": "es5",
"endOfLine": "auto"
Expand Down
80 changes: 40 additions & 40 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,49 @@ const Projects = React.lazy(() => import("./pages/Projects"));
const Resume = React.lazy(() => import("./pages/Resume"));

const App = () => {
const { t } = useTranslation();
const { t } = useTranslation();

return (
<React.Suspense
fallback={
<main className="container text-center align-items-center">
<div className="row px-4">
<h1 className="ff-poppins fw-bold">{t("global.loading")}</h1>
</div>
</main>
}
>
<HashRouter>
<Navbar />
return (
<React.Suspense
fallback={
<main className="container text-center align-items-center">
<div className="row px-4">
<h1 className="ff-poppins fw-bold">{t("global.loading")}</h1>
</div>
</main>
}
>
<HashRouter>
<Navbar />

<main className="container-xl">
<Routes>
<Route path="/" element={<Home />} />
<Route path="/resume" element={<Resume />} />
<Route path="/projects" element={<Projects />} />
<Route
path="*"
element={
<>
<div className="container text-center">
<h2>{t("pages.not_found.heading")}</h2>
<p className="fs-5">
<Link to="/" className="btn btn-primary py-2">
<FontAwesomeIcon icon={faHome} />
&nbsp;{t("pages.not_found.homepage_link_text")}
</Link>
</p>
</div>
</>
}
/>
</Routes>
</main>
<main className="container-xl">
<Routes>
<Route path="/" element={<Home />} />
<Route path="/resume" element={<Resume />} />
<Route path="/projects" element={<Projects />} />
<Route
path="*"
element={
<>
<div className="container text-center">
<h2>{t("pages.not_found.heading")}</h2>
<p className="fs-5">
<Link to="/" className="btn btn-primary py-2">
<FontAwesomeIcon icon={faHome} />
&nbsp;{t("pages.not_found.homepage_link_text")}
</Link>
</p>
</div>
</>
}
/>
</Routes>
</main>

<Footer />
</HashRouter>
</React.Suspense>
);
<Footer />
</HashRouter>
</React.Suspense>
);
};

export default App;
40 changes: 20 additions & 20 deletions src/assets/fonts/fonts.scss
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
@font-face {
font-display: swap;
font-family: "Raleway";
font-style: normal;
font-weight: 500;
src: url("/static/fonts/Raleway/raleway-v28-latin-500.woff2") format("woff2");
font-display: swap;
font-family: "Raleway";
font-style: normal;
font-weight: 500;
src: url("/static/fonts/Raleway/raleway-v28-latin-500.woff2") format("woff2");
}

@font-face {
font-display: swap;
font-family: "Raleway";
font-style: normal;
font-weight: 700;
src: url("/static/fonts/Raleway/raleway-v28-latin-700.woff2") format("woff2");
font-display: swap;
font-family: "Raleway";
font-style: normal;
font-weight: 700;
src: url("/static/fonts/Raleway/raleway-v28-latin-700.woff2") format("woff2");
}

@font-face {
font-display: swap;
font-family: "Poppins";
font-style: normal;
font-weight: 400;
src: url("/static/fonts/Poppins/poppins-v20-latin-regular.woff2") format("woff2");
font-display: swap;
font-family: "Poppins";
font-style: normal;
font-weight: 400;
src: url("/static/fonts/Poppins/poppins-v20-latin-regular.woff2") format("woff2");
}

@font-face {
font-display: swap;
font-family: "Poppins";
font-style: normal;
font-weight: 700;
src: url("/static/fonts/Poppins/poppins-v20-latin-700.woff2") format("woff2");
font-display: swap;
font-family: "Poppins";
font-style: normal;
font-weight: 700;
src: url("/static/fonts/Poppins/poppins-v20-latin-700.woff2") format("woff2");
}
26 changes: 13 additions & 13 deletions src/assets/styles/css_reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article,
Expand All @@ -103,27 +103,27 @@ hgroup,
menu,
nav,
section {
display: block;
display: block;
}
body {
line-height: 1;
line-height: 1;
}
/* ol,
ul {
list-style: none;
} */
blockquote,
q {
quotes: none;
quotes: none;
}
blockquote:before,
blockquote:after,
q:before,
q:after {
content: "";
content: none;
content: "";
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
border-collapse: collapse;
border-spacing: 0;
}
40 changes: 20 additions & 20 deletions src/assets/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,33 @@ $lightblue: #7fa3fa;

html,
body {
font-family:
"Raleway",
-apple-system,
BlinkMacSystemFont,
"Segoe UI",
"Roboto",
"Oxygen",
"Ubuntu",
"Cantarell",
"Fira Sans",
"Droid Sans",
"Helvetica Neue",
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family:
"Raleway",
-apple-system,
BlinkMacSystemFont,
"Segoe UI",
"Roboto",
"Oxygen",
"Ubuntu",
"Cantarell",
"Fira Sans",
"Droid Sans",
"Helvetica Neue",
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.ff-poppins {
font-family: "Poppins", sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: "Poppins", sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.bg-lightblue {
background-color: $lightblue;
background-color: $lightblue;
}

.box-shadow {
box-shadow: 0 3px 10px rgb(0 0 0 / 0.2);
box-shadow: 0 3px 10px rgb(0 0 0 / 0.2);
}
56 changes: 29 additions & 27 deletions src/components/Cards/EducationCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,37 @@ import React from "react";
import { useTranslation } from "react-i18next";

const EducationCard = (props) => {
const { t } = useTranslation();
const { t } = useTranslation();

return (
<div className="box-shadow rounded m-4 p-3">
<div className="row">
<div className="col-lg-4">
<p className="fw-bold fs-5 text-primary">
{props.start} - {props.end || "Présent"}
</p>
<p className="fw-bold">{t(`pages.resume.education.${props.slug}.degree`)}</p>
<p>{props.school}</p>
<p>
<FontAwesomeIcon icon={faMapMarkerAlt} className="text-success" />
&nbsp;
{props.school_location}
</p>
return (
<div className="box-shadow rounded m-4 p-3">
<div className="row">
<div className="col-lg-4">
<p className="fw-bold fs-5 text-primary">
{props.start} - {props.end || "Présent"}
</p>
<p className="fw-bold">{t(`pages.resume.education.${props.slug}.degree`)}</p>
<p>{props.school}</p>
<p>
<FontAwesomeIcon icon={faMapMarkerAlt} className="text-success" />
&nbsp;
{props.school_location}
</p>
</div>
<div className="col-lg-8 d-flex align-items-center">
{
<ul>
{Array.from({ length: props.course_details_num }, (value, index) => (
<li key={index}>
{t(`pages.resume.education.${props.slug}.course_details.${index + 1}`)}
</li>
))}
</ul>
}
</div>
</div>
</div>
<div className="col-lg-8 d-flex align-items-center">
{
<ul>
{Array.from({ length: props.course_details_num }, (value, index) => (
<li key={index}>{t(`pages.resume.education.${props.slug}.course_details.${index + 1}`)}</li>
))}
</ul>
}
</div>
</div>
</div>
);
);
};

export default EducationCard;
Loading

0 comments on commit 6c8d095

Please sign in to comment.