Starting rebranding to ocelot.social

backend/Dockerfile

@@ -4,7 +4,7 @@ EXPOSE 4000
 CMD ["yarn", "run", "start"]
 ARG BUILD_COMMIT
 ENV BUILD_COMMIT=$BUILD_COMMIT
-ARG WORKDIR=/backend
+ARG WORKDIR=/develop-backend
 RUN mkdir -p $WORKDIR
 WORKDIR $WORKDIR
 
@@ -21,7 +21,7 @@ RUN NODE_ENV=production yarn run build
 # reduce image size with a multistage build
 FROM base as production
 ENV NODE_ENV=production
-COPY --from=build-and-test /backend/dist ./dist
+COPY --from=build-and-test /develop-backend/dist ./dist
 COPY ./public/img/ ./public/img/
 COPY ./public/providers.json ./public/providers.json
 RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache

backend/src/config/links.js

@@ -1,6 +1,6 @@
 export default {
-  ORGANIZATION: 'https://human-connection.org/',
-  DONATE: 'https://human-connection.org/spenden/',
-  FAQ: 'https://faq.human-connection.org/',
-  SUPPORT: 'https://human-connection.org/support'
+  ORGANIZATION: 'https://ocelot-social.herokuapp.com/',
+  DONATE: 'https://www.busfaktor.org/donations',
+  FAQ: 'https://ocelot-social.herokuapp.com/',
+  SUPPORT: 'https://ocelot-social.herokuapp.com/',
 }

backend/src/config/metadata.js

@@ -1,7 +1,7 @@
 export default {
-  APPLICATION_NAME: 'fyphe_O',
-  APPLICATION_SHORT_NAME: 'fyphe',
-  APPLICATION_DESCRIPTION: 'The Schools in Motion Network',
-  ORGANIZATION_NAME: 'Ensible e.V.',
-  ORGANIZATION_JURISDICTION: 'Köln',
+  APPLICATION_NAME: 'ocelot.social',
+  APPLICATION_SHORT_NAME: 'ocelot',
+  APPLICATION_DESCRIPTION: 'Ocelot Social Network',
+  ORGANIZATION_NAME: 'busFaktor() e.V.',
+  ORGANIZATION_JURISDICTION: 'Augsburg',
 }

backend/src/middleware/email/templateBuilder.js

@@ -9,7 +9,7 @@ const welcomeImageUrl = new URL(`/img/custom/welcome.svg`, CONFIG.CLIENT_URI)
 const defaultParams = {
   supportUrl: CONFIG.SUPPORT_URL,
   APPLICATION_NAME: CONFIG.APPLICATION_NAME,
-  welcomeImageUrl
+  welcomeImageUrl,
 }
 
 export const signupTemplate = ({ email, nonce }) => {
@@ -76,7 +76,7 @@ export const wrongAccountTemplate = ({ email }) => {
     subject,
     html: mustache.render(
       templates.layout,
-      { actionUrl, supportUrl, welcomeImageUrl },
+      { actionUrl, supportUrl: CONFIG.SUPPORT_URL, welcomeImageUrl },
       { content: templates.wrongAccount },
     ),
   }

deployment/helm/ocelot.social/templates/deployments/deployment-backend.yaml

@@ -44,7 +44,7 @@ spec:
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
         volumeMounts:
-          - mountPath: /backend/public/uploads
+          - mountPath: /develop-backend/public/uploads
             name: uploads
       dnsPolicy: ClusterFirst
       restartPolicy: Always

docker-compose.yml

@@ -45,7 +45,7 @@ services:
       - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
       - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
       - "DEBUG=${DEBUG}"
-      - EMAIL_DEFAULT_SENDER=info@human-connection.org
+      - EMAIL_DEFAULT_SENDER=devops@ocelot.social
   neo4j:
     image: ocelotsocialnetwork/develop-neo4j:latest
     build:

webapp/components/ContributionForm/ContributionForm.vue

@@ -24,6 +24,14 @@
         <div v-if="formData.image" class="blur-toggle">
           <label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label>
           <input type="checkbox" id="blur-img" v-model="formData.imageBlurred" />
+          <a
+            href="https://support.human-connection.org/kb/faq.php?id=113"
+            target="_blank"
+            class="link"
+          >
+            {{ $t('contribution.inappropriatePictureText') }}
+            <base-icon name="question-circle" />
+          </a>
         </div>
         <ds-input
           model="title"

webapp/components/Logo/Logo.vue

@@ -1,17 +1,7 @@
 <template>
-  <component
-    :is="tag"
-    class="ds-logo"
-    :class="[inverse && 'ds-logo-inverse']"
-  >
-    <svg-logo
-      v-if="!inverse"
-      class="ds-logo-svg"
-    />
-    <svg-logo-inverse
-      v-else
-      class="ds-logo-svg"
-    />
+  <component :is="tag" class="ds-logo" :class="[inverse && 'ds-logo-inverse']">
+    <svg-logo v-if="!inverse" class="ds-logo-svg" />
+    <svg-logo-inverse v-else class="ds-logo-svg" />
   </component>
 </template>
 
@@ -26,7 +16,7 @@ export default {
   name: 'Logo',
   components: {
     svgLogo,
-    svgLogoInverse
+    svgLogoInverse,
   },
   props: {
     /**
@@ -34,16 +24,16 @@ export default {
      */
     inverse: {
       type: Boolean,
-      default: false
+      default: false,
     },
     /**
      * The html element name used for the logo.
      */
     tag: {
       type: String,
-      default: 'div'
-    }
-  }
+      default: 'div',
+    },
+  },
 }
 </script>
 

webapp/components/Registration/Signup.vue

@@ -8,7 +8,11 @@
       @submit="handleSubmit"
     >
       <h1>
-        {{ invitation ? $t('profile.invites.title', metadata) : $t('components.registration.signup.title', metadata) }}
+        {{
+          invitation
+            ? $t('profile.invites.title', metadata)
+            : $t('components.registration.signup.title', metadata)
+        }}
       </h1>
       <ds-space v-if="token" margin-botton="large">
         <ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" />

webapp/constants/emails.js

@@ -1,4 +1,4 @@
 export default {
-  SUPPORT: 'support@human-connection.org',
-  MODERATION: 'moderation@human-connection.org',
+  SUPPORT: 'devops@ocelot.social',
+  MODERATION: 'devops@ocelot.social',
 }

webapp/constants/links.js

@@ -1,6 +1,6 @@
 export default {
-  ORGANIZATION: 'https://human-connection.org/',
-  DONATE: 'https://human-connection.org/spenden/',
-  FAQ: 'https://faq.human-connection.org/',
-  SUPPORT: 'https://human-connection.org/support',
+  ORGANIZATION: 'https://www.busfaktor.org',
+  DONATE: 'https://www.busfaktor.org/donations',
+  FAQ: 'https://ocelot-social.herokuapp.com',
+  SUPPORT: 'https://ocelot-social.herokuapp.com',
 }

webapp/constants/metadata.js

@@ -1,7 +1,7 @@
 export default {
-  APPLICATION_NAME: 'fyphe_O',
-  APPLICATION_SHORT_NAME: 'fyphe',
-  APPLICATION_DESCRIPTION: 'The Schools in Motion Network',
-  ORGANIZATION_NAME: 'Ensible e.V.',
-  ORGANIZATION_JURISDICTION: 'Köln',
+  APPLICATION_NAME: 'ocelot.social',
+  APPLICATION_SHORT_NAME: 'ocelot',
+  APPLICATION_DESCRIPTION: 'Ocelot Social Network',
+  ORGANIZATION_NAME: 'buusFaktor() e.V.',
+  ORGANIZATION_JURISDICTION: 'Augsburg',
 }

webapp/layouts/basic.vue

@@ -6,7 +6,7 @@
           <ds-flex-item width="5.5%" />
           <ds-flex-item style="flex-grow: 1;" width="20%">
             <a @click="redirectToRoot">
-              <Logo />
+              <logo />
             </a>
           </ds-flex-item>
           <ds-flex-item width="20%" style="flex-grow: 0;">

webapp/layouts/default.vue

@@ -6,7 +6,7 @@
           <ds-flex class="main-navigation-flex">
             <ds-flex-item :width="{ base: '142px' }">
               <nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'">
-                <Logo />
+                <logo />
               </nuxt-link>
             </ds-flex-item>
             <ds-flex-item

webapp/locales/html/de/code-of-conduct.html

@@ -1 +1 @@
-<p1>Ich bin der Inhalt vom Verhaltenskodex</p>
+<p>Ich bin der Inhalt vom Verhaltenskodex</p>

webapp/locales/html/de/imprint.html

@@ -1 +1 @@
-<p1>Ich bin das Impressum</p>
+<p>Ich bin das Impressum</p>

webapp/locales/html/en/code-of-conduct.html

@@ -1 +1 @@
-<p1>I am the content of the code of conduct</p>
+<p>I am the content of the code of conduct</p>

webapp/maintenance/source/nuxt.config.maintenance.js

@@ -57,6 +57,6 @@ export default {
         loader: 'raw-loader',
         exclude: /(node_modules)/,
       })
-    }
-  }
+    },
+  },
 }