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

v1.1.0 #67

Merged
merged 246 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
246 commits
Select commit Hold shift + click to select a range
b6c2bff
update list 1.2.1& 2.2 add list 2.2.1
vincentxuu Apr 9, 2023
b643cf7
update figma 1.2 & 2.2
vincentxuu Apr 15, 2023
6d8a8ec
comment out components/Home/ FacebookPosts/Cardlist due to an error …
vincentxuu May 28, 2023
cc2c4cf
fix: resource title
SiongSng Jul 5, 2023
871e62c
Merge pull request #6 from daodaoedu/fix/resouce-title
pepe1113 Jul 5, 2023
3f7b96e
🔧 add alias import config
JohnsonMao Oct 10, 2023
5358d7a
✨ add group page
JohnsonMao Oct 10, 2023
fc5d1d2
♻️ refactor group page
JohnsonMao Nov 10, 2023
e4be18d
♻️ refactor coding style
JohnsonMao Nov 11, 2023
5728acc
🐛 fixed isActive props console error
JohnsonMao Nov 12, 2023
02865b8
🐛 fixed server and client placeholder not match
JohnsonMao Nov 12, 2023
fe9c2a0
⚡️ optimize developer experience
JohnsonMao Nov 12, 2023
8589f22
🐛 fixed next export error
JohnsonMao Nov 12, 2023
4174a9d
🐛 resolve group card text issue
JohnsonMao Nov 12, 2023
986dd63
⏪ Revert "🐛 fixed next export error"
JohnsonMao Nov 14, 2023
f6b757e
🎨 eslint format
JohnsonMao Nov 14, 2023
29c4f16
🔧 disable a11y/control-has-associated-label check
JohnsonMao Nov 14, 2023
bc93ce4
Merge pull request #9 from JohnsonMao/feature/group
JohnsonMao Nov 23, 2023
2eb05ad
feat: Add new ui and remove firebase code
whalekiller03 Oct 29, 2023
316ddbd
chore: Add parameter and nuxt.config
whalekiller03 Oct 29, 2023
cc85fb6
feat(partner): Modify PartnerList and fetch api with redux-saga
whalekiller03 Nov 20, 2023
dc97fb2
fix(partner): show 顯示更多的 Button 及 mobile 樣式
whalekiller03 Nov 20, 2023
fb86820
feat(Partner/Banner): Modify Banner and Include shared image
whalekiller03 Nov 28, 2023
d3381fd
fix(Partner/PartnerList): fix logical and ui style
whalekiller03 Nov 28, 2023
2499210
refactor: remove useless file
whalekiller03 Dec 3, 2023
6d937c0
feat(partner): Add SearchField and SearchParams in Partner
whalekiller03 Dec 3, 2023
094e991
style(partner/banner): modify banner style
whalekiller03 Dec 3, 2023
d120f4b
refactor(partner/partnerCard): Modify CardStyle and setData
whalekiller03 Dec 3, 2023
efe6e3c
chore(sagas/user): Add default baseUrl
whalekiller03 Dec 3, 2023
f69f6f4
fix: yarn build issue
whalekiller03 Dec 3, 2023
3889578
feat(profile): Add Profile components ui and PartnerDetail
whalekiller03 Dec 3, 2023
8ecdc20
style(userTabs): create userTabs.styled
whalekiller03 Dec 4, 2023
c5c428d
fix(searchParamsList): filter unexpected params in SearchParamsList
whalekiller03 Dec 10, 2023
dfba0ec
♻️ Move mockData to the API directory and implement Redux integration…
JohnsonMao Dec 12, 2023
3517660
🐛 Fixed potential type confusion and refactor style
JohnsonMao Dec 13, 2023
ab987bc
Merge pull request #10 from daodaoedu/feature/2.1_partner
JohnsonMao Dec 14, 2023
b5c3c14
feat: add donate promotion
Dec 23, 2023
0a3a720
feat: donate promotion
Dec 23, 2023
0e7240f
Merge pull request #21 from pepe1113/feature/donate_link
pepe1113 Dec 23, 2023
9991c64
feat(partner): Deal with Fetching Search Partners results
whalekiller03 Dec 27, 2023
47c4b64
Merge pull request #22 from daodaoedu/feature/2.1_partner_add_api
hsuifang Jan 2, 2024
7212670
fix(partner): add getStaticProps and getStaticPaths to generate page
whalekiller03 Jan 2, 2024
ca536a8
Merge pull request #11 from daodaoedu/feature/2.2_partner_profile
hsuifang Jan 2, 2024
97379a9
fix(partner): ui - show Tag and api: queryParams
whalekiller03 Jan 2, 2024
95e1858
Merge pull request #23 from daodaoedu/fix/2.1_partner_add_api
hsuifang Jan 2, 2024
57ea764
feat(partner): 串接 user/:id 及 調整頁面路徑
whalekiller03 Jan 7, 2024
82d9d9a
Merge pull request #24 from daodaoedu/feature/2.2_partner_profile
hsuifang Jan 7, 2024
dca8936
feat(user): 新增 user 登入 google流程
whalekiller03 Jan 14, 2024
d807fe9
feat: 串接聯繫夥伴,並寄送 Email
whalekiller03 Jan 14, 2024
e943b69
feat: 新增社群及標籤
whalekiller03 Jan 15, 2024
897e423
chore(partner/profile): 1. 調整 partner 及 profile 呈現 2. build issue
whalekiller03 Jan 15, 2024
1de4287
fix(signin): Delete SignInStyled and move styled in to index
whalekiller03 Jan 15, 2024
e6179ab
Merge pull request #27 from daodaoedu/feature/1.2_profile_login
hsuifang Jan 15, 2024
0dc8292
fix: 登入Login 配置及 remove unnecessary code
whalekiller03 Jan 16, 2024
f9b9fd7
Merge pull request #28 from daodaoedu/fix/1.2_google_login
hsuifang Jan 16, 2024
5fcdc03
fix(sign): define BaseUrl and modify style
whalekiller03 Jan 16, 2024
3e89d37
✨ 新增 Image 404 時,自動更換備用圖
JohnsonMao Jan 16, 2024
ab754c6
✨ 串接揪團查詢 API
JohnsonMao Jan 16, 2024
4f24885
Merge branch 'dev' into feature/group
JohnsonMao Jan 16, 2024
08c38b2
Merge pull request #29 from daodaoedu/fix/1.2_google_login_url
hsuifang Jan 16, 2024
b0df1aa
fix: fix partnerSaga and add .env.sample
whalekiller03 Jan 16, 2024
cbf1e19
Merge pull request #20 from daodaoedu/feature/group
JohnsonMao Jan 17, 2024
966630a
✨ add prototype - group detail page
JohnsonMao Jan 20, 2024
2dc9e68
feat: add email images
Jan 21, 2024
0dca461
Merge pull request #30 from daodaoedu/feature/add_image
pepe1113 Jan 21, 2024
3654aff
fix(profile): fix tags of profile
whalekiller03 Jan 24, 2024
10f41fa
Merge pull request #32 from daodaoedu/feature/1.2.1_edit_profile
hsuifang Jan 24, 2024
bf5ae91
💄 modify style and loading skeleton
JohnsonMao Jan 24, 2024
5e9b25a
✨ add fetch hook
JohnsonMao Jan 24, 2024
ed27828
✨ add group detail endpoint
JohnsonMao Jan 24, 2024
d25d8b0
fix: 發送 Email 內容- 角色及切換訂閱電子報
whalekiller03 Jan 25, 2024
1cb36b1
Merge pull request #33 from daodaoedu/fix/sendemail
hsuifang Jan 25, 2024
bcdbb96
🐛 fix fetch hook bug
JohnsonMao Jan 28, 2024
5cca26b
✨ add empty page and loading page
JohnsonMao Jan 28, 2024
ce8164e
✨ add create group page
JohnsonMao Jan 28, 2024
174c8c8
feat: Add country/city/district field in Location profile/edit, Modif…
whalekiller03 Jan 29, 2024
fa0c22b
Merge pull request #34 from daodaoedu/feature/edit_locations
hsuifang Jan 30, 2024
fdc6ab1
♻️ refactor contact dialog feedback
JohnsonMao Feb 10, 2024
4c88a0d
Merge pull request #35 from daodaoedu/feature/group-detail
JohnsonMao Feb 10, 2024
939f305
✨ create group page and form
JohnsonMao Feb 12, 2024
c62a1be
Merge pull request #36 from daodaoedu/feature/group-create
JohnsonMao Feb 13, 2024
bcec624
style(profile): add skelton in usercard
whalekiller03 Feb 14, 2024
eede182
refactor(profile/Edit): Add Zod in edit form
whalekiller03 Feb 14, 2024
1c20450
fix: fix sonarqube issues
whalekiller03 Feb 19, 2024
195c176
Merge pull request #37 from daodaoedu/refactor/profile_form
hsuifang Feb 19, 2024
c7d8afe
fix (profile/partner section): Modify the items related to areas and …
whalekiller03 Feb 28, 2024
1cfba1e
Merge pull request #41 from daodaoedu/fix/profile_area_edu
hsuifang Feb 28, 2024
bdf7f1b
✨ add create group page and fetch api
JohnsonMao Mar 1, 2024
8260103
✨ add send email feature
JohnsonMao Mar 1, 2024
dd3fb64
🐛 fix edu options bug and modify styles
JohnsonMao Mar 1, 2024
6b6f208
✨ add my group feature
JohnsonMao Mar 1, 2024
59ced99
✨ integrate activity API
JohnsonMao Mar 1, 2024
c8489d1
🐛 fix create group redirect bug
JohnsonMao Mar 1, 2024
93cdc72
🐛 fix code scanning alerts "server-side request forgery"
JohnsonMao Mar 1, 2024
9db683f
Merge pull request #42 from daodaoedu/feature/group
JohnsonMao Mar 1, 2024
9317fb5
🐛 fix create group and my group bug
JohnsonMao Mar 3, 2024
e842eac
Merge pull request #43 from daodaoedu/feature/group
JohnsonMao Mar 3, 2024
0e34f86
🐛 fix facebook api to handle error payloads properly
JohnsonMao Mar 7, 2024
7df10be
Merge branch 'dev' of https://github.com/daodaoedu/daodao-f2e into dev
JohnsonMao Mar 9, 2024
3458062
feature: add group nav link
JohnsonMao Mar 16, 2024
3d8d771
feature: update my group page
JohnsonMao Mar 16, 2024
828050a
refactor: profile page seo and tabs
JohnsonMao Mar 16, 2024
5ceb3e3
feature: add snackbar context
JohnsonMao Mar 16, 2024
bb2eb89
refactor: group detail page
JohnsonMao Mar 16, 2024
cabe95e
feature: use fetch hook success handler
JohnsonMao Mar 17, 2024
1485155
fix: Fix logical of location property in useEditProfile
whalekiller03 Mar 17, 2024
176583d
feat: Add mygroup in profile and modify style
whalekiller03 Mar 17, 2024
35a3fde
Merge pull request #46 from daodaoedu/chore/useProfile
hsuifang Mar 17, 2024
d3aab02
fix: modify style of text when description is empty
whalekiller03 Mar 17, 2024
dcb0e12
fix: Add userId in MyGroup props and Modify UserCard
whalekiller03 Apr 8, 2024
53c8684
feat: Create a req.js utils - add token when fetch Api
whalekiller03 Apr 29, 2024
fca2299
revert: files relative to useFetch hook
whalekiller03 Apr 29, 2024
a3a62b1
fix: remove parameter - options from useFetch
whalekiller03 May 1, 2024
1db4d11
feat(partner): Fetch Tags in searchField
whalekiller03 May 1, 2024
8add658
fix: not display contact button bug
JohnsonMao May 6, 2024
2532313
Merge pull request #47 from daodaoedu/fix/group-detail
JohnsonMao May 6, 2024
e6b697a
fix: mobile menu display partner and group link
JohnsonMao May 9, 2024
8dd027f
Merge pull request #48 from daodaoedu/fix/mobile_menu
JohnsonMao May 9, 2024
8fcd995
chore: Add autoLogoutSaga and persist partner
whalekiller03 May 21, 2024
6f0b4a9
Merge pull request #49 from daodaoedu/refactor/redux-persist
hsuifang May 21, 2024
e902061
fix: call api 401 status (#50)
JohnsonMao Jun 9, 2024
33b9641
fix: token expires (#51)
JohnsonMao Jun 9, 2024
bcba472
fix: line overflow issue causing text not to wrap (#52)
JohnsonMao Jun 10, 2024
ef2025c
fix(partner): hide button after login
evonnehsuhsu Jun 19, 2024
0c72032
Merge pull request #53 from daodaoedu/fix/remove-signup-button
hsuifang Jun 19, 2024
592dbbb
fix: auto logout bug (#55)
JohnsonMao Jun 23, 2024
61e764b
Bump next from 13.0.3 to 13.5.1 (#13)
dependabot[bot] Jun 24, 2024
f64e6b2
fix(partner): modify payload - url in sendEmail
whalekiller03 Jun 26, 2024
06efbb7
fix: search group list (#57)
JohnsonMao Jun 30, 2024
ca9e92d
feat: group upload photo (#58)
JohnsonMao Jul 7, 2024
be32a73
fix: build error ReferenceError: Blob is not defined (#59)
JohnsonMao Jul 7, 2024
c26c374
fix: send email to group own (#60)
JohnsonMao Jul 7, 2024
a2d86f0
refactor(profile): Added a detailed explanation to describe the statu…
hsuifang Jul 18, 2024
277a8fe
chore(profile): modify text of contact box
hsuifang Jul 18, 2024
26a8252
feature: add conditional logic for menu display (#61)
JohnsonMao Jul 20, 2024
ed8d378
chore: modify text on group detail page (#62)
JohnsonMao Jul 20, 2024
efb5582
feature: add link to report form (#63)
JohnsonMao Jul 20, 2024
e673903
feature: add join community page (#64)
JohnsonMao Jul 21, 2024
7886133
update list 1.2.1& 2.2 add list 2.2.1
vincentxuu Apr 9, 2023
5e63345
update figma 1.2 & 2.2
vincentxuu Apr 15, 2023
dd274f4
fix: resource title
SiongSng Jul 5, 2023
81b91cc
🔧 add alias import config
JohnsonMao Oct 10, 2023
3f51346
✨ add group page
JohnsonMao Oct 10, 2023
d1d7dc7
♻️ refactor group page
JohnsonMao Nov 10, 2023
259e729
♻️ refactor coding style
JohnsonMao Nov 11, 2023
d7d780e
🐛 fixed isActive props console error
JohnsonMao Nov 12, 2023
af36e76
🐛 fixed server and client placeholder not match
JohnsonMao Nov 12, 2023
844d327
⚡️ optimize developer experience
JohnsonMao Nov 12, 2023
00ec4a9
🐛 fixed next export error
JohnsonMao Nov 12, 2023
e976e33
🐛 resolve group card text issue
JohnsonMao Nov 12, 2023
ed7ef4f
⏪ Revert "🐛 fixed next export error"
JohnsonMao Nov 14, 2023
b3af05d
🎨 eslint format
JohnsonMao Nov 14, 2023
14bf975
🔧 disable a11y/control-has-associated-label check
JohnsonMao Nov 14, 2023
85b0201
feat: Add new ui and remove firebase code
whalekiller03 Oct 29, 2023
b7cdfb6
chore: Add parameter and nuxt.config
whalekiller03 Oct 29, 2023
2ac3c4b
feat(partner): Modify PartnerList and fetch api with redux-saga
whalekiller03 Nov 20, 2023
bb3bab0
fix(partner): show 顯示更多的 Button 及 mobile 樣式
whalekiller03 Nov 20, 2023
a538925
feat(Partner/Banner): Modify Banner and Include shared image
whalekiller03 Nov 28, 2023
ef61048
fix(Partner/PartnerList): fix logical and ui style
whalekiller03 Nov 28, 2023
5cf61df
refactor: remove useless file
whalekiller03 Dec 3, 2023
c0dc192
feat(partner): Add SearchField and SearchParams in Partner
whalekiller03 Dec 3, 2023
9dde24d
style(partner/banner): modify banner style
whalekiller03 Dec 3, 2023
953789f
refactor(partner/partnerCard): Modify CardStyle and setData
whalekiller03 Dec 3, 2023
03174e0
chore(sagas/user): Add default baseUrl
whalekiller03 Dec 3, 2023
23432b6
fix: yarn build issue
whalekiller03 Dec 3, 2023
2baaefe
fix(searchParamsList): filter unexpected params in SearchParamsList
whalekiller03 Dec 10, 2023
d375e0d
feat: add donate promotion
Dec 23, 2023
c713b98
feat: donate promotion
Dec 23, 2023
625a969
feat(partner): Deal with Fetching Search Partners results
whalekiller03 Dec 27, 2023
1633d27
feat(profile): Add Profile components ui and PartnerDetail
whalekiller03 Dec 3, 2023
c0cef2e
style(userTabs): create userTabs.styled
whalekiller03 Dec 4, 2023
9a48b9c
fix(partner): add getStaticProps and getStaticPaths to generate page
whalekiller03 Jan 2, 2024
aec9eae
fix(partner): ui - show Tag and api: queryParams
whalekiller03 Jan 2, 2024
1069bc7
feat(partner): 串接 user/:id 及 調整頁面路徑
whalekiller03 Jan 7, 2024
1b6fbfd
feat(user): 新增 user 登入 google流程
whalekiller03 Jan 14, 2024
6e04e4f
feat: 串接聯繫夥伴,並寄送 Email
whalekiller03 Jan 14, 2024
08e4ff0
feat: 新增社群及標籤
whalekiller03 Jan 15, 2024
7bfe8e9
chore(partner/profile): 1. 調整 partner 及 profile 呈現 2. build issue
whalekiller03 Jan 15, 2024
1c9cd93
fix(signin): Delete SignInStyled and move styled in to index
whalekiller03 Jan 15, 2024
70b8198
fix: 登入Login 配置及 remove unnecessary code
whalekiller03 Jan 16, 2024
4b2dc16
fix(sign): define BaseUrl and modify style
whalekiller03 Jan 16, 2024
ba47ecf
fix: fix partnerSaga and add .env.sample
whalekiller03 Jan 16, 2024
9dc9520
♻️ Move mockData to the API directory and implement Redux integration…
JohnsonMao Dec 12, 2023
600d4df
🐛 Fixed potential type confusion and refactor style
JohnsonMao Dec 13, 2023
d7deaf4
✨ 新增 Image 404 時,自動更換備用圖
JohnsonMao Jan 16, 2024
65c1877
✨ 串接揪團查詢 API
JohnsonMao Jan 16, 2024
e7a39ee
fix(profile): fix tags of profile
whalekiller03 Jan 24, 2024
cfbc0e7
fix: 發送 Email 內容- 角色及切換訂閱電子報
whalekiller03 Jan 25, 2024
84114d7
feat: Add country/city/district field in Location profile/edit, Modif…
whalekiller03 Jan 29, 2024
e3e4751
✨ add prototype - group detail page
JohnsonMao Jan 20, 2024
ab32d42
💄 modify style and loading skeleton
JohnsonMao Jan 24, 2024
4cb1e5b
✨ add fetch hook
JohnsonMao Jan 24, 2024
4b1591e
✨ add group detail endpoint
JohnsonMao Jan 24, 2024
3dcf3df
🐛 fix fetch hook bug
JohnsonMao Jan 28, 2024
17a176b
✨ add empty page and loading page
JohnsonMao Jan 28, 2024
4cebbf3
✨ add create group page
JohnsonMao Jan 28, 2024
37250e3
♻️ refactor contact dialog feedback
JohnsonMao Feb 10, 2024
6238173
✨ create group page and form
JohnsonMao Feb 12, 2024
136915e
style(profile): add skelton in usercard
whalekiller03 Feb 14, 2024
136156a
refactor(profile/Edit): Add Zod in edit form
whalekiller03 Feb 14, 2024
98dc113
fix: fix sonarqube issues
whalekiller03 Feb 19, 2024
d58fb6b
fix (profile/partner section): Modify the items related to areas and …
whalekiller03 Feb 28, 2024
6975549
✨ add create group page and fetch api
JohnsonMao Mar 1, 2024
facef16
✨ add send email feature
JohnsonMao Mar 1, 2024
d459e9e
🐛 fix edu options bug and modify styles
JohnsonMao Mar 1, 2024
f665cf8
✨ add my group feature
JohnsonMao Mar 1, 2024
283ed82
✨ integrate activity API
JohnsonMao Mar 1, 2024
d8b5a28
🐛 fix create group redirect bug
JohnsonMao Mar 1, 2024
aeac9af
🐛 fix code scanning alerts "server-side request forgery"
JohnsonMao Mar 1, 2024
f805c9d
🐛 fix create group and my group bug
JohnsonMao Mar 3, 2024
95bd88f
feature: add group nav link
JohnsonMao Mar 16, 2024
1e178d5
feature: update my group page
JohnsonMao Mar 16, 2024
63a7af3
refactor: profile page seo and tabs
JohnsonMao Mar 16, 2024
deeab34
feature: add snackbar context
JohnsonMao Mar 16, 2024
ca5f887
refactor: group detail page
JohnsonMao Mar 16, 2024
da53c6a
feature: use fetch hook success handler
JohnsonMao Mar 17, 2024
4120730
fix: Fix logical of location property in useEditProfile
whalekiller03 Mar 17, 2024
2bf3bb6
feat: Add mygroup in profile and modify style
whalekiller03 Mar 17, 2024
8c9750c
fix: modify style of text when description is empty
whalekiller03 Mar 17, 2024
7342d29
fix: Add userId in MyGroup props and Modify UserCard
whalekiller03 Apr 8, 2024
5658687
feat: Create a req.js utils - add token when fetch Api
whalekiller03 Apr 29, 2024
3664cdf
revert: files relative to useFetch hook
whalekiller03 Apr 29, 2024
1cac5cc
fix: remove parameter - options from useFetch
whalekiller03 May 1, 2024
e502c42
feat(partner): Fetch Tags in searchField
whalekiller03 May 1, 2024
9ad047f
fix: not display contact button bug
JohnsonMao May 6, 2024
df2b1b4
fix: mobile menu display partner and group link
JohnsonMao May 9, 2024
0dce423
chore: Add autoLogoutSaga and persist partner
whalekiller03 May 21, 2024
432f259
fix: call api 401 status (#50)
JohnsonMao Jun 9, 2024
189f606
fix: token expires (#51)
JohnsonMao Jun 9, 2024
1cea7f5
fix: line overflow issue causing text not to wrap (#52)
JohnsonMao Jun 10, 2024
4729d66
fix(partner): hide button after login
evonnehsuhsu Jun 19, 2024
0106c18
fix: auto logout bug (#55)
JohnsonMao Jun 23, 2024
3821dd1
Bump next from 13.0.3 to 13.5.1 (#13)
dependabot[bot] Jun 24, 2024
71d3974
fix(partner): modify payload - url in sendEmail
whalekiller03 Jun 26, 2024
074dd0c
fix: search group list (#57)
JohnsonMao Jun 30, 2024
2b5a7fa
feat: group upload photo (#58)
JohnsonMao Jul 7, 2024
449b0cd
fix: build error ReferenceError: Blob is not defined (#59)
JohnsonMao Jul 7, 2024
29dcd5e
fix: send email to group own (#60)
JohnsonMao Jul 7, 2024
47d1d85
refactor(profile): Added a detailed explanation to describe the statu…
hsuifang Jul 18, 2024
8367cd8
chore(profile): modify text of contact box
hsuifang Jul 18, 2024
5c9f06a
feature: add conditional logic for menu display (#61)
JohnsonMao Jul 20, 2024
4fe25c9
chore: modify text on group detail page (#62)
JohnsonMao Jul 20, 2024
2ee4506
feature: add link to report form (#63)
JohnsonMao Jul 20, 2024
8536169
feature: add join community page (#64)
JohnsonMao Jul 21, 2024
185033c
Merge branch 'dev' into merge/sync-prod-code/20240721
JohnsonMao Jul 21, 2024
e174b42
Merge pull request #66 from JohnsonMao/merge/sync-prod-code/20240721
JohnsonMao Jul 21, 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
22 changes: 21 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,25 @@
}
]
],
"plugins": ["@emotion/babel-plugin"]
"plugins": [
[
"babel-plugin-import",
{
"libraryName": "@mui/material",
"libraryDirectory": "",
"camel2DashComponentName": false
},
"core"
],
[
"babel-plugin-import",
{
"libraryName": "@mui/icons-material",
"libraryDirectory": "",
"camel2DashComponentName": false
},
"icons"
],
"@emotion/babel-plugin"
]
}
1 change: 1 addition & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NEXT_PUBLIC_API_URL=
16 changes: 9 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ module.exports = {
node: true,
},
ignorePatterns: ['.eslintrc.js'],
// settings: {
// 'import/resolver': {
// node: {
// extensions: ['.js', '.jsx', '.ts', '.tsx'],
// },
// },
// },
settings: {
'import/resolver': {
alias: {
extensions: ['.js', '.jsx'],
map: [['@', '.']],
},
},
},
rules: {
'react/no-unescaped-entities': 'off',
'@next/next/no-page-custom-font': 'off',
Expand All @@ -41,6 +42,7 @@ module.exports = {
'operator-linebreak': 0,
'function-paren-newline': 0,
'jsx-a11y/click-events-have-key-events': 0,
'jsx-a11y/control-has-associated-label': 0,
'jsx-a11y/no-noninteractive-element-interactions': 0,
'react/jsx-one-expression-per-line': 0,
'no-confusing-arrow': 0,
Expand Down
Binary file added .yarn/install-state.gz
Binary file not shown.
48 changes: 48 additions & 0 deletions components/Group/AreaChips.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { useCallback, useMemo } from 'react';
import styled from '@emotion/styled';
import { AREAS } from '@/constants/areas';
import useSearchParamsManager from '@/hooks/useSearchParamsManager';
import Chip from '@/shared/components/Chip';

const StyledAreaChips = styled.ul`
display: flex;
flex-wrap: wrap;
margin-bottom: 16px;
gap: 12px 0;
`;

const AreaChips = () => {
const [getSearchParams, pushState] = useSearchParamsManager();

const currentArea = useMemo(
() =>
getSearchParams('area').filter((area) =>
AREAS.find(({ name }) => name === area),
),
[getSearchParams],
);

const handleClickArea = useCallback(
(event) => {
const targetArea = event.target.parentNode.textContent;
const areas = currentArea.filter((area) => area !== targetArea);

pushState('area', areas.toString());
},
[pushState, currentArea],
);

return (
currentArea.length > 0 && (
<StyledAreaChips>
{currentArea.map((name) => (
<li key={name}>
<Chip value={name} onDelete={handleClickArea} />
</li>
))}
</StyledAreaChips>
)
);
};

export default AreaChips;
69 changes: 69 additions & 0 deletions components/Group/Banner.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { useRouter } from 'next/router';
import styled from '@emotion/styled';
import Button from '@/shared/components/Button';
import groupBannerImg from '@/public/assets/group-banner.png';
import Image from '@/shared/components/Image';

const StyledBanner = styled.div`
position: relative;

picture {
position: absolute;
width: 100%;
top: 0;
height: 398px;
img {
height: inherit;
}
}

h1 {
margin-bottom: 8px;
font-weight: 700;
font-size: 36px;
line-height: 140%;
color: #536166;
}

p {
font-weight: 400;
font-size: 14px;
line-height: 140%;
color: #536166;
}

> div {
position: relative;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding-top: 100px;
}
`;

const Banner = () => {
const router = useRouter();

return (
<StyledBanner>
<picture>
<Image
src={groupBannerImg.src}
alt="揪團封面"
height="inherit"
background="linear-gradient(#fcfefe 10%, #e0f1f2 40%)"
borderRadius="0"
/>
</picture>
<div>
<h1>揪團</h1>
<p>想一起組織有趣的活動或學習小組嗎?</p>
<p>註冊並加入我們,然後創建你的活動,讓更多人一起參加!</p>
<Button onClick={() => router.push('/group/create')}>我想揪團</Button>
</div>
</StyledBanner>
);
};

export default Banner;
88 changes: 88 additions & 0 deletions components/Group/Form/Fields/AreaCheckbox.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { useEffect, useState } from 'react';
import Box from '@mui/material/Box';
import FormControlLabel from '@mui/material/FormControlLabel';
import Checkbox from '@mui/material/Checkbox';
import Select from './Select';

export default function AreaCheckbox({
options,
itemLabel,
itemValue,
name,
value,
control,
}) {
const [isPhysicalArea, setIsPhysicalArea] = useState(false);

const getPhysicalArea = (data) =>
options.find((option) => data.includes(option.name));

const handleChange = (val) =>
control.onChange({ target: { name, value: val } });

const physicalAreaValue = getPhysicalArea(value)?.name || '';

const toggleIsPhysicalArea = () => {
const updatedValue = value.filter((v) => !getPhysicalArea([v]));
handleChange(updatedValue);
setIsPhysicalArea((pre) => !pre);
};

const handleCheckboxChange = (_value) => {
const updatedValue = value.includes(_value)
? value.filter((v) => v !== _value)
: [...value, _value];
handleChange(updatedValue);
};

const handlePhysicalAreaChange = ({ target }) => {
const updatedValue = value
.filter((v) => !getPhysicalArea([v]))
.concat(target.value);
handleChange(updatedValue);
};

const physicalAreaControl = {
onChange: handlePhysicalAreaChange,
onBlur: handlePhysicalAreaChange,
};

useEffect(() => {
if (value.find((v) => getPhysicalArea([v]))) setIsPhysicalArea(true);
}, [value]);

return (
<>
<Box sx={{ display: 'flex', label: { whiteSpace: 'nowrap' } }}>
<FormControlLabel
control={<Checkbox onClick={toggleIsPhysicalArea} />}
label="實體活動"
checked={isPhysicalArea}
/>
<Select
name={name}
options={options}
placeholder="地點"
value={physicalAreaValue}
itemLabel={itemLabel}
itemValue={itemValue}
control={physicalAreaControl}
/>
</Box>
<div>
<FormControlLabel
control={<Checkbox onClick={() => handleCheckboxChange('線上')} />}
label="線上"
checked={value.includes('線上')}
/>
</div>
<div>
<FormControlLabel
control={<Checkbox onClick={() => handleCheckboxChange('待討論')} />}
label="待討論"
checked={value.includes('待討論')}
/>
</div>
</>
);
}
63 changes: 63 additions & 0 deletions components/Group/Form/Fields/Select.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { useState } from 'react';
import FormControl from '@mui/material/FormControl';
import MuiSelect from '@mui/material/Select';
import MenuItem from '@mui/material/MenuItem';

export default function Select({
id,
name,
placeholder,
options = [],
itemLabel = 'label',
fullWidth = true,
multiple,
sx,
disabled,
control,
value,
error,
}) {
const getValue = (any, key) => (typeof any === 'object' ? any[key] : any);
const renderValue = (selected) => {
if (selected.length === 0) return placeholder;
if (Array.isArray(selected)) return selected.join('、');
return selected;
};

return (
<FormControl size="small" fullWidth>
<MuiSelect
displayEmpty
multiple={multiple}
fullWidth={fullWidth}
renderValue={renderValue}
id={id}
name={name}
sx={{
color: value.length ? '#000' : '#92989A',
'& legend': { display: 'none' },
'& fieldset': { top: 0 },
...sx,
}}
value={value}
disabled={disabled}
{...control}
>
{placeholder && (
<MenuItem disabled value="" sx={{ fontSize: 14 }}>
{placeholder}
</MenuItem>
)}
{options.map((item) => (
<MenuItem
key={getValue(item, itemLabel)}
value={getValue(item, itemLabel)}
>
{getValue(item, itemLabel)}
</MenuItem>
))}
</MuiSelect>
<span className="error-message">{error}</span>
</FormControl>
);
}
Loading
Loading