Skip to content
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.

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

Account system (part) #14

Merged
merged 54 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
ea6bb67
feat: Add Clerk sign-in and sign-up components
phoenixpereira Dec 28, 2023
382ca37
feat: Customise sign in and sign up pages
phoenixpereira Dec 28, 2023
3c8fc66
feat: Add basic custom join us section
phoenixpereira Dec 31, 2023
fd2f5fd
fix: Add z-index to fix button shadow
phoenixpereira Jan 1, 2024
9856437
refactor: Seperate join us form into individual step components
phoenixpereira Jan 1, 2024
8d4140b
feat: Add basic input validation to step one of form
phoenixpereira Jan 1, 2024
a346d5e
refactor: Make components for field, progress bar and validation
phoenixpereira Jan 3, 2024
40398a9
refactor: Make all form steps use components and validation
phoenixpereira Jan 3, 2024
9b6ed1d
refactor: Make all form steps use components and validation
phoenixpereira Jan 3, 2024
4e0b3ec
fix: Adjust footer icons size to centre icons properly
phoenixpereira Jan 4, 2024
bbd2cc4
feat: Clerk account sign up workflow finished
phoenixpereira Jan 4, 2024
1ca4a2b
feat: Add custom sign-in component
phoenixpereira Jan 6, 2024
c4e26a0
feat: Add extra password error handling
phoenixpereira Jan 6, 2024
fb1bdca
fix: Adjust field width
phoenixpereira Jan 6, 2024
4f48319
feat: Add continue signing up button
phoenixpereira Jan 6, 2024
2fc8dd3
feat: Add error message for sign in when Google was used to make account
phoenixpereira Jan 7, 2024
3deda76
feat: Add forgot password
phoenixpereira Jan 10, 2024
bf64e6c
chore: Add example env local
phoenixpereira Jan 10, 2024
9908c3a
feat: Change join us fields based on student status
phoenixpereira Jan 10, 2024
d9b143d
chore: Adjusted text sizes and container widths for mobile
phoenixpereira Jan 12, 2024
fafc025
chore: Update dependencies
phoenixpereira Jan 13, 2024
4acca59
refactor: optimize sign in form with `react-hook-form`
jsun969 Jan 13, 2024
0254c32
feat: Add user button
phoenixpereira Jan 15, 2024
d9b08cb
fix: User button styling updated for mobile
phoenixpereira Jan 15, 2024
45ee19e
style: Run prettier and fix linting issues
phoenixpereira Jan 15, 2024
adb8e91
fix(eslint): single quote -> `'`
jsun969 Jan 15, 2024
b2cc8f0
Merge branch 'account-system' into refactor/account-form
phoenixpereira Jan 15, 2024
05980e1
style: Run prettier
phoenixpereira Jan 15, 2024
fcef617
chore: add prettier git hook
jsun969 Jan 15, 2024
7ceb23d
fix: Add remotePatterns to next.config.js and added width and height …
phoenixpereira Jan 15, 2024
d91cd7f
style: Run Prettier
phoenixpereira Jan 15, 2024
35cab0e
Merge pull request #10 from jsun969/refactor/account-form
rayokamoto Jan 15, 2024
14096ab
refactor: reuse account layout
jsun969 Jan 15, 2024
bd6f0b6
feat(util): remove validation, use rhf instead
jsun969 Jan 15, 2024
8758c76
refactor: add util `handleClerkErrors`
jsun969 Jan 15, 2024
63eb0d4
refactor: forgot password form
jsun969 Jan 15, 2024
4120698
fix: add select placeholder
jsun969 Jan 16, 2024
e8a8dc7
refactor: move `handleClerkErrors` to account helpers
jsun969 Jan 17, 2024
a00ade2
chore: typo
jsun969 Jan 17, 2024
cb4247f
refactor: extract schema
jsun969 Jan 17, 2024
fe9194b
refactor: `join-us`
jsun969 Jan 17, 2024
deb3adf
fix: judge `isLoaded` first
jsun969 Jan 17, 2024
60956f3
fix: store student info state between steps
jsun969 Jan 17, 2024
dad6151
refactor: reuse email schema
jsun969 Jan 17, 2024
bc912f0
refactor: `schema.ts` -> `schemas.ts`
jsun969 Jan 17, 2024
c7a7d95
chore(forgot-password): `as const` for step instructions
jsun969 Jan 17, 2024
874694c
chore: comment typo
jsun969 Jan 17, 2024
9c85f41
fix(join-us): comsci degree typo
jsun969 Jan 18, 2024
6e59b0e
fix(schema): strict code to be exact 6 digitals
jsun969 Jan 18, 2024
7c5ede8
fix: name regex
jsun969 Jan 18, 2024
5234f90
Merge pull request #11 from jsun969/refactor/forgot-and-join-form
rayokamoto Jan 18, 2024
964e6ce
chore(env): new line
jsun969 Jan 18, 2024
02171a7
fix(not-found): text style
jsun969 Jan 18, 2024
8f841e8
feat: make club drive link wip
jsun969 Jan 18, 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 .env.local.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=YOUR_NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY
CLERK_SECRET_KEY=YOUR_CLERK_SECRET_KEY
11 changes: 10 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
/** @type {import('next').NextConfig} */
const nextConfig = {};
const nextConfig = {
images: {
remotePatterns: [
{
protocol: 'https',
hostname: 'img.clerk.com',
},
],
},
};

module.exports = nextConfig;
38 changes: 27 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,41 @@
"format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,css,json,yaml,yml}\""
},
"dependencies": {
"next": "14.0.3",
"@clerk/clerk-react": "^4.30.3",
"@clerk/nextjs": "^4.29.3",
"@hookform/resolvers": "^3.3.4",
"next": "14.0.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.12.0"
"react-hook-form": "^7.49.3",
"react-icons": "^4.12.0",
"zod": "^3.22.4",
"zustand": "^4.4.7"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/node": "^20.10.0",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"@types/node": "^20.11.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"autoprefixer": "^10.4.16",
"cross-env": "^7.0.3",
"eslint": "^8.54.0",
"eslint": "^8.56.0",
"eslint-config-next": "14.0.3",
"postcss": "^8.4.31",
"prettier-plugin-jsdoc": "^1.1.1",
"prettier-plugin-tailwindcss": "^0.5.7",
"tailwindcss": "^3.3.5",
"lint-staged": "^15.2.0",
"postcss": "^8.4.33",
"prettier-plugin-jsdoc": "^1.3.0",
"prettier-plugin-tailwindcss": "^0.5.11",
"simple-git-hooks": "^2.9.0",
"tailwindcss": "^3.4.1",
"tsec": "^0.2.8",
"typescript": "^5.3.2"
"typescript": "^5.3.3"
},
"lint-staged": {
"*.{js,jsx,ts,tsx,css,json,yaml,yml}": [
"prettier --write"
]
},
"simple-git-hooks": {
"pre-commit": "npx lint-staged"
}
}
Loading