Skip to content

Issue 33: Create admin login page draft #89

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
Patrickodrat wants to merge 29 commits into
base: main
Choose a base branch
from
Open

Issue 33: Create admin login page draft #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
72117cd
Add Room card component with user, admin, and mobile views.
loklokyx Dec 2, 2025
b617702
Merge branch 'main' into issue-21-Add_Room_card_component
loklokyx Dec 2, 2025
28e3621
WIP: email config
Viloetsisi Dec 3, 2025
f8445eb
Resolve merge conflict in settings.py and keep email + S3 config
Viloetsisi Dec 3, 2025
dc3c101
Add email configuration variables to .env.example
Viloetsisi Dec 3, 2025
e2f6271
Refactor color properties in AlertDialog and RoomCard components for …
loklokyx Dec 3, 2025
f09fd57
Remove unnecessary requirements.txt from branch
Viloetsisi Dec 6, 2025
0d53973
Resolve merge conflict in .env.example and remove DEFAULT_FROM_EMAIL
Viloetsisi Dec 8, 2025
9c70db6
Improve RoomCard components and update layout for responsiveness
loklokyx Dec 8, 2025
a9321da
Merge branch 'main' into issue-21-Add_Room_card_component
loklokyx Dec 8, 2025
2b0f609
feat(email): update email_utils to support HTML templates
Viloetsisi Dec 8, 2025
39a3d3d
chore(settings): enable api/templates directory for email HTML templates
Viloetsisi Dec 8, 2025
d5553cd
feat(email-template): add booking confirmed HTML template
Viloetsisi Dec 8, 2025
554a44e
feat(email-template): add booking cancelled HTML template
Viloetsisi Dec 8, 2025
c75ce34
refactor: update email templates with Bloom Figma logo and add base t…
Viloetsisi Dec 11, 2025
8b3c178
docs: add usage comments for email helper functions
Viloetsisi Dec 13, 2025
ed78710
docs: document email context structure and align templates with start…
Viloetsisi Dec 13, 2025
cdc9a01
Refactor components and remove mobile version
loklokyx Dec 13, 2025
74163e3
Merge remote-tracking branch 'origin/main' into issue-21-Add_Room_car…
loklokyx Dec 15, 2025
f927c5f
edit styles
ErikaKK Jan 3, 2026
a244ba5
Issue 33: Create admin login page draft
Patrickodrat Jan 3, 2026
017ec6b
Merge pull request #49 from codersforcauses/issue-21-Add_Room_card_co…
ErikaKK Jan 3, 2026
0b8e7c5
Merge pull request #51 from codersforcauses/issue-31-Add_email_API_an…
ErikaKK Jan 6, 2026
102fc5a
Remove old input component from the branch
Patrickodrat Jan 8, 2026
4ea3571
PR update
Patrickodrat Jan 8, 2026
23b5a63
Issue 33: Create admin login page draft
Patrickodrat Jan 3, 2026
9f7a67f
Remove old input component from the branch
Patrickodrat Jan 8, 2026
edd30d1
PR update
Patrickodrat Jan 8, 2026
6a37656
Merge branch 'issue-33-Create_admin_login_page' of https://github.com…
Patrickodrat Jan 10, 2026
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
128 changes: 87 additions & 41 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
"dependencies": {
"@radix-ui/react-accordion": "^1.2.12",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-label": "^2.1.8",
"@radix-ui/react-popover": "^1.1.15",
"@radix-ui/react-radio-group": "^1.3.8",
"@radix-ui/react-select": "^2.2.6",
"@radix-ui/react-slot": "^1.2.3",
"@tanstack/react-query": "^5.80.7",
Expand All @@ -30,9 +27,9 @@
"clsx": "^2.1.1",
"is-inside-container": "^1.0.0",
"lucide-react": "^0.516.0",
"next": "15.4.8",
"react": "19.1.2",
"react-dom": "19.1.2",
"next": "15.4.7",
"react": "19.1.0",
"react-dom": "19.1.0",
"react-google-recaptcha": "^3.1.0",
"react-icons": "^5.5.0",
"tailwind-merge": "^3.3.1",
Expand Down
9 changes: 8 additions & 1 deletion client/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ const montserrat = Montserrat({
export default function RootLayout({ children }: { children: ReactNode }) {
return (
<html lang="en">
<body className={montserrat.variable}>
<body
className={montserrat.variable}
// The following attributes are injected by browser extensions.
// This can cause React hydration warnings. They are safe to ignore or remove.
data-new-gr-c-s-check-loaded="14.1265.0"
data-gr-ext-installed=""
data-gr-ext-disabled="forever"
>
<Providers>{children}</Providers>
</body>
</html>
Expand Down
Loading