Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions components/project/ProjectGalleryProjectCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ export default function ProjectGalleryProjectCard({ ...props }) {
: "w-[370px] h-[580px] flex bg-[#f8fbff] flex-col rounded-xl overflow-hidden p-3 shadow-xl hover:shadow-xxl dark:bg-[#2D2D2D] sm:w-3/4 md:w-1/1 lg:w-[520px] xl:w-[600px] 2xl-[700px]"
}>
{/* ====== #TOP SECTION */}
<div className="w-full flex items-center justify-between relative pl-4 pr-4 pt-[8px] pb-[20px]">
<div className="flex justify-between items-center w-full">
<div className="relative flex gap-4 items-center">
<div className="w-full flex items-center justify-between relative pr-4 pt-[8px] pb-[20px]">
<div className="flex justify-between items-center w-full h-[52.2px]">
<div className="relative flex gap-4 items-center pl-4">
{bubbles &&
bubbles.map((bubble, index) => {
return (
Expand All @@ -50,19 +50,19 @@ export default function ProjectGalleryProjectCard({ ...props }) {
);
})}
<div>
{bubbles.length === 1 ? <p className="ml-4 font-semibold text-[23.2px]">{name}</p> : <p className="ml-4 font-semibold text-[23.2px]">{`+ ${bubbleNumber - 3} more`}</p>}
<p className="ml-4 caption text-[11.6px] flex items-center gap-[6px] dark:text-[#7D7D7D]"><TimeIcon width={10} height={10} /> <span>{date}</span></p>
{bubbles.length === 1 ? <p className="ml-4 font-semibold text-[23.2px]">{name}</p> : (bubbles.length === 0 ? '' : <p className="ml-4 font-semibold text-[23.2px]">{`+ ${bubbleNumber - 3} more`}</p>)}
<p style={{paddingLeft: bubbles.length === 0 ? 0 : 16, top: bubbles.length === 0 ? 12 : 0 }} className="relative caption text-[11.6px] flex items-center gap-[6px] dark:text-[#7D7D7D]"><TimeIcon width={10} height={10} /> <span>{date}</span></p>
</div>
</div>
<div className="flex gap-[10px]">
{tools && tools.map(tool => {
{tools && tools.map((tool, index) => {
switch (tool) {
case 'github':
return <GithubIcon fill={darkMode ? "white" : "black"} width={21} height={21} />
return <GithubIcon key={index} fill={darkMode ? "white" : "black"} width={21} height={21} />
case 'figma':
return <FigmaIcon fill={darkMode ? "white" : "black"} width={21} height={21} />
return <FigmaIcon key={index} fill={darkMode ? "white" : "black"} width={21} height={21} />
case 'adobexd':
return <AdobeIcon fill={darkMode ? "white" : "black"} width={21} height={21} />
return <AdobeIcon key={index} fill={darkMode ? "white" : "black"} width={21} height={21} />
default:
break;
}
Expand Down
2 changes: 1 addition & 1 deletion pages/events/[id].js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default function Event({ loggedIn, event, isRegistered }) {

return (
<div className="dark:bg-[#202020] dark:text-white min-h-screen">
<nav className="flex items-center justify-between pl-8 pr-12">
<nav className="flex items-center justify-between pl-[10px] lg:pl-[37px] pr-[10px] lg:pr-[37px]">
<Logo className="w-[120px] py-5" />
<div className="flex gap-x-2">
<DarkModeToggle
Expand Down
4 changes: 2 additions & 2 deletions pages/events/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ArrowIcon from "../../components/icons/Arrow";
export default function Events({ events, loggedIn }) {
return (
<div className="dark:bg-[#202020] dark:text-white">
<nav className="flex items-center justify-between pl-[10px] lg:pl-8 pr-[12px] lg:pr-12">
<nav className="flex items-center justify-between pl-[10px] lg:pl-[37px] pr-[10px] lg:pr-[37px]">
<Logo className="w-[80px] md:w-[120px] py-5" />
<div className="flex gap-x-[0px] md:gap-x-2 lg:gap-x-4 items-center">
<DarkModeToggle
Expand All @@ -22,7 +22,7 @@ export default function Events({ events, loggedIn }) {
<GithubIcon />
</a>
<Link href="/">
<button className="px-[10px] py-[6px] md:py-[2px] bg-[#03a9f4] text-white rounded-[6px] text-[12px] md:text-[23px] lg:text-[28px] lg:py-[10px] button-deep-sky-blue inline-flex gap-x-1 md:gap-x-3 items-center mx-2 my-0 md:my-0">
<button className="px-[10px] py-[6px] md:py-[2px] bg-[#03a9f4] text-white rounded-[6px] text-[12px] md:text-[23px] lg:text-[28px] lg:button-big button-deep-sky-blue inline-flex gap-x-1 md:gap-x-3 items-center mx-2 my-0 md:my-0 focus:outline-none">
{loggedIn ? "Go back home" : "Join us"}
<div className="scale-75 md:scale-100 lg:relative lg:top-[2px]">
<ArrowIcon />
Expand Down
76 changes: 49 additions & 27 deletions pages/profile/[id].js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import TwitterIcon from "../../components/icons/Twitter";
import ProfileProjectCard from "../../components/project/ProfileProjectCard";
import LinkedinIcon from "../../components/icons/Linkedin";
import Empty from "../../components/Empty";
import ProjectGalleryProjectCard from "../../components/project/ProjectGalleryProjectCard";


/**
* takes initial array and returns trimmed array
Expand All @@ -38,20 +40,22 @@ export default function Profile({ loggedIn, user }) {
return (
<div className="dark:bg-[#202020] dark:text-white h-screen ">
{/* ====== NavBar start */}
<nav className="flex items-center justify-between md:pl-8 md:pr-12 pl-3 pr-2 ">
<nav className="flex items-center justify-between pl-[10px] lg:pl-[37px] pr-[10px] lg:pr-[37px]">
<Logo className="md:w-[120px] py-5 w-[100px]" />
<div className="flex md:gap-x-2 gap-x-1 items-center">
<div className="flex gap-x-[0px] md:gap-x-3 lg:gap-x-5 items-center">
<DarkModeToggle
className="mx-0 md:w-[40px] md:h-[40px] h-[30px] w-[33px]"
darkClassName="mx-0 md:w-[40px] md:h-[42px] h-[30px] w-[33px]"
/>
<a href="https://github.com/TheDynamics">
<GithubIcon className="md:h-[40px] md:w-[40px] h-[30px] w-[33px] " />
</a>
<Link href="/">
<button className="md:button-medium button-small button-deep-sky-blue inline-flex md:gap-x-3 gap-x-1 px-3 py-2 items-center mx-2 md:text-30px text-15px h-[35px]">
className="mx-0 w-[25px] md:w-[44px] lg:scale-[1.24] lg:mr-[10px]"
darkClassName="mx-0 w-[25px] md:w-[33px] lg:w-[40px] h-[25px] md:h-[48px] lg:h-[60px]"
/>
<a href="https://github.com/TheDynamics" className="scale-75 lg:scale-[1.4] md:scale-[1.15]">
<GithubIcon />
</a>
<Link href="https://thedynamics.tech">
<button className="px-[10px] py-[6px] md:py-[2px] bg-[#03a9f4] text-white rounded-[6px] text-[12px] md:text-[23px] lg:text-[28px] lg:button-big button-deep-sky-blue inline-flex gap-x-1 md:gap-x-3 items-center mx-0 my-0 md:my-0 focus:outline-none">
{loggedIn ? "Go back home" : "All Events"}
<ArrowIcon className="md:h-[50px] md:w-[17px] w-[20px] h-[6px]" />
<div className="scale-75 md:scale-100 lg:relative lg:top-[2px]">
<ArrowIcon />
</div>
</button>
</Link>
</div>
Expand Down Expand Up @@ -115,16 +119,21 @@ export default function Profile({ loggedIn, user }) {
{user &&
user.projects.map((project, index) => {
return (
<ProfileProjectCard
<ProjectGalleryProjectCard
key={index}
name={project.name}
tools={project.tools}
bubbles={bubbleTrimmer(project.bubbles, 0, 3)}
date="ferbrary 28, 2020"
bubbleNumber={project.bubbles.length}
date={project.date}
title="Web Scrapper"
likes={93}
image={project.image}
comments={27}
tags={bubbleTrimmer(project.tags, 0, 4)}
desc={project.desc}
className="w-full flex flex-col bg-[#f8fbff] dark:bg-[#2D2D2D] rounded-xl overflow-hidden shadow-xl hover:shadow-xxl p-3"

/>
);
})}
Expand Down Expand Up @@ -157,28 +166,35 @@ export async function getServerSideProps(context) {
],
projects: [
{
bubbles: [1, 2, 3, 4, 5, 6],
date: "ferbrary 28, 2020",
name: "Zach Latta",
tools: ['github'],
bubbles: [],
date: "11:00 am, Today",
title: "Web Scrapper",
desc: "A chrome extension that gathers vital information a the tap of a button, easy as ABC",
image: "/assets/TEST/user_projects/img-1.png",
comments: 22222,
likes: 33333333,
tags: ["NextJs", "Figma"]
tags: ["NextJs", "Figma"],
liked: true
},
{
bubbles: [1, 2, 3],
date: "ferbrary 28, 2020",
name: "Elon Musk",
tools: ['figma', 'github'],
bubbles: [],
date: "12:00 pm, Today, 2020",
title: "Tesla",
desc: "Launched the first prototype of the world’s firts self-driving vehicle. Best part: 100% AI",
image: "/assets/TEST/user_projects/img-2.png",
comments: 22222,
likes: 33333333,
tags: ["React", "Vue", "Express", "Laravel"]
tags: ["React", "Vue", "Laravel"]
},
{
bubbles: [2],
date: "ferbrary 28, 2020",
name: "Dora Palfi",
tools: ['figma', 'github'],
bubbles: [1, 2, 3, 4, 5],
date: "2:00 pm, Today",
title: "Codetivate",
desc: "The world’s largest diversity-focused hackhon web application built for this fall 2022",
image: "/assets/TEST/user_projects/img-3.png",
Expand All @@ -187,8 +203,10 @@ export async function getServerSideProps(context) {
tags: ["PHP", "Golang", "Adobe XD"]
},
{
name: "Bill gates",
tools: ['adobexd', 'github'],
bubbles: [],
date: "ferbrary 28, 2020",
date: "February 28, 2022",
title: "Command tech",
desc: "Advancing the partcipation of non-binary and female students in STEM worlwide ",
image: "/assets/TEST/user_projects/img-4.png",
Expand All @@ -197,8 +215,10 @@ export async function getServerSideProps(context) {
tags: ["Python"]
},
{
bubbles: [1, 2, 3, 4, 5, 6],
date: "ferbrary 28, 2020",
name: "Ronald",
tools: ['figma', 'github'],
bubbles: [],
date: "February 27, 2022",
title: "Frelapay",
desc: "Get payments from all your freelance work converted into the highest selling cryptos",
image: "/assets/TEST/user_projects/img-5.png",
Expand All @@ -207,15 +227,17 @@ export async function getServerSideProps(context) {
tags: ["HTML", "CSS", "JSON"]
},
{
bubbles: [1, 2],
date: "ferbrary 28, 2020",
name: "Mark Zuckerburg",
tools: ['adobexd', 'github'],
bubbles: [],
date: "February 28, 2020",
title: "Microsoft",
desc: "Coded Windows 7 a new OS from my dorm room, probably gonna dropout soon :(",
image: "/assets/TEST/user_projects/img-6.png",
comments: 22222,
likes: 33333333,
tags: ["Git", "Flask", "Django"]
}
},
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions pages/project-gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const bubbleTrimmer = (bubbles, start = 0, end = 0) => {
export default function ProjectGallery({user, project}) {
return (
<div className="dark:bg-[#202020] dark:text-white">
<nav className="flex items-center justify-between pl-[10px] lg:pl-8 pr-[12px] lg:pr-12">
<nav className="flex items-center justify-between pl-[10px] lg:pl-[37px] pr-[10px] lg:pr-[37px]">
<Logo className="w-[80px] md:w-[120px] py-5" />
<div className="flex gap-x-[0px] md:gap-x-3 lg:gap-x-5 items-center">
<DarkModeToggle
Expand All @@ -27,7 +27,7 @@ export default function ProjectGallery({user, project}) {
<GithubIcon />
</a>
<Link href="https://thedynamics.tech">
<button className="px-[10px] py-[6px] md:py-[2px] bg-[#03a9f4] text-white rounded-[6px] text-[12px] md:text-[23px] lg:text-[28px] lg:button-big button-deep-sky-blue inline-flex gap-x-1 md:gap-x-3 items-center mx-2 my-0 md:my-0 focus:outline-none">
<button className="px-[10px] py-[6px] md:py-[2px] bg-[#03a9f4] text-white rounded-[6px] text-[12px] md:text-[23px] lg:text-[28px] lg:button-big button-deep-sky-blue inline-flex gap-x-1 md:gap-x-3 items-center mx-0 my-0 md:my-0 focus:outline-none">
Go back home
<div className="scale-75 md:scale-100 lg:relative lg:top-[2px]">
<ArrowIcon />
Expand Down