Support multiple domains (#478)

antoinejaussoin · Feb 24, 2023 · 4324988 · 4324988
1 parent 11ede58
commit 4324988
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 22 deletions.
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -2,7 +2,7 @@ name: 'Alpha Build'
 
 on:
   push:
-    branches: [v5000/separate-app]
+    branches: [v5000/xx]
 
 jobs:
   frontend:
@@ -99,6 +99,8 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: marketing/Dockerfile
+          build-args: |
+            SUB_DOMAIN=www-beta
           context: marketing
           tags: retrospected/marketing:alpha
           platforms: linux/amd64

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -132,6 +132,8 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: marketing/Dockerfile
+          build-args: |
+            SUB_DOMAIN=www-beta
           context: marketing
           tags: retrospected/marketing:canary
           platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/marketing.yml b/.github/workflows/marketing.yml
@@ -2,7 +2,7 @@ name: 'Marketing Build'
 
 on:
   push:
-    branches: [v5000/marketing-final]
+    branches: [v5000/domains]
 
 jobs:
   marketing:
@@ -33,6 +33,8 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: marketing/Dockerfile
+          build-args: |
+            SUB_DOMAIN=www-beta
           context: marketing
           tags: retrospected/marketing:alpha
           platforms: linux/amd64

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -132,6 +132,8 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           file: marketing/Dockerfile
+          build-args: |
+            SUB_DOMAIN=www
           context: marketing
           tags: retrospected/marketing:${{ steps.package.outputs.current-version }}
           platforms: linux/amd64,linux/arm64

diff --git a/marketing/Dockerfile b/marketing/Dockerfile
@@ -23,6 +23,7 @@ COPY . .
 
 ARG NEXT_PUBLIC_MEASUREMENT_ID=APP_NEXT_PUBLIC_MEASUREMENT_ID
 ARG NEXT_PUBLIC_APP_URL=APP_NEXT_PUBLIC_APP_URL
+ARG SUB_DOMAIN=www
 RUN yarn build
 
 # If using npm comment out above and use below instead

diff --git a/marketing/next-i18next.config.js b/marketing/next-i18next.config.js
@@ -1,18 +1,20 @@
+const subDomain = process.env.SUB_DOMAIN;
+
 module.exports = {
   i18n: {
     defaultLocale: 'en',
     locales: ['en', 'fr', 'de', 'nl'],
     domains: [
       {
-        domain: 'retrospected.com',
+        domain: `${subDomain}.retrospected.com`,
         defaultLocale: 'en',
       },
       {
-        domain: 'retrospected.fr',
+        domain: `${subDomain}.retrospected.fr`,
         defaultLocale: 'fr',
       },
       {
-        domain: 'retrospected.de',
+        domain: `${subDomain}.retrospected.de`,
         defaultLocale: 'de',
       }
     ],

diff --git a/marketing/src/common/components/Navbar/index.tsx b/marketing/src/common/components/Navbar/index.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import NavbarStyle from './navbar.style';
 
 type NavbarProps = {
@@ -8,12 +7,7 @@ type NavbarProps = {
   navbarStyle?: any;
 };
 
-const Navbar = ({
-  className,
-  children,
-  navbarStyle,
-  ...props
-}: NavbarProps) => {
+const Navbar = ({ className, children, navbarStyle }: NavbarProps) => {
   const addAllClasses = ['reusecore__navbar'];
 
   // className prop checking

diff --git a/marketing/src/containers/WebAppCreative/Navbar/index.tsx b/marketing/src/containers/WebAppCreative/Navbar/index.tsx
@@ -105,16 +105,15 @@ const Navbar = ({
               menuItems={menuItems}
               offset={-70}
             />
-            <Link href={`${appUrl}/subscribe`} legacyBehavior>
-              <a className="navbar_button navbar_button_one">
-                <Button {...button} title={t('Nav.subscribe')} />
-              </a>
-            </Link>
-            <Link href={appUrl!} legacyBehavior>
-              <a className="navbar_button navbar_button_two">
-                <Button {...button} title={t('Nav.login')} />
-              </a>
-            </Link>
+            <a
+              className="navbar_button navbar_button_one"
+              href={`${appUrl}/subscribe`}
+            >
+              <Button {...button} title={t('Nav.subscribe')} />
+            </a>
+            <a className="navbar_button navbar_button_two" href={appUrl!}>
+              <Button {...button} title={t('Nav.login')} />
+            </a>
             <Drawer
               width="420px"
               placement="right"