Merge pull request #228 from kartevonmorgen/develop

Issues 226, 211

components/EntityDetailHeader.tsx

@@ -11,7 +11,7 @@ import { createSlugPathFromQueryAndRemoveSlug } from '../utils/slug'
 import { deleteSlugLevelsFromRouter } from '../utils/router'
 
 
-const onBack = (router: NextRouter) => () => {
+export const onBack = (router: NextRouter) => () => {
   const newQueryParams = deleteSlugLevelsFromRouter(2, router)
   const [newPath, newQueryWithoutSlug] = createSlugPathFromQueryAndRemoveSlug(newQueryParams)
 

components/EntryDetail.tsx

@@ -16,7 +16,7 @@ import EntityAddress from './EntityAddress'
 import EntityTags from './EntityTags'
 import EntityRatings from './EntityRatings'
 import EntityFooter from './EntityFooter'
-import EntityDetailHeader from './EntityDetailHeader'
+import EntityDetailHeader, { onBack } from './EntityDetailHeader'
 import OpeningHours from './OpeningHours'
 import EntryLinks from './EntryLinks'
 import TypeTag from './TypeTag'
@@ -123,7 +123,12 @@ const EntryDetail: FC<EntryDetailProps> = (props) => {
           <Text>{t('entryDetails.entryIsInvisibleBeforeApprovement')}</Text>
         </Paragraph>
 
-        <Button type="primary">{t('backToSearch')}</Button>
+        <Button
+          onClick={onBack(router)}
+          type="primary"
+        >
+          {t('backToSearch')}
+        </Button>
       </div>
     )
   }

components/MapSharingDropdown.tsx

@@ -3,8 +3,8 @@ import useTranslation from 'next-translate/useTranslation'
 import { Button, Dropdown, Menu } from 'antd'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import CopyURLToClipboardButton from './CopyURLToClipboardButton'
-// import MapSharingModal from './MapSharingModal'
-import SubscriptionModal from './SubscriptionModal'
+import MapSharingModal from './MapSharingModal'
+// import SubscriptionModal from './SubscriptionModal'
 
 
 const { Item } = Menu
@@ -16,15 +16,15 @@ const menu = (
       right: 40,
     }}
   >
-    <Item
+    {/* <Item
       icon={
         <FontAwesomeIcon
           icon={["fas", "bell"]}
         />
       }
     >
       <SubscriptionModal/>
-    </Item>
+    </Item> */}
 
     <Item
       icon={
@@ -35,15 +35,15 @@ const menu = (
       <CopyURLToClipboardButton/>
     </Item>
 
-    {/* <Item
+    <Item
       icon={
         <FontAwesomeIcon
           icon="code"
         />
       }
     >
       <MapSharingModal/>
-    </Item> */}
+    </Item>
   </Menu>
 )
 

consts/version.ts

@@ -1,4 +1,4 @@
-const version = 'v1.2.8'
+const version = 'v1.2.9'
 
 
 export default version