TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix canonical urls

Browse Source
This commit is contained in:
Aarni Halinen
2021-03-28 22:42:59 +03:00
parent 9777d30b38
commit e256f93c7d
20 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
+1 -1
View File
@@ -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
.env.prod
+1 -1
View File
@@ -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
.env.test
+1 -1
View File
@@ -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
Dockerfile
+1 -1
View File
@@ -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
Dockerfile.prod
+1 -1
View File
@@ -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
next-sitemap.js
+1 -1
View File
@@ -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/*"]
}
src/pages/admin/index.tsx
+1 -1
View File
@@ -6,7 +6,7 @@ import AdminPageWrapper from "@views/common/AdminPageWrapper";
const AdminFrontPage: NextPage = () => (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/admin`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/admin`} />
</Head>
<AdminPageWrapper requiresAuthentication>
<div data-e2e="admin-front-page">
src/pages/events/[id].tsx
+1 -1
View File
@@ -25,7 +25,7 @@ const EventPage: NextPage<InitialProps> = ({ initialEvent }) => {
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/events/${id}`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/events/${id}`} />
</Head>
<PageWrapper>
<EventPageView event={data as Event} />
src/pages/feed/[id].tsx
+1 -1
View File
@@ -25,7 +25,7 @@ const FeedPage: NextPage<InitialProps> = ({ initialPost }) => {
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/feed/${id}`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/feed/${id}`} />
</Head>
<PageWrapper>
<FeedPageView post={data} />
src/pages/in_english.tsx
+1 -1
View File
@@ -27,7 +27,7 @@ const InEnglishPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) =
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/in_english`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/in_english`} />
</Head>
<PageWrapper>
<InEnglishPageView events={eventResult.data as Event[]} feed={feedResult.data} />
src/pages/index.tsx
+1 -1
View File
@@ -27,7 +27,7 @@ const FrontPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/`} />
</Head>
<PageWrapper>
<FrontPageView events={eventResult.data as Event[]} feed={feedResult.data} />
src/pages/kilta/fuksi.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper";
const FreshmenPage: NextPage = () => (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/kilta/fuksi`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta/fuksi`} />
</Head>
<PageWrapper>
<FreshmenPageView />
src/pages/kilta/index.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper";
const GuildPage: NextPage = () => (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/kilta`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta`} />
</Head>
<PageWrapper>
<GuildPageView />
src/pages/kilta/kunnia.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper";
const HonoraryPage: NextPage = () => (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/kilta/kunnia`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta/kunnia`} />
</Head>
<PageWrapper>
<HonoraryPageView />
src/pages/kilta/toiminta.tsx
+1 -1
View File
@@ -26,7 +26,7 @@ const ActualPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/kilta/toiminta`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta/toiminta`} />
</Head>
<PageWrapper>
<ActualPageView events={eventResult.data} feed={feedResult.data} />
src/pages/opinnot_ja_ura.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper";
const StudiesPage: NextPage = () => (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/opinnot_ja_ura`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/opinnot_ja_ura`} />
</Head>
<PageWrapper>
<StudiesPageView />
src/pages/signup/[id].tsx
+1 -1
View File
@@ -40,7 +40,7 @@ const SignUpPage: NextPage<InitialProps> = ({ form }) => {
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/signup/${form.id}`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/signup/${form.id}`} />
</Head>
<PageWrapper>
<SignUpPageView
src/pages/yhteystiedot.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper";
const ContactsPage: NextPage = () => (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/yhteystiedot`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/yhteystiedot`} />
</Head>
<PageWrapper>
<ContactsPageView />
src/pages/yritysyhteistyo.tsx
+1 -1
View File
@@ -17,7 +17,7 @@ const CorporatePage: NextPage<InitialProps> = ({ initialJobAds }) => {
return (
<>
<Head>
<link rel="canonical" href={`${process.env.SITE_URL}/yritysyhteistyo`} />
<link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/yritysyhteistyo`} />
</Head>
<PageWrapper>
<CorporatePageView jobAds={data as JobAd[]} />
tests/testcafe/utils.ts
+1 -1
View File
@@ -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" }, {