Skip to content

Commit

Permalink
Added Samhammer, upgraded packages - react-scripts is no longer suppo…
Browse files Browse the repository at this point in the history
…rted and is causing legacy-peer-deps issues
  • Loading branch information
VijoPlays committed Apr 16, 2024
1 parent 6abd9da commit 7e190a6
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 29 deletions.
1 change: 1 addition & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
with:
persist-credentials: false

#FIXME: npm i --legacy-peer-deps is required right now due to react-scripts no longer being maintained - will replace it at some point.
- name: Install and Build 🔧
run: |
npm i --legacy-peer-deps
Expand Down
43 changes: 19 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,28 @@
"version": "0.1.0",
"private": false,
"dependencies": {
"@babel/preset-typescript": "^7.21.4",
"@emotion/react": "^11.10.6",
"@types/react": "^18.0.32",
"@types/react-dom": "^18.0.11",
"@types/react-headroom": "^3.2.0",
"@types/react-lottie": "^1.2.6",
"axios": "^1.3.4",
"colorthief": "^2.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"gh-pages": "^2.1.1",
"react": "^16.10.2",
"react-awesome-reveal": "^4.2.3",
"react-dom": "^16.10.2",
"@babel/preset-typescript": "^7.24.1",
"@emotion/react": "^11.11.4",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@types/react-headroom": "^3.2.3",
"@types/react-lottie": "^1.2.10",
"axios": "^1.6.8",
"colorthief": "^2.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-awesome-reveal": "^4.2.8",
"react-easy-emoji": "^1.8.1",
"react-headroom": "^3.0.0",
"react-lottie": "^1.2.3",
"react-scripts": "^5.0.1",
"sass": "^1.32.8",
"typescript": "^5.0.3"
"react-headroom": "^3.2.1",
"react-lottie": "^1.2.4",
"sass": "^1.75.0",
"typescript": "^5.4.5"
},
"scripts": {
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"build": "react-scripts build"
},
"eslintConfig": {
"extends": [
Expand All @@ -57,7 +51,8 @@
]
},
"devDependencies": {
"dotenv": "^8.2.0",
"prettier": "^2.3.1"
"react-scripts": "^5.0.1",
"prettier": "^3.2.5",
"gh-pages": "^6.1.1"
}
}
27 changes: 22 additions & 5 deletions src/Customization.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import emoji from 'react-easy-emoji';
import emoji from "react-easy-emoji";

import {
Proficiency, School, SkillBulletPoints, SocialMedia, SoftwareSkill, WorkExperience
} from './types';
Proficiency,
School,
SkillBulletPoints,
SocialMedia,
SoftwareSkill,
WorkExperience,
} from "./types";

//_globalColor.scss can be updated to change the look of the website.

Expand Down Expand Up @@ -101,14 +106,26 @@ const workExperiences: WorkExperience[] = [
role: "Software Engineer",
company: "Mmmake GmbH",
companyLogo: require("./assets/images/mmmake-logo.png"),
date: "October 2021 – Present",
date: "October 2021 – December 2023",
description: "C#/Java Backend and Deployment",
descriptionBullets: [
"ERP with authentication, messaging and user management for one of the biggest IT firms in Germany.",
"WaWi (inventory management system) with authentication, messaging and user management for one of the biggest IT firms in Germany.",
"During downtime I got to work on Teams applications written in React and Go.",
"Brought Testing guidelines to the company to increase the quality of our products.",
],
},
{
role: "Full-Stack Software Engineer",
company: "Samhammer AG",
companyLogo: require("./assets/images/sag-logo.png"),
date: "February 2024 – Present",
description: "C# + Vue TypeScript and Deployment",
descriptionBullets: [
"Ticket system for many customers throughout Germany, with high degree of customization",
"Refactoring of old systems (10+ years old) to bring them up to current standards",
"Used various technologies (C#, Aurelia, Vue with TypeScript)",
],
},
];

export {
Expand Down
Binary file added src/assets/images/sag-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7e190a6

Please sign in to comment.