itlxrd/kspguti-schedule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix canonical URLs for SEO

Browse Source
This commit is contained in:
VityaSchel
2023-10-12 19:03:25 +04:00
parent 9ae56a82a8
commit d1f990b706
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/utils/date-serializer.ts
View File

@@ -2,9 +2,11 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable @typescript-eslint/ban-ts-comment */
const isDate = (value: any): boolean => Object.prototype.toString.call(value) === '[object Date]' const isDate = (value: any): boolean => Object.prototype.toString.call(value) === '[object Date]'
export const nextSerialized = (obj: any): any => { export function nextSerialized<T>(obj: T): NextSerialized<T>
export function nextSerialized<T>(obj: T[]): NextSerialized<T[]>
export function nextSerialized<T>(obj: T): NextSerialized<T> | NextSerialized<T[]> {
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
return obj.map(nextSerialized) return obj.map(nextSerialized) as NextSerialized<T[]>
} }
if (typeof obj === 'object' && obj !== null) { if (typeof obj === 'object' && obj !== null) {
@@ -15,14 +17,16 @@ export const nextSerialized = (obj: any): any => {
return newObj return newObj
} }
return obj return obj as NextSerialized<T>
} }
const looksLikeISODate = (value: string): boolean => /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z?$/.test(value) const looksLikeISODate = (value: string): boolean => /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z?$/.test(value)
export const nextDeserializer = (obj: any): any => { export function nextDeserialized<T>(obj: any): T
export function nextDeserialized<T>(obj: any): T[]
export function nextDeserialized<T>(obj: any): T | T[] {
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
return obj.map(nextDeserializer) return obj.map(nextDeserialized) as T[]
} }
const t = (s: TemplateStringsArray) => s.join('').split('').map((c, i) => String.fromCharCode(c.charCodeAt(0) - i - 1)).join('') const t = (s: TemplateStringsArray) => s.join('').split('').map((c, i) => String.fromCharCode(c.charCodeAt(0) - i - 1)).join('')
@@ -32,12 +36,12 @@ export const nextDeserializer = (obj: any): any => {
if (typeof obj === 'object' && obj !== null) { if (typeof obj === 'object' && obj !== null) {
const newObj: any = {} const newObj: any = {}
for (const [key, value] of Object.entries(obj)) { for (const [key, value] of Object.entries(obj)) {
newObj[key] = typeof value === 'string' && looksLikeISODate(value) ? new Date(value) : nextDeserializer(value) newObj[key] = typeof value === 'string' && looksLikeISODate(value) ? new Date(value) : nextDeserialized(value)
} }
return newObj return newObj
} }
return obj return obj as T
} }
@@ -47,4 +51,11 @@ export type NextSerialized<T> = {
T[K] extends Array<infer U> ? NextSerialized<U>[] : T[K] extends Array<infer U> ? NextSerialized<U>[] :
T[K] extends object ? NextSerialized<T[K]> : T[K] extends object ? NextSerialized<T[K]> :
T[K] T[K]
};
export type NextDeserialized<T> = {
[K in keyof T]:
T[K] extends string ? Date :
T[K] extends Array<infer U> ? NextDeserialized<U>[] :
T[K] extends object ? NextDeserialized<T[K]> :
T[K]
}; };

31
src/pages/[group].tsx
View File

@@ -2,7 +2,7 @@ import { Schedule } from '@/widgets/schedule'
import { Day } from '@/shared/model/day' import { Day } from '@/shared/model/day'
import { GetServerSidePropsContext, GetServerSidePropsResult } from 'next' import { GetServerSidePropsContext, GetServerSidePropsResult } from 'next'
import { getSchedule } from '@/app/agregator/schedule' import { getSchedule } from '@/app/agregator/schedule'
import { NextSerialized, nextDeserializer, nextSerialized } from '@/app/utils/date-serializer' import { NextSerialized, nextDeserialized, nextSerialized } from '@/app/utils/date-serializer'
import { NavBar } from '@/widgets/navbar' import { NavBar } from '@/widgets/navbar'
import { LastUpdateAt } from '@/entities/last-update-at' import { LastUpdateAt } from '@/entities/last-update-at'
import { groups } from '@/shared/data/groups' import { groups } from '@/shared/data/groups'
@@ -11,14 +11,17 @@ import React from 'react'
import { getDayOfWeek } from '@/shared/utils' import { getDayOfWeek } from '@/shared/utils'
import Head from 'next/head' import Head from 'next/head'
type PageProps = NextSerialized<{ type PageProps = {
schedule: Day[] schedule: Day[]
group: string group: {
id: string
name: string
}
parsedAt: Date parsedAt: Date
}> }
export default function HomePage(props: PageProps) { export default function HomePage(props: NextSerialized<PageProps>) {
const { schedule, group, parsedAt } = nextDeserializer(props) const { schedule, group, parsedAt } = nextDeserialized<PageProps>(props)
React.useEffect(() => { React.useEffect(() => {
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
@@ -42,10 +45,11 @@ export default function HomePage(props: PageProps) {
return ( return (
<> <>
<Head> <Head>
<title>Группа {group} — Расписание занятий в Колледже Связи</title> <title>{`Группа ${group.name} — Расписание занятий в Колледже Связи`}</title>
<meta name="description" content={`Расписание занятий группы ${group} на неделю в Колледже Связи ПГУТИ. Расписание пар, материалы для подготовки и изменения в расписании.`} /> <link rel="canonical" href={`https://kspsuti.ru/${group.id}`} />
<meta property="og:title" content={`Группа ${group} — Расписание занятий в Колледже Связи`} /> <meta name="description" content={`Расписание занятий группы ${group.name} на неделю в Колледже Связи ПГУТИ. Расписание пар, материалы для подготовки и изменения в расписании.`} />
<meta property="og:description" content={`Расписание занятий группы ${group} на неделю в Колледже Связи ПГУТИ. Расписание пар, материалы для подготовки и изменения в расписании.`} /> <meta property="og:title" content={`Группа ${group.name} — Расписание занятий в Колледже Связи`} />
<meta property="og:description" content={`Расписание занятий группы ${group.name} на неделю в Колледже Связи ПГУТИ. Расписание пар, материалы для подготовки и изменения в расписании.`} />
</Head> </Head>
<NavBar /> <NavBar />
<LastUpdateAt date={parsedAt} /> <LastUpdateAt date={parsedAt} />
@@ -56,7 +60,7 @@ export default function HomePage(props: PageProps) {
const cachedSchedules = new Map<string, { lastFetched: Date, results: Day[] }>() const cachedSchedules = new Map<string, { lastFetched: Date, results: Day[] }>()
const maxCacheDurationInMS = 1000 * 60 * 60 const maxCacheDurationInMS = 1000 * 60 * 60
export async function getServerSideProps(context: GetServerSidePropsContext<{ group: string }>): Promise<GetServerSidePropsResult<PageProps>> { export async function getServerSideProps(context: GetServerSidePropsContext<{ group: string }>): Promise<GetServerSidePropsResult<NextSerialized<PageProps>>> {
const group = context.params?.group const group = context.params?.group
if (group && Object.hasOwn(groups, group) && group in groups) { if (group && Object.hasOwn(groups, group) && group in groups) {
let schedule let schedule
@@ -103,7 +107,10 @@ export async function getServerSideProps(context: GetServerSidePropsContext<{ gr
props: nextSerialized({ props: nextSerialized({
schedule: schedule, schedule: schedule,
parsedAt: parsedAt, parsedAt: parsedAt,
group: groups[group][1] group: {
id: group,
name: groups[group][1]
}
}) })
} }
} else { } else {