Skip to content

Commit 45c61f2

Browse files
authored
Merge pull request #7 from DaRichardX/feat/registration-page-routing-and-ux
[FEATURE] Registration page routing & UX polish
2 parents 122f5dd + 009a823 commit 45c61f2

File tree

6 files changed

+151
-137
lines changed

6 files changed

+151
-137
lines changed

package-lock.json

Lines changed: 8 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@react-pdf/renderer": "3.4.4",
4444
"@supabase/ssr": "0.5.0",
4545
"@supabase/supabase-js": "2.45.1",
46-
"@tanstack/react-query": "^5.66.9",
46+
"@tanstack/react-query": "^5.74.4",
4747
"@testing-library/dom": "10.4.0",
4848
"@tiptap/extension-link": "2.6.4",
4949
"@tiptap/extension-placeholder": "2.6.4",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"use client";
2+
3+
import * as React from "react";
4+
import Registration from "@/components/registration/registration";
5+
import { useParams } from "next/navigation";
6+
7+
export default function Page() {
8+
const { id } = useParams();
9+
10+
return <Registration id={id} />;
11+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ import * as React from "react";
44
import Registration from "@/components/registration/registration";
55

66
export default function Page() {
7-
return <Registration />;
7+
return <Registration id={"demo"} />;
88
}

src/components/registration/registration.css

Lines changed: 18 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,14 @@ button:active {
346346
transition: background-color 0.2s ease-in-out;
347347
}
348348

349-
350349
.register-btn.disabled {
351-
background-color: #B0C4DE; /* Grey-blue when disabled */
350+
background-color: #b0c4de; /* Grey-blue when disabled */
352351
color: #ffffff;
353352
cursor: not-allowed;
354353
}
355354

356355
.register-btn.registered {
357-
background-color: #6FA3EF; /* Slightly blue when registered */
356+
background-color: #6fa3ef; /* Slightly blue when registered */
358357
color: white;
359358
cursor: default;
360359
}
@@ -474,61 +473,46 @@ h2 {
474473
left: 0;
475474
width: 100%;
476475
height: 100%;
477-
background-color: rgba(0, 0, 0, 0.5);
478-
backdrop-filter: blur(0px);
476+
background-color: rgba(0, 0, 0, 0.2);
477+
backdrop-filter: blur(2px);
479478
display: flex;
480479
align-items: center;
481480
justify-content: center;
482481
z-index: 1000;
483-
padding: 50px 20px; /* Adds top/bottom padding with some left/right */
484482
box-sizing: border-box;
485-
486-
transition:
487-
opacity 0.3s ease-in-out,
488-
visibility 0.3s ease-in-out;
489-
/*overflow-y: scroll;*/
490483
}
491-
.register-content{
484+
485+
.register-content {
492486
position: sticky;
493487
bottom: 0;
494-
background-color: white; /* Ensures visibility */
488+
background-color: white;
495489
padding: 15px;
496490
display: flex;
497491
justify-content: space-between;
498492
align-items: center;
499-
border-top: 1px solid #ddd; /* Optional: separator */
493+
border-top: 1px solid #ddd;
500494
margin-top: 30px;
501495
}
496+
502497
.modal-content {
503-
height: 55%;
498+
max-height: 55%;
504499
background-color: white;
505-
padding: 30px 40px; /* More padding inside the modal */
506-
border-radius: 10px;
500+
border-radius: 20px;
507501
max-width: 1000px; /* Increase max width to make it wider */
508502
width: 90%; /* Ensures it takes up most of the screen width */
509503
max-height: calc(100% - 100px); /* Adds more top/bottom spacing */
510504
overflow-y: auto;
511505
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
512506
position: relative;
507+
z-index: 1200;
513508
}
514509

515510
.modal-overlay.show {
516511
visibility: visible;
517512
opacity: 1;
513+
z-index: 1200;
518514
}
519515

520-
/*.modal-content {*/
521-
/* background-color: white;*/
522-
/* padding: 20px;*/
523-
/* border-radius: 8px;*/
524-
/* max-width: 800px;*/
525-
/* width: 80vw;*/
526-
/* min-height: 500px;*/
527-
/* text-align: left;*/
528-
/* box-shadow: 0px 10px 30px rgba(0, 0, 0, 0.3);*/
529-
/* animation: fadeIn 0.2s ease-in-out;*/
530-
/*}*/
531-
532516
@keyframes fadeIn {
533517
from {
534518
opacity: 0;
@@ -539,7 +523,7 @@ h2 {
539523
transform: translateY(0);
540524
}
541525
}
542-
.random-btn{
526+
.random-btn {
543527
background: whitesmoke;
544528
color: black;
545529
border: none;
@@ -554,28 +538,17 @@ h2 {
554538
}
555539

556540
.close-btn {
557-
background: #d9d9d9;
558541
color: white;
559542
border: none;
560-
padding: 8px 12px;
561-
border-radius: 5px;
562543
cursor: pointer;
563-
margin-top: 10px;
564-
transition: background-color 0.2s ease-in-out;
565544
}
566545

567-
.close-btn:hover {
568-
background: #d6d6d6;
569-
}
570546
.modal-close-button {
571-
position: absolute;
572-
top: 15px;
573-
right: 15px;
547+
position: sticky;
548+
top: 0;
549+
574550
background: none;
575551
border: none;
576552
font-size: 24px;
577-
cursor: pointer;
578-
color: #333;
579-
z-index: 10;
553+
color: #252525;
580554
}
581-

0 commit comments

Comments
 (0)