Merge pull request #214 from kartevonmorgen/develop

handle broken configs
kartevonmorgen · Jul 9, 2024 · 6cb0316 · 6cb0316
2 parents 910d736 + 9cc30c4
commit 6cb0316
Show file tree

Hide file tree

Showing 18 changed files with 174 additions and 104 deletions.
diff --git a/components/EntryDetail.tsx b/components/EntryDetail.tsx
@@ -3,7 +3,7 @@ import { useRouter } from 'next/router'
 import { useDispatch } from 'react-redux'
 import isString from 'lodash/isString'
 import isArray from 'lodash/isArray'
-import { Divider, Spin, Typography } from 'antd'
+import { Divider, Spin, Typography, Button } from 'antd'
 import { useUnmount, useMount } from 'ahooks'
 import useRequest from '../api/useRequest'
 import { EntryRequest } from '../dtos/EntryRequest'
@@ -28,9 +28,10 @@ import { PartialLatLng } from '../utils/geolocation'
 import useFly from '../hooks/useFly'
 import EntityRouteLink from './EntityRouteLink'
 import { entityDetailActions, viewActions } from '../slices'
+import useTranslation from 'next-translate/useTranslation'
 
 
-const { Title } = Typography
+const { Title, Paragraph, Text } = Typography
 
 
 interface EntryDetailProps {
@@ -50,6 +51,8 @@ const EntryDetail: FC<EntryDetailProps> = (props) => {
   const router = useRouter()
   const { query } = router
 
+  const { t } = useTranslation('map')
+
   const currentUrl = window.location.href
 
   const { orgTag: optionalOrgTag } = query
@@ -100,7 +103,29 @@ const EntryDetail: FC<EntryDetailProps> = (props) => {
 
   if (!foundEntry) {
     //  todo: show not found notification, redirect to the search view
-    return null
+    return (
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: '100vh',
+          flexDirection: 'column',
+          textAlign: 'center',
+
+        }}
+      >
+        <Paragraph>{t('entryDetails.notFound')}</Paragraph>
+
+        <Paragraph>
+          <Text>{t('entryDetails.approvalRequired')}</Text>
+          <br />
+          <Text>{t('entryDetails.entryIsInvisibleBeforeApprovement')}</Text>
+        </Paragraph>
+
+        <Button type="primary">{t('backToSearch')}</Button>
+      </div>
+    )
   }
 
   if (!entry) {
@@ -111,8 +136,6 @@ const EntryDetail: FC<EntryDetailProps> = (props) => {
   const type: Category = entry.categories[0]
   const typeName: string = CategoryToNameMapper[type]
 
-  console.log(entry.image_url)
-
   return (
     <div id='entity-detail'>
       <EntityDetailHeader hasImage={entry.image_url !== undefined && entry.image_url !== null}/>

diff --git a/components/EventDetail.tsx b/components/EventDetail.tsx
@@ -76,12 +76,7 @@ const EventDetail: FC<EventDetailProps> = (props) => {
 
 
   return (
-    <div
-      id="entity-detail"
-      style={{
-        position: 'relative',
-      }}
-    >
+    <div id="entity-detail">
 
       <EntityDetailHeader hasImage={event.image_url !== undefined && event.image_url !== null}/>
 

diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
@@ -7,15 +7,16 @@ import SidebarCollapseButton from './SidebarCollapseButton'
 import {convertQueryParamToString} from '../utils/utils'
 import {isSidebarStatusShown} from '../dtos/SidebarStatus'
 import {useSidebar} from '../hooks/useResponsive'
-import { closeSidebar } from './SidebarCollapseButton'
 
 
 interface SidebarProps {
-  title: String
+  title: string
 }
 
 
 const Sidebar: FC<SidebarProps> = (props) => {
+  const { title } = props
+
   const ClientDrawer = useMemo(() => dynamic(
     () => Promise.resolve(Drawer),
     {
@@ -65,6 +66,7 @@ const Sidebar: FC<SidebarProps> = (props) => {
           display: 'block'
         }
       }}
+      title={title.length !== 0 ? title : undefined}
     >
       <SidebarCollapseButton />
       {isSidebarOpen && (

diff --git a/consts/version.ts b/consts/version.ts
@@ -1,4 +1,4 @@
-const version = 'v1.2.6'
+const version = 'v1.2.7'
 
 
 export default version
diff --git a/locales/be/map.json b/locales/be/map.json
@@ -85,7 +85,10 @@
       "telephone": "Зарэгістравацца па тэл.",
       "homepage": "Зарэгістравацца онлайн"
     },
-    "route": "Маршрут"
+    "route": "Маршрут",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "абавязковае поле",
@@ -357,5 +360,6 @@
   "mapColorMode": {
     "colorful": "Colorful",
     "grey": "Grey"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/de/map.json b/locales/de/map.json
@@ -85,7 +85,10 @@
       "telephone": "Anmeldung telefonisch",
       "homepage": "Anmeldung online"
     },
-    "route": "Route"
+    "route": "Route",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "Pflichtangabe",
@@ -208,7 +211,19 @@
     "edit": "ändern",
     "unsubscribe": "Abonnement abbestellen",
     "back": "abbrechen",
-    "subscribe": "abonnieren"
+    "subscribe": "abonnieren",
+    "frequencies": {
+      "frequency": "Frequency",
+      "hour": "Hour",
+      "day": "Day",
+      "week": "Week"
+    },
+    "changeType": {
+      "type": "Type",
+      "new": "New",
+      "all": "All"
+    },
+    "subscriptionName": "Subscription Name"
   },
   "search-results": {
     "cities": "Städte",
@@ -357,5 +372,6 @@
   "mapColorMode": {
     "colorful": "Farbig",
     "grey": "Grau"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/en/map.json b/locales/en/map.json
@@ -85,7 +85,10 @@
       "telephone": "Register by phone",
       "homepage": "Register online"
     },
-    "route": "Route"
+    "route": "Route",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "required field",
@@ -207,8 +210,20 @@
     "cancel": "cancel",
     "edit": "edit",
     "unsubscribe": "unsubscribe",
-    "back": "cancel",
-    "subscribe": "subscribe"
+    "back": "Cancel",
+    "subscribe": "Subscribe",
+    "frequencies": {
+      "frequency": "Frequency",
+      "hour": "Hour",
+      "day": "Day",
+      "week": "Week"
+    },
+    "changeType": {
+      "type": "Type",
+      "new": "New",
+      "all": "All"
+    },
+    "subscriptionName": "Subscription Name"
   },
   "search-results": {
     "cities": "cities",
@@ -358,5 +373,6 @@
   "mapColorMode": {
     "colorful": "Colorful",
     "grey": "Grey"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/es/map.json b/locales/es/map.json
@@ -85,7 +85,10 @@
       "telephone": "Registro por teléfono",
       "homepage": "Registro en línea"
     },
-    "route": "Ruta"
+    "route": "Ruta",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "información requerida",
@@ -357,5 +360,6 @@
   "mapColorMode": {
     "colorful": "Colorido",
     "grey": "Gris"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/fr/map.json b/locales/fr/map.json
@@ -85,7 +85,10 @@
       "telephone": "Register by phone",
       "homepage": "Register online"
     },
-    "route": "Route"
+    "route": "Route",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "required field",
@@ -358,5 +361,6 @@
   "mapColorMode": {
     "colorful": "Colorée",
     "grey": "Gris"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/it/map.json b/locales/it/map.json
@@ -85,7 +85,10 @@
       "telephone": "Register by phone",
       "homepage": "Register online"
     },
-    "route": "Route"
+    "route": "Route",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "required field",
@@ -358,5 +361,6 @@
   "mapColorMode": {
     "colorful": "Colorful",
     "grey": "Grey"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/nl/map.json b/locales/nl/map.json
@@ -85,7 +85,10 @@
       "telephone": "Register by phone",
       "homepage": "Register online"
     },
-    "route": "Route"
+    "route": "Route",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "required field",
@@ -358,5 +361,6 @@
   "mapColorMode": {
     "colorful": "Colorful",
     "grey": "Grey"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/pt/map.json b/locales/pt/map.json
@@ -85,7 +85,10 @@
       "telephone": "Registrar por telefone",
       "homepage": "Registo online"
     },
-    "route": "Rota"
+    "route": "Rota",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "Campo obrigatório",
@@ -357,5 +360,6 @@
   "mapColorMode": {
     "colorful": "Colorido",
     "grey": "Cinza"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/ru/map.json b/locales/ru/map.json
@@ -85,7 +85,10 @@
       "telephone": "Зарегистрируйтесь по телефону",
       "homepage": "Зарегистрируйтесь онлайн"
     },
-    "route": "Маршрут"
+    "route": "Маршрут",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "Обязательное поле",
@@ -357,5 +360,6 @@
   "mapColorMode": {
     "colorful": "Colorful",
     "grey": "Grey"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }
diff --git a/locales/uk/map.json b/locales/uk/map.json
@@ -85,7 +85,10 @@
       "telephone": "Register by phone",
       "homepage": "Register online"
     },
-    "route": "Route"
+    "route": "Route",
+    "notFound": "Entry not found or needs approval",
+    "approvalRequired": "The approval is required for the organizational tags",
+    "entryIsInvisibleBeforeApprovement": "The entry remains invisible before approvement"
   },
   "login": {
     "requiredField": "required field",
@@ -357,5 +360,6 @@
   "mapColorMode": {
     "colorful": "Барвистість",
     "grey": "Сірий"
-  }
+  },
+  "backToSearch": "Back to the search results"
 }