Skip to content

Commit 3720a5a

Browse files
mikecaomikecao
committed
Fix CSS. Updated pages.
1 parent 0f12226 commit 3720a5a

File tree

12 files changed

+71
-71
lines changed

12 files changed

+71
-71
lines changed

‎next-env.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference types="next/navigation-types/compat/navigation" />
34

45
// NOTE: This file should not be edited
56
// see https://nextjs.org/docs/basic-features/typescript for more information.

‎next.config.js

+3
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,16 @@ const basePath = process.env.BASE_PATH;
7878

7979
/** @type {import('next').NextConfig} */
8080
const config = {
81+
reactStrictMode: false,
8182
env: {
8283
basePath: basePath || '',
8384
cloudMode: !!process.env.CLOUD_MODE,
8485
cloudUrl: process.env.CLOUD_URL,
8586
configUrl: '/config',
8687
currentVersion: pkg.version,
8788
defaultLocale: process.env.DEFAULT_LOCALE,
89+
disableLogin: process.env.DISABLE_LOGIN,
90+
disableUI: process.env.DISABLE_UI,
8891
isProduction: process.env.NODE_ENV === 'production',
8992
},
9093
basePath,

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"dependencies": {
6464
"@fontsource/inter": "^4.5.15",
6565
"@prisma/client": "5.3.1",
66+
"@react-spring/web": "^9.7.3",
6667
"@tanstack/react-query": "^4.33.0",
6768
"@umami/prisma-client": "^0.3.0",
6869
"@umami/redis-client": "^0.15.0",
@@ -102,7 +103,6 @@
102103
"react-error-boundary": "^4.0.4",
103104
"react-intl": "^6.4.7",
104105
"react-simple-maps": "^2.3.0",
105-
"react-spring": "^9.4.4",
106106
"react-use-measure": "^2.0.4",
107107
"react-window": "^1.8.6",
108108
"request-ip": "^3.3.0",

‎src/app/(app)/console/TestConsole.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use client';
12
import WebsiteSelect from 'components/input/WebsiteSelect';
23
import Page from 'components/layout/Page';
34
import PageHeader from 'components/layout/PageHeader';

‎src/app/(app)/layout.module.css

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
width: 100vw;
1111
grid-column: 1;
1212
grid-row: 1 / 2;
13-
z-index: var(--z-index-popup);
1413
}
1514

1615
.body {

‎src/app/layout.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import '@fontsource/inter/400.css';
44
import '@fontsource/inter/700.css';
55
import '@fontsource/inter/800.css';
66
import 'react-basics/dist/styles.css';
7-
import 'styles/variables.css';
87
import 'styles/locale.css';
98
import 'styles/index.css';
9+
import 'styles/variables.css';
1010

1111
export default function RootLayout({ children }) {
1212
return (
1313
<html lang="en" data-scroll="0">
1414
<head>
15-
<link rel="icon" href={`favicon.ico`} />
16-
<link rel="apple-touch-icon" sizes="180x180" href={`apple-touch-icon.png`} />
17-
<link rel="icon" type="image/png" sizes="32x32" href={`favicon-32x32.png`} />
18-
<link rel="icon" type="image/png" sizes="16x16" href={`favicon-16x16.png`} />
19-
<link rel="manifest" href={`site.webmanifest`} />
20-
<link rel="mask-icon" href={`safari-pinned-tab.svg`} color="#5bbad5" />
15+
<link rel="icon" href={`/favicon.ico`} />
16+
<link rel="apple-touch-icon" sizes="180x180" href={`/apple-touch-icon.png`} />
17+
<link rel="icon" type="image/png" sizes="32x32" href={`/favicon-32x32.png`} />
18+
<link rel="icon" type="image/png" sizes="16x16" href={`/favicon-16x16.png`} />
19+
<link rel="manifest" href={`/site.webmanifest`} />
20+
<link rel="mask-icon" href={`/safari-pinned-tab.svg`} color="#5bbad5" />
2121
<meta name="msapplication-TileColor" content="#da532c" />
2222
<meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
2323
<meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />

‎src/app/logout/Logout.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
'use client';
2+
import { useEffect } from 'react';
3+
import { useRouter } from 'next/navigation';
4+
import useApi from 'components/hooks/useApi';
5+
import { setUser } from 'store/app';
6+
import { removeClientAuthToken } from 'lib/client';
7+
8+
export function Logout() {
9+
const disabled = !!(process.env.disableLogin || process.env.cloudMode);
10+
const router = useRouter();
11+
const { post } = useApi();
12+
13+
useEffect(() => {
14+
async function logout() {
15+
await post('/auth/logout');
16+
}
17+
18+
if (!disabled) {
19+
removeClientAuthToken();
20+
21+
logout();
22+
23+
router.push('/login');
24+
25+
return () => setUser(null);
26+
}
27+
}, [disabled, router, post]);
28+
29+
return null;
30+
}
31+
32+
export default Logout;

‎src/app/logout/page.tsx

+3-32
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,5 @@
1-
'use client';
2-
import { useEffect } from 'react';
3-
import { useRouter } from 'next/router';
4-
import useApi from 'components/hooks/useApi';
5-
import { setUser } from 'store/app';
6-
import { removeClientAuthToken } from 'lib/client';
1+
import Logout from './Logout';
72

8-
async function getDisabled() {
9-
return !!(process.env.DISABLE_LOGIN || process.env.CLOUD_MODE);
10-
}
11-
12-
export default async function LogoutPage() {
13-
const disabled = await getDisabled();
14-
const router = useRouter();
15-
const { post } = useApi();
16-
17-
useEffect(() => {
18-
async function logout() {
19-
await post('/auth/logout');
20-
}
21-
22-
if (!disabled) {
23-
removeClientAuthToken();
24-
25-
logout();
26-
27-
router.push('/login');
28-
29-
return () => setUser(null);
30-
}
31-
}, [disabled, router, post]);
32-
33-
return null;
3+
export default function () {
4+
return <Logout />;
345
}

‎src/app/share/[...id]/Share.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
'use client';
2+
import WebsiteDetails from 'app/(app)/websites/[id]/WebsiteDetails';
3+
import useShareToken from 'components/hooks/useShareToken';
4+
5+
export default function ({ shareId }) {
6+
const shareToken = useShareToken(shareId);
7+
8+
if (!shareToken) {
9+
return null;
10+
}
11+
12+
return <WebsiteDetails websiteId={shareToken.websiteId} />;
13+
}

‎src/app/share/[...id]/page.tsx

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
import Page from 'components/layout/Page';
2-
import WebsiteDetails from 'app/(app)/websites/[id]/WebsiteDetails';
3-
import useShareToken from 'components/hooks/useShareToken';
1+
import Share from './Share';
42

5-
export default function SharePage({ params }) {
6-
const shareToken = useShareToken(params.id);
7-
8-
if (!shareToken) {
3+
export default function ({ params: { id } }) {
4+
if (!id) {
95
return null;
106
}
117

12-
return (
13-
<Page>
14-
<WebsiteDetails websiteId={shareToken.websiteId} />
15-
</Page>
16-
);
8+
return <Share shareId={id} />;
179
}

‎src/styles/variables.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:root {
1+
html body {
22
--primary400: var(--blue800);
33
--primary500: var(--blue900);
44
--primary600: var(--blue1000);

‎yarn.lock

+5-17
Original file line numberDiff line numberDiff line change
@@ -2024,7 +2024,7 @@
20242024
"@react-spring/shared" "~9.7.3"
20252025
"@react-spring/types" "~9.7.3"
20262026

2027-
"@react-spring/konva@~9.7.1", "@react-spring/konva@~9.7.3":
2027+
"@react-spring/konva@~9.7.1":
20282028
version "9.7.3"
20292029
resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.7.3.tgz#16bd29dd4860a99e960a72987c8bcfc828b22119"
20302030
integrity sha512-R9sY6SiPGYqz1383P5qppg5z57YfChVknOC1UxxaGxpw+WiZa8fZ4zmZobslrw+os3/+HAXZv8O+EvU/nQpf7g==
@@ -2034,7 +2034,7 @@
20342034
"@react-spring/shared" "~9.7.3"
20352035
"@react-spring/types" "~9.7.3"
20362036

2037-
"@react-spring/native@~9.7.1", "@react-spring/native@~9.7.3":
2037+
"@react-spring/native@~9.7.1":
20382038
version "9.7.3"
20392039
resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.7.3.tgz#ee38d7c23482cfb4916c9b3c021de2995a4f553a"
20402040
integrity sha512-4mpxX3FuEBCUT6ae2fjhxcJW6bhr2FBwFf274eXB7n+U30Gdg8Wo2qYwcUnmiAA0S3dvP8vLTazx3+CYWFShnA==
@@ -2051,7 +2051,7 @@
20512051
dependencies:
20522052
"@react-spring/types" "~9.7.3"
20532053

2054-
"@react-spring/three@~9.7.1", "@react-spring/three@~9.7.3":
2054+
"@react-spring/three@~9.7.1":
20552055
version "9.7.3"
20562056
resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.7.3.tgz#4358a0c4640efe2972c4f7d0f7cd4efe927471c1"
20572057
integrity sha512-Q1p512CqUlmMK8UMBF/Rj79qndhOWq4XUTayxMP9S892jiXzWQuj+xC3Xvm59DP/D4JXusXpxxqfgoH+hmOktA==
@@ -2066,7 +2066,7 @@
20662066
resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.3.tgz#ea78fd447cbc2612c1f5d55852e3c331e8172a0b"
20672067
integrity sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw==
20682068

2069-
"@react-spring/web@~9.7.1", "@react-spring/web@~9.7.3":
2069+
"@react-spring/web@^9.7.3", "@react-spring/web@~9.7.1":
20702070
version "9.7.3"
20712071
resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.3.tgz#d9f4e17fec259f1d65495a19502ada4f5b57fa3d"
20722072
integrity sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==
@@ -2076,7 +2076,7 @@
20762076
"@react-spring/shared" "~9.7.3"
20772077
"@react-spring/types" "~9.7.3"
20782078

2079-
"@react-spring/zdog@~9.7.1", "@react-spring/zdog@~9.7.3":
2079+
"@react-spring/zdog@~9.7.1":
20802080
version "9.7.3"
20812081
resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.7.3.tgz#8ccc7316f6d3460ed244d9e3f60de9b4c4a848ac"
20822082
integrity sha512-L+yK/1PvNi9n8cldiJ309k4LdxcPkeWE0W18l1zrP1IBIyd5NB5EPA8DMsGr9gtNnnIujtEzZk+4JIOjT8u/tw==
@@ -7914,18 +7914,6 @@ react-simple-maps@^2.3.0:
79147914
d3-zoom "^2.0.0"
79157915
topojson-client "^3.1.0"
79167916

7917-
react-spring@^9.4.4:
7918-
version "9.7.3"
7919-
resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.3.tgz#3211dea4c4d7c5b541260af5100261b87becb5d5"
7920-
integrity sha512-oTxDpFV5gzq7jQX6+bU0SVq+vX8VnuuT5c8Zwn6CpDErOPvCmV+DRkPiEBtaL3Ozgzwiy5yFx83N0h303j/r3A==
7921-
dependencies:
7922-
"@react-spring/core" "~9.7.3"
7923-
"@react-spring/konva" "~9.7.3"
7924-
"@react-spring/native" "~9.7.3"
7925-
"@react-spring/three" "~9.7.3"
7926-
"@react-spring/web" "~9.7.3"
7927-
"@react-spring/zdog" "~9.7.3"
7928-
79297917
react-spring@^9.5.5:
79307918
version "9.7.1"
79317919
resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.1.tgz#8acfed700823490a4d9d4cf131c5fea12d1aaa93"

0 commit comments

Comments
 (0)