Skip to content

Commit 4e550d9

Browse files
tefkahtefkah
committed
fix: add analytics
1 parent 2ced04a commit 4e550d9

2 files changed

Lines changed: 125 additions & 84 deletions

File tree

‎apps/next-blog/src/app/layout.tsx‎

Lines changed: 61 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,70 @@
1-
import { AnalyticsWrapper } from './components/Analytics'
2-
import { Footer } from './components/Footer'
3-
import { createMetadata } from '../utils/createMetadata'
1+
import { Open_Sans, Overpass } from "next/font/google";
2+
import Script from "next/script";
3+
import { createMetadata } from "../utils/createMetadata";
4+
import { AnalyticsWrapper } from "./components/Analytics";
5+
import { Footer } from "./components/Footer";
46

5-
import { Overpass, Open_Sans } from 'next/font/google'
6-
import Script from 'next/script'
7-
8-
import '../styles/globals.css'
9-
import { HeaderWrapper } from './components/HeaderWrapper'
7+
import "../styles/globals.css";
8+
import { HeaderWrapper } from "./components/HeaderWrapper";
109

1110
const overpass = Overpass({
12-
subsets: ['latin'],
13-
variable: '--font-overpass',
14-
display: 'swap',
15-
})
11+
subsets: ["latin"],
12+
variable: "--font-overpass",
13+
display: "swap",
14+
});
1615

1716
const open_sans = Open_Sans({
18-
subsets: ['latin'],
19-
variable: '--font-open-sans',
20-
display: 'swap',
21-
})
17+
subsets: ["latin"],
18+
variable: "--font-open-sans",
19+
display: "swap",
20+
});
2221

23-
export const metadata = createMetadata({})
22+
export const metadata = createMetadata({});
2423

25-
export default function RootLayout({ children }: { children: React.ReactNode }) {
26-
return (
27-
<html lang="en" className={`${open_sans.variable} ${overpass.variable}`}>
28-
<head>
29-
<meta charSet="UTF-8" />
30-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
31-
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
32-
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
33-
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
34-
<link rel="manifest" href="/site.webmanifest" />
35-
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#002642" />
36-
<meta name="msapplication-TileColor" content="#002642" />
37-
<meta name="theme-color" content="#ffffff" />
38-
</head>
24+
export default function RootLayout({
25+
children,
26+
}: {
27+
children: React.ReactNode;
28+
}) {
29+
return (
30+
<html lang="en" className={`${open_sans.variable} ${overpass.variable}`}>
31+
<head>
32+
<meta charSet="UTF-8" />
33+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
34+
<link
35+
rel="apple-touch-icon"
36+
sizes="180x180"
37+
href="/apple-touch-icon.png"
38+
/>
39+
<link
40+
rel="icon"
41+
type="image/png"
42+
sizes="32x32"
43+
href="/favicon-32x32.png"
44+
/>
45+
<link
46+
rel="icon"
47+
type="image/png"
48+
sizes="16x16"
49+
href="/favicon-16x16.png"
50+
/>
51+
<link rel="manifest" href="/site.webmanifest" />
52+
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#002642" />
53+
<meta name="msapplication-TileColor" content="#002642" />
54+
<meta name="theme-color" content="#ffffff" />
55+
</head>
3956

40-
<body className="selection:bg-orange-200/50 flex min-h-screen flex-col bg-white tracking-tight text-gray-900 antialiased transition-colors selection:border selection:border-black selection:transition-all dark:bg-slate-800 dark:text-slate-300">
41-
<HeaderWrapper />
42-
<div className="flex-grow">{children}</div>
43-
<Footer />
44-
<AnalyticsWrapper />
45-
<Script
46-
strategy="afterInteractive"
47-
data-domain="blog.trialanderror.org"
48-
src="/stats/js/script"
49-
data-api="/stats/api/event"
50-
/>
51-
</body>
52-
</html>
53-
)
57+
<body className="selection:bg-orange-200/50 flex min-h-screen flex-col bg-white tracking-tight text-gray-900 antialiased transition-colors selection:border selection:border-black selection:transition-all dark:bg-slate-800 dark:text-slate-300">
58+
<HeaderWrapper />
59+
<div className="flex-grow">{children}</div>
60+
<Footer />
61+
<AnalyticsWrapper />
62+
<Script
63+
defer
64+
src="https://analytics.trialanderror.org/script.js"
65+
data-website-id="24642014-38d2-478a-9bb0-35e9f29746ea"
66+
/>
67+
</body>
68+
</html>
69+
);
5470
}

‎apps/trialanderror.org/src/app/layout.tsx‎

Lines changed: 64 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,73 @@
1-
import { Overpass, Open_Sans } from 'next/font/google'
2-
import { AnalyticsWrapper } from './components/Analytics'
3-
import { Footer } from './components/Footer'
4-
import { Nav } from './components/Nav'
5-
import { createMetadata } from '../utils/createMetadata'
1+
import { Open_Sans, Overpass } from "next/font/google";
2+
import { createMetadata } from "../utils/createMetadata";
3+
import { AnalyticsWrapper } from "./components/Analytics";
4+
import { Footer } from "./components/Footer";
5+
import { Nav } from "./components/Nav";
66

7-
import '../styles/globals.css'
7+
import "../styles/globals.css";
8+
import Script from "next/script";
89

910
const overpass = Overpass({
10-
subsets: ['latin'],
11-
variable: '--font-overpass',
12-
// display: 'swap',
13-
})
11+
subsets: ["latin"],
12+
variable: "--font-overpass",
13+
// display: 'swap',
14+
});
1415

1516
const openSans = Open_Sans({
16-
subsets: ['latin'],
17-
variable: '--font-open-sans',
18-
// display: 'swap',
19-
})
17+
subsets: ["latin"],
18+
variable: "--font-open-sans",
19+
// display: 'swap',
20+
});
2021

2122
export const metadata = createMetadata({
22-
title: 'Center of Trial and Error',
23-
description: 'Creating transparent and responsible scholarship.',
24-
})
23+
title: "Center of Trial and Error",
24+
description: "Creating transparent and responsible scholarship.",
25+
});
2526

26-
export default function RootLayout({ children }: { children: React.ReactNode }) {
27-
return (
28-
<html lang="en" className={`${openSans.variable} ${overpass.variable}`}>
29-
<head>
30-
<meta charSet="UTF-8" />
31-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
32-
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
33-
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
34-
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
35-
<link rel="manifest" href="/site.webmanifest" />
36-
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#002642" />
37-
<meta name="msapplication-TileColor" content="#002642" />
38-
<meta name="theme-color" content="#ffffff" />
39-
</head>
40-
<body>
41-
<Nav />
42-
<main>{children}</main>
43-
<Footer />
44-
<AnalyticsWrapper />
45-
</body>
46-
</html>
47-
)
27+
export default function RootLayout({
28+
children,
29+
}: {
30+
children: React.ReactNode;
31+
}) {
32+
return (
33+
<html lang="en" className={`${openSans.variable} ${overpass.variable}`}>
34+
<head>
35+
<meta charSet="UTF-8" />
36+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
37+
<link
38+
rel="apple-touch-icon"
39+
sizes="180x180"
40+
href="/apple-touch-icon.png"
41+
/>
42+
<link
43+
rel="icon"
44+
type="image/png"
45+
sizes="32x32"
46+
href="/favicon-32x32.png"
47+
/>
48+
<link
49+
rel="icon"
50+
type="image/png"
51+
sizes="16x16"
52+
href="/favicon-16x16.png"
53+
/>
54+
<link rel="manifest" href="/site.webmanifest" />
55+
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#002642" />
56+
<meta name="msapplication-TileColor" content="#002642" />
57+
<meta name="theme-color" content="#ffffff" />
58+
</head>
59+
<body>
60+
<Nav />
61+
<main>{children}</main>
62+
<Footer />
63+
<AnalyticsWrapper />
64+
65+
<Script
66+
defer
67+
src="https://analytics.trialanderror.org/script.js"
68+
data-website-id="60d1573a-ec6c-43e7-88cb-2fdaae0701b1"
69+
/>
70+
</body>
71+
</html>
72+
);
4873
}

0 commit comments

Comments
 (0)