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

Fixed dev merge #174

Merged
merged 319 commits into from
May 31, 2024
Merged

Fixed dev merge #174

merged 319 commits into from
May 31, 2024

Conversation

gf-rog
Copy link
Collaborator

@gf-rog gf-rog commented May 31, 2024

No description provided.

Karol-2 and others added 30 commits March 15, 2024 17:01
@Karol-2
Fix errors
dd6f479
@Karol-2
Remove unused imports
19e11fd
@Karol-2 @github-actions
Apply formatting
0d2a029
@Piterson25
Fix cypress register test
4524a1d
@Piterson25 @github-actions
Apply formatting
fc71063
@gf-rog
Add mercury-backend client for REST API use
d1bbc69
@JANKROL123
Merge pull request #152 from Karol-2/edit
3a0720b 
Edit
@Piterson25
Merge branch 'dev' into pagination
6726bce
@Piterson25
Fix search test
e681ee7
@gf-rog
Remove master realm (not imported)
53e9085
@gf-rog
Move backend client to mercury realm
6af6980
@gf-rog
Add test rest API script
c7fc94f
@gf-rog
Separate getUser and getDbUser
befe95d
@gf-rog
Get user using getDbUser instead of query
a424c0c
@gf-rog
Change create user data type
174c88a
@gf-rog
Use createUser function
e867c44
@gf-rog
Add @keycloak/keycloak-admin-client
e1a926b
@gf-rog
Add register user stub
1edbfa3
@gf-rog
Convert backend from CommonJS to ESM (es2022)
1d2b48c
@gf-rog
Use email as username
1fb5068
@gf-rog
Add Keycloak admin client
83a54b0
@gf-rog
Add Keycloak user register function
6c5a65b
@gf-rog
Fix tuple type to array type
ddcb298
@gf-rog
Improve type
3acf091
@gf-rog
Add Either type
c45a4a3
@gf-rog
Extend DbUser type
c0f0cba
@gf-rog
Complete user registering
1b173c8
@gf-rog
Add test user registering logs
39b84bc
@gf-rog
Add get-token endpoint
b318abd
@gf-rog
Use query parameter to get Keycloak user
77d3ea0
gf-rog and others added 21 commits May 15, 2024 10:18
@gf-rog
Print response if request failed
40203cb
@gf-rog
Add authorization to user friend requests
fb92fdc
@gf-rog
Add authorization to chat requests
e26477e
@gf-rog
Remove unused meeting endpoints
28dfced
@gf-rog
Merge pull request #170 from Karol-2/tests
757a357 
Tests
@gf-rog
Add token parameter to frontend fetchData
b630f27
@gf-rog
Fix frontend authorization
32f4229
@Piterson25
Merge pull request #171 from Karol-2/frontend-auth-fix
2a3f212 
Frontend auth fix
@Piterson25
Refactor tests for more readability
4548737
@gf-rog
Add authorization to user friends
165317d
@gf-rog
Fix endpoints not checking the token user ID
fa21c27
@gf-rog
Add authorization to user friend suggestions
8973b0b
@gf-rog
Fix issuers not exported
5b4c87b
@gf-rog
Add @ianvs/prettier-plugin-sort-imports
2ccd6d9
@gf-rog
Ignore non-code folders when formatting code
c25cce2
@gf-rog
Add blank lines between import groups
8ce797c
@gf-rog
Merge remote-tracking branch 'origin/dev' into backend-fixes
e99a597
@gf-rog @github-actions
Apply formatting
4428e05
@gf-rog
Remove debug console.log
2b32909
@JANKROL123
Merge pull request #172 from Karol-2/backend-fixes
e954d56 
Backend fixes
@gf-rog
Merge remote-tracking branch 'origin/dev' into fix-dev-merge
5c90f0b
@gf-rog gf-rog changed the title Fix dev merge Fixed dev merge May 31, 2024
Piterson25
Piterson25 approved these changes May 31, 2024
View reviewed changes
Copy link
Collaborator

@Piterson25 Piterson25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a lot of changes!
🦎

Karol-2
Karol-2 approved these changes May 31, 2024
View reviewed changes
Copy link
Owner

@Karol-2 Karol-2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally <3

JANKROL123
JANKROL123 approved these changes May 31, 2024
View reviewed changes
Copy link
Collaborator

@JANKROL123 JANKROL123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@JANKROL123 JANKROL123 merged commit b0bdba4 into main May 31, 2024
2 checks passed
@Karol-2 Karol-2 deleted the fix-dev-merge branch May 31, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Karol-2 Karol-2 Karol-2 approved these changes

@Piterson25 Piterson25 Piterson25 approved these changes

@JANKROL123 JANKROL123 JANKROL123 approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@gf-rog @JANKROL123 @Piterson25 @Karol-2