Merge branch 'dev' into feat/um-145-re-add-events

README.md

@@ -72,13 +72,13 @@ docker compose up
 Alternatively, to pull just the Umami Docker image with PostgreSQL support:
 
 ```bash
-docker pull docker.umami.is/umami-software/umami:postgresql-latest
+docker pull docker.umami.dev/umami-software/umami:postgresql-latest
 ```
 
 Or with MySQL support:
 
 ```bash
-docker pull docker.umami.is/umami-software/umami:mysql-latest
+docker pull docker.umami.dev/umami-software/umami:mysql-latest
 ```
 
 ## Getting updates

lib/types.ts

@@ -7,7 +7,9 @@ export interface Auth {
     role: string;
     isAdmin: boolean;
   };
-  shareToken?: string;
+  shareToken?: {
+    websiteId: string;
+  };
 }
 
 export interface NextApiRequestQueryBody<TQuery = any, TBody = any> extends NextApiRequest {

pages/api/share/[id].ts

@@ -23,8 +23,7 @@ export default async (
     const website = await getWebsite({ shareId });
 
     if (website) {
-      const { id } = website;
+      const data = { websiteId: website.id };
-      const data = { id };
       const token = createToken(data, secret());
 
       return ok(res, { ...data, token });

pages/api/websites/[id]/active.ts

@@ -1,5 +1,4 @@
-import { WebsiteActive } from 'lib/types';
+import { WebsiteActive, NextApiRequestQueryBody } from 'lib/types';
-import { NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors } from 'lib/middleware';
 import { NextApiResponse } from 'next';

pages/share/[...id].js

@@ -15,7 +15,7 @@ export default function SharePage() {
 
   return (
     <Layout>
-      <WebsiteDetails websiteId={shareToken.id} />
+      <WebsiteDetails websiteId={shareToken.websiteId} />
     </Layout>
   );
 }

styles/index.css

@@ -69,6 +69,7 @@ a,
 a:active,
 a:visited {
   color: var(--primary400);
+  text-decoration: none;
 }
 
 main {