Skip to content

feat: Experience & Education #74

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.

Sign up for GitHub

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

Merged
merged 34 commits into from
Aug 21, 2024
Merged

feat: Experience & Education #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
94337f7
fix: Remove unused file
carsonSgit Aug 20, 2024
995305f
fix: On hover experience element
carsonSgit Aug 20, 2024
141705f
style: Rename component
carsonSgit Aug 20, 2024
f671599
style: Cleaning up
carsonSgit Aug 20, 2024
655f5ed
style: Moving things around
carsonSgit Aug 20, 2024
be21bf1
fix: Import
carsonSgit Aug 20, 2024
6621dd7
feat: Past experience
carsonSgit Aug 20, 2024
f92ebf1
feat: Improved size of experiences/education
carsonSgit Aug 20, 2024
bb6fc66
style: Changing text
carsonSgit Aug 20, 2024
b455a9f
feat: Add tech stack to experience page
carsonSgit Aug 21, 2024
1cf7d91
feat: add SCSS for the timeline
carsonSgit Aug 21, 2024
dc91301
feat: Add MongoDB
carsonSgit Aug 21, 2024
06e8ff1
feat: Improve alignment
carsonSgit Aug 21, 2024
076db0d
feat: Convert TechList items to be in a grid
carsonSgit Aug 21, 2024
70d6686
feat: Improved display
carsonSgit Aug 21, 2024
157f8aa
feat: Improved alignment
carsonSgit Aug 21, 2024
dcc21b9
chore: Remove Markdown
carsonSgit Aug 21, 2024
c894184
chore: Remove Canva
carsonSgit Aug 21, 2024
dae7d85
chore: Remove Gimp
carsonSgit Aug 21, 2024
9dd5768
chore: Readd hover
carsonSgit Aug 21, 2024
a46a09b
style: Add the spacing
carsonSgit Aug 21, 2024
756ecf5
feat: Improve pill text styling
carsonSgit Aug 21, 2024
864dafe
chore: Remove unnecessary font size
carsonSgit Aug 21, 2024
f14edfb
chore: Remove unnecessary font-size
carsonSgit Aug 21, 2024
41d7987
chore: Tweak font-size
carsonSgit Aug 21, 2024
570fc47
chore: Remove gap spacing
carsonSgit Aug 21, 2024
66d1dd0
chore: Remove GNS3
carsonSgit Aug 21, 2024
8ac91d7
chore: Remove Cisco
carsonSgit Aug 21, 2024
a3eeefc
chore: Remove Mantine
carsonSgit Aug 21, 2024
ed2ea94
feat: Finalized spacing for Experiences
carsonSgit Aug 21, 2024
625649f
feat: Import styles
carsonSgit Aug 21, 2024
909293d
chore: Tweak gap
carsonSgit Aug 21, 2024
06ea26e
chore: Remove replaced code
carsonSgit Aug 21, 2024
6f413c2
chore: Tweaks for responsiveness
carsonSgit Aug 21, 2024
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
14 changes: 4 additions & 10 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
import React from 'react';
import Hero from './Components/Home/Hero/Hero';
import Project from './Components/Projects/Projects';
import About from './Components/About/About';
import Experience from './Components/Experience/Experience';
import { Route, Routes } from 'react-router-dom';
import Navbar from './Components/Navbar';
import './App.scss';
import Navbar from './Components/Navbar/Navbar';
import Content from './Components/Content/Content';
import Footer from './Components/Footer/Footer';

import OnePager from './Components/Test-Onepager/OnePager';
import './App.scss';

const App: React.FC = () => {
return (
<div className="App">
<Navbar />
<OnePager />
<Content />
<Footer />
</div>
);
Expand Down
56 changes: 1 addition & 55 deletions src/Components/About/About.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,60 +46,6 @@ $tools-item-tint: darken($list-item-color, 40%);
padding: 0px 40px 0px 30px; /* top, right, bottom, left */
}

.Technologies {
flex: 1;
}

.CategoryContainer {
margin-bottom: 20px;
}

.CategoryTitle {
font-size: 1.3rem;
margin-bottom: 10px;
color: $text-color;
text-align: center;
}

.TechList {
list-style-type: none;
padding: 0;
display: flex;
flex-wrap: wrap;
gap: 15px;
justify-content: center;
}

.TechList.programming-languages li {
background-color: $language-item-tint;
}

.TechList.frameworks-libraries li {
background-color: $framework-item-tint;
}

.TechList.tools-platforms li {
background-color: $tools-item-tint;
}

.TechList li {
font-size: 1.1rem;
padding: 12px 20px;
border-radius: $border-radius;
color: $text-color;
display: flex;
align-items: center;
gap: 10px;
transition:
background-color 0.3s ease,
transform 0.3s ease;

&:hover {
background-color: darken($background-color, 15%);
transform: scale(1.05);
}
}

@media screen and (max-width: 768px) {
.AboutContentContainer {
flex-direction: column;
Expand All @@ -113,7 +59,7 @@ $tools-item-tint: darken($list-item-color, 40%);

@media screen and (max-width: 768px) {
.AboutText {
font-size: 1.4em; // Adjust for readability
font-size: 1.4em;
padding-left: 20px;
padding-right: 20px;
text-align: center;
Expand Down
224 changes: 7 additions & 217 deletions src/Components/About/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,5 @@
import React from 'react';
import './About.scss';
import {
FaPython,
FaJava,
FaJsSquare,
FaReact,
FaGitAlt,
FaDocker,
FaHtml5,
FaCss3Alt,
FaAws,
FaNodeJs,
FaSass,
FaPhp,
FaMarkdown,
FaAngular,
FaBootstrap,
FaFigma,
FaRaspberryPi,
} from 'react-icons/fa';
import {
SiCsharp,
SiSqlite,
SiKotlin,
SiDotnet,
SiXamarin,
SiTypescript,
SiJquery,
SiNextdotjs,
SiAzuredevops,
SiFirebase,
SiVercel,
SiCloudflare,
SiExpress,
SiTailwindcss,
SiNginx,
SiMongodb,
SiMysql,
SiMicrosoftsqlserver,
SiKeras,
SiPytorch,
SiScikitlearn,
SiPostman,
SiSwagger,
SiJira,
SiKubernetes,
SiCisco,
SiUnity,
SiMantine,
SiGnubash,
SiPowershell,
} from 'react-icons/si';

const About: React.FC = () => {
return (
Expand Down Expand Up @@ -123,173 +72,14 @@ const About: React.FC = () => {
</p>
</div>

<div className="Technologies">
<div className="CategoryContainer">
<h3 className="CategoryTitle">Languages</h3>
<ul className="TechList programming-languages">
<li>
<FaPython /> Python
</li>
<li>
<FaJava /> Java
</li>
<li>
<FaJsSquare /> JavaScript
</li>
<li>
<SiTypescript /> TypeScript
</li>
<li>
<SiCsharp /> C#
</li>
<li>
<SiKotlin /> Kotlin
</li>
<li>
<FaPhp /> PHP
</li>
<li>
<SiPowershell /> PowerShell
</li>
<li>
<SiGnubash /> Bash
</li>
<li>
<FaMarkdown /> Markdown
</li>
<li>
<FaHtml5 /> HTML
</li>
<li>
<FaCss3Alt /> CSS
</li>
<li>
<SiMicrosoftsqlserver /> MSSQL
</li>
<li>
<SiSqlite /> SQLite
</li>
<li>
<SiMysql /> MySQL
</li>
</ul>
</div>

<div className="CategoryContainer">
<h3 className="CategoryTitle">Frameworks & Libraries</h3>
<ul className="TechList frameworks-libraries">
<li>
<SiDotnet /> ASP.NET
</li>
<li>
<SiDotnet /> .NET MAUI
</li>
<li>
<SiDotnet /> WPF
</li>
<li>
<SiXamarin /> Xamarin
</li>
<li>
<FaReact /> React
</li>
<li>
<SiNextdotjs /> Next.js
</li>
<li>
<SiJquery /> jQuery
</li>
<li>
<FaAngular /> Angular
</li>
<li>
<FaBootstrap /> Bootstrap
</li>
<li>
<SiMantine /> Mantine
</li>
<li>
<FaNodeJs /> Node.js
</li>
<li>
<FaSass /> SCSS
</li>
<li>
<SiTailwindcss /> TailwindCSS
</li>
<li>
<SiExpress /> Express.js
</li>
<li>
<SiKeras /> Keras
</li>
<li>
<SiPytorch /> PyTorch
</li>
<li>
<SiScikitlearn /> scikit-learn
</li>
</ul>
</div>

<div className="CategoryContainer">
<h3 className="CategoryTitle">Tools</h3>
<ul className="TechList tools-platforms">
<li>
<FaGitAlt /> Git
</li>
<li>
<FaDocker /> Docker
</li>
<li>
<SiAzuredevops /> Microsoft Azure
</li>
<li>
<FaAws /> AWS
</li>
<li>
<SiCloudflare /> Cloudflare
</li>
<li>
<SiFirebase /> Firebase
</li>
<li>
<SiVercel /> Vercel
</li>
<li>
<SiNginx /> Nginx
</li>
<li>
<SiUnity /> Unity
</li>
<li>
<SiKubernetes /> Kubernetes
</li>
<li>
<SiPostman /> Postman
</li>
<li>
<SiSwagger /> Swagger
</li>
<li>
<SiJira /> Jira
</li>
<li>
<SiCisco /> Cisco
</li>
<li>
<FaRaspberryPi /> Raspberry Pi
</li>
<li>
<FaFigma /> Figma
</li>
<li>
<SiMongodb /> MongoDB
</li>
</ul>
</div>
<div className="AboutImageContainer">
<img
className="AboutImage"
src="https://avatars.githubusercontent.com/u/92652800?v=4"
alt="PlaceHolder"
/>
</div>
</div>
</div>
</div>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Test-Onepager/OnePager.tsx → src/Components/Content/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Projects from '../Projects/Projects';
import Experience from '../Experience/Experience';
import About from '../About/About';

const OnePager: React.FC = () => {
const Content: React.FC = () => {
return (
<div>
<Hero />
Expand All @@ -15,4 +15,4 @@ const OnePager: React.FC = () => {
);
};

export default OnePager;
export default Content;
6 changes: 3 additions & 3 deletions src/Components/Data/experience.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export const experience = [
},
{
date: 'March 2024 - Ongoing',
title: 'Head Delegate Montreal',
company: 'Canadian University Software Engineering Conference (CUSEC)',
title: 'HD Montreal',
company: 'CUSEC',
description:
'Leading the delegation of post-secondary students across Montreal for the annual conference.',
statsKey: 'Head Delegate Montreal',
Expand All @@ -19,7 +19,7 @@ export const experience = [
title: 'IT Intern',
company: 'Town of Kirkland',
description:
'Delivered technical support to government employees and received training in cybersecurity under the Cybersecurity Analyst of the municipality.',
'Delivered technical support to government employees and trained under the Cybersecurity Lead of the municipality.',
statsKey: 'IT Intern',
},
{
Expand Down
Empty file removed src/Components/Experience/Experience.scss
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion src/Components/Experience/Experience.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import ExperienceTimeline from './ExperienceTimeline';
import './Experience.scss';

const Experience = () => (
<div className="experience-page">
Expand Down
Loading