Skip to content

Commit

Permalink
Merge branch 'main' into dev/auth-api
Browse files Browse the repository at this point in the history
  • Loading branch information
PokeJofeJr4th authored Apr 14, 2024
2 parents d5778a8 + 8ad701a commit 4d9bf11
Show file tree
Hide file tree
Showing 6 changed files with 6,092 additions and 19 deletions.
73 changes: 55 additions & 18 deletions next/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,67 @@ import { DiscordIcon, InstagramIcon, SlackIcon, TikTokIcon, TwitchIcon } from '@
import Link from 'next/link';

export default function Home() {
const placeholder_w = 800;
const placeholder_h = 800;

const placeholder_img = (
<Image
src={`https://dummyimage.com/${placeholder_w}x${placeholder_h}`}
alt="Placeholder"
width={placeholder_w}
height={placeholder_h}
className="w-full h-auto rounded-[60px]"
/>
)

return (
<>
<section className="text-base-content">
<div className="mx-auto max-w-screen-xl px-4 pt-16 lg:flex">
<div className="text-center flex flex-col items-center w-full max-w-4xl">
<h1>
Society of
<span className="block lg:inline"> Software Engineers </span>
</h1>
{/* Hero section */}
<div className='my-auto flex flex-col md:flex-row items-center md:justify-evenly'>
<div className="flex flex-col justify-center w-auto md:w-2/5">
<h1 className='text-center md:text-left'>
Society of
<span className="block lg:inline"> Software Engineers </span>
</h1>

<p className="mx-auto mt-4 max-w-2xl sm:text-xl/relaxed text-center">
{HomepageContent.description}
</p>
<p className='mt-4 font-bold text-center'>
{HomepageContent.weeklyMeetingCallout}
</p>
<p className="mx-auto mt-4 sm:text-xl/relaxed text-center md:text-left">
{HomepageContent.description}
</p>
<p className='mt-4 font-bold text-center md:text-left'>
{HomepageContent.weeklyMeetingCallout}
</p>

<div className="mt-8 flex flex-row flex-wrap justify-center items-center gap-4 min-[460px]:flex-row">
<CTAButton href={HomepageContent.slackLink} text="Join Slack" />
<CTAButton href="/about/get-involved" text="Get Involved" />
</div>
<div className="mt-8 flex flex-row flex-wrap gap-4 min-[460px]:flex-row justify-center md:justify-start">
<CTAButton href={HomepageContent.slackLink} text="Join Slack" />
<CTAButton href="/about/get-involved" text="Get Involved" />
</div>
</div>
</section>
<div className='flex mt-12 md:mt-0 w-11/12 sm:w-2/5 justify-center'>
{placeholder_img}
</div>
</div>
{/* About Us Section */}
{/* <div className='flex flex-col md:flex-row items-center md:justify-evenly md:mt-28'>
<div className='flex mt-12 md:mt-0 w-11/12 sm:w-2/5 justify-center'>
{placeholder_img}
</div>
<div className="flex flex-col justify-center w-auto md:w-2/5">
<h1 className='text-center md:text-left mt-8 md:mt-0'>
About Us
</h1>
<p className="mx-auto mt-4 text-lg/relaxed text-center md:text-left">
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
Tess is Tech Head. Tess is Tech Head. Tess is Tech Head. Tess is Tech Head.
</p>
</div>
</div> */}
</>
);
}
50 changes: 50 additions & 0 deletions next/app/projects/ProjectCard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import React from "react";
import { Project } from "./projects";

const ProjectCard = ({logo, title, lead, contact, description, stack, progress}: Project) => {
return (
<div className="rounded-lg bg-base-100 w-10/12 py-8 px-12 mx-auto flex flex-row items-center content-center gap-10 my-10">
{/* Left half */}
<img src={logo} />

{/* Right half */}
<div>
{/* Heading */}
<h1 className="text-2xl font-bold text-primary text-left mb-4">
{title ? title : "Default"}
</h1>

{/* Body */}
<div className="text-lg flex flex-col gap-2">
<div>
<span className="font-bold">Project Lead: </span>
{lead ? lead : "Default"}
</div>

<div>
<span className="font-bold">Contact: </span>
{contact ? contact : "Default"}
</div>

<div>
<span className="font-bold">Tech Stack: </span>
{stack ? stack : "Default"}
</div>

<div>
<span className="font-bold">Description: </span>
{description ? description : "Default"}
</div>

<div>
<span className="font-bold">Progress: </span>
{progress ? progress : "Default"}
</div>

</div>
</div>
</div>
);
};

export default ProjectCard;
39 changes: 39 additions & 0 deletions next/app/projects/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"use client";
import React from "react";
import ProjectCard from "./ProjectCard";
import { Project, projectsData } from "./projects";
import { useState } from "react";

const Projects = () => {
const [projects, setProjects] = useState(projectsData);

return (
<>
{/* Intro */}
<section className="intro mt-16 mb-5 max-w-2xl mx-auto">
<h1
className="bg-gradient-to-t from-primary to-secondary
bg-clip-text text-4xl font-extrabold text-transparent md:text-5xl"
>
Projects
</h1>
<div className="mt-3 text-xl text-center">
<div className="leading-8">Our mission is simple.</div>
<div className="leading-8">Want to build? We'll make it happen.</div>
<div className="text-xl text-primary opacity-70 mt-1">
Write to <span className="hover:underline hover:font-bold"><a href="mailto:[email protected]">[email protected]</a></span> for more info.
</div>
</div>
</section>

{/* Exhibit */}
<section className="exihibit">
{projects.map((project, key) => (
<ProjectCard key={key} {...project} />
))}
</section>
</>
);
};

export default Projects;
41 changes: 41 additions & 0 deletions next/app/projects/projects.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const placeholder_w = 400;
const placeholder_h = 240;
const defaultImage = `https://dummyimage.com/${placeholder_w}x${placeholder_h}`
export interface Project{
logo: string;
title: string;
lead: string;
contact: string;
description: string;
stack?: string;
progress: string;
}

export const projectsData: Project[] = [
{
logo: defaultImage,
title: "Project 1",
lead: "lead 1",
contact: "[email protected]",
description: "Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia, aliquid. Laudantium veritatis veniam praesentium nesciunt facilis quod quam nihil labore perferendis, qui molestiae ad quibusdam magnam consequatur tempore, hic minus!",
stack: "Stack",
progress: "In Progress"
},
{
logo: defaultImage,
title: "Project 2",
lead: "Lead 2",
contact: "[email protected]",
description: "Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia, aliquid. Laudantium veritatis veniam praesentium nesciunt facilis quod quam nihil labore perferendis, qui molestiae ad quibusdam magnam consequatur tempore, hic minus!",
progress: "Conceptualization"
},
{
logo: defaultImage,
title: "Project 3",
lead: "Lead 3",
contact: "[email protected]",
description: "Lorem ipsum dolor sit amet consectetur adipisicing elit. Quia, aliquid. Laudantium veritatis veniam praesentium nesciunt facilis quod quam nihil labore perferendis, qui molestiae ad quibusdam magnam consequatur tempore, hic minus!",
stack: "Stack",
progress: "Complete"
},
]
2 changes: 1 addition & 1 deletion next/components/nav/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const navItems: NavItemProps[] = [
},
{
title: "Projects",
route: "#",
route: "/projects",
},
{ // Go links dropdown removed. Check commit d2f1d82 in feature branch if we need to restore the dropdowns.
title: "Go Links",
Expand Down
Loading

0 comments on commit 4d9bf11

Please sign in to comment.