diff --git a/apps/frontend/index.html b/apps/frontend/index.html index 614a2a6..96fe92a 100644 --- a/apps/frontend/index.html +++ b/apps/frontend/index.html @@ -2,7 +2,7 @@ - + diff --git a/apps/frontend/public/images/icons/gitea.svg b/apps/frontend/public/images/icons/gitea.svg new file mode 100644 index 0000000..054976d --- /dev/null +++ b/apps/frontend/public/images/icons/gitea.svg @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/apps/frontend/public/images/icons/github.svg b/apps/frontend/public/images/icons/github.svg new file mode 100644 index 0000000..42720ce --- /dev/null +++ b/apps/frontend/public/images/icons/github.svg @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/apps/frontend/public/images/icons/google/back_arrow.svg b/apps/frontend/public/images/icons/google/back_arrow.svg new file mode 100644 index 0000000..a491042 --- /dev/null +++ b/apps/frontend/public/images/icons/google/back_arrow.svg @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/apps/frontend/public/images/icons/google/cross.svg b/apps/frontend/public/images/icons/google/cross.svg new file mode 100644 index 0000000..5a8c653 --- /dev/null +++ b/apps/frontend/public/images/icons/google/cross.svg @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/apps/frontend/public/images/icons/google/filter.svg b/apps/frontend/public/images/icons/google/filter.svg new file mode 100644 index 0000000..881a40c --- /dev/null +++ b/apps/frontend/public/images/icons/google/filter.svg @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/apps/frontend/public/images/icons/google/school_hat.svg b/apps/frontend/public/images/icons/google/school_hat.svg new file mode 100644 index 0000000..cd4147f --- /dev/null +++ b/apps/frontend/public/images/icons/google/school_hat.svg @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/apps/frontend/public/assets/images/logo.svg b/apps/frontend/public/images/icons/logo.svg similarity index 100% rename from apps/frontend/public/assets/images/logo.svg rename to apps/frontend/public/images/icons/logo.svg diff --git a/apps/frontend/public/assets/images/skills/C++.svg b/apps/frontend/public/images/icons/skills/C++.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/C++.svg rename to apps/frontend/public/images/icons/skills/C++.svg diff --git a/apps/frontend/public/assets/images/skills/CSS.svg b/apps/frontend/public/images/icons/skills/CSS.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/CSS.svg rename to apps/frontend/public/images/icons/skills/CSS.svg diff --git a/apps/frontend/public/assets/images/skills/Git.svg b/apps/frontend/public/images/icons/skills/Git.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/Git.svg rename to apps/frontend/public/images/icons/skills/Git.svg diff --git a/apps/frontend/public/assets/images/skills/HTML.svg b/apps/frontend/public/images/icons/skills/HTML.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/HTML.svg rename to apps/frontend/public/images/icons/skills/HTML.svg diff --git a/apps/frontend/public/assets/images/skills/Java.svg b/apps/frontend/public/images/icons/skills/Java.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/Java.svg rename to apps/frontend/public/images/icons/skills/Java.svg diff --git a/apps/frontend/public/assets/images/skills/JavaScript.svg b/apps/frontend/public/images/icons/skills/JavaScript.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/JavaScript.svg rename to apps/frontend/public/images/icons/skills/JavaScript.svg diff --git a/apps/frontend/public/assets/images/skills/PHP.svg b/apps/frontend/public/images/icons/skills/PHP.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/PHP.svg rename to apps/frontend/public/images/icons/skills/PHP.svg diff --git a/apps/frontend/public/assets/images/skills/Python.svg b/apps/frontend/public/images/icons/skills/Python.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/Python.svg rename to apps/frontend/public/images/icons/skills/Python.svg diff --git a/apps/frontend/public/assets/images/skills/Qt.svg b/apps/frontend/public/images/icons/skills/Qt.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/Qt.svg rename to apps/frontend/public/images/icons/skills/Qt.svg diff --git a/apps/frontend/public/assets/images/skills/React.svg b/apps/frontend/public/images/icons/skills/React.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/React.svg rename to apps/frontend/public/images/icons/skills/React.svg diff --git a/apps/frontend/public/assets/images/skills/SQL.svg b/apps/frontend/public/images/icons/skills/SQL.svg similarity index 100% rename from apps/frontend/public/assets/images/skills/SQL.svg rename to apps/frontend/public/images/icons/skills/SQL.svg diff --git a/apps/frontend/public/assets/images/projectDetailsHeadband.png b/apps/frontend/public/images/projectDetailsHeadband.png similarity index 100% rename from apps/frontend/public/assets/images/projectDetailsHeadband.png rename to apps/frontend/public/images/projectDetailsHeadband.png diff --git a/apps/frontend/src/components/Footer/Footer.css b/apps/frontend/src/components/Footer/Footer.css index 763c81c..4833ce9 100644 --- a/apps/frontend/src/components/Footer/Footer.css +++ b/apps/frontend/src/components/Footer/Footer.css @@ -30,4 +30,9 @@ .footer-links a:hover { color: var(--title-color); transform: translateY(-3px); +} + +.footer-icon { + width: 1.7em; + height: 1.7em; } \ No newline at end of file diff --git a/apps/frontend/src/components/Footer/Footer.jsx b/apps/frontend/src/components/Footer/Footer.jsx index e7b379b..9869e6a 100644 --- a/apps/frontend/src/components/Footer/Footer.jsx +++ b/apps/frontend/src/components/Footer/Footer.jsx @@ -1,4 +1,5 @@ import './Footer.css'; +import React from "react"; function Footer() { const currentYear = new Date().getFullYear(); @@ -10,14 +11,10 @@ function Footer() {
- - - + Github icon - - - + Gitea icon
diff --git a/apps/frontend/src/components/SingleProject/SingleProject.jsx b/apps/frontend/src/components/SingleProject/SingleProject.jsx index 0fa3112..18eec37 100644 --- a/apps/frontend/src/components/SingleProject/SingleProject.jsx +++ b/apps/frontend/src/components/SingleProject/SingleProject.jsx @@ -25,9 +25,7 @@ function SingleProject({ image, title, description, skills, id, school, beginnin

{title} {school ? ( - - - + School project icon ) : null}

diff --git a/apps/frontend/src/components/SkillCard/SkillCard.jsx b/apps/frontend/src/components/SkillCard/SkillCard.jsx index e1425a6..b1ab099 100644 --- a/apps/frontend/src/components/SkillCard/SkillCard.jsx +++ b/apps/frontend/src/components/SkillCard/SkillCard.jsx @@ -3,7 +3,7 @@ import "./SkillCard.css"; function SkillCard({ text }) { return (
- {text} + {text}

{text}

); diff --git a/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.css b/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.css index 4079ca5..a3674a0 100644 --- a/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.css +++ b/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.css @@ -15,7 +15,7 @@ overflow: hidden; height: 280px; - background-image: url("/apps/frontend/public/assets/images/projectDetailsHeadband.png"); + background-image: url("/apps/frontend/public/images/projectDetailsHeadband.png"); background-size: cover; &::after { @@ -178,6 +178,15 @@ aside ul li a:hover { margin-bottom: 2%; } +.project-school { + width: 1em; + height: 1em; +} + +.repo-link-icon { + width: 1em; + height: 1em; +} @media (max-width: 480px) { .return-button { diff --git a/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx b/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx index 07116ee..d528b48 100644 --- a/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx +++ b/apps/frontend/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx @@ -29,9 +29,7 @@ function ProjectDetails({project}) { return (
@@ -42,21 +40,15 @@ function ProjectDetails({project}) {
{project.title} {project.school ? ( - - - + School project icon ) : null}
{typeof project.repo_link === "string" && project.repo_link.length > 0 ? ( {project.repo_link.includes("github") ? ( - - - + Github icon ) : ( - - - + Gitea icon )} ) : null} diff --git a/apps/frontend/src/pages/Projects/components/Filter/Filter.jsx b/apps/frontend/src/pages/Projects/components/Filter/Filter.jsx index 0363da7..e54c787 100644 --- a/apps/frontend/src/pages/Projects/components/Filter/Filter.jsx +++ b/apps/frontend/src/pages/Projects/components/Filter/Filter.jsx @@ -90,9 +90,7 @@ function Filter({ filters, setFilters }) { return (
{isFilterVisible ?
: null} @@ -101,9 +99,7 @@ function Filter({ filters, setFilters }) {

Filter Projects