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.

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

Jump to bottom

From aws-test to main #61

Open
wants to merge 248 commits into
base: main
Choose a base branch
from
Open

From aws-test to main #61

wants to merge 248 commits into from

Conversation

goathoon
Copy link
Collaborator

ㅇㅇ

eunnbi and others added 30 commits April 11, 2023 19:42
@eunnbi
feat(fe): add login page
3bcff55
@eunnbi
Merge branch 'backend-jwt' of https://github.com/silverwest8/MixBowl …
68f69d0 
…into fe-login
@EliseCho13
Merge branch 'frontend' of github.com:silverwest8/MixBowl into frontend
4b19b5b
@EliseCho13
Merge branch 'main' of github.com:silverwest8/MixBowl into fe-communi…
86a4e8d 
…ty-main
@EliseCho13
Merge branch 'main' of github.com:silverwest8/MixBowl into fe-communi…
46c54e3 
…ty-main
@EliseCho13
fix(fe): fixed pointer position in posting page
bfa891f
@EliseCho13
fix(fe): fixed mobile posting page width
2b01224
@EliseCho13
fix(fe): changed position of posting button
6837aeb
@EliseCho13
feat(fe): made community folder, basic postDetail page done, changed …
857a994 
…some file names
@EliseCho13
feat(fe): answer comment in qna category added
490f75a
@EliseCho13
feat(fe): category board list page skeleton done, modified mobile ver…
e9bd08b 
…sion of homepage
@silverwest8
feat(be): set mypage files
d22a3e3
@EliseCho13
fix(fe): pulled branches, added routing, fixed design details
0061351
@eunnbi
chore(fe): add admin project
fd3668d
@eunnbi
chore(be): add admin route
a9b85dc
@EliseCho13
feaat(fe): added routings, changed category names, added reporting
2917d88
@eunnbi
Merge branch 'main' of https://github.com/silverwest8/MixBowl into admin
2ee0a15
@eunnbi
Merge branch 'be-recipes' of https://github.com/silverwest8/MixBowl i…
7421869 
…nto admin
@EliseCho13
feat(fe): added recommendation icon
c934372
@EliseCho13
fe(feat): mypage started
097e967
@eunnbi
feat: add login page and admin APIs
b92cc65
@eunnbi
chore(fe): change nextjs app route to page route
b5bdbc7
@eunnbi
chore(fe): update cookie expire time
9e2bbbc
@eunnbi
chore(fe): update cookie expire time
cc3cc9e
@eunnbi
chore(fe): update setting
716df47
@eunnbi
chore(fe): update next config
1d14e23
@eunnbi
feat(fe): add report chart component
a9f0f31
@EliseCho13
fix(fe): pulled community
b003771
@EliseCho13
fix(fe): pulled main
d0599fb
@EliseCho13
feat(fe): mypage basic done
9e5630f
@eunnbi eunnbi changed the title 암호화로인한 로그인 안됨에 따라 올리는 급한 PR From aws-test to main Jun 2, 2023
eunnbi and others added 24 commits June 2, 2023 23:32
@eunnbi
fix(fe): fix routing url in community post detail page
ad5211a
@eunnbi
Merge branch 'frontend' of https://github.com/silverwest8/MixBowl int…
7fa44b9 
…o frontend
@eunnbi
Merge branch 'frontend' of https://github.com/silverwest8/MixBowl int…
c2dffd1 
…o aws-test
@silverwest8
fix(be): remove recipes duplecate & hide 5 report
c33d089
@silverwest8
Merge branch 'aws-test' of github.com:silverwest8/MixBowl into aws-test
bf77906
@goathoon
신고 반영 쿼리
e18bdfd
@goathoon
커뮤니티 글 신고 5회이상 블라인드처리
371f07a
@eunnbi
fix(fe): add getting link function with authentication
31b0619
@eunnbi
fix(fe): use getLinkWithAuth function
485cb69
@eunnbi
refactor(fe): update cocktail components
8b85574
@eunnbi
refactor(fe): update login form component
3130965
@eunnbi
refactor(fe): update community posting page
6fa7869
@eunnbi
refactor(fe): add replace option
bfb2ae5
@eunnbi
refactor(fe): update cocktail bar map components
89956e2
@eunnbi
refactor(fe): update cocktail bar list component
6ab2829
@eunnbi
refactor(fe): update banner component
0df9c73
@eunnbi
refactor(fe): update logout function
9cd003d
@eunnbi
refactor(fe): update community components
208b2cf
@eunnbi
refactor(fe): update community components
271a6c7
@EliseCho13
fix(fe): removed cocktail image from board list
3a16551
@EliseCho13
Merge branch 'aws-test' of github.com:silverwest8/MixBowl into aws-test
9e7992f
@EliseCho13
fixe(fe): modified mypage verify button css
3ef43e4
@eunnbi
refactor(fe): update kakao map component
269583f
@eunnbi
Merge branch 'aws-test' of https://github.com/silverwest8/MixBowl int…
5ef7655 
…o aws-test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silverwest8 silverwest8 Awaiting requested review from silverwest8

@EliseCho13 EliseCho13 Awaiting requested review from EliseCho13

@eunnbi eunnbi Awaiting requested review from eunnbi

@pbk95120 pbk95120 Awaiting requested review from pbk95120

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@goathoon @eunnbi @EliseCho13 @silverwest8 @pbk95120