IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5059-epic-groups' into 5344-add-group-members-management

Browse Source
This commit is contained in:
Alexander Friedland 2022-09-28 09:22:12 +02:00 committed by GitHub
commit c6fa49ee0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 75 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.github/workflows/publish.yml vendored
View File

@ -3,8 +3,8 @@ name: ocelot.social publish CI
on: on:
push: push:
branches: branches:
- master # - master
# - 5093-fix-automatic-deployment # for testing while developing - 5059-epic-groups # for testing while developing
jobs: jobs:
############################################################################## ##############################################################################
@ -94,16 +94,16 @@ jobs:
########################################################################## ##########################################################################
- name: Backend | Build `production` image - name: Backend | Build `production` image
run: | 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 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: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 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: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 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 - 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 - name: Upload Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: docker-backend-production name: docker-backend-production
path: /tmp/backend.tar path: /tmp/backend-groups.tar
############################################################################## ##############################################################################
# JOB: DOCKER BUILD PRODUCTION WEBAPP ######################################## # JOB: DOCKER BUILD PRODUCTION WEBAPP ########################################
@ -134,16 +134,16 @@ jobs:
########################################################################## ##########################################################################
- name: Webapp | Build `production` image - name: Webapp | Build `production` image
run: | 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 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: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 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: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 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 - 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 - name: Upload Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: docker-webapp-production name: docker-webapp-production
path: /tmp/webapp.tar path: /tmp/webapp-groups.tar
############################################################################## ##############################################################################
# JOB: DOCKER BUILD PRODUCTION MAINTENANCE ################################### # JOB: DOCKER BUILD PRODUCTION MAINTENANCE ###################################
@ -174,16 +174,16 @@ jobs:
########################################################################## ##########################################################################
- name: Maintenance | Build `production` image - name: Maintenance | Build `production` image
run: | 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 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: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 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: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 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 - 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 - name: Upload Artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: docker-maintenance-production name: docker-maintenance-production
path: /tmp/maintenance.tar path: /tmp/maintenance-groups.tar
############################################################################## ##############################################################################
# JOB: UPLOAD TO DOCKERHUB ################################################### # JOB: UPLOAD TO DOCKERHUB ###################################################
@ -217,21 +217,21 @@ jobs:
name: docker-backend-production name: docker-backend-production
path: /tmp path: /tmp
- name: Load Docker Image - name: Load Docker Image
run: docker load < /tmp/backend.tar run: docker load < /tmp/backend-groups.tar
- name: Download Docker Image (WebApp) - name: Download Docker Image (WebApp)
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: docker-webapp-production name: docker-webapp-production
path: /tmp path: /tmp
- name: Load Docker Image - name: Load Docker Image
run: docker load < /tmp/webapp.tar run: docker load < /tmp/webapp-groups.tar
- name: Download Docker Image (Maintenance) - name: Download Docker Image (Maintenance)
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: docker-maintenance-production name: docker-maintenance-production
path: /tmp path: /tmp
- name: Load Docker Image - name: Load Docker Image
run: docker load < /tmp/maintenance.tar run: docker load < /tmp/maintenance-groups.tar
########################################################################## ##########################################################################
# Upload ################################################################# # Upload #################################################################
########################################################################## ##########################################################################
@ -240,11 +240,11 @@ jobs:
- name: Push neo4j - name: Push neo4j
run: docker push --all-tags ocelotsocialnetwork/neo4j-community run: docker push --all-tags ocelotsocialnetwork/neo4j-community
- name: Push backend - name: Push backend
run: docker push --all-tags ocelotsocialnetwork/backend run: docker push --all-tags ocelotsocialnetwork/backend-groups
- name: Push webapp - name: Push webapp
run: docker push --all-tags ocelotsocialnetwork/webapp run: docker push --all-tags ocelotsocialnetwork/webapp-groups
- name: Push maintenance - name: Push maintenance
run: docker push --all-tags ocelotsocialnetwork/maintenance run: docker push --all-tags ocelotsocialnetwork/maintenance-groups
############################################################################## ##############################################################################
# JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ###################################### # JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ######################################
@ -292,11 +292,11 @@ jobs:
# kubectl -n default rollout restart deployment/ocelot-neo4j # kubectl -n default rollout restart deployment/ocelot-neo4j
- name: Deploy actual version '$BUILD_VERSION' to DigitalOcean Kubernetes - name: Deploy actual version '$BUILD_VERSION' to DigitalOcean Kubernetes
run: | 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 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 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 rollout restart deployment/ocelot-maintenance
kubectl -n default set image deployment/ocelot-neo4j container-ocelot-neo4j=ocelotsocialnetwork/neo4j-community:$BUILD_VERSION kubectl -n default set image deployment/ocelot-neo4j container-ocelot-neo4j=ocelotsocialnetwork/neo4j-community:$BUILD_VERSION
kubectl -n default rollout restart deployment/ocelot-neo4j kubectl -n default rollout restart deployment/ocelot-neo4j

20
webapp/components/AvatarMenu/AvatarMenu.spec.js
View File

@ -90,6 +90,13 @@ describe('AvatarMenu.vue', () => {
expect(profileLink.exists()).toBe(true) expect(profileLink.exists()).toBe(true)
}) })
it('displays a link to "My groups"', () => {
const profileLink = wrapper
.findAll('.ds-menu-item span')
.at(wrapper.vm.routes.findIndex((route) => route.path === '/my-groups'))
expect(profileLink.exists()).toBe(true)
})
it('displays a link to the notifications page', () => { it('displays a link to the notifications page', () => {
const notificationsLink = wrapper const notificationsLink = wrapper
.findAll('.ds-menu-item span') .findAll('.ds-menu-item span')
@ -103,6 +110,11 @@ describe('AvatarMenu.vue', () => {
.at(wrapper.vm.routes.findIndex((route) => route.path === '/settings')) .at(wrapper.vm.routes.findIndex((route) => route.path === '/settings'))
expect(settingsLink.exists()).toBe(true) expect(settingsLink.exists()).toBe(true)
}) })
it('displays a total of 4 links', () => {
const allLinks = wrapper.findAll('.ds-menu-item')
expect(allLinks).toHaveLength(4)
})
}) })
describe('role moderator', () => { describe('role moderator', () => {
@ -125,9 +137,9 @@ describe('AvatarMenu.vue', () => {
expect(moderationLink.exists()).toBe(true) expect(moderationLink.exists()).toBe(true)
}) })
it('displays a total of 4 links', () => { it('displays a total of 5 links', () => {
const allLinks = wrapper.findAll('.ds-menu-item') const allLinks = wrapper.findAll('.ds-menu-item')
expect(allLinks).toHaveLength(4) expect(allLinks).toHaveLength(5)
}) })
}) })
@ -151,9 +163,9 @@ describe('AvatarMenu.vue', () => {
expect(adminLink.exists()).toBe(true) expect(adminLink.exists()).toBe(true)
}) })
it('displays a total of 5 links', () => { it('displays a total of 6 links', () => {
const allLinks = wrapper.findAll('.ds-menu-item') const allLinks = wrapper.findAll('.ds-menu-item')
expect(allLinks).toHaveLength(5) expect(allLinks).toHaveLength(6)
}) })
}) })
}) })

7
webapp/components/AvatarMenu/AvatarMenu.vue
View File

@ -72,10 +72,15 @@ export default {
} }
const routes = [ const routes = [
{ {
name: this.$t('profile.name'), name: this.$t('header.avatarMenu.myProfile'),
path: `/profile/${this.user.id}/${this.user.slug}`, path: `/profile/${this.user.id}/${this.user.slug}`,
icon: 'user', icon: 'user',
}, },
{
name: this.$t('header.avatarMenu.myGroups'),
path: '/my-groups',
icon: 'users',
},
{ {
name: this.$t('notifications.pageLink'), name: this.$t('notifications.pageLink'),
path: '/notifications', path: '/notifications',

1
webapp/constants/groups.js
View File

@ -2,3 +2,4 @@
export const NAME_LENGTH_MIN = 3 export const NAME_LENGTH_MIN = 3
export const NAME_LENGTH_MAX = 50 export const NAME_LENGTH_MAX = 50
export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags
export const SHOW_GROUP_BUTTON_IN_HEADER = true

23
webapp/layouts/default.vue
View File

@ -88,6 +88,9 @@
<invite-button placement="top" /> <invite-button placement="top" />
</client-only> </client-only>
</div> </div>
<client-only v-if="SHOW_GROUP_BUTTON_IN_HEADER">
<group-button />
</client-only>
<client-only> <client-only>
<group-button /> <group-button />
</client-only> </client-only>
@ -115,21 +118,22 @@
</template> </template>
<script> <script>
import Logo from '~/components/Logo/Logo'
import LOGOS from '../constants/logos.js'
import headerMenu from '../constants/headerMenu.js'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Logo from '~/components/Logo/Logo'
import { SHOW_GROUP_BUTTON_IN_HEADER } from '~/constants/groups.js'
import headerMenu from '~/constants/headerMenu.js'
import LOGOS from '~/constants/logos.js'
import seo from '~/mixins/seo'
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
import SearchField from '~/components/features/SearchField/SearchField.vue' import SearchField from '~/components/features/SearchField/SearchField.vue'
import Modal from '~/components/Modal' import Modal from '~/components/Modal'
import NotificationMenu from '~/components/NotificationMenu/NotificationMenu'
import seo from '~/mixins/seo'
import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
import PageFooter from '~/components/PageFooter/PageFooter'
import AvatarMenu from '~/components/AvatarMenu/AvatarMenu' import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu'
import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
import GroupButton from '~/components/Group/GroupButton'
import InviteButton from '~/components/InviteButton/InviteButton' import InviteButton from '~/components/InviteButton/InviteButton'
import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu.vue' import NotificationMenu from '~/components/NotificationMenu/NotificationMenu'
import GroupButton from '~/components/Group/GroupButton.vue' import PageFooter from '~/components/PageFooter/PageFooter'
export default { export default {
components: { components: {
@ -149,6 +153,7 @@ export default {
data() { data() {
return { return {
LOGOS, LOGOS,
SHOW_GROUP_BUTTON_IN_HEADER,
isHeaderMenu: headerMenu.MENU.length > 0, isHeaderMenu: headerMenu.MENU.length > 0,
menu: headerMenu.MENU, menu: headerMenu.MENU,
mobileSearchVisible: false, mobileSearchVisible: false,

7
webapp/locales/de.json
View File

@ -470,6 +470,12 @@
"hashtag-search": "Suche nach #{hashtag}", "hashtag-search": "Suche nach #{hashtag}",
"title": "Deine Filterblase" "title": "Deine Filterblase"
}, },
"header": {
"avatarMenu": {
"myGroups": "Mein Gruppen",
"myProfile": "Mein Profil"
}
},
"index": { "index": {
"change-filter-settings": "Verändere die Filter-Einstellungen, um mehr Ergebnisse zu erhalten.", "change-filter-settings": "Verändere die Filter-Einstellungen, um mehr Ergebnisse zu erhalten.",
"no-results": "Keine Beiträge gefunden." "no-results": "Keine Beiträge gefunden."
@ -628,7 +634,6 @@
"title": "Lade jemanden zu {APPLICATION_NAME} ein!" "title": "Lade jemanden zu {APPLICATION_NAME} ein!"
}, },
"memberSince": "Mitglied seit", "memberSince": "Mitglied seit",
"name": "Mein Profil",
"network": { "network": {
"andMore": "und {number} weitere …", "andMore": "und {number} weitere …",
"followedBy": "wird gefolgt von:", "followedBy": "wird gefolgt von:",

7
webapp/locales/en.json
View File

@ -470,6 +470,12 @@
"hashtag-search": "Searching for #{hashtag}", "hashtag-search": "Searching for #{hashtag}",
"title": "Your filter bubble" "title": "Your filter bubble"
}, },
"header": {
"avatarMenu": {
"myGroups": "My groups",
"myProfile": "My profile"
}
},
"index": { "index": {
"change-filter-settings": "Change your filter settings to get more results.", "change-filter-settings": "Change your filter settings to get more results.",
"no-results": "No contributions found." "no-results": "No contributions found."
@ -628,7 +634,6 @@
"title": "Invite somebody to {APPLICATION_NAME}!" "title": "Invite somebody to {APPLICATION_NAME}!"
}, },
"memberSince": "Member since", "memberSince": "Member since",
"name": "My Profile",
"network": { "network": {
"andMore": "and {number} more …", "andMore": "and {number} more …",
"followedBy": "is followed by:", "followedBy": "is followed by:",