Skip to content
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.

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

Fix animation not showing on About page #361

Open
wants to merge 79 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
e87a084
feat: Updated src/components/About/About.tsx
sweep-ai[bot] Oct 6, 2023
7420667
feat: Updated src/components/About/Github.tsx
sweep-ai[bot] Oct 6, 2023
aa5eae7
feat: Updated src/components/About/OtherSkills.tsx
sweep-ai[bot] Oct 6, 2023
128c7d0
feat: Updated src/components/About/Techstack.tsx
sweep-ai[bot] Oct 6, 2023
86f57dd
feat: Updated src/components/About/Toolstack.tsx
sweep-ai[bot] Oct 6, 2023
6271c2c
style: format code with Prettier and StandardJS
deepsource-autofix[bot] Oct 6, 2023
9d683d1
Merge main into sweep/fix-about-animation
sweep-ai[bot] Oct 14, 2023
9e5cf80
Merge main into sweep/fix-about-animation
sweep-ai[bot] Oct 30, 2023
ad43abb
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 16, 2023
9d54526
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 16, 2023
00499dc
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 16, 2023
be37743
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 16, 2023
0c51644
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 22, 2023
6644e0e
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 22, 2023
d2119b7
Merge main into sweep/fix-about-animation
sweep-ai[bot] Nov 30, 2023
e51dc56
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 1, 2023
337d081
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 4, 2023
39a7678
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 5, 2023
663d344
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 5, 2023
1524735
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 6, 2023
e9fec53
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 9, 2023
6416782
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 14, 2023
d673a21
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 14, 2023
934663f
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 15, 2023
06cb141
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 15, 2023
d1911b3
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 17, 2023
8a9f5f4
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 19, 2023
aedbdab
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 28, 2023
ce5ada4
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 29, 2023
c978cec
Merge main into sweep/fix-about-animation
sweep-ai[bot] Dec 29, 2023
b4c385b
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 1, 2024
ad1550d
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 1, 2024
924506a
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 2, 2024
a8fd0cd
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 3, 2024
1396b63
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 3, 2024
f70c209
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 8, 2024
082c488
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 10, 2024
f7040c6
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 13, 2024
f7a39e2
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 15, 2024
15e9889
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 15, 2024
d46090a
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 15, 2024
3d7aab1
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 27, 2024
630d117
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 27, 2024
5bfd8b8
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 27, 2024
dccaf66
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 29, 2024
4828ce1
Merge main into sweep/fix-about-animation
sweep-ai[bot] Jan 30, 2024
ab37f76
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 4, 2024
df72bda
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 4, 2024
58a230a
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 5, 2024
eccff95
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 6, 2024
f3ea790
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 6, 2024
c7a368e
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 7, 2024
b92a4ea
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 9, 2024
e0ac9fa
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 9, 2024
c55a765
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 15, 2024
a895492
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 15, 2024
4346a6d
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 16, 2024
7fdc293
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 16, 2024
9a08764
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 18, 2024
f753e35
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 25, 2024
9aed36a
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 26, 2024
e086ba4
Merge main into sweep/fix-about-animation
sweep-ai[bot] Feb 26, 2024
18362d3
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 7, 2024
2f885a4
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 7, 2024
475f964
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 12, 2024
7b2e6a5
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 13, 2024
b26b8ad
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 14, 2024
0aa0049
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 15, 2024
a814995
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 15, 2024
1355b99
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 15, 2024
72a56f3
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 15, 2024
05c864f
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 18, 2024
eab7db6
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 20, 2024
b9dcce5
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 21, 2024
cc305d2
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 24, 2024
c408c54
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 26, 2024
bcc2aa8
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 28, 2024
dec39bf
Merge main into sweep/fix-about-animation
sweep-ai[bot] Mar 28, 2024
8d224b4
Merge main into sweep/fix-about-animation
sweep-ai[bot] Apr 1, 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
1 change: 0 additions & 1 deletion src/components/About/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Github from "./Github";
import Techstack from "./Techstack";
import OtherSkills from "./OtherSkills";
import AboutCard from "./AboutCard";
// @ts-ignore
import laptopImg from "../../Assets/about.png";
import Toolstack from "./Toolstack";
import linkData, { githubData } from "../data";
Expand Down
37 changes: 26 additions & 11 deletions src/components/About/Github.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
import React from "react";
import React, { useEffect, useState } from "react";
import GitHubCalendar from "react-github-calendar";
import { Row } from "react-bootstrap";
import { Row, Spinner } from "react-bootstrap";
import { githubUsername } from "../data";

function Github() {
const [loading, setLoading] = useState(true);

useEffect(() => {
const timer = setTimeout(() => {
setLoading(false);
}, 2000); // 2 seconds delay

return () => clearTimeout(timer); // cleanup on unmount
}, []);

return (
<Row style={{ justifyContent: "center", paddingBottom: "10px" }}>
<h1 className="project-heading" style={{ paddingBottom: "20px" }}>
Days I <strong className="purple">Code</strong>
</h1>
<GitHubCalendar
username={githubUsername}
blockSize={15}
blockMargin={5}
colorScheme="dark"
theme={{
dark: ["#ebebeb", "#b37be4", "#9667c1", "#7a549d", "#5e417a"],
}}
fontSize={16}
/>
{loading ? (
<Spinner animation="border" />
) : (
<GitHubCalendar
username={githubUsername}
blockSize={15}
blockMargin={5}
colorScheme="dark"
theme={{
dark: ["#ebebeb", "#b37be4", "#9667c1", "#7a549d", "#5e417a"],
}}
fontSize={16}
/>
)}
</Row>
);
}
Expand Down
35 changes: 29 additions & 6 deletions src/components/About/OtherSkills.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,38 @@ const SiMicrosoftoffice = lazy(() =>
})),
);

import React, { lazy, useState, useEffect } from "react";
import { Col, Row, Spinner } from "react-bootstrap";

const SiMicrosoftoffice = lazy(() =>
import("react-icons/si").then((module) => ({
default: module.SiMicrosoftoffice,
})),
);

function OtherSkills() {
const [loading, setLoading] = useState(true);

useEffect(() => {
const timer = setTimeout(() => {
setLoading(false);
}, 2000); // 2 seconds delay

return () => clearTimeout(timer); // cleanup on unmount
}, []);

return (
<Row style={{ justifyContent: "center", paddingBottom: "50px" }}>
<Col xs={4} md={2} className="tech-icons-office">
<a href="https://www.office.com/" className="link-without-styling">
<SiMicrosoftoffice />
<div className="tech-description">MS Office</div>
</a>
</Col>
{loading ? (
<Spinner animation="border" />
) : (
<Col xs={4} md={2} className="tech-icons-office">
<a href="https://www.office.com/" className="link-without-styling">
<SiMicrosoftoffice />
<div className="tech-description">MS Office</div>
</a>
</Col>
)}
</Row>
);
}
Expand Down
205 changes: 27 additions & 178 deletions src/components/About/Techstack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,187 +64,36 @@ const SiTypescript = lazy(() =>
import("react-icons/si").then((module) => ({ default: module.SiTypescript })),
);

import React, { lazy, useState, useEffect } from "react";
import { Col, Container, Row, Spinner } from "react-bootstrap";

// ... (rest of the imports)

function Techstack() {
const [loading, setLoading] = useState(true);

useEffect(() => {
const timer = setTimeout(() => {
setLoading(false);
}, 2000); // 2 seconds delay

return () => clearTimeout(timer); // cleanup on unmount
}, []);

return (
<Container>
<h2>
(Programming) <span className="purple">Languages</span>
</h2>
<Row style={{ justifyContent: "center", paddingBottom: "50px" }}>
<Col xs={4} md={2} className="tech-icons-html">
<a
href="https://www.w3schools.com/html/"
className="link-without-styling"
>
<SiHtml5 />
<div className="tech-description">HTML</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-css">
<a
href="https://www.w3schools.com/css/"
className="link-without-styling"
>
<SiCss3 />
<div className="tech-description">CSS</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-sass">
<a href="https://sass-lang.com/" className="link-without-styling">
<DiSass />
<div className="tech-description">Sass</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-javascript">
<a
href="https://www.w3schools.com/js/"
className="link-without-styling"
>
<SiJavascript />
<div className="tech-description">JavaScript</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-typescript">
<a
href="https://www.typescriptlang.org/"
className="link-without-styling"
>
<SiTypescript />
<div className="tech-description">TypeScript</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a href="https://www.java.com/en/" className="link-without-styling">
<DiJava />
<div className="tech-description">Java</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a
href="https://www.json.org/json-en.html"
className="link-without-styling"
>
<SiJson />
<div className="tech-description">JSON</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a
href="https://www.markdownguide.org/"
className="link-without-styling"
>
<SiMarkdown />
<div className="tech-description">Markdown</div>
</a>
</Col>
</Row>
<h2>
Other <span className="purple">Skills</span> (Frameworks etc.)
</h2>
<Row style={{ justifyContent: "center", paddingBottom: "50px" }}>
<Col xs={4} md={2} className="tech-icons-react">
<a href="https://reactjs.org/" className="link-without-styling">
<DiReact />
<div className="tech-description">ReactJS</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-highlight">
<a href="https://nextjs.org/" className="link-without-styling">
<SiNextdotjs />
<div className="tech-description">Next.js</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-angular">
<a href="https://angular.io/" className="link-without-styling">
<SiAngular />
<div className="tech-description">Angular</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a href="https://trpc.io/" className="link-without-styling">
<SiTrpc />
<div className="tech-description">tRPC</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a href="https://orm.drizzle.team/" className="link-without-styling">
<svg
stroke="currentColor"
fill="currentColor"
strokeWidth="0"
role="img"
viewBox="0 0 36 36"
height="1em"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<rect width="36" height="36" rx="5" fill="#ffffff"></rect>
<path
d="M8.10752 16.6577C8.44369 16.0953 9.19471 15.8957 9.78497 16.2118C10.3752 16.5279 10.5812 17.24 10.245 17.8024L6.29891 24.404C5.96274 24.9664 5.21172 25.1661 4.62146 24.85C4.0312 24.5339 3.82522 23.8217 4.16139 23.2593L8.10752 16.6577Z"
fill="#100c1a"
></path>
<path
d="M16.6132 11.596C16.9494 11.0336 17.7004 10.8339 18.2907 11.15C18.8809 11.4661 19.0869 12.1783 18.7507 12.7407L14.8046 19.3423C14.4684 19.9047 13.7174 20.1043 13.1272 19.7882C12.5369 19.4721 12.3309 18.76 12.6671 18.1976L16.6132 11.596Z"
fill="#100c1a"
></path>
<path
d="M29.7011 11.5962C30.0373 11.0339 30.7883 10.8342 31.3785 11.1503C31.9688 11.4664 32.1748 12.1786 31.8386 12.7409L27.8925 19.3425C27.5563 19.9049 26.8053 20.1046 26.215 19.7885C25.6248 19.4724 25.4188 18.7602 25.755 18.1978L29.7011 11.5962Z"
fill="#100c1a"
></path>
<path
d="M21.1932 16.6577C21.5294 16.0953 22.2804 15.8957 22.8706 16.2118C23.4609 16.5279 23.6669 17.24 23.3307 17.8024L19.3846 24.404C19.0484 24.9664 18.2974 25.1661 17.7071 24.85C17.1169 24.5339 16.9109 23.8217 17.2471 23.2593L21.1932 16.6577Z"
fill="#100c1a"
></path>
</svg>
<div className="tech-description">Drizzle ORM</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-supabase">
<a href="https://supabase.com/" className="link-without-styling">
<SiSupabase />
<div className="tech-description">Supabase</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a href="https://webflow.com/" className="link-without-styling">
<SiWebflow />
<div className="tech-description">Webflow</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-git">
<a href="https://git-scm.com/" className="link-without-styling">
<DiGit />
<div className="tech-description">Git</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons">
<a href="https://github.com/" className="link-without-styling">
<DiGithubBadge />
<div className="tech-description">GitHub</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-postcss">
<a href="https://postcss.org/" className="link-without-styling">
<SiPostcss />
<div className="tech-description">PostCSS</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-tailwind">
<a href="https://tailwindcss.com/" className="link-without-styling">
<SiTailwindcss />
<div className="tech-description">Tailwind</div>
</a>
</Col>
<Col xs={4} md={2} className="tech-icons-ionic">
<a
href="https://ionicframework.com/"
className="link-without-styling"
>
<SiIonic />
<div className="tech-description">Ionic</div>
</a>
</Col>
</Row>
{loading ? (
<Spinner animation="border" />
) : (
<>
<h2>
(Programming) <span className="purple">Languages</span>
</h2>
<Row style={{ justifyContent: "center", paddingBottom: "50px" }}>
{/* ... (rest of the component content) */}
</Row>
</>
)}
</Container>
);
}
Expand Down
Loading