merge: dev to prod #102
Merged
merge: dev to prod #102
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
修正以下： 1.刪除高中以下學歷選項 2.刪除交友相關字眼，並新增選項 3.調整揪團教育階段敘述 4.調整學歷敘述 5.調整性別敘述
* fix:adjust value of options * fix:adjust value of rule
* fix: search group parameters * fix: create group login redirect * remove: unused file
* update: update privacy policy and switch from component to inline HTML * update: remove unused styles and mui components * update: update privacy policy page styles
* refactor: group list page * refactor: change empty cover image * feat: empty group list ui * feat: error group list page
* refactor: contact popup * refactor: login flow
* feat: add styles for terms * remove: remove unused component AboutUs * feat: refactor component in terms and add pages * refactor: component in terms * add: terms/ipr * add: terms/service * update: update routes of /privacypolicy * update: update sitemap * feat: add terms links on footer
# Conflicts: # components/Group/Form/useGroupForm.jsx # components/Group/detail/Contact/index.jsx # pages/login/index.jsx # pages/login/popup/index.jsx # utils/openLoginWindow.js
merge: resolve merge conflicts
|
This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation. |
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
Deploying daodao-f2e with
|
| Latest commit: |
218b596
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://14613aa3.daodao-notion-test.pages.dev |
| Branch Preview URL: | https://dev.daodao-notion-test.pages.dev |
hsuifang
approved these changes
Oct 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.