Try to implement footer in maintenance

2026-01-20 20:01:25 +00:00 · 2021-08-09 08:34:00 +02:00 · 2021-08-09 08:34:00 +02:00 · 294e9156d9
commit 294e9156d9
parent 41252785d2
5 changed files with 151 additions and 128 deletions
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@ -4,47 +4,50 @@ services:
  ########################################################
  # WEBAPP ###############################################
  ########################################################
-  webapp:
-    image: ocelotsocialnetwork/webapp:development
-    build:
-      target: development
-    environment:
-      - NODE_ENV="development"
-      # - DEBUG=true
-      - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
-    volumes:
-      # This makes sure the docker container has its own node modules.
-      # Therefore it is possible to have a different node version on the host machine
-      - webapp_node_modules:/app/node_modules
-      # bind the local folder to the docker to allow live reload
-      - ./webapp:/app
+  # Wolle
+  # webapp:
+  #   image: ocelotsocialnetwork/webapp:development
+  #   build:
+  #     target: development
+  #   environment:
+  #     - NODE_ENV="development"
+  #     # - DEBUG=true
+  #     - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
+  #   volumes:
+  #     # This makes sure the docker container has its own node modules.
+  #     # Therefore it is possible to have a different node version on the host machine
+  #     - webapp_node_modules:/app/node_modules
+  #     # bind the local folder to the docker to allow live reload
+  #     - ./webapp:/app
  ########################################################
  # BACKEND ##############################################
  ########################################################
-  backend:
-    image: ocelotsocialnetwork/backend:development
-    build:
-      target: development
-    environment:
-      - NODE_ENV="development"
-      - DEBUG=true
-    volumes:
-      # This makes sure the docker container has its own node modules.
-      # Therefore it is possible to have a different node version on the host machine
-      - backend_node_modules:/app/node_modules
-      # bind the local folder to the docker to allow live reload
-      - ./backend:/app
+  # Wolle
+  # backend:
+  #   image: ocelotsocialnetwork/backend:development
+  #   build:
+  #     target: development
+  #   environment:
+  #     - NODE_ENV="development"
+  #     - DEBUG=true
+  #   volumes:
+  #     # This makes sure the docker container has its own node modules.
+  #     # Therefore it is possible to have a different node version on the host machine
+  #     - backend_node_modules:/app/node_modules
+  #     # bind the local folder to the docker to allow live reload
+  #     - ./backend:/app
  ########################################################
  # NEO4J ################################################
  ########################################################
-  neo4j:
-    image: ocelotsocialnetwork/neo4j:development
-    ports:
-      # Also expose the neo4j query browser
-      - 7474:7474
-    networks:
-      # So we can access the neo4j query browser from our host machine
-      - external-net
+  # Wolle
+  # neo4j:
+  #   image: ocelotsocialnetwork/neo4j:development
+  #   ports:
+  #     # Also expose the neo4j query browser
+  #     - 7474:7474
+  #   networks:
+  #     # So we can access the neo4j query browser from our host machine
+  #     - external-net
  ########################################################
  # MAINTENANCE ##########################################
  ########################################################
@ -53,13 +56,15 @@ services:
  ########################################################
  # MAILSERVER TO FAKE SMTP ##############################
  ########################################################
-  mailserver:
-    image: djfarrelly/maildev
-    ports:
-      - 1080:80
-    networks:
-      - external-net
+  # Wolle
+  # mailserver:
+  #   image: djfarrelly/maildev
+  #   ports:
+  #     - 1080:80
+  #   networks:
+  #     - external-net
      
-volumes:
-  webapp_node_modules:
-  backend_node_modules:
+  # Wolle
+# volumes:
+#   webapp_node_modules:
+#   backend_node_modules:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -9,87 +9,90 @@ services:
  ########################################################
  # WEBAPP ###############################################
  ########################################################
-  webapp:
-    image: ocelotsocialnetwork/webapp:latest
-    build:
-      context: ./webapp
-      target: production
-    networks:
-      - external-net
-    depends_on:
-      - backend
-    ports:
-      - 3000:3000
-      # Storybook: Todo externalize, its not working anyways
-      # - 3002:3002
-    environment:
-      # Envs used in Dockerfile
-      # - DOCKER_WORKDIR="/app"
-      # - PORT="3000"
-      - BUILD_DATE
-      - BUILD_VERSION
-      - BUILD_COMMIT
-      - NODE_ENV="production"
-      # Application only envs
-      - HOST=0.0.0.0 # This is nuxt specific, alternative value is HOST=webapp
-      - GRAPHQL_URI=http://backend:4000
-    env_file:
-      - ./webapp/.env
+  # Wolle
+  # webapp:
+  #   image: ocelotsocialnetwork/webapp:latest
+  #   build:
+  #     context: ./webapp
+  #     target: production
+  #   networks:
+  #     - external-net
+  #   depends_on:
+  #     - backend
+  #   ports:
+  #     - 3000:3000
+  #     # Storybook: Todo externalize, its not working anyways
+  #     # - 3002:3002
+  #   environment:
+  #     # Envs used in Dockerfile
+  #     # - DOCKER_WORKDIR="/app"
+  #     # - PORT="3000"
+  #     - BUILD_DATE
+  #     - BUILD_VERSION
+  #     - BUILD_COMMIT
+  #     - NODE_ENV="production"
+  #     # Application only envs
+  #     - HOST=0.0.0.0 # This is nuxt specific, alternative value is HOST=webapp
+  #     - GRAPHQL_URI=http://backend:4000
+  #   env_file:
+  #     - ./webapp/.env
  ########################################################
  # BACKEND ##############################################
  ########################################################
-  backend:
-    image: ocelotsocialnetwork/backend:latest
-    build:
-      context: ./backend
-      target: production
-    networks:
-      - external-net
-      - internal-net
-    depends_on:
-      - neo4j
-    ports:
-      - 4000:4000
-    volumes:
-      - backend_uploads:/app/public/uploads
-    environment:
-      # Envs used in Dockerfile
-      # - DOCKER_WORKDIR="/app"
-      # - PORT="4000"
-      - BUILD_DATE
-      - BUILD_VERSION
-      - BUILD_COMMIT
-      - NODE_ENV="production"
-      # Application only envs
-      - DEBUG=false
-      - NEO4J_URI=bolt://neo4j:7687
-      - GRAPHQL_URI=http://backend:4000
-      - CLIENT_URI=http://webapp:3000
-    env_file:
-      - ./backend/.env
+  # Wolle
+  # backend:
+  #   image: ocelotsocialnetwork/backend:latest
+  #   build:
+  #     context: ./backend
+  #     target: production
+  #   networks:
+  #     - external-net
+  #     - internal-net
+  #   depends_on:
+  #     - neo4j
+  #   ports:
+  #     - 4000:4000
+  #   volumes:
+  #     - backend_uploads:/app/public/uploads
+  #   environment:
+  #     # Envs used in Dockerfile
+  #     # - DOCKER_WORKDIR="/app"
+  #     # - PORT="4000"
+  #     - BUILD_DATE
+  #     - BUILD_VERSION
+  #     - BUILD_COMMIT
+  #     - NODE_ENV="production"
+  #     # Application only envs
+  #     - DEBUG=false
+  #     - NEO4J_URI=bolt://neo4j:7687
+  #     - GRAPHQL_URI=http://backend:4000
+  #     - CLIENT_URI=http://webapp:3000
+  #   env_file:
+  #     - ./backend/.env
  ########################################################
  # NEO4J ################################################
  ########################################################
-  neo4j:
-    image: ocelotsocialnetwork/neo4j:latest
-    build:
-      context: ./neo4j
-      # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment
-      target: community
-    networks:
-      - internal-net
-    ports:
-      - 7687:7687
-    volumes:
-      - neo4j_data:/data
-    environment:
-      # TODO: This sounds scary for a production environment
-      - NEO4J_AUTH=none
-      - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
-      # Uncomment following line for Neo4j Enterprise version instead of Community version
-      # TODO: clarify if that is the only thing needed to unlock the Enterprise version
-      # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
-      # TODO: Remove the playground from production
+  # Wolle
+  # neo4j:
+  #   image: ocelotsocialnetwork/neo4j:latest
+  #   build:
+  #     context: ./neo4j
+  #     # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment
+  #     target: community
+  #   networks:
+  #     - internal-net
+  #   ports:
+  #     - 7687:7687
+  #   volumes:
+  #     - neo4j_data:/data
+  #   environment:
+  #     # TODO: This sounds scary for a production environment
+  #     - NEO4J_AUTH=none
+  #     - NEO4J_dbms_security_procedures_unrestricted=algo.*,apoc.*
+  #     # Uncomment following line for Neo4j Enterprise version instead of Community version
+  #     # TODO: clarify if that is the only thing needed to unlock the Enterprise version
+  #     # - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
+  #     # TODO: Remove the playground from production
  ########################################################
  # MAINTENANCE ##########################################
  ########################################################
@ -109,6 +112,7 @@ networks:
  internal-net:
    internal: true

-volumes:
-  backend_uploads:
-  neo4j_data:
+  # Wolle
+# volumes:
+#   backend_uploads:
+#   neo4j_data:
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@ -59,7 +59,17 @@ RUN yarn install --production=false --frozen-lockfile --non-interactive
 COPY assets assets
 COPY components/LocaleSwitch/ components/LocaleSwitch
 COPY components/Dropdown.vue components/Dropdown.vue
-COPY layouts/blank.vue layouts/blank.vue
+# Wolle 
+COPY components/utils/InternalPages.js components/utils/InternalPages.js
+COPY components/PageFooter/PageFooter.vue components/PageFooter/PageFooter.vue
+COPY components/_new/features/PageParamsLink/PageParamsLink.vue components/_new/features/PageParamsLink/PageParamsLink.vue
+# Wolle COPY XXX XXX
+# Wolle COPY XXX XXX
+# Wolle COPY XXX XXX
+# Wolle COPY XXX XXX
+# Wolle COPY layouts/blank.vue layouts/blank.vue
+# Wolle
+COPY layouts/no-header.vue layouts/no-header.vue
 COPY locales locales
 COPY mixins mixins
 COPY plugins/i18n.js plugins/v-tooltip.js plugins/styleguide.js plugins/
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@ -1,14 +1,16 @@
 <template>
-  <nuxt-link
+  <!-- Wolle -->
+  <!-- <nuxt-link
    v-if="pageParams.isInternalPage"
    :to="pageParams.internalPage.pageRoute"
    :data-test="pageParams.name + '-nuxt-link'"
  >
    <slot />
-  </nuxt-link>
-  <a v-else :href="pageParams.externalLink" target="_blank" :data-test="pageParams.name + '-link'">
+  </nuxt-link> -->
+  <!-- <a v-else :href="pageParams.externalLink" target="_blank" :data-test="pageParams.name + '-link'"> -->
+  <!-- <a :href="pageParams.internalPage.pageRoute" target="_blank" :data-test="pageParams.name + '-link'"> -->
    <slot />
-  </a>
+  <!-- </a> -->
 </template>

 <script>
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@ -53,7 +53,9 @@ import metadata from '~/constants/metadata.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'

 export default {
-  layout: 'blank',
+  // layout: 'blank',
+  // Wolle 
+  layout: 'no-header',
  components: {
    LocaleSwitch,
  },