Skip to content

Commit

Permalink
modified
Browse files Browse the repository at this point in the history
  • Loading branch information
@arcVaishali
arcVaishali committed Jan 26, 2024
1 parent 70cc2c2 commit 2b77ad4
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 60 deletions.
65 changes: 43 additions & 22 deletions src/components/About/Achievement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import React from "react";
import Marquee from "react-fast-marquee";
import { faArrowAltCircleRight } from "@fortawesome/free-solid-svg-icons";
import { card } from "../../constants/index";
import { card1 , card2 } from "../../constants/index";
import { animated, useSpring } from "@react-spring/web";

const Achievement = () => {
Expand All @@ -26,7 +26,7 @@ const Achievement = () => {
style={{ ...styles }}
className="col-span-10 font-black text-4xl lg:text-7xl uppercase"
>
<span className="hidden lg:inline">My</span>
<span className="hidden lg:inline">My</span>
Achievements
</animated.span>
<animated.button
Expand All @@ -43,26 +43,47 @@ const Achievement = () => {
data-aos-easing="ease-in-out"
className="grid lg:grid-cols-12 col-span-6 gap-8"
>
{card.map((element, index) => (
<animated.div
style={{ ...style3 }}
data-aos={index % 2 == 0 ? "fade-right" : "fade-left"}
data-aos-easing="ease-in-out"
className="flex col-span-6 justify-between items-center border-t-[1px] border-black p-4"
>
<span className="uppercase">{element.title}</span>
<button className="border-[1px] border-black rounded-full p-2">
{element.tag}
</button>
<FontAwesomeIcon
icon={faArrowAltCircleRight}
className="cursor-pointer"
size="xl"
swapOpacity
transform={{ rotate: 315 }}
/>
</animated.div>
))}
{idx === 1
? card1.map((element, index) => (
<animated.div
style={{ ...style3 }}
data-aos={index % 2 == 0 ? "fade-right" : "fade-left"}
data-aos-easing="ease-in-out"
className="flex col-span-6 justify-between items-center border-t-[1px] border-black p-4"
>
<span className="uppercase">{element.title}</span>
<button className="border-[1px] border-black rounded-full p-2">
{element.tag}
</button>
<FontAwesomeIcon
icon={faArrowAltCircleRight}
className="cursor-pointer"
size="xl"
swapOpacity
transform={{ rotate: 315 }}
/>
</animated.div>
))
: card2.map((element, index) => (
<animated.div
style={{ ...style3 }}
data-aos={index % 2 == 0 ? "fade-right" : "fade-left"}
data-aos-easing="ease-in-out"
className="lg:flex col-span-6 justify-between items-center border-t-[1px] border-black p-4 hidden"
>
<span className="uppercase">{element.title}</span>
<button className="border-[1px] border-black rounded-full p-2">
{element.tag}
</button>
<FontAwesomeIcon
icon={faArrowAltCircleRight}
className="cursor-pointer"
size="xl"
swapOpacity
transform={{ rotate: 315 }}
/>
</animated.div>
))}
</div>
))}
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/About/Experience.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ const Experience = () => {
const AnimatedComponent = animated(Link);
return (
<animated.div
className="grid grid-cols-12 col-span-12 p-16 lg:py-32 lg:px-16 justify-center items-center bg-black text-white my-64"
className="grid grid-cols-12 col-span-12 p-16 lg:py-32 lg:px-16 justify-center items-center bg-black text-white my-32 lg:my-64"
>
<span
data-aos="zoom-in"
style={{ ...styles }}
className="col-span-8 lg:col-start-3 font-black uppercase text-4xl lg:text-7xl text-center"
>
Job Experience
<span className="hidden lg:inline">Job</span>Experience
</span>
<div className="grid lg:grid-cols-12 col-span-12 lg:m-16">
{exp.map((element, index) => (
Expand All @@ -38,7 +38,7 @@ const Experience = () => {
>
<animated.span
style={{ ...styleOnContent }}
className="uppercase font-semibold text-lg lg:text-xl"
className="uppercase font-semibold text-sm lg:text-xl"
>
{element.name}
</animated.span>
Expand Down
12 changes: 6 additions & 6 deletions src/components/About/Hero.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ const Hero = () => {
return (
<div className="grid grid-cols-12 justify-center items-center p-16 m-2 lg:pt-32 lg:pl-32 lg:pr-32 lg:pb-8 lg:mb-16">
<div className="grid grid-cols-6 col-span-12 justify-center items-center">
<animated.div
<animated.span
style={{ ...styleOnHeader }}
className="text-4xl col-span-12 lg:col-span-6 text-center uppercase font-black p-2 lg:text-7xl"
className="text-4xl text-center lg:col-span-6 uppercase font-black p-2 lg:text-7xl"
>
i focus on both design and development
</animated.div>
i focus on design development problem solving
</animated.span>
<animated.div
style={{ ...styleOnSubHeader }}
className="col-start-2 col-span-4 text-center text-sm font-extralight p-2 hidden lg:flex"
Expand All @@ -40,7 +40,7 @@ const Hero = () => {
domination. At the end of the day, going forward, a new.
</animated.div>
</div>
<div className="col-start-3 lg:col-start-1 col-span-12 grid grid-cols-12 justify-center items-center p-8 gap-8">
<div className="lg:col-start-1 col-span-12 grid grid-cols-12 justify-center items-center p-8 gap-8">
{imgg.map((element, index) => (
<div className="col-span-3">
{index === 1 ? (
Expand All @@ -67,7 +67,7 @@ const Hero = () => {
</animated.div>
</div>
) : (
<img data-aos="zoom-in-up" src={aboutSectionImage3} />
<img className="hidden lg:inline" data-aos="zoom-in-up" src={aboutSectionImage3} />
)}
</div>
))}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Home/Footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { socials } from "../../constants";
const Footer = () => {
return (
<div className="grid grid-cols-12 col-span-12 px-4 lg:px-16 py-8 justify-between items-center bg-[#121212] border-t-[1px] border-b-[1px] border-gray-700 text-white">
<Link className="col-span-3 hidden lg:w-16" to="/">
<Link className="col-span-3 w-0 lg:w-16" to="/">
<img src={Logo} />
</Link>
<div className="flex col-span-12 lg:col-span-6 justify-center items-center lg:ml-0">
Expand Down
26 changes: 19 additions & 7 deletions src/components/Home/Hero.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useState } from "react";
import { animated, useSpring } from "@react-spring/web";
import Marquee from "react-fast-marquee";
import H from "../H";
import { Link } from "react-router-dom";

const Hero = () => {
const names = [1, 2, 3, 4, 5, 6, 6, 7, 8, 9, 0];
Expand Down Expand Up @@ -42,15 +43,26 @@ const Hero = () => {

<animated.span
style={{ ...spring2 }}
className="hidden lg:flex col-span-8 col-start-4 col-end-10 text-center text-sm m-2"
className="hidden lg:flex col-span-8 col-start-5 col-end-10 text-center text-sm m-2"
>
Quis culpa culpa Lorem velit dolore.Esse elit irure minim ad est
incididunt commodo eu nulla tempor labore dolor.
I believe in collaborative excellence, striving resilience.
</animated.span>

<button className="w-[150px] text-sm col-start-4 my-8 ml-4 lg:col-start-6 bg-black text-white border-2 border-black hover:bg-white hover:text-black rounded-full px-4 py-2 lg:my-8 lg:mx-8">
Book a free call
</button>
<div className="col-start-4 grid col-span-5 lg:inline lg:col-span-12 my-8 ml-4 lg:col-start-5 lg:ml-8">
<Link
target="_blank"
to="https://topmate.io/vaishali_p14"
className="text-sm bg-black text-white border-2 border-black hover:bg-white hover:text-black rounded-full px-4 py-2 lg:my-8 lg:mx-2 my-2"
>
Book a free call
</Link>
<Link
target="_blank"
to="https://drive.google.com/file/d/16acvxeGGuvW6n63jfJ4Edu7u8EXkKLx2/view?usp=sharing"
className="text-sm bg-transparent text-black border-2 border-black hover:bg-white hover:text-black rounded-full px-4 py-2 lg:my-8 my-2"
>
View Resume
</Link>
</div>
{initial ? (
<div className="mt-64 grid grid-cols-12 col-span-12 border-t-[1px] border-b-[1px] border-gray-700 p-4">
{names.map((element, index) => (
Expand Down
6 changes: 2 additions & 4 deletions src/components/Home/Recommendation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ const Recommendation = () => {
data-aos="fade-in"
className="col-span-6 text-sm font-extralight mt-8 lg:mt-0"
>
Voluptate do aliqua aliqua duis esse nisi.Enim incididunt id sunt sit
nisi incididunt sint mollit veniam eiusmod.Sit qui duis occaecat minim
dolor.
<img src={dummyImage2} />
Vaishali is a highly skilled and dedicated professional whom I've had the pleasure of collaborating with on various projects. Their exceptional abilities and commitment to excellence make them a standout talent in the industry.
{/* <img src={dummyImage2} /> */}
</div>
</div>
</div>
Expand Down
5 changes: 2 additions & 3 deletions src/components/Home/Stack.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ const Stack = () => {
<div
data-aos="fade-in"
data-aos-easing="ease-in-out"
className="text-sm col-span-6 font-light"
className="text-sm col-span-6 font-light ml-2"
>
Labore et dolor consequat ea velit. t dolor consequat ea velit. t
dolor consequat ea velit.
I'm a passionate tech enthusiast with a proven proficiency in
</div>
</div>
<div
Expand Down
44 changes: 31 additions & 13 deletions src/constants/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,55 @@ export const exp = [
},
{
name: "Web Developer",
post: "Vaishali.com",
post: "Code Clause",
},
{
name: "Designer",
post: "Design.OG",
name: "Open Source Contributor",
post: "GSosC'23",
},
// {
// name: "Developer",
// post: "Alice in Wonderland",
// },
// {
// name: "Sr. Developer",
// post: "Fla Fla Fla",
// },
];

export const card1 = [
{
name: "Developer",
post: "Alice in Wonderland",
title: "MediHacks 2023 Winner",
tag: "sss",
},
{
name: "Sr. Developer",
post: "Fla Fla Fla",
title: "Impact Hacks Winner",
tag: "sss",
},
{
title: "Empower Hacks",
tag: "sss",
},
{
title: "370+ problems on Leetcode",
tag: "sss",
},
];

export const card = [
export const card2 = [
{
title: "Name of Award",
title: "1st rank holder in UT",
tag: "sss",
},
{
title: "Name of Award",
title: "MLH DataHackfest Winner",
tag: "sss",
},
{
title: "Name of Award",
title: "MLH Web3Apps Hackathon Winner",
tag: "sss",
},
{
title: "Name of Award",
title: "250+ problems on Codechef",
tag: "sss",
},
];
Expand Down
2 changes: 1 addition & 1 deletion src/pages/About.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const About = () => {
<Slider />
<Experience />
<Achievement />
<FAQ />
{/* <FAQ /> */}
<Contact />
</div>
);
Expand Down

0 comments on commit 2b77ad4

Please sign in to comment.