Skip to content

feat: 🍰 EPIC Groups #5132

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

Merged
merged 474 commits into from
Oct 25, 2022
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
474 commits
Select commit Hold shift + click to select a range
a5e0794
style in groupList for locationName and radius
ogerly Sep 15, 2022
912980c
Implement 'description', 'descriptionExcerpt', and collapse on group …
Tirokk Sep 15, 2022
32fe095
Make Jenny Rostock a usual member of group Yoga Practice in seeding
Tirokk Sep 16, 2022
f367ac3
Set 'DESCRIPTION_EXCERPT_HTML_LENGTH' to 250
Tirokk Sep 16, 2022
e570d07
Remove unneeded eslint-enable
Tirokk Sep 16, 2022
4f68d9c
Implement 'categories' on group profile, first step
Tirokk Sep 16, 2022
2e2581c
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Sep 16, 2022
5f0f3fc
Refine group categories in seeding
Tirokk Sep 16, 2022
7f397b4
Set Vue tooltip delay to 1500 ms and remove unneeded properties
Tirokk Sep 16, 2022
1d3fc9b
Set tooltip on post page categories
Tirokk Sep 16, 2022
b26c500
Implement 'categories' on group profile, next step
Tirokk Sep 16, 2022
a48a338
Merge branch 'category-tooltipps' of github.com:Ocelot-Social-Communi…
Tirokk Sep 16, 2022
bece00c
Set Vue tooltip delay to 1500 ms and remove unneeded properties
Tirokk Sep 16, 2022
9396a61
Implement 'categories' on group profile
Tirokk Sep 16, 2022
d32c137
Implement 'locationName', 'location' in 'CreateGroup', 'UpdateGroup',…
Tirokk Sep 16, 2022
1195be1
Fix, refactor, and partly implement generation of a location relation…
Tirokk Sep 16, 2022
a52c3b4
Add location to group seeding
Tirokk Sep 16, 2022
57f7a43
Test locations in group resolvers
Tirokk Sep 16, 2022
58bdb33
Exclude 'Group' resolver from 'makeAugmentedSchema'
Tirokk Sep 16, 2022
a4575f3
Implement 'location' on group profile
Tirokk Sep 16, 2022
728eac9
Refine 'createOrUpdateLocations' call and import
Tirokk Sep 17, 2022
0048486
Refactor to save location in db by 'UpdateUser', 'CreateGroup', and '…
Tirokk Sep 17, 2022
dcfb361
Refine group 'UpdateGroup' resolver tests
Tirokk Sep 17, 2022
7d9e428
Refactor 'createGroupMutation' to a function that returns GQL
Tirokk Sep 18, 2022
6df10e5
Refactor 'updateGroupMutation' to a function that returns GQL
Tirokk Sep 18, 2022
1c040e1
Refactor 'joinGroupMutation' to a function that returns GQL
Tirokk Sep 18, 2022
14824c8
Refactor 'leaveGroupMutation' to a function that returns GQL
Tirokk Sep 18, 2022
a85085c
Refactor 'changeGroupMemberRoleMutation', 'groupQuery' to a function …
Tirokk Sep 18, 2022
6f6dc4e
Refactor 'groupMembersQuery' to a function that returns GQL
Tirokk Sep 18, 2022
8da2d11
Fix tests in 'AvatarUploader.spec.js'
Tirokk Sep 18, 2022
e53e502
Removed 'lang="ts"' in 'GroupCard.vue'
Tirokk Sep 18, 2022
bba4ca0
Test 'descriptionExcerpt' in all relevant group resolvers
Tirokk Sep 18, 2022
c2f7604
Fix 'groupQuery' GQL on group edit page
Tirokk Sep 18, 2022
98b9e3d
Rename 'isAllowedSeeingMembersOfGroup' to 'isAllowedSeeingGroupMember…
Tirokk Sep 18, 2022
83bfbd8
Manage seeing group members on group profile
Tirokk Sep 19, 2022
2e0e485
Fix multiple use of 'disabled' property in BaseButton component in co…
Tirokk Sep 19, 2022
29be8ee
Fix update of members list if current user is not allowed to see it a…
Tirokk Sep 19, 2022
5d0eecf
Cleanup
Tirokk Sep 19, 2022
7d5205e
translation of the texts
ogerly Sep 19, 2022
57a6e74
fix lint and locales
ogerly Sep 19, 2022
e4c3600
Merge branch '5059-epic-groups' into 5344-add-group-members-management
ogerly Sep 19, 2022
ad349e4
Fix warning "Invalid component name: …" of 'webapp/pages/terms-and-co…
Tirokk Sep 20, 2022
17891c9
fix locales lint
ogerly Sep 20, 2022
25c26ce
test group profile page, a start
Tirokk Sep 20, 2022
66fe131
Test group profile page, the end
Tirokk Sep 20, 2022
90e1696
add group to post in schema
Mogge Sep 20, 2022
f331813
create post in group
Mogge Sep 20, 2022
0c32fd8
add post access filter for all post queries
Mogge Sep 20, 2022
5e30bfe
add direction of Post in Group
Mogge Sep 20, 2022
a20d66b
Fix type validation error in BaseButton
Tirokk Sep 21, 2022
c47aef0
Cleanup
Tirokk Sep 21, 2022
54cd7e8
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Sep 21, 2022
35b0aa8
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Sep 21, 2022
319ca05
Merge pull request #5368 from Ocelot-Social-Community/5059-groups/531…
Tirokk Sep 21, 2022
4d480d3
add post query
Mogge Sep 22, 2022
e748fcc
add is member of group check to permission of create post
Mogge Sep 22, 2022
a9cd661
add tets for posts in groups
Mogge Sep 22, 2022
c37aef8
Update webapp/components/Group/GroupForm.vue
ogerly Sep 23, 2022
bf492ce
Update webapp/components/Group/GroupForm.vue
ogerly Sep 23, 2022
522a9ff
Update webapp/components/Group/GroupForm.vue
ogerly Sep 23, 2022
10975f5
Update webapp/components/Group/GroupForm.vue
ogerly Sep 23, 2022
1598175
Update webapp/components/Group/GroupForm.vue
ogerly Sep 23, 2022
4753630
Update webapp/locales/en.json
ogerly Sep 23, 2022
c8dc0d9
Update webapp/components/Group/GroupForm.vue
ogerly Sep 23, 2022
4c55ca7
Update webapp/pages/my-groups.vue
ogerly Sep 23, 2022
22f5c90
Update webapp/pages/group/edit/_id/members.vue
ogerly Sep 23, 2022
fcf2bba
Update webapp/components/Group/GroupList.vue
ogerly Sep 23, 2022
3d6c5e6
Update webapp/locales/de.json
ogerly Sep 23, 2022
69620ca
fix reviews
ogerly Sep 23, 2022
12a0ca5
fix lint && locales
ogerly Sep 23, 2022
3e1eb29
pull && resolve conflicts
ogerly Sep 23, 2022
f1427b2
fix lint
ogerly Sep 23, 2022
beebcdb
Merge branch 'master' into 5344-add-group-members-management
ogerly Sep 23, 2022
02d1a44
fix lint backend
ogerly Sep 23, 2022
2aa85d7
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Sep 23, 2022
13ec4ee
Refine design and a bit functionality, first step
Tirokk Sep 24, 2022
84d90dd
Refine design and a bit functionality, additions to first step
Tirokk Sep 24, 2022
5392da0
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Sep 24, 2022
a3c6429
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Sep 24, 2022
41af877
Refine functionality, second step
Tirokk Sep 25, 2022
023ee74
Cleanup
Tirokk Sep 25, 2022
e5acca7
Use Vue Apollo automatic fetching in 'members.vue'
Tirokk Sep 25, 2022
7b11122
Refine design and functionality of group list and create, edit group
Tirokk Sep 26, 2022
0d44d8a
Cleanup
Tirokk Sep 26, 2022
211a4b9
Fix webapp tests
Tirokk Sep 26, 2022
8e19c04
Implement automatic deployment for branch '5059-epic-groups'
Tirokk Sep 26, 2022
9c0cc26
Disable push on master in 'publishing.yml'
Tirokk Sep 26, 2022
0318b17
Merge pull request #5408 from Ocelot-Social-Community/5059-groups/540…
Tirokk Sep 26, 2022
8ff8d55
Implement 'GroupButton' in 'default' layout
Tirokk Sep 26, 2022
e430f22
add test GroupContentMenu ans GroupForm
ogerly Sep 27, 2022
c2dc8b4
fix lint
ogerly Sep 27, 2022
60b68ed
Add 'SHOW_GROUP_BUTTON_IN_HEADER' in 'groups.js', still unused
Tirokk Sep 27, 2022
8867f86
Make group button in header configurable
Tirokk Sep 27, 2022
f62df1f
Add 'my groups' to avatar menu
Tirokk Sep 27, 2022
421f8a6
Enhance tests of 'AvatarMenu'
Tirokk Sep 27, 2022
bf60c41
Overtake 'GroupContentMenu' from branch '5344-add-group-members-manag…
Tirokk Sep 28, 2022
21ade3a
Merge pull request #5411 from Ocelot-Social-Community/5059-groups/539…
Tirokk Sep 28, 2022
c6fa49e
Merge branch '5059-epic-groups' into 5344-add-group-members-management
ogerly Sep 28, 2022
6364974
add editor component for GroupForm.vue
ogerly Sep 28, 2022
8ff1713
delete unused code
ogerly Sep 28, 2022
fdc72c7
resolve conflicts
ogerly Sep 28, 2022
a502148
Remove 'gost' property from 'ContentMenu' button
Tirokk Sep 28, 2022
1e01ccf
Add 'GroupContentMenu' on group profile page
Tirokk Sep 28, 2022
0d8ce0a
Cleanup
Tirokk Sep 28, 2022
3a51b69
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Sep 28, 2022
178c64a
Merge branch '5344-add-group-members-management' of github.com:Ocelot…
Tirokk Sep 28, 2022
b965bab
translation selects in GroupForm.vue, change css of selects
ogerly Sep 28, 2022
f21796b
delete location entry per button
ogerly Sep 28, 2022
1199c5d
fix lint
ogerly Sep 28, 2022
2eda102
Remove doubled 'GroupButton'
Tirokk Sep 28, 2022
ac9be9e
Refactor 'GroupContentMenu' component
Tirokk Sep 28, 2022
f534d1c
Move component 'GroupContentMenu' to folder 'ContentMenu'
Tirokk Sep 28, 2022
07b03d5
Remove doubled 'GroupButton'
Tirokk Sep 28, 2022
5a9d9f9
Fix tests in webapp
Tirokk Sep 28, 2022
00fad09
Merge branch '5344-add-group-members-management' into 5397-Refine-Gro…
ogerly Sep 28, 2022
992dd99
form error alternativ
ogerly Sep 29, 2022
0a511b4
form submit dissable by update
ogerly Sep 29, 2022
e09fb17
fix lint
ogerly Sep 29, 2022
ab0f381
Merge branch '5397-Refine-Group-Creation-And-Group-Edit' of https://g…
ogerly Sep 29, 2022
5846636
delete LocationName in form
ogerly Sep 29, 2022
3ebfc7c
add constants GOAL_LENGTH_MIN
ogerly Sep 29, 2022
cf7e61a
add default color on ds-chip in GroupForm.vue
ogerly Sep 29, 2022
c7bd0cc
Merge pull request #5345 from Ocelot-Social-Community/5344-add-group-…
ogerly Sep 30, 2022
90b64dc
resolve review fix
ogerly Sep 30, 2022
8ecd6bb
resolve review from wolle
ogerly Sep 30, 2022
b1e0f96
resolve review from wolle
ogerly Sep 30, 2022
ff0396a
check valid group form selects
ogerly Oct 2, 2022
60303b1
fix lint
ogerly Oct 2, 2022
b259295
Merge branch '5059-epic-groups' into post-in-group
Mogge Oct 3, 2022
1870efc
add CANNOT_SEE relation to posts in groups
Mogge Oct 3, 2022
5f4d7c2
add notVisibleFor statement
Mogge Oct 3, 2022
abcfe25
query and mutations are functions
Mogge Oct 3, 2022
4a63e14
calls to query and mutate are functions
Mogge Oct 3, 2022
4a12cdf
remove unused memberIds statement
Mogge Oct 3, 2022
069eefd
add helper function to filter invisible posts
Mogge Oct 3, 2022
833bd5f
use invisible post filter
Mogge Oct 4, 2022
16a24bf
remove not working filters from schema
Mogge Oct 4, 2022
32d3c5e
insure that user context is present as posts can be queried without a…
Mogge Oct 4, 2022
4331c73
test post invisibility for unauthenticated users
Mogge Oct 4, 2022
77125e4
createPostMutation as function
Mogge Oct 4, 2022
068d622
createPostMutation as function
Mogge Oct 4, 2022
275d196
further testting for post visibility
Mogge Oct 4, 2022
0343407
fix cypher to have signup verification to block posts of groups for n…
Mogge Oct 4, 2022
f94fc5d
Update webapp/components/Group/GroupForm.vue
ogerly Oct 4, 2022
a676a18
Merge pull request #5419 from Ocelot-Social-Community/5059-groups/531…
Tirokk Oct 4, 2022
cbedf6f
change from review
ogerly Oct 4, 2022
d4b5823
fix lint
ogerly Oct 4, 2022
68cb597
Merge branch '5397-Refine-Group-Creation-And-Group-Edit' of https://g…
ogerly Oct 4, 2022
67cba10
remove findPosts and findUsers as they are never used.
Mogge Oct 5, 2022
570d6c0
test filter posts
Mogge Oct 5, 2022
ab5d308
test profile page posts
Mogge Oct 5, 2022
aa870b5
searches need authorization as they are not working without user id i…
Mogge Oct 5, 2022
76bfe48
implement and test post visibilty when leaving or changing the role i…
Mogge Oct 5, 2022
a924357
fix cypher when posts do not exist
Mogge Oct 5, 2022
350d59b
Refine create and edit group form
Tirokk Oct 5, 2022
009558f
Remove unused variable
Tirokk Oct 5, 2022
74505a1
filter posts for group visibility on search posts
Mogge Oct 5, 2022
a4cd7a8
test search posts with groups
Mogge Oct 5, 2022
4fdaa0d
Update backend/src/schema/resolvers/helpers/filterInvisiblePosts.js
Mogge Oct 6, 2022
9528365
add ds-space if update GroupForm
ogerly Oct 7, 2022
7b9b253
Implement post creation in a group
Tirokk Oct 7, 2022
fc4e679
Implement visibility of posts on group profile
Tirokk Oct 7, 2022
1703638
Implement group indication headline for view and edit post page
Tirokk Oct 7, 2022
42f5df7
Cleanup
Tirokk Oct 7, 2022
356627a
Merge pull request #5418 from Ocelot-Social-Community/5397-Refine-Gro…
ogerly Oct 10, 2022
4556276
fix: leaving public group keeps the posts in public group visible. Te…
Mogge Oct 10, 2022
631f34a
improved code and tests as suggested by @tirokk, thanks for the great…
Mogge Oct 10, 2022
5bc20a9
Merge branch 'post-in-group' of github.com:Ocelot-Social-Community/Oc…
Tirokk Oct 11, 2022
7cb1663
change from role eq pending to usual, admin, owner includes role
Mogge Oct 11, 2022
527e90e
Merge branch 'post-in-group' of github.com:Ocelot-Social-Community/Oc…
Tirokk Oct 11, 2022
51ce290
Merge pull request #5380 from Ocelot-Social-Community/post-in-group
Mogge Oct 11, 2022
018cfc6
check groupForm disableButton if creat and update
ogerly Oct 16, 2022
fc75d4f
rename computed disableButtomByUpdate to disableButtonByUpdate
ogerly Oct 16, 2022
9baabd0
change sameLocation and delete Location Button position
ogerly Oct 17, 2022
1a27391
remove console statments, fix lint
ogerly Oct 17, 2022
11f5ce7
search input for invite user in group
ogerly Oct 17, 2022
731f3a5
Add group to user teaser, on post page, and on news feed
Tirokk Oct 17, 2022
4f8ebeb
add search groups to schema
Mogge Oct 17, 2022
8a410cf
add search groups to resolvers
Mogge Oct 17, 2022
391c8d4
feat: Seed some simple posts into groups
Mogge Oct 17, 2022
e5e6dbc
change user to post in public group
Mogge Oct 17, 2022
2755ca6
change location in group update
ogerly Oct 18, 2022
7412ec9
Merge pull request #5503 from Ocelot-Social-Community/seed-posts-in-g…
Mogge Oct 18, 2022
a8cf6ac
add slug user to group member
ogerly Oct 18, 2022
548dcaa
dynamic load by add new group member per slug
ogerly Oct 18, 2022
3c4d4bb
style flex find user per slug
ogerly Oct 18, 2022
4521c71
Fix location bugs
Tirokk Oct 18, 2022
ab6b5ad
Fix 'ds-chip' 'color' error
Tirokk Oct 18, 2022
490c7bf
Refine logic of location
Tirokk Oct 18, 2022
79644cb
add locals for group member
ogerly Oct 18, 2022
138f9a1
Merge pull request #5489 from Ocelot-Social-Community/5472-Disable-Su…
ogerly Oct 19, 2022
78f03da
add groupId to variables in spec
Mogge Oct 19, 2022
61ae380
add callback for data object to Wrapper function
Mogge Oct 19, 2022
25001ce
mock route params
Mogge Oct 19, 2022
7b69a4d
deactivate deprecated test
Mogge Oct 19, 2022
89e1de0
mock route query group id
Mogge Oct 19, 2022
2eb5995
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 19, 2022
d1585bf
Add group to user teaser on post teaser at user and group profile
Tirokk Oct 19, 2022
fc32a5f
Add new user teaser options to storybook
Tirokk Oct 19, 2022
0846340
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Oct 19, 2022
25c1c7f
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Oct 19, 2022
1d0b187
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 19, 2022
d223826
Merge branch '5059-groups/5385-webapp-post-in-group' of github.com:Oc…
Tirokk Oct 19, 2022
1c3a592
Lower webapp coverage from 65% to 64%
Tirokk Oct 20, 2022
0158850
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 20, 2022
5b6e3a0
Lower webapp coverage from 65% to 64%
Tirokk Oct 20, 2022
759ec89
corrected & for groups instead of @
ulfgebhardt Oct 20, 2022
56850f7
include `in` between user and group link -> `@user in &group`
ulfgebhardt Oct 20, 2022
c0ed122
Merge pull request #5468 from Ocelot-Social-Community/5059-groups/538…
Mogge Oct 20, 2022
af5447e
coverage 65.14%, add specs GroupList.spec, GroupMember.spec
ogerly Oct 20, 2022
de33b22
fix lint
ogerly Oct 20, 2022
e68952b
Merge pull request #5512 from Ocelot-Social-Community/5384-Group-Invi…
ogerly Oct 21, 2022
294da30
Refine 'in' text between user slug and group slug in user teaser
Tirokk Oct 21, 2022
4f2ea8e
Refine and synchronize group slug on group profile with user slug on …
Tirokk Oct 21, 2022
1d9c24d
Fix tests of group profile page
Tirokk Oct 21, 2022
937954b
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Oct 21, 2022
46e4d1d
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 21, 2022
9773a7b
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 21, 2022
3fb4146
Merge branch 'master' into 5059-epic-groups
Mogge Oct 21, 2022
37babb5
Merge branch '5059-epic-groups' into search-groups
Mogge Oct 21, 2022
cb1e9f9
add headers for group search
Mogge Oct 21, 2022
add85ef
add graphql for group search
Mogge Oct 21, 2022
522cd8e
search for groups
Mogge Oct 21, 2022
61c2250
respect & symbol in searches
Mogge Oct 21, 2022
2b8b50a
add group hint to search hint
Mogge Oct 21, 2022
57bbe4c
allow search groups in permission middleware, add user id to search g…
Mogge Oct 21, 2022
d1b05b7
add groups to search result page
Mogge Oct 21, 2022
1421973
Fix Cypress test 'I_click_on_the_author.js'
Tirokk Oct 22, 2022
2e50e61
Merge pull request #5502 from Ocelot-Social-Community/5059-groups/550…
Tirokk Oct 22, 2022
5434bbf
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Oct 22, 2022
2b0ea92
Fix master merge by adding groups button to mobile menu
Tirokk Oct 22, 2022
c2617af
add db:migrate up to CI
Mogge Oct 22, 2022
f90d671
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 22, 2022
6f4bde9
Update backend/src/schema/resolvers/searches.js
Mogge Oct 22, 2022
19aa01f
Update webapp/components/generic/SearchGroup/SearchGroup.vue
Mogge Oct 22, 2022
7102de6
Update webapp/components/generic/SearchGroup/SearchGroup.vue
Mogge Oct 22, 2022
9cffe4f
Update webapp/components/generic/SearchGroup/SearchGroup.vue
Mogge Oct 22, 2022
c17bdea
Update webapp/graphql/Fragments.js
Mogge Oct 22, 2022
fc605a6
remove blank line
Mogge Oct 22, 2022
e27f9b0
remove location from group fragment, remove search type from search s…
Mogge Oct 22, 2022
88b5fb9
have i18n as option for search groups, fix test
Mogge Oct 23, 2022
02d25c4
Restore 'groupName: name' in 'searchGroups' GQL to have back the grou…
Tirokk Oct 23, 2022
717b36b
Merge pull request #5543 from Ocelot-Social-Community/search-groups
Tirokk Oct 23, 2022
ab6a4f4
Release v2.0.0
Tirokk Oct 23, 2022
c8d8168
Remove groups separate auto-deployment
Tirokk Oct 23, 2022
04c8da6
Change commented publishing branch and add commented template branch …
Tirokk Oct 23, 2022
ef06f1a
Add database migration to auto-deployment on publish
Tirokk Oct 23, 2022
0aa4172
Merge pull request #5552 from Ocelot-Social-Community/5059-groups/555…
Tirokk Oct 25, 2022
b9488d7
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-So…
Tirokk Oct 25, 2022
5b92292
Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community…
Tirokk Oct 25, 2022
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
52 changes: 26 additions & 26 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: ocelot.social publish CI
on:
push:
branches:
- master
# - 5093-fix-automatic-deployment # for testing while developing
# - master
- 5059-epic-groups # for testing while developing

jobs:
##############################################################################
Expand Down Expand Up @@ -94,16 +94,16 @@ jobs:
##########################################################################
- name: Backend | Build `production` image
run: |
docker build --target base -t "ocelotsocialnetwork/backend:latest-base" -t "ocelotsocialnetwork/backend:${VERSION}-base" -t "ocelotsocialnetwork/backend:${BUILD_VERSION}-base" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
docker build --target code -t "ocelotsocialnetwork/backend:latest-code" -t "ocelotsocialnetwork/backend:${VERSION}-code" -t "ocelotsocialnetwork/backend:${BUILD_VERSION}-code" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
docker build --target production -t "ocelotsocialnetwork/backend:latest" -t "ocelotsocialnetwork/backend:${VERSION}" -t "ocelotsocialnetwork/backend:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
docker build --target base -t "ocelotsocialnetwork/backend-groups:latest-base" -t "ocelotsocialnetwork/backend-groups:${VERSION}-base" -t "ocelotsocialnetwork/backend-groups:${BUILD_VERSION}-base" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
docker build --target code -t "ocelotsocialnetwork/backend-groups:latest-code" -t "ocelotsocialnetwork/backend-groups:${VERSION}-code" -t "ocelotsocialnetwork/backend-groups:${BUILD_VERSION}-code" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
docker build --target production -t "ocelotsocialnetwork/backend-groups:latest" -t "ocelotsocialnetwork/backend-groups:${VERSION}" -t "ocelotsocialnetwork/backend-groups:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
- name: Backend | Save docker image
run: docker save "ocelotsocialnetwork/backend" > /tmp/backend.tar
run: docker save "ocelotsocialnetwork/backend-groups" > /tmp/backend-groups.tar
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: docker-backend-production
path: /tmp/backend.tar
path: /tmp/backend-groups.tar

##############################################################################
# JOB: DOCKER BUILD PRODUCTION WEBAPP ########################################
Expand Down Expand Up @@ -134,16 +134,16 @@ jobs:
##########################################################################
- name: Webapp | Build `production` image
run: |
docker build --target base -t "ocelotsocialnetwork/webapp:latest-base" -t "ocelotsocialnetwork/webapp:${VERSION}-base" -t "ocelotsocialnetwork/webapp:${BUILD_VERSION}-base" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
docker build --target code -t "ocelotsocialnetwork/webapp:latest-code" -t "ocelotsocialnetwork/webapp:${VERSION}-code" -t "ocelotsocialnetwork/webapp:${BUILD_VERSION}-code" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
docker build --target production -t "ocelotsocialnetwork/webapp:latest" -t "ocelotsocialnetwork/webapp:${VERSION}" -t "ocelotsocialnetwork/webapp:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
docker build --target base -t "ocelotsocialnetwork/webapp-groups:latest-base" -t "ocelotsocialnetwork/webapp-groups:${VERSION}-base" -t "ocelotsocialnetwork/webapp-groups:${BUILD_VERSION}-base" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
docker build --target code -t "ocelotsocialnetwork/webapp-groups:latest-code" -t "ocelotsocialnetwork/webapp-groups:${VERSION}-code" -t "ocelotsocialnetwork/webapp-groups:${BUILD_VERSION}-code" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
docker build --target production -t "ocelotsocialnetwork/webapp-groups:latest" -t "ocelotsocialnetwork/webapp-groups:${VERSION}" -t "ocelotsocialnetwork/webapp-groups:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
- name: Webapp | Save docker image
run: docker save "ocelotsocialnetwork/webapp" > /tmp/webapp.tar
run: docker save "ocelotsocialnetwork/webapp-groups" > /tmp/webapp-groups.tar
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: docker-webapp-production
path: /tmp/webapp.tar
path: /tmp/webapp-groups.tar

##############################################################################
# JOB: DOCKER BUILD PRODUCTION MAINTENANCE ###################################
Expand Down Expand Up @@ -174,16 +174,16 @@ jobs:
##########################################################################
- name: Maintenance | Build `production` image
run: |
docker build --target base -t "ocelotsocialnetwork/maintenance:latest-base" -t "ocelotsocialnetwork/maintenance:${VERSION}-base" -t "ocelotsocialnetwork/maintenance:${BUILD_VERSION}-base" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
docker build --target code -t "ocelotsocialnetwork/maintenance:latest-code" -t "ocelotsocialnetwork/maintenance:${VERSION}-code" -t "ocelotsocialnetwork/maintenance:${BUILD_VERSION}-code" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
docker build --target production -t "ocelotsocialnetwork/maintenance:latest" -t "ocelotsocialnetwork/maintenance:${VERSION}" -t "ocelotsocialnetwork/maintenance:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
docker build --target base -t "ocelotsocialnetwork/maintenance-groups:latest-base" -t "ocelotsocialnetwork/maintenance-groups:${VERSION}-base" -t "ocelotsocialnetwork/maintenance-groups:${BUILD_VERSION}-base" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
docker build --target code -t "ocelotsocialnetwork/maintenance-groups:latest-code" -t "ocelotsocialnetwork/maintenance-groups:${VERSION}-code" -t "ocelotsocialnetwork/maintenance-groups:${BUILD_VERSION}-code" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
docker build --target production -t "ocelotsocialnetwork/maintenance-groups:latest" -t "ocelotsocialnetwork/maintenance-groups:${VERSION}" -t "ocelotsocialnetwork/maintenance-groups:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
- name: Maintenance | Save docker image
run: docker save "ocelotsocialnetwork/maintenance" > /tmp/maintenance.tar
run: docker save "ocelotsocialnetwork/maintenance-groups" > /tmp/maintenance-groups.tar
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: docker-maintenance-production
path: /tmp/maintenance.tar
path: /tmp/maintenance-groups.tar

##############################################################################
# JOB: UPLOAD TO DOCKERHUB ###################################################
Expand Down Expand Up @@ -217,21 +217,21 @@ jobs:
name: docker-backend-production
path: /tmp
- name: Load Docker Image
run: docker load < /tmp/backend.tar
run: docker load < /tmp/backend-groups.tar
- name: Download Docker Image (WebApp)
uses: actions/download-artifact@v2
with:
name: docker-webapp-production
path: /tmp
- name: Load Docker Image
run: docker load < /tmp/webapp.tar
run: docker load < /tmp/webapp-groups.tar
- name: Download Docker Image (Maintenance)
uses: actions/download-artifact@v2
with:
name: docker-maintenance-production
path: /tmp
- name: Load Docker Image
run: docker load < /tmp/maintenance.tar
run: docker load < /tmp/maintenance-groups.tar
##########################################################################
# Upload #################################################################
##########################################################################
Expand All @@ -240,11 +240,11 @@ jobs:
- name: Push neo4j
run: docker push --all-tags ocelotsocialnetwork/neo4j-community
- name: Push backend
run: docker push --all-tags ocelotsocialnetwork/backend
run: docker push --all-tags ocelotsocialnetwork/backend-groups
- name: Push webapp
run: docker push --all-tags ocelotsocialnetwork/webapp
run: docker push --all-tags ocelotsocialnetwork/webapp-groups
- name: Push maintenance
run: docker push --all-tags ocelotsocialnetwork/maintenance
run: docker push --all-tags ocelotsocialnetwork/maintenance-groups

##############################################################################
# JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ######################################
Expand Down Expand Up @@ -292,11 +292,11 @@ jobs:
# kubectl -n default rollout restart deployment/ocelot-neo4j
- name: Deploy actual version '$BUILD_VERSION' to DigitalOcean Kubernetes
run: |
kubectl -n default set image deployment/ocelot-webapp container-ocelot-webapp=ocelotsocialnetwork/webapp:$BUILD_VERSION
kubectl -n default set image deployment/ocelot-webapp container-ocelot-webapp=ocelotsocialnetwork/webapp-groups:$BUILD_VERSION
kubectl -n default rollout restart deployment/ocelot-webapp
kubectl -n default set image deployment/ocelot-backend container-ocelot-backend=ocelotsocialnetwork/backend:$BUILD_VERSION
kubectl -n default set image deployment/ocelot-backend container-ocelot-backend=ocelotsocialnetwork/backend-groups:$BUILD_VERSION
kubectl -n default rollout restart deployment/ocelot-backend
kubectl -n default set image deployment/ocelot-maintenance container-ocelot-maintenance=ocelotsocialnetwork/maintenance:$BUILD_VERSION
kubectl -n default set image deployment/ocelot-maintenance container-ocelot-maintenance=ocelotsocialnetwork/maintenance-groups:$BUILD_VERSION
kubectl -n default rollout restart deployment/ocelot-maintenance
kubectl -n default set image deployment/ocelot-neo4j container-ocelot-neo4j=ocelotsocialnetwork/neo4j-community:$BUILD_VERSION
kubectl -n default rollout restart deployment/ocelot-neo4j
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ jobs:
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend
- name: backend | Initialize Database
run: docker-compose exec -T backend yarn db:migrate init
- name: backend | Migrate Database Up
run: docker-compose exec -T backend yarn db:migrate up
- name: backend | Unit test
run: docker-compose exec -T backend yarn test
##########################################################################
Expand Down Expand Up @@ -267,7 +269,7 @@ jobs:
report_name: Coverage Webapp
type: lcov
result_path: ./coverage/lcov.info
min_coverage: 65
min_coverage: 64
token: ${{ github.token }}

##############################################################################
Expand Down
35 changes: 31 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,43 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [1.1.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.1.0...1.1.1)
#### [2.0.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.1.0...2.0.0)

- feat: 🍰 Search For Groups [`#5543`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5543)
- feat: 🍰 Mobile Footer Menu To Header Menu [`#5524`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5524)
- feat: 🍰 Implement `LOGO_HEADER_CLICK` As Configuration [`#5525`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5525)
- refactor: 🍰 Category Filter In Filter Menu [`#5527`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5527)
- feat: 🍰 Group Invitation [`#5512`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5512)
- feat: 🍰 Implement Post In Group In Webapp [`#5468`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5468)
- feat: :cake: Update Issue Templates [`#5508`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5508)
- refactor: 🍰 Disable Submit Button On group Update Changed Error [`#5489`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5489)
- feat: 🍰 Seed Posts In Groups [`#5503`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5503)
- feat: 🍰 Make Configurable Header Menu Translatable [`#5491`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5491)
- feat: 🍰 Post In Groups [`#5380`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5380)
- feat: 🍰 Refine Group Creation And Group Edit [`#5418`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5418)
- feat: 🍰 Implement Content Menu On Group Profile [`#5419`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5419)
- feat: 🍰 Group Members Management [`#5345`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5345)
- feat: 🍰 Have My Groups In The User Menu And Configure Groups Button In Header [`#5411`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5411)
- chore: 🍰 Implement Automatic Deployment For Groups Branch '5059-epic-groups' [`#5408`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5408)
- Chore: 🍰 Release v1.1.1 – Refactor Rebranding [`#5392`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5392)
- chore: 🍰 Refactor Rebranding [`#5390`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5390)
- feat: 🍰 Group Profile Description Etc [`#5368`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5368)
- feat: 🍰 Tooltips For Topics [`#5350`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5350)
- feat: 🍰 Group Profile Members List Etc [`#5335`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5335)
- feat: 🍰 Implement Group Profile – Visibility [`#5332`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5332)
- feat: 🍰 Save Categories In Frontend [`#5284`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5284)
- feat: 🍰 Add New Yunite Icons [`#5319`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5319)
- chore: 🍰 Update Neode From v^0.4.7 To v^0.4.8 In Backend [`#5334`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5334)
- feat: 🍰 My Groups Page [`#5148`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5148)
- feat: 🍰 Hidden Groups Shall Not Be Visible For None Or Pending Members In Backend [`#5317`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5317)
- feat: 🍰 Implement Group Profile [`#5197`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5197)
- fix: Category Filter Menu Client Only [`#5301`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5301)
- feat: Save Category Settings [`#5261`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5261)
- feat: 🍰 Implement `UpdateGroup` Resolver [`#5224`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5224)
- feat: Topics Menu [`#5248`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5248)
- docs: 🍰 Document GraqhQL Playground [`#5253`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5253)
- feat: Categories Filter Menu [`#5198`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5198)
- feat: 🍰 Implement `JoinGroup`, `GroupMember`, `SwitchGroupMemberRole` Resolvers [`#5199`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5199)
- fix: 🍰 Fix Test Description From `enter-nonce.vue` To `change-password` [`#5217`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5217)
- Bump cookie-universal-nuxt from 2.1.5 to 2.2.2 in /webapp [`#5218`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5218)
- Bump prettier from 2.2.1 to 2.7.1 in /webapp [`#5170`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5170)
Expand All @@ -27,10 +52,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- feat: 🍰 Change Error Message With `Authorised` To `Authorized` All Over The Place To Have American English [`#5206`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5206)
- Bump cross-env from 7.0.2 to 7.0.3 in /webapp [`#5168`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5168)
- chore: 🍰 Add `--logHeapUsage` To Jest Test Call [`#5182`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5182)
- chore: 🍰 Add Groups To Seeding [`#5185`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5185)
- feat: 🍰 Implement Group GQL Model And CRUD Resolvers – First Step [`#5139`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5139)
- refactor: 🍰 Rename `UserGroup` To `UserRole` [`#5143`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5143)
- add new yunite icons [`bb0d632`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/bb0d6329e7e36ea03671318ea8dd128a6d5a5a7a)
- cleanup refactor rebranding [`5f5c0fa`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/5f5c0faa1f28cd4df7681eba335ae5998b2d9cca)
- change color and scss in branding [`52070b8`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/52070b8c570970bf48df561134bf67cb4111b640)
- Refine design and a bit functionality, first step [`13ec4ee`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/13ec4ee776728983e25d87078b804bdaaca66e38)
- add tets for posts in groups [`a9cd661`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/a9cd661e63181dc5ea207b2e1e656f720e0b10d0)
- Refine design and functionality of group list and create, edit group [`7b11122`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/7b11122bea4868624dd1c1641219e71070412e20)

#### [1.1.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.9...1.1.0)

Expand Down
2 changes: 1 addition & 1 deletion backend/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ AWS_BUCKET=
EMAIL_DEFAULT_SENDER="[email protected]"
EMAIL_SUPPORT="[email protected]"

CATEGORIES_ACTIVE=false
CATEGORIES_ACTIVE=false
Loading