Merge branch 'master' into 6014-feature-webapp-join-leave-button-on-group-page-is-misleading

.github/workflows/publish.yml

@@ -300,6 +300,14 @@ jobs:
           repository: ${{ github.repository }}
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
 
+      - name: Repository Dispatch stage.ocelot.social
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ github.token }}
+          event-type: trigger-build-success
+          repository: 'Ocelot-Social-Community/stage.ocelot.social'
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
+
   # ##############################################################################
   # # JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ######################################
   # ##############################################################################

deployment/scripts/cluster.upgrade.sh

@@ -7,7 +7,13 @@ SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 # configuration
 CONFIGURATION=${CONFIGURATION:-"example"}
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
-VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.yaml
+VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.
+DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"}
 
 # upgrade with helm
-helm --kubeconfig=${KUBECONFIG} upgrade ocelot --values ${VALUES} ${SCRIPT_DIR}/../src/kubernetes/ --debug --timeout 10m
+helm --kubeconfig=${KUBECONFIG} upgrade ocelot \
+  --values ${VALUES} \
+  --set appVersion="${DOCKERHUB_OCELOT_TAG}"
+  ${SCRIPT_DIR}/../src/kubernetes/ \
+  --debug \
+  --timeout 10m

webapp/components/Group/GroupList.vue

@@ -1,9 +1,14 @@
 <template>
-  <div class="group-list">
+  <ds-flex class="group-list">
-    <ds-space margin-bottom="small" v-for="group in groups" :key="group.id">
+    <ds-flex-item
+      v-for="group in groups"
+      :key="group.id"
+      :width="{ base: '98%', sm: '98%', md: '48%' }"
+      class="group-item"
+    >
       <group-teaser :group="group" />
-    </ds-space>
+    </ds-flex-item>
-  </div>
+  </ds-flex>
 </template>
 
 <script>
@@ -19,3 +24,8 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.group-item {
+  margin: 0 1% 2% 1%;
+}
+</style>

webapp/pages/groups.vue

@@ -4,7 +4,7 @@
       <tab-navigation :tabs="tabOptions" :activeTab="tabActive" @switch-tab="handleTab" />
     </ds-space>
     <ds-space margin="large" />
-    <ds-container>
+    <ds-space>
       <!-- create group -->
       <ds-space centered>
         <nuxt-link :to="{ name: 'group-create' }">
@@ -49,7 +49,7 @@
           @next="nextResults"
         />
       </ds-space>
-    </ds-container>
+    </ds-space>
   </div>
 </template>
 

webapp/pages/index.vue

@@ -346,7 +346,7 @@ export default {
   position: fixed;
   z-index: 6;
   margin-top: -35px;
-  padding: 20px 10px 5px 10px;
+  padding: 20px 10px 20px 10px;
   background-color: #f5f4f6;
 }
 @media screen and (max-width: 656px) {