Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
172c06c
Route page
GeneralAcre Jul 11, 2025
2fc45d7
feat: complete quest-1-2-3-x
Riodsa Jul 12, 2025
6f42b88
Fest/Quest3
GeneralAcre Jul 13, 2025
308f190
feat: welcome page
RuffLogix Jul 13, 2025
e25189e
Complete Quest3-5
GeneralAcre Jul 13, 2025
e71a04c
Merge branch 'dev' into feat/firstdate/welcome
MasterIceZ Jul 13, 2025
c247f31
Quest3-5/Layout
GeneralAcre Jul 13, 2025
9980c97
add : test fest 2 data
neennera Jul 13, 2025
5bc490c
fox : show image
neennera Jul 13, 2025
c1a9913
refactor : move shop into new file
neennera Jul 13, 2025
3694dc1
add : other page title & button list
neennera Jul 13, 2025
33d690a
feat: add images banner for quest-3-x
Riodsa Jul 13, 2025
c4f76e2
pull dev
RuffLogix Jul 13, 2025
8f88576
Merge branch 'feat/firstdate/welcome' of https://github.com/isd-sgcu/…
RuffLogix Jul 13, 2025
0ca68b0
feat: fest home and reward
weerawitweem Jul 14, 2025
93347ff
fix: align 4 button at the end
weerawitweem Jul 14, 2025
79b89d6
feat: add popup and text scaling
weerawitweem Jul 14, 2025
17cb875
merge dev
RuffLogix Jul 14, 2025
22ded55
fix welcome
RuffLogix Jul 14, 2025
5f1d70c
Merge remote-tracking branch 'origin/feat/feat/quest2-sub-shop' into …
Riodsa Jul 14, 2025
39fdfd9
fix: logo size and background
RuffLogix Jul 14, 2025
51306c2
Merge branch 'dev' into feat/firstdate/welcome
MasterIceZ Jul 14, 2025
ec7431d
fest/quest3-5/finished
GeneralAcre Jul 15, 2025
b67e73c
fix: change date of quest-3-4
Riodsa Jul 15, 2025
0051fa2
fest/quest3-5/update path
GeneralAcre Jul 15, 2025
7395284
feat: add link for LineOA, change ggForm Link for each quests
Riodsa Jul 15, 2025
f2f5159
feat: add LineOA link and style button
weerawitweem Jul 15, 2025
6b179af
Merge branch 'dev' into feat/fest/home
weerawitweem Jul 15, 2025
49a73f0
fix: update fest2
neennera Jul 15, 2025
65a573e
chore : remove unused file
neennera Jul 15, 2025
4e3802f
Merge branch 'dev' into feat/fest/quest-1,2,3-x
Riodsa Jul 15, 2025
bab9147
fest/quest3-5/fix conflict
GeneralAcre Jul 15, 2025
b0f42ba
Merge branch 'dev' into feat/firstdate/welcome
neennera Jul 15, 2025
023ea9b
fest/quest3-5/fix conflict 2nd time
GeneralAcre Jul 15, 2025
1af6238
Merge branch 'dev' into feat/fest/quest-1,2,3-x
Taihenc Jul 15, 2025
85dc6f0
fix: time constraint
BadLuckZ Jul 15, 2025
9643c16
Merge branch 'dev' into fix/fd/timeconstraint
BadLuckZ Jul 15, 2025
900cf06
โอ้ย
MasterIceZ Jul 15, 2025
525643a
Merge branch 'dev' into feat/firstdate/welcome
MasterIceZ Jul 15, 2025
2a3be5c
Merge branch 'dev' into fix/middleware
MasterIceZ Jul 16, 2025
ee4fa12
Merge pull request #57 from isd-sgcu/fix/middleware
MasterIceZ Jul 16, 2025
5cdf08a
Merge branch 'dev' into feat/fest/home
MasterIceZ Jul 16, 2025
3f3d379
Merge branch 'dev' into feat/fest/quest-1,2,3-x
MasterIceZ Jul 16, 2025
5c26486
Merge branch 'dev' into feat/firstdate/welcome
MasterIceZ Jul 16, 2025
ab551ba
Merge pull request #28 from isd-sgcu/feat/firstdate/welcome
MasterIceZ Jul 16, 2025
556300f
chore : fix quest 2 information
neennera Jul 16, 2025
39af316
chore : fix time in picture
neennera Jul 16, 2025
157d8fe
fix: url navigation in fest
neennera Jul 16, 2025
a4cbaba
fix: lint
neennera Jul 16, 2025
69efb24
chore: middleware.ts /staff/profile -> /staff
neennera Jul 16, 2025
36da175
add : calendar
neennera Jul 16, 2025
b37b6d1
fix: web logo & link
neennera Jul 16, 2025
1f2045c
fix: cufest link in navbar
neennera Jul 16, 2025
6ce9db2
fix: change logo to freshmen-fest-logo
neennera Jul 16, 2025
77980a9
bug: accidenlty override headers
Taihenc Jul 16, 2025
2323636
feat: add snack bar erros for register / login
Taihenc Jul 16, 2025
c734249
feat: add button for go to /register & /login
Taihenc Jul 16, 2025
89df52d
feat: integrate api for forgot password
Taihenc Jul 16, 2025
b113b33
fix: /events
neennera Jul 16, 2025
5468d15
Merge pull request #58 from isd-sgcu/neennera-patch-1
Taihenc Jul 16, 2025
8cbb94d
Merge branch 'dev' into fix/fd/timeconstraint
Taihenc Jul 16, 2025
bc0ccc0
Merge branch 'dev' into feat/fest/home
Taihenc Jul 16, 2025
481f877
Merge pull request #56 from isd-sgcu/fix/fd/timeconstraint
Taihenc Jul 16, 2025
68706d4
Merge branch 'dev' into feat/fest/home
Taihenc Jul 16, 2025
bd34e42
Merge branch 'dev' into feat/fest/quest-1,2,3-x
Taihenc Jul 16, 2025
3dae685
revert: pnpm-lock
Taihenc Jul 16, 2025
c12f677
Merge pull request #53 from isd-sgcu/feat/fest/home
Taihenc Jul 16, 2025
29d5c0d
chore: fix linting
Taihenc Jul 16, 2025
f829261
Merge branch 'dev' into feat/fest/quest-1,2,3-x
Taihenc Jul 16, 2025
0b866ed
Merge pull request #52 from isd-sgcu/feat/fest/quest-1,2,3-x
Taihenc Jul 16, 2025
bb1bf23
chore: resize image :Movieposter & PosterQuest5
Dpyde Jul 16, 2025
19c5c56
fix: api call
RuffLogix Jul 16, 2025
dbb40b5
Update tsconfig.json
BadLuckZ Jul 16, 2025
c21b1a9
Merge branch 'dev' into feat/fest/quest-3-5
BadLuckZ Jul 16, 2025
5022055
fix: even less image size !!
neennera Jul 16, 2025
0296bb3
Merge branch 'feat/fest/quest-3-5' of https://github.com/isd-sgcu/fdr…
neennera Jul 16, 2025
a5b3519
fix: /fest/home to /fest
neennera Jul 16, 2025
db48b78
chore: remove unrelated lock file
Taihenc Jul 16, 2025
031bde6
Merge pull request #51 from isd-sgcu/feat/fest/quest-3-5
Taihenc Jul 16, 2025
9db49f8
Merge branch 'dev' into feat/firstdate/profile
MasterIceZ Jul 16, 2025
0764a6b
Merge pull request #60 from isd-sgcu/feat/firstdate/profile
MasterIceZ Jul 16, 2025
e989c79
Merge branch 'dev' into recheck/check-work
neennera Jul 16, 2025
7a5a9af
feat: getProfile
BadLuckZ Jul 16, 2025
75b1ae2
fix: fix due to pre-push
BadLuckZ Jul 16, 2025
e5ee06c
fix: fix fest content
neennera Jul 16, 2025
a3101c3
Merge branch 'dev' into feat/fix-api-lib-bugs-add/integrate-be-api-fo…
Taihenc Jul 16, 2025
7c5ed0a
Merge branch 'dev' into feat/rpkm/groupAPI
BadLuckZ Jul 16, 2025
359c70d
Merge pull request #59 from isd-sgcu/feat/fix-api-lib-bugs-add/integr…
Taihenc Jul 16, 2025
ec58021
Merge branch 'dev' into feat/rpkm/groupAPI
BadLuckZ Jul 16, 2025
29e9ea6
add: staff homepage
neennera Jul 16, 2025
5030fb6
feat: logout
Taihenc Jul 16, 2025
7246446
Merge branch 'dev' into feat/logout
Taihenc Jul 16, 2025
8275d54
Merge branch 'dev' into recheck/check-work
neennera Jul 16, 2025
40245f4
fix: Create auth.ts
BadLuckZ Jul 16, 2025
536c2b5
fix: staff login
neennera Jul 16, 2025
e83658a
Merge pull request #64 from isd-sgcu/feat/logout
neennera Jul 16, 2025
b1c4cab
Merge branch 'dev' into recheck/check-work
neennera Jul 16, 2025
dc99fe6
Merge branch 'dev' into feat/rpkm/profileAPI
BadLuckZ Jul 16, 2025
be82afa
Merge pull request #63 from isd-sgcu/feat/rpkm/profileAPI
BadLuckZ Jul 16, 2025
58a1129
add: .+- to special charactor
neennera Jul 16, 2025
d675929
Merge branch 'dev' of https://github.com/isd-sgcu/fdrpkm68-frontend i…
neennera Jul 16, 2025
7885eb7
add: special char
neennera Jul 16, 2025
e620116
fix: logout for staff
Taihenc Jul 16, 2025
a022877
Merge branch 'dev' into fix/staff-logout
neennera Jul 16, 2025
50c6abc
Merge pull request #66 from isd-sgcu/fix/staff-logout
neennera Jul 16, 2025
90a5d7b
Update deploy.yml
RawSalmon69 Jul 16, 2025
04efed2
Merge branch 'deployyaml' into dev
RawSalmon69 Jul 16, 2025
5627d83
fix: icon for staff page
neennera Jul 16, 2025
06fc675
add: link login after
neennera Jul 16, 2025
78a90f0
fix? : make QueryClientProvider usable, I guess
neennera Jul 16, 2025
ded2dcd
add : fetch get user data & edit field
neennera Jul 16, 2025
03f50f8
add: patch user dai leaw
neennera Jul 16, 2025
b521ded
add : 404 page
neennera Jul 16, 2025
ee80dbc
Merge branch 'dev' of https://github.com/isd-sgcu/fdrpkm68-frontend i…
neennera Jul 16, 2025
d2e58d8
Merge branch 'dev' into fix/profile-page
neennera Jul 16, 2025
41e8b74
fix: kai ma add space tong ni wa !
neennera Jul 16, 2025
5141088
Merge pull request #69 from isd-sgcu/fix/profile-page
BadLuckZ Jul 16, 2025
3909a87
add : constrain in register
neennera Jul 16, 2025
6a5daa8
fix: fix by tester
neennera Jul 16, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ jobs:
env:
BUCKET_NAME: freshmenfest2025-static
SERVICE_NAME: freshmenfest2025-frontend
API_URL: https://freshmenfest2025.com/api
SITE_URL: https://freshmenfest2025.com
JWT_SECRET: ${{ secrets.PROD_SECRET_JWT_KEY }}

steps:
- name: Checkout code
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@fontsource/zen-dots": "^5.2.6",
"@lucide/astro": "^0.525.0",
"@tailwindcss/vite": "^4.1.11",
"@tanstack/react-query": "^5.83.0",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"astro": "^5.10.1",
Expand Down
24 changes: 24 additions & 0 deletions pnpm-lock.yaml

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

Binary file added public/fest/AboutTimePoster.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/fest/ActivityTable.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/fest/InterstellarPoster.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/fest/MoviePoster.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/fest/PosterQuest5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/fest/PosterTable.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/fest/fest-reward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions public/fest/fest_quest2_shop_list.csv

Large diffs are not rendered by default.

Binary file added public/images/background/bg-welcome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/fest/mapMark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/fest/quest-3-1-banner.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/fest/quest-3-2-banner.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/fest/quest-3-3-banner.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/fest/quest-3-4-banner.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/fest/quest-3-5-banner.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 33 additions & 5 deletions src/components/common/login/LoginForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useForm } from "react-hook-form";
import ForgotPasswordStep from "@/components/common/login/ForgetPasswordStep";
import LoginStep from "@/components/common/login/LoginStep";
import { api } from "@/lib/api";
import { showSnackbar } from "@/lib/utils";

interface LoginFormData {
studentId: string;
Expand Down Expand Up @@ -54,16 +55,43 @@ export default function LoginForm({
});

if (response.success) {
window.location.href = "/firstdate/home";
window.location.href =
userType === "FRESHMAN" ? "/firstdate/home" : "/staff/home";
} else {
showSnackbar(
response.error || "Login failed. Please try again.",
"error"
);
}
},
[]
);

const onForgotPasswordSubmit = useCallback((data: LoginFormData): void => {
console.log("Password reset form submitted:", data);
// Handle password reset logic here
}, []);
const onForgotPasswordSubmit = useCallback(
async (data: LoginFormData): Promise<void> => {
console.log("Password reset form submitted:", data);
// Handle password reset logic here
const response = await api.post("/auth/forgot-password", {
studentId: data.studentId,
citizenId: data.citizenId,
newPassword: data.newPassword,
});

if (response.success) {
showSnackbar(
"Password reset successful. You can now log in.",
"success"
);
setStep(1); // Go back to login step
} else {
showSnackbar(
response.error || "Password reset failed. Please try again.",
"error"
);
}
},
[]
);

const handleForgot = useCallback((): void => {
setStep(2);
Expand Down
8 changes: 8 additions & 0 deletions src/components/common/login/LoginStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ export default function LoginStep({
>
เข้าสู่ระบบ
</button>

<a
type="button"
className="mt-5 text-right text-sm text-gray-500 underline"
href="/register"
>
ลงทะเบียนบัญชีใหม่
</a>
</form>
</div>
);
Expand Down
Loading
Loading