Merge pull request #903 from mapswipe/dev

Release Community Dashboard minor changes
mapswipe · Aug 9, 2023 · 5a95c28 · 5a95c28
2 parents e7d3367 + 5dad0a4
commit 5a95c28
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/community-dashboard/.env.example b/community-dashboard/.env.example
@@ -4,3 +4,4 @@ REACT_APP_ENVIRONMENT=
 
 GRAPHQL_CODEGEN_ENDPOINT=
 REACT_APP_GRAPHQL_ENDPOINT=
+REACT_APP_MAPSWIPE_WEBSITE=
diff --git a/community-dashboard/app/Base/components/Navbar/index.tsx b/community-dashboard/app/Base/components/Navbar/index.tsx
@@ -2,9 +2,6 @@ import React, { useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 import { _cs } from '@togglecorp/fujs';
 
-import SmartNavLink from '#base/components/SmartNavLink';
-import route from '#base/configs/routes';
-
 import mapSwipeLogo from '#resources/img/logo.svg';
 import ItemSelectInput, { SearchItemType } from '#components/ItemSelectInput';
 
@@ -30,9 +27,8 @@ function Navbar(props: Props) {
         <nav className={_cs(className, styles.navbar)}>
             <div className={styles.container}>
                 <div className={styles.navLinks}>
-                    <SmartNavLink
-                        exact
-                        route={route.home}
+                    <a
+                        href={process.env.REACT_APP_MAPSWIPE_WEBSITE ?? 'https://mapswipe.org'}
                         className={styles.link}
                     >
                         <div className={styles.appBrand}>
@@ -42,7 +38,7 @@ function Navbar(props: Props) {
                                 alt="MapSwipe"
                             />
                         </div>
-                    </SmartNavLink>
+                    </a>
                 </div>
                 <ItemSelectInput
                     className={styles.filter}

diff --git a/community-dashboard/app/components/Footer/index.tsx b/community-dashboard/app/components/Footer/index.tsx
@@ -58,22 +58,13 @@ function Footer() {
             <div className={styles.links}>
                 <a
                     aria-label="Privacy"
-                    href="https://mapswipe.org/en/privacy.html"
+                    href="https://mapswipe.org/en/privacy"
                     target="_blank"
                     rel="noreferrer"
                     className={styles.link}
                 >
                     Privacy
                 </a>
-                <a
-                    aria-label="Cookies"
-                    href="https://mapswipe.org/en/cookies.html"
-                    target="_blank"
-                    rel="noreferrer"
-                    className={styles.link}
-                >
-                    Cookies
-                </a>
                 <span
                     className={styles.link}
                 >

diff --git a/django/mapswipe/types.py b/django/mapswipe/types.py
@@ -26,6 +26,6 @@
 
 GenericJSON = strawberry.scalar(
     NewType("GenericJSON", JSON),
-    serialize=lambda v: json.loads(v) if type(v) == str else v,
+    serialize=lambda v: json.loads(v) if isinstance(v, str) else v,
     parse_value=lambda v: v,
 )
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -155,6 +155,7 @@ services:
             GRAPHQL_CODEGEN_ENDPOINT: ${COMMUNITY_DASHBOARD_GRAPHQL_CODEGEN_ENDPOINT}
             REACT_APP_GRAPHQL_ENDPOINT: ${COMMUNITY_DASHBOARD_GRAPHQL_ENDPOINT}
             REACT_APP_SENTRY_DSN: ${COMMUNITY_DASHBOARD_SENTRY_DSN}
+            REACT_APP_MAPSWIPE_WEBSITE: ${COMMUNITY_DASHBOARD_MAPSWIPE_WEBSITE:-https://mapswipe.org}
             REACT_APP_SENTRY_TRACES_SAMPLE_RATE: ${COMMUNITY_DASHBOARD_SENTRY_TRACES_SAMPLE_RATE}
         volumes:
             - community-dashboard-static:/code/build/

diff --git a/example.env b/example.env
@@ -73,3 +73,4 @@ COMMUNITY_DASHBOARD_GRAPHQL_CODEGEN_ENDPOINT=https://api.example.com/graphql/
 COMMUNITY_DASHBOARD_GRAPHQL_ENDPOINT=https://api.example.com/graphql/
 COMMUNITY_DASHBOARD_SENTRY_DSN=
 COMMUNITY_DASHBOARD_SENTRY_TRACES_SAMPLE_RATE=
+COMMUNITY_DASHBOARD_MAPSWIPE_WEBSITE=https://mapswipe.org