diff --git a/.env.development b/.env.development index ddef833..ebca46f 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api -SITE_URL=https://dev.sahkoinsinoorikilta.fi +NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi diff --git a/.env.prod b/.env.prod index 409de90..c148bfe 100644 --- a/.env.prod +++ b/.env.prod @@ -1,2 +1,2 @@ NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api -SITE_URL=https://sahkoinsinoorikilta.fi +NEXT_PUBLIC_SITE_URL=https://sahkoinsinoorikilta.fi diff --git a/.env.test b/.env.test index ddef833..ebca46f 100644 --- a/.env.test +++ b/.env.test @@ -1,2 +1,2 @@ NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api -SITE_URL=https://dev.sahkoinsinoorikilta.fi +NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi diff --git a/Dockerfile b/Dockerfile index 00b848e..dc7d45f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ COPY types types/ ENV NEXT_TELEMETRY_DISABLED=1 ENV NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api -ENV SITE_URL=https://dev.sahkoinsinoorikilta.fi +ENV NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi RUN npm run build FROM node:14-alpine as server diff --git a/Dockerfile.prod b/Dockerfile.prod index 5367289..2f1ff6c 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -10,7 +10,7 @@ COPY types types/ ENV NEXT_TELEMETRY_DISABLED=1 ENV NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api -ENV SITE_URL=https://sahkoinsinoorikilta.fi +ENV NEXT_PUBLIC_SITE_URL=https://sahkoinsinoorikilta.fi RUN npm run build FROM node:14-alpine as server diff --git a/next-sitemap.js b/next-sitemap.js index 94d1a86..8e458bb 100644 --- a/next-sitemap.js +++ b/next-sitemap.js @@ -1,5 +1,5 @@ module.exports = { - siteUrl: process.env.SITE_URL || "https://sahkoinsinoorikilta.fi", + siteUrl: process.env.NEXT_PUBLIC_SITE_URL || "https://sahkoinsinoorikilta.fi", generateRobotsTxt: true, exclude: ["/events/*", "/feed/*", "/signup/*", "/admin/*"] } \ No newline at end of file diff --git a/src/pages/admin/index.tsx b/src/pages/admin/index.tsx index b60d44d..cab83e2 100644 --- a/src/pages/admin/index.tsx +++ b/src/pages/admin/index.tsx @@ -6,7 +6,7 @@ import AdminPageWrapper from "@views/common/AdminPageWrapper"; const AdminFrontPage: NextPage = () => ( <> - +
diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx index fe1cd13..1dbcaf1 100644 --- a/src/pages/events/[id].tsx +++ b/src/pages/events/[id].tsx @@ -25,7 +25,7 @@ const EventPage: NextPage = ({ initialEvent }) => { return ( <> - + diff --git a/src/pages/feed/[id].tsx b/src/pages/feed/[id].tsx index c87acf7..e184bb3 100644 --- a/src/pages/feed/[id].tsx +++ b/src/pages/feed/[id].tsx @@ -25,7 +25,7 @@ const FeedPage: NextPage = ({ initialPost }) => { return ( <> - + diff --git a/src/pages/in_english.tsx b/src/pages/in_english.tsx index 1668381..8b9abf0 100644 --- a/src/pages/in_english.tsx +++ b/src/pages/in_english.tsx @@ -27,7 +27,7 @@ const InEnglishPage: NextPage = ({ initialEvents, initialFeed }) = return ( <> - + diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 82646bf..23483b9 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -27,7 +27,7 @@ const FrontPage: NextPage = ({ initialEvents, initialFeed }) => { return ( <> - + diff --git a/src/pages/kilta/fuksi.tsx b/src/pages/kilta/fuksi.tsx index 1acf7af..f1b6b7a 100644 --- a/src/pages/kilta/fuksi.tsx +++ b/src/pages/kilta/fuksi.tsx @@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper"; const FreshmenPage: NextPage = () => ( <> - + diff --git a/src/pages/kilta/index.tsx b/src/pages/kilta/index.tsx index 98d1d8a..4d24616 100644 --- a/src/pages/kilta/index.tsx +++ b/src/pages/kilta/index.tsx @@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper"; const GuildPage: NextPage = () => ( <> - + diff --git a/src/pages/kilta/kunnia.tsx b/src/pages/kilta/kunnia.tsx index 0e08248..ca416f8 100644 --- a/src/pages/kilta/kunnia.tsx +++ b/src/pages/kilta/kunnia.tsx @@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper"; const HonoraryPage: NextPage = () => ( <> - + diff --git a/src/pages/kilta/toiminta.tsx b/src/pages/kilta/toiminta.tsx index 73eafcf..65026db 100644 --- a/src/pages/kilta/toiminta.tsx +++ b/src/pages/kilta/toiminta.tsx @@ -26,7 +26,7 @@ const ActualPage: NextPage = ({ initialEvents, initialFeed }) => { return ( <> - + diff --git a/src/pages/opinnot_ja_ura.tsx b/src/pages/opinnot_ja_ura.tsx index 265c58f..0f448f9 100644 --- a/src/pages/opinnot_ja_ura.tsx +++ b/src/pages/opinnot_ja_ura.tsx @@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper"; const StudiesPage: NextPage = () => ( <> - + diff --git a/src/pages/signup/[id].tsx b/src/pages/signup/[id].tsx index 44796eb..fc379d1 100644 --- a/src/pages/signup/[id].tsx +++ b/src/pages/signup/[id].tsx @@ -40,7 +40,7 @@ const SignUpPage: NextPage = ({ form }) => { return ( <> - + ( <> - + diff --git a/src/pages/yritysyhteistyo.tsx b/src/pages/yritysyhteistyo.tsx index b45c295..0c185c2 100644 --- a/src/pages/yritysyhteistyo.tsx +++ b/src/pages/yritysyhteistyo.tsx @@ -17,7 +17,7 @@ const CorporatePage: NextPage = ({ initialJobAds }) => { return ( <> - + diff --git a/tests/testcafe/utils.ts b/tests/testcafe/utils.ts index 7653030..2cc2eca 100644 --- a/tests/testcafe/utils.ts +++ b/tests/testcafe/utils.ts @@ -4,7 +4,7 @@ import axios from "axios"; const API_URL = "https://api.dev.sahkoinsinoorikilta.fi/api"; -export const getSiteRoot = (): string => process.env.SITE_URL || "http://localhost:3000"; +export const getSiteRoot = (): string => process.env.NEXT_PUBLIC_SITE_URL || "http://localhost:3000"; export const getPageUrl = ClientFunction(() => window.location.pathname); export const getPostRequestLogger = (url: string) => RequestLogger({ url: `${API_URL}/${url}`, method: "post" }, {