Merge pull request #64 from yngwi/master

Version 0.6.15
nam-pi · Nov 8, 2021 · 774469c · 774469c
2 parents ee3a949 + d4fdc8e
commit 774469c
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 123 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nampi-frontend",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "private": true,
   "dependencies": {
     "//": "TODO: Replace with the original react-leaflet package after this [issue](https://github.com/PaulLeCam/react-leaflet/issues/891) is resolved.",

diff --git a/src/App/components/ActDetails/index.tsx b/src/App/components/ActDetails/index.tsx
diff --git a/src/App/components/ActsPage/index.tsx b/src/App/components/ActsPage/index.tsx
diff --git a/src/App/components/AspectDetails/index.tsx b/src/App/components/AspectDetails/index.tsx
@@ -13,6 +13,7 @@ import { Heading } from "../Heading";
 import { ItemComments } from "../ItemComments";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
+import { ItemPermalink } from "../ItemPermalink";
 import { ItemSameAs } from "../ItemSameAs";
 import { ItemTexts } from "../ItemTexts";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
@@ -123,6 +124,7 @@ export const AspectDetails = ({ idLocal }: Props) => {
           />
         )}
       </div>
+      <ItemPermalink item={data} />
       <ItemInheritance item={data} />
       <ItemLabels item={data} />
       <ItemTexts item={data} />

diff --git a/src/App/components/AuthorDetails/index.tsx b/src/App/components/AuthorDetails/index.tsx
@@ -10,6 +10,7 @@ import { FilterableItemList } from "../FilterableItemList";
 import { Heading } from "../Heading";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
+import { ItemPermalink } from "../ItemPermalink";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
 
 interface Props {
@@ -67,6 +68,7 @@ export const AuthorDetails = ({ idLocal }: Props) => {
           values={{ label: getText(data.labels) }}
         />
       </Heading>
+      <ItemPermalink item={data} />
       <ItemInheritance item={data} />
       <ItemLabels item={data} />
       <EventsWithAuthor id={data.id} />

diff --git a/src/App/components/EventDetails/index.tsx b/src/App/components/EventDetails/index.tsx
@@ -13,6 +13,7 @@ import { ItemComments } from "../ItemComments";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
 import { ItemLink } from "../ItemLink";
+import { ItemPermalink } from "../ItemPermalink";
 import { ItemTexts } from "../ItemTexts";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
 import { Map } from "../Map";
@@ -80,6 +81,7 @@ export const EventDetails = ({ idLocal }: Props) => {
               />
             )}
           </div>
+          <ItemPermalink item={data} />
           <ItemInheritance item={data} />
           <ItemLabels item={data} />
           <ItemTexts item={data} />

diff --git a/src/App/components/GroupDetails/index.tsx b/src/App/components/GroupDetails/index.tsx
@@ -13,6 +13,7 @@ import { ItemComments } from "../ItemComments";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
 import { ItemLink } from "../ItemLink";
+import { ItemPermalink } from "../ItemPermalink";
 import { ItemSameAs } from "../ItemSameAs";
 import { ItemTexts } from "../ItemTexts";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
@@ -84,6 +85,7 @@ export const GroupDetails = ({ idLocal }: Props) => {
           />
         )}
       </div>
+      <ItemPermalink item={data} />
       <ItemInheritance item={data} />
       <ItemLabels item={data} />
       <ItemTexts item={data} />

diff --git a/src/App/components/ItemPermalink/index.tsx b/src/App/components/ItemPermalink/index.tsx
@@ -0,0 +1,34 @@
+import { faCopy } from "@fortawesome/free-solid-svg-icons";
+import { Item } from "nampi-use-api";
+import { FormattedMessage, useIntl } from "react-intl";
+import { IconButton } from "../IconButton";
+
+interface Props {
+  item: Item;
+}
+
+export const ItemPermalink = ({ item }: Props) => {
+  const intl = useIntl();
+  return (
+    <div className="text-xs">
+      <FormattedMessage
+        description="Permalink text"
+        defaultMessage="Permalink: {url} {copy}"
+        values={{
+          url: item.id,
+          copy: (
+            <IconButton
+              className="border-transparent text-gray-500"
+              icon={faCopy}
+              label={intl.formatMessage({
+                description: "Copy button label",
+                defaultMessage: "Copy permalink",
+              })}
+              onClick={() => navigator.clipboard.writeText(item.id)}
+            />
+          ),
+        }}
+      />
+    </div>
+  );
+};
diff --git a/src/App/components/PersonDetails/index.tsx b/src/App/components/PersonDetails/index.tsx
@@ -24,6 +24,7 @@ import { ItemComments } from "../ItemComments";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
 import { ItemLink } from "../ItemLink";
+import { ItemPermalink } from "../ItemPermalink";
 import { ItemSameAs } from "../ItemSameAs";
 import { ItemTexts } from "../ItemTexts";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
@@ -243,6 +244,7 @@ export const PersonDetails = ({ idLocal }: Props) => {
               />
             )}
           </div>
+          <ItemPermalink item={data} />
           <ItemInheritance item={data} />
           <ItemLabels item={data} />
           <ItemTexts item={data} />

diff --git a/src/App/components/PlaceDetails/index.tsx b/src/App/components/PlaceDetails/index.tsx
@@ -14,6 +14,7 @@ import { Heading } from "../Heading";
 import { ItemComments } from "../ItemComments";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
+import { ItemPermalink } from "../ItemPermalink";
 import { ItemSameAs } from "../ItemSameAs";
 import { ItemTexts } from "../ItemTexts";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
@@ -92,6 +93,7 @@ export const PlaceDetails = ({ idLocal }: Props) => {
               />
             )}
           </div>
+          <ItemPermalink item={data} />
           <ItemInheritance item={data} />
           <ItemLabels item={data} />
           <ItemTexts item={data} />

diff --git a/src/App/components/SourceDetails/index.tsx b/src/App/components/SourceDetails/index.tsx
@@ -12,6 +12,7 @@ import { Heading } from "../Heading";
 import { ItemComments } from "../ItemComments";
 import { ItemInheritance } from "../ItemInheritance";
 import { ItemLabels } from "../ItemLabels";
+import { ItemPermalink } from "../ItemPermalink";
 import { ItemSameAs } from "../ItemSameAs";
 import { ItemTexts } from "../ItemTexts";
 import { LoadingPlaceholder } from "../LoadingPlaceholder";
@@ -81,6 +82,7 @@ export const SourceDetails = ({ idLocal }: Props) => {
           />
         )}
       </div>
+      <ItemPermalink item={data} />
       <ItemInheritance item={data} />
       <ItemLabels item={data} />
       <ItemTexts item={data} />

diff --git a/src/App/index.tsx b/src/App/index.tsx
@@ -1,7 +1,6 @@
 import { useAuth } from "nampi-use-api";
 import { Route, Router, Switch } from "react-router";
 import { About } from "./components/About";
-import { ActsPage } from "./components/ActsPage";
 import { AspectsPage } from "./components/AspectsPage";
 import { AuthorsPage } from "./components/AuthorsPage";
 import { Data } from "./components/Data";
@@ -31,11 +30,6 @@ export const App = () => {
         <Navbar className="sticky top-0 z-10" />
         <Switch>
           <Route exact path="/" component={Home} />
-          <Route
-            exact
-            path={["/acts", "/acts/:idLocal"]}
-            component={ActsPage}
-          />
           <Route
             exact
             path={["/aspects", "/aspects/:idLocal"]}