Skip to content

Commit

Permalink
update timeline section
Browse files Browse the repository at this point in the history
* rename "Timeline" label to "Experience"
* add new experience chapter
* run linters
  • Loading branch information
YanivWein24 committed Mar 24, 2024
1 parent 892687c commit 3ffab3a
Show file tree
Hide file tree
Showing 15 changed files with 77 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": ["react", "@typescript-eslint", "prettier"],
"plugins": ["react", "@typescript-eslint"],
"rules": {
"@typescript-eslint/quotes": [
"error",
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ name: Node.js CI

on:
push:
branches: [ "master" ]
branches: ["master"]

jobs:
build:

runs-on: ubuntu-latest

strategy:
Expand All @@ -18,11 +17,11 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- run: npm ci
- run: npm run build --if-present
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Portfolio:

[![Netlify Status](https://api.netlify.com/api/v1/badges/742cc686-3052-432c-a678-70e0d7dae957/deploy-status)](https://app.netlify.com/sites/yaniv-weinshtein/deploys)
![eslint-status](https://img.shields.io/badge/es--lint-Passing-bef9c6?logo=eslint&logoColor=whtie&badgeColor=white)
![eslint-status](https://img.shields.io/badge/es--lint-Passing-bef9c6?logo=eslint&logoColor=whtie&badgeColor=white)

<img align="center" src="https://user-images.githubusercontent.com/97472180/194753796-148c3e8a-6fe4-450a-9777-760785a85a3f.gif"
alt="My Project GIF" width="600" height="323">
<br>
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
Binary file added src/assets/media/Productive.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions src/components/Cards/Cards.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@
border-radius: 14px;
transition: all 0.2s ease-in-out;
margin: 1rem auto 3rem;
box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5), -2px -2px 10px rgba(0, 0, 0, 0.5);
box-shadow:
2px 2px 10px rgba(0, 0, 0, 0.5),
-2px -2px 10px rgba(0, 0, 0, 0.5);
background-color: rgb(240, 240, 240);
min-height: 41rem;
}

.card:hover {
transform: scale(1.03);
box-shadow: 6px 6px 13px rgba(0, 0, 0, 0.5), -6px -6px 13px rgba(0, 0, 0, 0.5);
box-shadow:
6px 6px 13px rgba(0, 0, 0, 0.5),
-6px -6px 13px rgba(0, 0, 0, 0.5);
}

.card-title {
Expand Down Expand Up @@ -160,6 +164,8 @@

.card:hover {
transform: none;
box-shadow: 6px 6px 13px #333, -6px -6px 13px #333;
box-shadow:
6px 6px 13px #333,
-6px -6px 13px #333;
}
}
24 changes: 16 additions & 8 deletions src/components/Hamburger/Hamburger.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,13 @@
}
.hamburger--collapse .hamburger-inner::after {
top: -20px;
transition: top 0.2s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
transition:
top 0.2s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
opacity 0.1s linear;
}
.hamburger--collapse .hamburger-inner::before {
transition: top 0.12s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
transition:
top 0.12s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
transform 0.13s cubic-bezier(0.55, 0.055, 0.675, 0.19);
}

Expand All @@ -96,13 +98,15 @@
.hamburger--collapse.is-active .hamburger-inner::after {
top: 0;
opacity: 0;
transition: top 0.2s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
transition:
top 0.2s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
opacity 0.1s 0.22s linear;
}
.hamburger--collapse.is-active .hamburger-inner::before {
top: 0;
transform: rotate(-90deg);
transition: top 0.1s 0.16s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
transition:
top 0.1s 0.16s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
transform 0.13s 0.25s cubic-bezier(0.215, 0.61, 0.355, 1);
}

Expand All @@ -118,11 +122,13 @@
}
.hamburger--collapse-r .hamburger-inner::after {
top: -20px;
transition: top 0.2s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
transition:
top 0.2s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
opacity 0.1s linear;
}
.hamburger--collapse-r .hamburger-inner::before {
transition: top 0.12s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
transition:
top 0.12s 0.2s cubic-bezier(0.33333, 0.66667, 0.66667, 1),
transform 0.13s cubic-bezier(0.55, 0.055, 0.675, 0.19);
}

Expand All @@ -134,12 +140,14 @@
.hamburger--collapse-r.is-active .hamburger-inner::after {
top: 0;
opacity: 0;
transition: top 0.2s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
transition:
top 0.2s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
opacity 0.1s 0.22s linear;
}
.hamburger--collapse-r.is-active .hamburger-inner::before {
top: 0;
transform: rotate(90deg);
transition: top 0.1s 0.16s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
transition:
top 0.1s 0.16s cubic-bezier(0.33333, 0, 0.66667, 0.33333),
transform 0.13s 0.25s cubic-bezier(0.215, 0.61, 0.355, 1);
}
4 changes: 4 additions & 0 deletions src/components/Header/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
padding: 0 10px;
}

.container {
max-width: 1150px;
}

.navbar-brand {
font-weight: 500;
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/Timeline/Timeline.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

.timelineCurrentText {
color: var(--color-offWhite);
color: white;
}

.timelineHeader {
Expand All @@ -58,7 +58,6 @@

.toolsContainer {
margin: 1rem 0 1.5rem;
text-align: center;
}

.tool.socialo {
Expand Down
23 changes: 11 additions & 12 deletions src/components/Timeline/Timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ export default function Timeline() {
return (
<div className="timeline-container">
<h1 id="TimeLine" data-aos="fade-down" data-aos-once="true">
TimeLine
Experience
</h1>
<VerticalTimeline>
{TimelineChapters.map((chapter) => {
{TimelineChapters.map((chapter, index) => {
const {
id,
header,
subHeader,
text,
Expand All @@ -29,18 +28,18 @@ export default function Timeline() {
image,
scores,
} = chapter;
const isActiveChapter = [0, 1].includes(id);
const isCurrentChapter = !index;
return (
<VerticalTimelineElement
key={id}
key={`${header} ${subHeader}`}
className={`vertical-timeline-element--work ${
type === "school" ? "redBorder" : "blueBorder"
} ${isActiveChapter && "current"}`}
} ${isCurrentChapter && "current"}`}
contentStyle={{
background: isActiveChapter ? "rgb(33, 150, 243)" : "",
background: isCurrentChapter ? "rgb(33, 150, 243)" : "",
}}
contentArrowStyle={{
borderRight: isActiveChapter
borderRight: isCurrentChapter
? "7px solid rgb(33, 150, 243)"
: "",
}}
Expand All @@ -66,21 +65,21 @@ export default function Timeline() {
>
<h3
className={`vertical-timeline-element-title ${
isActiveChapter ? "timelineCurrentHeader" : "timelineHeader"
isCurrentChapter ? "timelineCurrentHeader" : "timelineHeader"
}`}
>
{header}
</h3>
<h4
className={`vertical-timeline-element-subtitle ${
isActiveChapter ? "timelineCurrentHeader" : "timelineHeader"
isCurrentChapter ? "timelineCurrentHeader" : "timelineHeader"
}`}
>
{subHeader}
</h4>
<p
className={
isActiveChapter
isCurrentChapter
? "timelineText timelineCurrentText"
: "timelineText"
}
Expand Down Expand Up @@ -108,7 +107,7 @@ export default function Timeline() {
technologies.map((tool) => (
<div
key={tool}
className={`tool ${isActiveChapter && "socialo"}`}
className={`tool ${isCurrentChapter && "socialo"}`}
>
{tool}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/data/HeaderLinks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const HeaderLinks: HeaderLinkProps[] = [
},
{
id: 2,
name: "TimeLine",
name: "Experience",
icon: "fa-solid fa-clock-rotate-left",
offset: -100,
duration: 1000,
Expand Down
24 changes: 14 additions & 10 deletions src/data/TimelineChapters.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
import TimelineChapter from "../types/TimelineChapters";
import Socialo from "../assets/media/Socialo.png";
import eBigay from "../assets/media/eBigay.png";
import Socialo from "../assets/media/Socialo.jpg";
import eBigay from "../assets/media/eBigay.jpg";
import Productive from "../assets/media/Productive.jpg";

const TimelineChapters: TimelineChapter[] = [
{
id: 0,
header: "CRM Developer",
subHeader: "Productive Software",
text: "Building custom CRM systems tailored to diverse clients, ranging from small businesses to large companies. Utilizing platforms such as Salesforce and Monday.com for CRM functionalities, alongside Make (Integromat) for automation and API integrations. Leading the development process from the initial characterization stage through to production, and working in an agile environment.",
date: "Dec 2023 - Present",
type: "work",
link: "https://productive.co.il",
image: Productive,
technologies: ["Salesforce", "Monday", "Make", "Automation", "Jira"],
},
{
header: "Front-End Developer",
subHeader: "Fluffy Finder",
text: "Joining the frontend team to continue a Work-In-Progress centralized system for reporting lost/found pets that use AI and algorithms to match between reports. Improving and refactoring the existing user interface, adding new features, integrating with the backend API and analytics providers, working alongside other development teams, designers, QA and a product manager.",
Expand All @@ -23,11 +33,10 @@ const TimelineChapters: TimelineChapter[] = [
],
},
{
id: 1,
header: "Full-Stack Developer",
subHeader: "Socialo",
text: "Building an AI-based B2B SaaS digital-marketing platform for businesses and marketing agencies. Leading product development from planning to production. Working end-to-end, writing clean, reusable, and type-safe code, managing integrations (AI models, Social networks, Analytics, etc.), building CI/CD pipelines, working with SCRUM methodology.",
date: "Jan 2023 - Present",
date: "Jan 2023 - Sep 2023",
type: "work",
link: "https://www.socialo.app",
image: Socialo,
Expand All @@ -45,7 +54,6 @@ const TimelineChapters: TimelineChapter[] = [
],
},
{
id: 2,
header: "Front-End Developer",
subHeader: "eBigay",
text: "Working in the frontend team for a marketplace web app that connects donors with those in need. Developing responsive and user-friendly UI from scratch, according to the given design in Figma. Consuming the server API and working alongside the back-end team. Working with SCRUM methodology.",
Expand All @@ -64,23 +72,20 @@ const TimelineChapters: TimelineChapter[] = [
],
},
{
id: 3,
header: "Full-Stack Development",
subHeader: "Self study",
text: "Learn Full-Stack web development using online courses and a lot of hands-on projects, mostly with React and Node.js.",
date: "2022",
type: "school",
},
{
id: 4,
header: "Control Systems Technician",
subHeader: "Israeli Navy",
text: "Locating and solving complex problems on large-scale naval systems. Working in a team and working with tight schedules.",
date: "2019 - 2022",
type: "military",
},
{
id: 5,
header: "Practical Engineering",
subHeader: "Kziney-Yam Acre",
text: "Electrical And Electronics Engineering.",
Expand All @@ -92,7 +97,6 @@ const TimelineChapters: TimelineChapter[] = [
},
},
{
id: 6,
header: "High-School",
subHeader: "Kziney-Yam Acre",
text: "Electrical And Electronics Engineering - 10 points",
Expand Down
4 changes: 2 additions & 2 deletions src/service-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ registerRoute(
// Return true to signal that we want to use the handler.
return true;
},
createHandlerBoundToURL(`${process.env.PUBLIC_URL}/index.html`)
createHandlerBoundToURL(`${process.env.PUBLIC_URL}/index.html`),
);

// An example runtime caching route for requests that aren't handled by the
Expand All @@ -68,7 +68,7 @@ registerRoute(
// least-recently used images are removed.
new ExpirationPlugin({ maxEntries: 50 }),
],
})
}),
);

// This allows the web app to trigger skipWaiting via
Expand Down
10 changes: 5 additions & 5 deletions src/serviceWorkerRegistration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const isLocalhost = Boolean(
window.location.hostname === "[::1]" ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/,
),
);

type Config = {
Expand Down Expand Up @@ -50,7 +50,7 @@ export function register(config?: Config) {
navigator.serviceWorker.ready.then(() => {
console.log(
"This web app is being served cache-first by a service " +
"worker. To learn more, visit https://cra.link/PWA"
"worker. To learn more, visit https://cra.link/PWA",
);
});
} else {
Expand Down Expand Up @@ -78,7 +78,7 @@ function registerValidSW(swUrl: string, config?: Config) {
// content until all client tabs are closed.
console.log(
"New content is available and will be used when all " +
"tabs for this page are closed. See https://cra.link/PWA."
"tabs for this page are closed. See https://cra.link/PWA.",
);

// Execute callback
Expand Down Expand Up @@ -130,7 +130,7 @@ function checkValidServiceWorker(swUrl: string, config?: Config) {
})
.catch(() => {
console.log(
"No internet connection found. App is running in offline mode."
"No internet connection found. App is running in offline mode.",
);
});
}
Expand Down
Loading

0 comments on commit 3ffab3a

Please sign in to comment.