fix: name env vars

Multiform-Validator · May 28, 2024 · 915f12d · 915f12d
1 parent d98f2c3
commit 915f12d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
@@ -85,10 +85,10 @@ jobs:
         run: ${{ steps.detect-package-manager.outputs.runner }} next build
         env:
           NODE_ENV: production
-          GOOGLE_SEARCH_CONSOLE_API_KEY: ${{ secrets.GOOGLE_SEARCH_CONSOLE_API_KEY }}
-          GOOGLE_ADSENSE_CLIENT_ID: ${{ secrets.GOOGLE_ADSENSE_CLIENT_ID }}
-          WEBSITE_DNS_NAME: ${{ secrets.WEBSITE_DNS_NAME }}
-          WEBSITE_URL: ${{ secrets.WEBSITE_URL }}
+          NEXT_PUBLIC_GOOGLE_SEARCH_CONSOLE_API_KEY: ${{ secrets.GOOGLE_SEARCH_CONSOLE_API_KEY }}
+          NEXT_PUBLIC_GOOGLE_ADSENSE_CLIENT_ID: ${{ secrets.GOOGLE_ADSENSE_CLIENT_ID }}
+          NEXT_PUBLIC_WEBSITE_DNS_NAME: ${{ secrets.WEBSITE_DNS_NAME }}
+          NEXT_PUBLIC_WEBSITE_URL: ${{ secrets.WEBSITE_URL }}
         working-directory: ./docs
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -36,3 +36,6 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 .env
+
+# Temporary files
+backupnews.tsx
diff --git a/docs/src/app/layout.tsx b/docs/src/app/layout.tsx
@@ -45,7 +45,9 @@ export const metadata: Metadata = {
 		"Validator",
 		"validate",
 	],
-	verification: { google: process.env.GOOGLE_SEARCH_CONSOLE_API_KEY },
+	verification: {
+		google: process.env.NEXT_PUBLIC_GOOGLE_SEARCH_CONSOLE_API_KEY,
+	},
 	appleWebApp: {
 		title: t("Multiform Validator"),
 		capable: true,
@@ -56,31 +58,31 @@ export const metadata: Metadata = {
 	icons: [
 		{
 			rel: "android-chrome-192x192",
-			url: `${process.env.WEBSITE_URL}/android-chrome-192x192.png`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/android-chrome-192x192.png`,
 		},
 		{
 			rel: "android-chrome-512x512",
-			url: `${process.env.WEBSITE_URL}/android-chrome-512x512.png`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/android-chrome-512x512.png`,
 		},
 		{
 			rel: "apple-touch-icon",
-			url: `${process.env.WEBSITE_URL}/apple-touch-icon.png`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/apple-touch-icon.png`,
 		},
 		{
 			rel: "favicon-16x16",
-			url: `${process.env.WEBSITE_URL}/favicon-16x16.png`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/favicon-16x16.png`,
 		},
 		{
 			rel: "favicon-32x32",
-			url: `${process.env.WEBSITE_URL}/favicon-32x32.png`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/favicon-32x32.png`,
 		},
 		{
 			rel: "mstile-150x150",
-			url: `${process.env.WEBSITE_URL}/mstile-150x150.png`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/mstile-150x150.png`,
 		},
 		{
 			rel: "safari-pinned-tab",
-			url: `${process.env.WEBSITE_URL}/safari-pinned-tab.svg`,
+			url: `${process.env.NEXT_PUBLIC_WEBSITE_URL}/safari-pinned-tab.svg`,
 		},
 	],
 };
@@ -95,10 +97,12 @@ export default function RootLayout({
 			<head>
 				<meta
 					name="google-adsense-account"
-					content={process.env.GOOGLE_ADSENSE_CLIENT_ID}
+					content={process.env.NEXT_PUBLIC_GOOGLE_ADSENSE_CLIENT_ID}
 				/>
 				<Adsense
-					GOOGLE_ADSENSE_CLIENT_ID={process.env.GOOGLE_ADSENSE_CLIENT_ID}
+					GOOGLE_ADSENSE_CLIENT_ID={
+						process.env.NEXT_PUBLIC_GOOGLE_ADSENSE_CLIENT_ID
+					}
 				/>
 			</head>
 			<body className={inter.className}>

diff --git a/docs/src/app/news/page.tsx b/docs/src/app/news/page.tsx
@@ -9,7 +9,8 @@ import { AddBanner } from "@/components/Adsense";
 import MainBg from "@/components/MainBg";
 
 export default function NewsPage() {
-	const GOOGLE_ADSENSE_CLIENT_ID = process.env.GOOGLE_ADSENSE_CLIENT_ID ?? "";
+	const GOOGLE_ADSENSE_CLIENT_ID =
+		process.env.NEXT_PUBLIC_GOOGLE_ADSENSE_CLIENT_ID ?? "";
 
 	const SlotAd1AndAd2 = "9630566447";
 	const SlotAd3 = "8700628151";
@@ -24,10 +25,15 @@ export default function NewsPage() {
 
 	return (
 		<MainBg>
-			<h1>{GOOGLE_ADSENSE_CLIENT_ID} TESTE</h1>
 			{isClient && (
 				<>
-					<div id="news-page" />
+					<div id="news-page">
+						<AddBanner
+							AdClient={GOOGLE_ADSENSE_CLIENT_ID}
+							AdSlot={SlotAd3}
+							AdFormat="fluid"
+						/>
+					</div>
 				</>
 			)}
 		</MainBg>

diff --git a/docs/src/app/page.tsx b/docs/src/app/page.tsx
@@ -1,15 +1,11 @@
 import Image from "next/image";
 import Link from "next/link";
 
-import translation, { getBrowserLang } from "@/components/Internationalization";
+import translation from "@/components/Internationalization";
 import MainBg from "@/components/MainBg";
 import { merriweather, oswald, playfair, roboto100, sofiaPro } from "@/fonts";
 
 export default function Home() {
-	const browserLang = getBrowserLang();
-
-	console.log("Browser language:", browserLang);
-
 	const t = (text: string) => translation({ text, subject: "HomePage" });
 
 	return (

diff --git a/docs/src/app/robots.ts b/docs/src/app/robots.ts
@@ -2,7 +2,7 @@ import { MetadataRoute } from "next";
 
 export default function robots(): MetadataRoute.Robots {
 	const hostUrl: string =
-		process.env.WEBSITE_URL ??
+		process.env.NEXT_PUBLIC_WEBSITE_URL ??
 		"https://gabriel-logan.github.io/multiform-validator";
 
 	return {

diff --git a/docs/src/app/sitemap.ts b/docs/src/app/sitemap.ts
@@ -1,7 +1,7 @@
 import { MetadataRoute } from "next";
 
 const hostUrl: string =
-	process.env.WEBSITE_URL ??
+	process.env.NEXT_PUBLIC_WEBSITE_URL ??
 	"https://gabriel-logan.github.io/multiform-validator";
 
 function generateJsMaps(): MetadataRoute.Sitemap {