Skip to content

Commit

Permalink
feature: New Project and Scroll animation delay
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonascsantos-dev committed Apr 22, 2024
1 parent 325d66d commit 6d24060
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 8 deletions.
Binary file added src/assets/projects/project5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function Footer() {
const [ref, inView] = useInView()

const opacityVariant = {
visible: { opacity: 1, transition:{ delay: 0.1, duration: 0.5}},
visible: { opacity: 1, transition:{ delay: 0.3, duration: 0.5}},
hidden: { opacity: 0 },
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ const NavBar = ({ isLoading }: Props) => {
}

const opacityVariant2 = {
visible: { opacity: 1, transition:{ delay: 0.1, duration: 0.5 }},
visible: { opacity: 1, transition:{ delay: 0.2, duration: 0.5 }},
hidden: { opacity: 0 },
}

Expand Down
6 changes: 4 additions & 2 deletions src/components/Projects/Project.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const gradients: Gradients = {
2: "bg-gradient-project-2",
3: "bg-gradient-project-3",
4: "bg-gradient-project-4",
5: "bg-gradient-project-5",
};

export function Project(props: { project: ProjectProps }) {
Expand All @@ -38,7 +39,7 @@ export function Project(props: { project: ProjectProps }) {
const [ref, inView] = useInView()

const opacityVariant = {
visible: { opacity: 1, transition:{ delay: 0.1, duration: 0.5}},
visible: { opacity: 1, transition:{ delay: 0.2, duration: 0.5}},
hidden: { opacity: 0 },
}

Expand All @@ -58,6 +59,7 @@ export function Project(props: { project: ProjectProps }) {
variants={opacityVariant}
initial="hidden"
animate={control}
className="h-full"
>
<div
style={{
Expand All @@ -76,7 +78,7 @@ export function Project(props: { project: ProjectProps }) {
</h1>
<div
className={"relative w-full overflow-hidden rounded-3xl shadow-lg"}
style={{ aspectRatio: 1.236 }}
style={{ aspectRatio: 1.236, background: "white" }}
>
<Image
style={{ objectFit: "contain" }}
Expand Down
32 changes: 28 additions & 4 deletions src/components/Projects/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import project1 from "@/assets/projects/project1.png";
import project2 from "@/assets/projects/project2.png";
import project3 from "@/assets/projects/project3.png";
import project4 from "@/assets/projects/project4.png";
import project5 from "@/assets/projects/project5.png";
import { useEffect } from "react";
import { motion, useAnimation } from "framer-motion";
import { useInView } from "react-intersection-observer";
Expand All @@ -14,7 +15,7 @@ export function Projects() {
const [ref, inView] = useInView()

const opacityVariant = {
visible: { opacity: 1, transition:{ delay: 0.1, duration: 0.5}},
visible: { opacity: 1, transition:{ delay: 0.2, duration: 0.5}},
hidden: { opacity: 0 },
}

Expand Down Expand Up @@ -52,6 +53,29 @@ export function Projects() {
},
{
projectNumber: "02.",
projectName: "McArthurGlen Designer Outlets",
websiteLink: "https://play.google.com/store/apps/details?id=com.mcarthurglen.a1&hl=en_US&pli=1",
description:
"McArthurGlen is Europe's leader in designer outlet shopping, with 25 locations in 8 countries. I've worked on implementing new features, fixing bugs, and releasing updates for their Expo React-Native app on both the Google Play Store and the App Store.",
technologies: [
"React Native",
"Expo",
"TypeScript",
"ASP.NET Core",
"Apple TestFlight",
"Google Play Console",
"Salesforce",
"MSSQL",
],
image: project5.src,
bgColor: "#e6e5ff",
primaryProjectColor: "#3e3a93",
secondaryProjectColor: "#232052",
tertiaryProjectColor: "#27245c",
gradient: 5,
},
{
projectNumber: "03.",
projectName: "Simple Weather Forecast",
githubLink: "https://github.com/jonascsantos/WeatherForecastApp",
websiteLink: "https://weather.jonascsantos.com",
Expand All @@ -76,7 +100,7 @@ export function Projects() {
gradient: 1,
},
{
projectNumber: "03.",
projectNumber: "04.",
projectName: "Indoor Positioning System",
githubLink: "https://github.com/jonascsantos/IndoorPositioningAPP",
websiteLink: "https://indoor.jonascsantos.com",
Expand All @@ -100,7 +124,7 @@ export function Projects() {
gradient: 2,
},
{
projectNumber: "04.",
projectNumber: "05.",
projectName: "Universal ClipSync (UI/UX)",
githubLink: "https://github.com/jonascsantos/UniversalClipSyncAPP",
websiteLink: "",
Expand Down Expand Up @@ -129,7 +153,7 @@ export function Projects() {
<section id="Projects">
<div className="flex flex-col gap-5 md:gap-8 w-full pt-10 px-5 sm:pr-10 sm:pl-10 sm:pt-12 md:pt-24 lg:pl-24 lg:pr-24 pb-12 bg-cloudy-white">
<Title />
<div className="flex flex-col gap-16 md:gap-10 md:grid md:grid-cols-2" >
<div className="flex flex-col gap-16 md:gap-10 md:grid md:grid-cols-2 justify-center" >
{projectsObj.map((item, index) => (
<Project key={item.projectName + "-" + index} project={item} />
))}
Expand Down
12 changes: 12 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ module.exports = {
project4Primary: "#070707",
project4Secondary: "#190084",
project4Tertiary: "#2400c0",
project5Bg: "#27245c",
project5Primary: "#27245c",
project5Secondary: "#232052",
project5Tertiary: "#67658c",
},
extend: {
backgroundImage: (theme) => ({
Expand Down Expand Up @@ -71,6 +75,14 @@ module.exports = {
"colors.project4Primary"
)}, ${theme("colors.project4Secondary")})`,

"gradient-project-5": `linear-gradient(to right, ${theme(
"colors.project5Primary"
)}, ${theme("colors.project5Secondary")}, ${theme(
"colors.project5Tertiary"
)}, ${theme("colors.project5Secondary")}, ${theme(
"colors.project5Primary"
)}, ${theme("colors.project5Secondary")})`,

"gradient-work": `radial-gradient(at 96% 98%, hsla(193, 70%, 56%, 1) 0px, transparent 50%),
radial-gradient(at 95% 74%, hsla(33, 78%, 74%, 0.81) 0px, transparent 50%),
radial-gradient(at 2% 96%, hsla(187, 96%, 50%, 1) 0px, transparent 50%),
Expand Down

0 comments on commit 6d24060

Please sign in to comment.