Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-changemedia.at-v3.7.0-change-footer

2026-01-16 01:44:35 +00:00 · 2025-05-27 12:04:20 +02:00 · 2025-05-27 12:04:20 +02:00 · 764cd51716
commit 764cd51716
parent a067470b5e 5bec51ad5d
12 changed files with 140 additions and 51 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,48 @@ 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).

+#### [3.7.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.6.1...3.7.0)
+
+- fix(webapp): logo and top-menu optimization [`#8590`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8590)
+- fix(webapp): hotfix dropdown menu placement [`#8594`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8594)
+- fix(webapp): notifications - UI Improvements [`#8559`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8559)
+- update user, write all values, query verification Badge [`#8593`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8593)
+- refactor(webapp): remove email normalization [`#8580`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8580)
+- feat(backend): autoselect badges when rewarding and the user still have free slots [`#8577`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8577)
+- fix websocket - downgrade graphql [`#8592`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8592)
+- build(deps-dev): bump @faker-js/faker from 9.7.0 to 9.8.0 in /webapp [`#8567`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8567)
+- build(deps): bump @aws-sdk/client-s3 from 3.804.0 to 3.817.0 in /backend [`#8582`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8582)
+- build(deps-dev): bump eslint-plugin-jsonc in /backend [`#8583`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8583)
+- build(deps-dev): bump @types/lodash from 4.17.16 to 4.17.17 in /backend [`#8585`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8585)
+- build(deps-dev): bump the cypress group across 1 directory with 2 updates [`#8561`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8561)
+- build(deps-dev): bump @types/node from 22.15.18 to 22.15.21 in /backend [`#8586`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8586)
+- build(deps): bump peter-evans/repository-dispatch [`#8589`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8589)
+- build(deps-dev): bump eslint-plugin-prettier in /webapp [`#8520`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8520)
+- improve login & invite mechanics [`#8574`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8574)
+- build(backend): upgrade outdated S3 client [`#8463`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8463)
+- refactor(docker): remove dead code [`#8554`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8554)
+- build(deps-dev): bump eslint-plugin-prettier in /backend [`#8526`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8526)
+- build(deps): bump linkify-html from 4.2.0 to 4.3.1 in /backend [`#8532`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8532)
+- build(deps-dev): bump @faker-js/faker from 9.7.0 to 9.8.0 [`#8560`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8560)
+- build(deps): bump peter-evans/repository-dispatch [`#8563`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8563)
+- fix(webapp): fix popover flickering [`#8555`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8555)
+- fix(backend): user role in group in notifications [`#8552`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8552)
+- fix statistics: reports [`#8576`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8576)
+- build(deps): bump docker/build-push-action from 6.16.0 to 6.17.0 [`#8562`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8562)
+- build(deps): bump sanitize-html from 2.16.0 to 2.17.0 in /backend [`#8568`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8568)
+- build(deps-dev): bump @faker-js/faker from 9.7.0 to 9.8.0 in /backend [`#8570`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8570)
+- build(deps): bump node from 23.11.0-alpine to 24.0.2-alpine in /backend [`#8564`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8564)
+- build(deps-dev): bump ts-jest from 29.3.2 to 29.3.4 in /backend [`#8569`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8569)
+- build(deps-dev): bump @types/node from 22.15.3 to 22.15.18 in /backend [`#8571`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8571)
+- build(deps-dev): bump eslint-config-prettier in /backend [`#8529`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8529)
+- feat(backend): add support line to emails [`#8502`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8502)
+- build(deps-dev): bump tsc-alias from 1.8.15 to 1.8.16 in /backend [`#8530`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8530)
+
 #### [3.6.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.6.0...3.6.1)

+> 12 May 2025
+
+- v3.6.1 [`#8553`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8553)
 - fix(webapp): fix flickering? [`#8549`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8549)
 - fix(backend): fix statistics and introduce new values [`#8550`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8550)
 - Fix typo in german translation [`#8548`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8548)
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social-backend",
-  "version": "3.6.1",
+  "version": "3.7.0",
  "description": "GraphQL Backend for ocelot.social",
  "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
  "author": "ocelot.social Community",
--- a/backend/src/config/logosBranded.ts
+++ b/backend/src/config/logosBranded.ts
@ -6,8 +6,10 @@ import logos from '@config/logos'

 const defaultLogos = {
  LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
+  LOGO_HEADER_TABLET_PATH: '/img/custom/logo-horizontal.svg',
  LOGO_HEADER_MOBILE_PATH: '/img/custom/logo-horizontal.svg',
  LOGO_HEADER_WIDTH: '130px',
+  LOGO_HEADER_TABLET_WIDTH: '115px',
  LOGO_HEADER_MOBILE_WIDTH: '100px',
  LOGO_HEADER_CLICK: {
    // externalLink: {
--- a/deployment/helm/charts/ocelot-neo4j/Chart.yaml
+++ b/deployment/helm/charts/ocelot-neo4j/Chart.yaml
@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.6.1"
+appVersion: "3.7.0"
--- a/deployment/helm/charts/ocelot-social/Chart.yaml
+++ b/deployment/helm/charts/ocelot-social/Chart.yaml
@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.6.1"
+appVersion: "3.7.0"
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "ocelot-social-frontend",
-  "version": "3.6.1",
+  "version": "3.7.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ocelot-social-frontend",
-      "version": "3.6.1",
+      "version": "3.7.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@intlify/unplugin-vue-i18n": "^2.0.0",
--- a/frontend/package.json
+++ b/frontend/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social-frontend",
-  "version": "3.6.1",
+  "version": "3.7.0",
  "description": "ocelot.social new Frontend (in development and not fully implemented) by IT4C Boilerplate for frontends",
  "main": "build/index.js",
  "type": "module",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social",
-  "version": "3.6.1",
+  "version": "3.7.0",
  "description": "Free and open source software program code available to run social networks.",
  "author": "ocelot.social Community",
  "license": "MIT",
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@ -8,7 +8,7 @@
      <!-- header menu -->
      <ds-flex v-if="!showMobileMenu" class="main-navigation-flex">
        <!-- logo -->
-        <ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
+        <ds-flex-item class="logo-wrapper" :width="{ base: 'auto' }">
          <a
            v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
            :href="LOGOS.LOGO_HEADER_CLICK.externalLink.url"
@ -48,13 +48,7 @@
          v-if="isLoggedIn"
          id="nav-search-box"
          class="header-search"
-          :width="{
-            base: '45%',
-            sm: '40%',
-            md: isHeaderMenu ? 'auto' : '40%',
-            lg: isHeaderMenu ? 'auto' : '50%',
-          }"
-          style="flex-shrink: 0; flex-grow: 1"
+          :width="{ base: 'auto' }"
        >
          <search-field />
        </ds-flex-item>
@ -69,7 +63,7 @@
          </client-only>
        </ds-flex-item>
        <!-- right symbols -->
-        <ds-flex-item style="flex-basis: auto">
+        <ds-flex-item style="flex: none">
          <div class="main-navigation-right" style="flex-basis: auto">
            <!-- locale switch -->
            <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
@ -383,7 +377,6 @@ export default {
  white-space: nowrap;
 }
 .topbar-locale-switch {
-  display: flex;
  margin-right: $space-xx-small;
  align-self: center;
  display: inline-flex;
@ -392,36 +385,61 @@ export default {
  margin-top: $space-xx-small;
 }
 .main-navigation-flex {
+  display: flex;
  align-items: center;
  flex-wrap: nowrap !important;
+  gap: 20px;
+  min-width: 0;
 }
+@media (max-width: 800px) {
+  .main-navigation-flex {
+    gap: 10px;
+  }
+}
+
+.logo-wrapper {
+  flex: 0 0 auto;
+}
+.branding-menu {
+  flex: 0 0 auto;
+  white-space: nowrap;
+}
+.header-search {
+  flex: 1 1 auto !important;
+}
+.navigation-actions {
+  flex: 0 0 auto;
+}
+
 .main-navigation-right {
  display: flex;
  justify-content: flex-end;
 }
-.main-navigation-right .desktop-view {
-  float: right;
-}
-.ds-flex-item.mobile-hamburger-menu {
-  margin-left: auto;
-  text-align: right;
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: flex-end;

-  & > div {
-    display: inline-flex;
+// Mobile Header mit verbessertem Layout
+.mobil-header-box {
+  .logo-container {
+    flex: 1 1 auto;
+    min-width: 60px;
+    max-width: calc(100vw - 200px);
+  }

-    padding-right: 15px;
-    &:first-child {
-      padding-right: 10px;
-    }
+  .mobile-hamburger-menu {
+    flex: 0 0 auto; // no shrinking
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 10px;

-    button {
-      overflow: visible;
-      .svg {
-        height: 1.8em;
+    > div {
+      flex-shrink: 0; // Buttons remain their size
+
+      button {
+        overflow: visible;
+        .svg {
+          height: 1.8em;
+        }
      }
    }
  }
@ -429,9 +447,6 @@ export default {
    height: 1.5em;
  }
 }
-.mobile-menu {
-  margin: 0 20px;
-}
 .mobile-search {
  margin-top: 20px;
 }
@ -446,10 +461,4 @@ export default {
 .hide-mobile-menu {
  display: none;
 }
-.logo-container {
-  max-width: calc(100vw - 140px) !important;
-}
-.hamburger-button {
-  flex-shrink: 0;
-}
 </style>
--- a/webapp/components/Logo/Logo.vue
+++ b/webapp/components/Logo/Logo.vue
@ -8,10 +8,18 @@
      :style="logoWidthStyle"
    />

+    <!-- Tablet logo (falls back to desktop if not provided) -->
+    <img
+      class="ds-logo-svg ds-logo-tablet"
+      :alt="metadata.APPLICATION_NAME + ' ' + logo.alt"
+      :src="logo.tabletPath || logo.path"
+      :style="tabletLogoWidthStyle"
+    />
+
    <!-- Mobile logo (falls back to desktop if not provided) -->
    <img
      class="ds-logo-svg ds-logo-mobile"
-      :alt="metadata.APPLICATION_NAME + ' ' + logo.alt + ' Mobile'"
+      :alt="metadata.APPLICATION_NAME + ' ' + logo.alt"
      :src="logo.mobilePath || logo.path"
      :style="mobileLogoWidthStyle"
    />
@ -43,6 +51,13 @@ export default {
      type: String,
      default: null,
    },
+    /**
+     * Tablet logo width
+     */
+    tabletLogoWidth: {
+      type: String,
+      default: null,
+    },
    /**
     * Mobile logo width
     */
@ -69,9 +84,11 @@ export default {
    const logosObject = {
      header: {
        path: logos.LOGO_HEADER_PATH,
+        tabletPath: logos.LOGO_HEADER_TABLET_PATH || null,
        mobilePath: logos.LOGO_HEADER_MOBILE_PATH || null,
        alt: 'Header',
        widthDefault: logos.LOGO_HEADER_WIDTH,
+        tabletWidthDefault: logos.LOGO_HEADER_TABLET_WIDTH || logos.LOGO_HEADER_WIDTH,
        mobileWidthDefault: logos.LOGO_HEADER_MOBILE_WIDTH || logos.LOGO_HEADER_WIDTH,
      },
      welcome: { path: logos.LOGO_WELCOME_PATH, alt: 'Welcome', widthDefault: '200px' },
@ -98,6 +115,11 @@ export default {
      const width = this.logoWidth === null ? this.logo.widthDefault : this.logoWidth
      return `width: ${width};`
    },
+    tabletLogoWidthStyle() {
+      const width =
+        this.tabletLogoWidth === null ? this.logo.tabletWidthDefault : this.tabletLogoWidth
+      return `width: ${width};`
+    },
    mobileLogoWidthStyle() {
      const width =
        this.mobileLogoWidth === null ? this.logo.mobileWidthDefault : this.mobileLogoWidth
@ -130,16 +152,32 @@ export default {
 .ds-logo-desktop {
  display: block;
 }
-
+.ds-logo-tablet {
+  display: none;
+}
 .ds-logo-mobile {
  display: none;
 }

-@media (max-width: 767px) {
+@media (max-width: 810px) {
  .ds-logo-desktop {
    display: none;
  }
+  .ds-logo-tablet {
+    display: block;
+  }
+  .ds-logo-mobile {
+    display: none;
+  }
+}

+@media (max-width: 450px) {
+  .ds-logo-desktop {
+    display: none;
+  }
+  .ds-logo-tablet {
+    display: none;
+  }
  .ds-logo-mobile {
    display: block;
  }
--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@ -1,6 +1,6 @@
 {
  "name": "@ocelot-social/maintenance",
-  "version": "3.6.1",
+  "version": "3.7.0",
  "description": "Maintenance page for ocelot.social",
  "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
  "author": "ocelot.social Community",
--- a/webapp/package.json
+++ b/webapp/package.json
@ -1,6 +1,6 @@
 {
  "name": "ocelot-social-webapp",
-  "version": "3.6.1",
+  "version": "3.7.0",
  "description": "ocelot.social Frontend",
  "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
  "author": "ocelot.social Community",