Skip to content

Fix/logo #10

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix/logo #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e4b9df
fix login form and cca uiux.
juancarlovieri Aug 12, 2024
dbcee4f
Remove zone identifier.
juancarlovieri Aug 13, 2024
2b36d3b
fixed layout issues
frederickemerson Aug 13, 2024
a387bb1
fixed icon
frederickemerson Aug 15, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

**/*:Zone.Identifier

# dependencies
/node_modules
/.pnp
Expand Down
Binary file removed public/CCA booklet AY2425.pdf:Zone.Identifier
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/app/components/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default function LoginForm() {
id="username"
value={username}
onChange={e => setUsername(e.target.value)}
placeholder="Please insert your room number"
placeholder="Please insert your matric number"
className="appearance-none rounded-lg border-2 border-gray-100 px-4 py-3 text-black placeholder-gray-300 focus:shadow-lg focus:outline-none focus:ring-2 focus:ring-green-600"
/>
</div>
Expand Down
115 changes: 69 additions & 46 deletions src/app/dashboard/ccas/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ const CCAComponent: React.FC = () => {
const [activities, setActivities] = useState<CCA[]>([]);
const [signedUpCCAs, setCCAs] = useState<SignupData[]>([]);
const [tempReason, setReason] = useState<string>("");
<<<<<<< HEAD
const [flagNewCCA, setFlag] = useState(false)
=======
const [flagNewCCA, setFlag] = useState(false);
>>>>>>> d4a158b933066b2c0a9efaccfc327c2f1ce21cee

const moveUp = (index: number, selectedActivity: CCA, setSelectedActivity: (_: CCA) => void) => {
if (index === 0) return;
Expand Down Expand Up @@ -83,6 +88,7 @@ const CCAComponent: React.FC = () => {
const preventPropagation = (e: Event) => e.preventDefault();

useEffect(() => {
setFlag(true);
window.addEventListener("beforeunload", preventPropagation);
return () => window.removeEventListener("beforeunload", preventPropagation);
}, [email, name, signedUpCCAs, telegramHandle]);
Expand Down Expand Up @@ -178,6 +184,11 @@ const CCAComponent: React.FC = () => {
title: "Submitted Successfully",
});
window.removeEventListener("beforeunload", preventPropagation);
<<<<<<< HEAD
setFlag(false)
=======
setFlag(false);
>>>>>>> d4a158b933066b2c0a9efaccfc327c2f1ce21cee
} else {
toast({
variant: "destructive",
Expand Down Expand Up @@ -214,6 +225,7 @@ const CCAComponent: React.FC = () => {
toast({
title: "Added Successfully",
});
setFlag(true)
}
setReason("");
setIsModalOpen(false);
Expand All @@ -229,53 +241,60 @@ const CCAComponent: React.FC = () => {

return (
<>
<div className="flex flex-row items-center">
<h1 className="m-8 text-2xl font-bold text-black">CCA List</h1>
<Button onClick={handleSubmit}>Submit</Button>
<div className="mx-4 flex flex-row items-center justify-between">
<h1 className="m-8 text-2xl font-bold text-black">CCA Signup</h1>
<Button className="mr-6" onClick={handleSubmit}>
Submit
</Button>
</div>

<Card className="mx-8 my-4 flex w-auto items-center">
<CardContent>
<div className="flex w-[73vw] flex-row justify-between sm:w-[77vw]">
<h2 className="my-6 text-xl font-bold">Contact Information</h2>
</div>
<div className="space-y-4">
<Input value={name} onChange={e => setName(e.target.value)} placeholder="Name" />
<Input value={email} onChange={e => setEmail(e.target.value)} placeholder="Email" />
<Input
value={telegramHandle}
onChange={e => setTelegramHandle(e.target.value)}
placeholder="Telegram Handle"
/>
</div>
</CardContent>
</Card>
<Card className="m-8 flex w-auto items-center">
<CardContent>
<div className="flex w-[73vw] flex-row justify-between sm:w-[77vw]">
<h2 className="my-6 text-xl font-bold">Signed-Up CCAs</h2>
</div>
<div className="flex items-center gap-4 overflow-x-auto pb-4">
{signedUpCCAs.map((obj, i) => (
<div key={i} className="flex items-center justify-between rounded-md bg-white p-4 shadow-md">
<button className="mx-2" onClick={() => openModal(obj.cca.name)}>
{obj.cca.name}
</button>
<div className="flex space-x-2">
<Button
onClick={() => {
deleteItems(i);
}}
className="rounded bg-white p-2 text-black hover:bg-gray-200"
>
❌
</Button>
{flagNewCCA && (
<h1 className="text-md mb-4 text-center font-bold text-red-500 sm:text-2xl">Please remember to press Submit</h1>
)}

<div className="flex flex-col items-start">
<Card className="mx-8 my-4 flex w-auto items-center">
<CardContent>
<div className="flex w-[73vw] flex-row justify-between sm:w-[77vw]">
<h2 className="my-6 text-xl font-bold">Contact Information</h2>
</div>
<div className="space-y-4">
<Input value={name} onChange={e => setName(e.target.value)} placeholder="Name" />
<Input value={email} onChange={e => setEmail(e.target.value)} placeholder="Email" />
<Input
value={telegramHandle}
onChange={e => setTelegramHandle(e.target.value)}
placeholder="Telegram Handle"
/>
</div>
</CardContent>
</Card>
<Card className="my-4 flex w-full items-center sm:mx-8 sm:max-w-[80vw]">
<CardContent>
<div className="flex w-[73vw] flex-row justify-between">
<h2 className="my-6 text-xl font-bold">Signed-Up CCAs</h2>
</div>
<div className="flex flex-col flex-wrap items-start gap-4 overflow-y-auto pb-4 sm:flex-row">
{signedUpCCAs.map((obj, i) => (
<div key={i} className="flex items-center justify-between rounded-md bg-white p-4 shadow-md">
<button className="mx-2" onClick={() => openModal(obj.cca.name)}>
{obj.cca.name}
</button>
<div className="flex space-x-2">
<Button
onClick={() => {
deleteItems(i);
}}
className="rounded bg-white p-2 text-black hover:bg-gray-200"
>
❌
</Button>
</div>
</div>
</div>
))}
</div>
</CardContent>
</Card>
))}
</div>
</CardContent>
</Card>
</div>
<div className="mx-auto w-full max-w-4xl">
{Object.entries(groupedActivities).map(([category, activities]) => (
<Card key={category} className="mb-8">
Expand Down Expand Up @@ -303,7 +322,11 @@ const CCAComponent: React.FC = () => {
))}
{isModalOpen && selectedActivity && (
<Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
<DialogContent className="flex max-h-[90vh] min-w-[30vw] max-w-[95vw] flex-col overflow-y-auto lg:max-w-[50vw]">
<<<<<<< HEAD
<DialogContent className="flex max-h-[90vh] w-fit min-w-[30vw] max-w-[95vw] flex-col overflow-y-auto lg:max-w-[50vw]">
=======
<DialogContent className="flex max-h-[90vh] w-full min-w-[30vw] max-w-[95vw] flex-col overflow-y-auto lg:w-fit lg:max-w-[50vw]">
>>>>>>> d4a158b933066b2c0a9efaccfc327c2f1ce21cee
<DialogHeader>Why do you want to join {selectedActivity.name}?</DialogHeader>
<div className="space-y-4">
<Input
Expand Down
Binary file modified src/app/favicon.ico
View file
Open in desktop
Binary file not shown.