Merge pull request #68 from Ocelot-Social-Community/release-v1.1.1

chore: 🍰 Release v1.1.1-228 – Refactor Rebranding

branding/assets/styles/import/_branding.scss

@@ -0,0 +1,5 @@
+/* 
+    *
+    * Here, all SCSS variables and classes can be adapted to your custom design. 
+    *
+*/

branding/constants/headerMenu.js

@@ -0,0 +1,12 @@
+export default {
+  MENU: [
+    // {
+    //   name: 'Beiträge',
+    //   path: '/#',
+    // },
+    // {
+    //   name: 'Über Yunite',
+    //   url: 'https://yunite.org',
+    // },
+  ],
+}

branding/constants/logos.js

@@ -2,6 +2,7 @@
 // this are the paths in the webapp
 export default {
   LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
+  LOGO_HEADER_WIDTH: '130px',
   LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg',
   LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg',
   LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg',

docker-compose.ocelotsocial-branded.yml

@@ -21,6 +21,8 @@ services:
       - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
       # - WEBSOCKETS_URI=ws://backend:4000/graphql # is not working and not given in Docker YAML in main repo
       - PUBLIC_REGISTRATION=true
+      - INVITE_REGISTRATION=true
+      - CATEGORIES_ACTIVE=true
 
   ########################################################
   # BACKEND ##############################################
@@ -47,6 +49,8 @@ services:
       - EMAIL_DEFAULT_SENDER=info@wir.social
       # - PRODUCTION_DB_CLEAN_ALLOW=false # only true for production environments on staging servers
       - PUBLIC_REGISTRATION=true
+      - INVITE_REGISTRATION=true
+      - CATEGORIES_ACTIVE=true
       - SMTP_USERNAME=${SMTP_USERNAME}
       - SMTP_PASSWORD=${SMTP_PASSWORD}
       - SMTP_HOST=mailserver

docker-compose.yml

@@ -26,6 +26,8 @@ services:
       - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
       # - WEBSOCKETS_URI=ws://backend:4000/graphql # is not working and not given in Docker YAML in main repo
       - PUBLIC_REGISTRATION=true
+      - INVITE_REGISTRATION=true
+      - CATEGORIES_ACTIVE=true
 
   ########################################################
   # BACKEND ##############################################
@@ -56,6 +58,8 @@ services:
       - EMAIL_DEFAULT_SENDER=info@wir.social
       # - PRODUCTION_DB_CLEAN_ALLOW=false # only true for production environments on staging servers
       - PUBLIC_REGISTRATION=true
+      - INVITE_REGISTRATION=true
+      - CATEGORIES_ACTIVE=true
       - SMTP_USERNAME=${SMTP_USERNAME}
       - SMTP_PASSWORD=${SMTP_PASSWORD}
       - SMTP_HOST=mailserver

docker/webapp.Dockerfile

@@ -13,6 +13,7 @@ FROM $APP_IMAGE_CODE as code
 COPY branding/static/ static/
 COPY branding/constants/ constants/
 COPY branding/locales/ locales/
+COPY branding/assets/styles/imports/ assets/styles/imports/
 
 ##################################################################################
 # BUILD ##########################################################################
@@ -41,6 +42,7 @@ COPY --from=build ${DOCKER_WORKDIR}/config/ ./config/
 COPY --from=build ${DOCKER_WORKDIR}/constants ./constants
 COPY --from=build ${DOCKER_WORKDIR}/static ./static
 COPY --from=build ${DOCKER_WORKDIR}/locales ./locales
+COPY --from=build ${DOCKER_WORKDIR}/assets/styles/imports ./assets/styles/imports
 # Copy package.json for script definitions (lock file should not be needed)
 COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ocelot-social-branded",
-  "version": "1.1.0",
-  "ocelotDockerVersionTag": "1.1.0-225",
+  "version": "1.1.1",
+  "ocelotDockerVersionTag": "1.1.1-228",
   "dockerOrganisation": "ocelotsocialnetwork",
   "description": "ocelot.social Branded",
   "author": "ocelot.social Community",