modernize project with Docker support and dependency updates
- Pin all dependencies to stable versions (remove 'latest') - Update lucide-react to 0.554.0 for React 19 compatibility - Add Docker support with Dockerfile and docker-compose.yml - Update TypeScript target to ES2022 - Add .nvmrc and netlify.toml for deployment configuration - Update README with Docker deployment instructions
This commit is contained in:
65
.dockerignore
Normal file
65
.dockerignore
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
# Dependencies
|
||||||
|
node_modules
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
.pnpm-debug.log*
|
||||||
|
|
||||||
|
# Testing
|
||||||
|
coverage
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# Next.js
|
||||||
|
.next/
|
||||||
|
out/
|
||||||
|
build
|
||||||
|
dist
|
||||||
|
|
||||||
|
# Production
|
||||||
|
*.tsbuildinfo
|
||||||
|
next-env.d.ts
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
.DS_Store
|
||||||
|
*.pem
|
||||||
|
|
||||||
|
# Debug
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
|
||||||
|
# Local env files
|
||||||
|
.env*.local
|
||||||
|
.env
|
||||||
|
|
||||||
|
# Vercel
|
||||||
|
.vercel
|
||||||
|
|
||||||
|
# TypeScript
|
||||||
|
*.tsbuildinfo
|
||||||
|
next-env.d.ts
|
||||||
|
|
||||||
|
# IDE
|
||||||
|
.vscode
|
||||||
|
.idea
|
||||||
|
*.swp
|
||||||
|
*.swo
|
||||||
|
*~
|
||||||
|
|
||||||
|
# Git
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
|
||||||
|
# Docker
|
||||||
|
Dockerfile
|
||||||
|
.dockerignore
|
||||||
|
docker-compose.yml
|
||||||
|
|
||||||
|
# CI/CD
|
||||||
|
.github
|
||||||
|
|
||||||
|
# Documentation
|
||||||
|
README.md
|
||||||
|
*.md
|
||||||
|
|
||||||
61
Dockerfile
Normal file
61
Dockerfile
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
# Используем официальный образ Node.js LTS
|
||||||
|
FROM node:20-alpine AS base
|
||||||
|
|
||||||
|
# Устанавливаем зависимости только при необходимости
|
||||||
|
FROM base AS deps
|
||||||
|
# Проверяем https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine
|
||||||
|
RUN apk add --no-cache libc6-compat
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Копируем файлы для установки зависимостей
|
||||||
|
COPY package.json package-lock.json* pnpm-lock.yaml* ./
|
||||||
|
RUN \
|
||||||
|
if [ -f pnpm-lock.yaml ]; then \
|
||||||
|
corepack enable pnpm && pnpm install --frozen-lockfile; \
|
||||||
|
elif [ -f package-lock.json ]; then \
|
||||||
|
npm ci; \
|
||||||
|
else \
|
||||||
|
echo "Lockfile not found." && exit 1; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Пересобираем исходный код только при необходимости
|
||||||
|
FROM base AS builder
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=deps /app/node_modules ./node_modules
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Переменные окружения для сборки
|
||||||
|
ENV NEXT_TELEMETRY_DISABLED=1
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
if [ -f pnpm-lock.yaml ]; then \
|
||||||
|
corepack enable pnpm && pnpm run build; \
|
||||||
|
else \
|
||||||
|
npm run build; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Production образ, копируем все файлы и запускаем next
|
||||||
|
FROM base AS runner
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
ENV NODE_ENV=production
|
||||||
|
ENV NEXT_TELEMETRY_DISABLED=1
|
||||||
|
|
||||||
|
RUN addgroup --system --gid 1001 nodejs
|
||||||
|
RUN adduser --system --uid 1001 nextjs
|
||||||
|
|
||||||
|
COPY --from=builder /app/public ./public
|
||||||
|
|
||||||
|
# Автоматически используем output: 'standalone' в next.config.js
|
||||||
|
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
||||||
|
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||||
|
|
||||||
|
USER nextjs
|
||||||
|
|
||||||
|
EXPOSE 3000
|
||||||
|
|
||||||
|
ENV PORT=3000
|
||||||
|
ENV HOSTNAME="0.0.0.0"
|
||||||
|
|
||||||
|
CMD ["node", "server.js"]
|
||||||
|
|
||||||
80
README.md
80
README.md
@@ -10,14 +10,88 @@ Reskin of https://lk.ks.psuti.ru/ since it lacks mobile support.
|
|||||||
|
|
||||||
## Tech stack & features
|
## Tech stack & features
|
||||||
|
|
||||||
- React with Next.js v13.5 (pages router)
|
- React 19.2.0 with Next.js 16.0.3 (pages router)
|
||||||
- Tailwind CSS.
|
- Tailwind CSS
|
||||||
- @shadcn/ui components (built with Radix UI)
|
- @shadcn/ui components (built with Radix UI)
|
||||||
- JSDOM for parsing scraped pages, rehydration strategy for cache
|
- JSDOM for parsing scraped pages, rehydration strategy for cache
|
||||||
- TypeScript with types for each package
|
- TypeScript 5.6.0 with types for each package
|
||||||
- Telegram Bot API (via [node-telegram-bot-api]) for parsing failure notifications
|
- Telegram Bot API (via [node-telegram-bot-api]) for parsing failure notifications
|
||||||
- Custom [js parser for teachers' photos](https://gist.github.com/VityaSchel/28f1a360ee7798511765910b39c6086c)
|
- Custom [js parser for teachers' photos](https://gist.github.com/VityaSchel/28f1a360ee7798511765910b39c6086c)
|
||||||
- Accessability & tab navigation support
|
- Accessability & tab navigation support
|
||||||
- Dark theme with automatic switching based on system settings
|
- Dark theme with automatic switching based on system settings
|
||||||
|
|
||||||
Tools used: pnpm, eslint, react-icons. Deployed with Netlify and supported by Cloudflare.
|
Tools used: pnpm, eslint, react-icons. Deployed with Netlify and supported by Cloudflare.
|
||||||
|
|
||||||
|
## Development
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
|
||||||
|
- Node.js 20+ (see `.nvmrc`)
|
||||||
|
- npm 10+ or pnpm
|
||||||
|
|
||||||
|
### Local development
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install dependencies
|
||||||
|
npm install
|
||||||
|
# or
|
||||||
|
pnpm install
|
||||||
|
|
||||||
|
# Run development server
|
||||||
|
npm run dev
|
||||||
|
# or
|
||||||
|
pnpm dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### Docker deployment
|
||||||
|
|
||||||
|
#### Build and run with Docker
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build the image
|
||||||
|
docker build -t kspguti-schedule .
|
||||||
|
|
||||||
|
# Run the container
|
||||||
|
docker run -p 3000:3000 kspguti-schedule
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Using Docker Compose
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build and start
|
||||||
|
docker-compose up -d
|
||||||
|
|
||||||
|
# View logs
|
||||||
|
docker-compose logs -f
|
||||||
|
|
||||||
|
# Stop
|
||||||
|
docker-compose down
|
||||||
|
```
|
||||||
|
|
||||||
|
**Environment variables:** Edit `docker-compose.yml` to add your environment variables:
|
||||||
|
- `PROXY_URL` - URL for schedule parsing
|
||||||
|
- `PARSING_FAILURE_NOTIFICATIONS_TELEGRAM_BOTAPI_TOKEN` - Telegram bot token
|
||||||
|
- `PARSING_FAILURE_NOTIFICATIONS_TELEGRAM_CHAT_ID` - Telegram chat ID
|
||||||
|
|
||||||
|
### Production deployment
|
||||||
|
|
||||||
|
#### Netlify
|
||||||
|
|
||||||
|
The project includes `netlify.toml` for automatic deployment configuration.
|
||||||
|
|
||||||
|
#### Docker
|
||||||
|
|
||||||
|
The Dockerfile uses Next.js standalone output for optimized production builds. The image includes:
|
||||||
|
- Multi-stage build for smaller image size
|
||||||
|
- Non-root user for security
|
||||||
|
- Health checks
|
||||||
|
- Production optimizations
|
||||||
|
|
||||||
|
#### Other platforms
|
||||||
|
|
||||||
|
The project can be deployed to any platform supporting Node.js 20+:
|
||||||
|
- Vercel
|
||||||
|
- Railway
|
||||||
|
- DigitalOcean App Platform
|
||||||
|
- AWS App Runner
|
||||||
|
- Any Docker-compatible platform
|
||||||
|
|||||||
24
docker-compose.yml
Normal file
24
docker-compose.yml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
version: '3.8'
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
|
environment:
|
||||||
|
- NODE_ENV=production
|
||||||
|
- NEXT_TELEMETRY_DISABLED=1
|
||||||
|
# Добавьте ваши переменные окружения здесь
|
||||||
|
# - PROXY_URL=${PROXY_URL}
|
||||||
|
# - PARSING_FAILURE_NOTIFICATIONS_TELEGRAM_BOTAPI_TOKEN=${PARSING_FAILURE_NOTIFICATIONS_TELEGRAM_BOTAPI_TOKEN}
|
||||||
|
# - PARSING_FAILURE_NOTIFICATIONS_TELEGRAM_CHAT_ID=${PARSING_FAILURE_NOTIFICATIONS_TELEGRAM_CHAT_ID}
|
||||||
|
restart: unless-stopped
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 40s
|
||||||
|
|
||||||
11
netlify.toml
Normal file
11
netlify.toml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
[build]
|
||||||
|
command = "npm run build"
|
||||||
|
publish = ".next"
|
||||||
|
|
||||||
|
[[plugins]]
|
||||||
|
package = "@netlify/plugin-nextjs"
|
||||||
|
|
||||||
|
[build.environment]
|
||||||
|
NODE_VERSION = "20"
|
||||||
|
NPM_VERSION = "10"
|
||||||
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
/** @type {import('next').NextConfig} */
|
/** @type {import('next').NextConfig} */
|
||||||
const nextConfig = {
|
const nextConfig = {
|
||||||
reactStrictMode: true,
|
reactStrictMode: true,
|
||||||
|
output: 'standalone',
|
||||||
redirects: async () => [{
|
redirects: async () => [{
|
||||||
permanent: false,
|
permanent: false,
|
||||||
destination: '/ps7',
|
destination: '/ps7',
|
||||||
|
|||||||
28
package.json
28
package.json
@@ -2,6 +2,10 @@
|
|||||||
"name": "kspguti-schedule",
|
"name": "kspguti-schedule",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
"engines": {
|
||||||
|
"node": ">=20.0.0",
|
||||||
|
"npm": ">=10.0.0"
|
||||||
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
@@ -22,14 +26,14 @@
|
|||||||
"content-type": "^1.0.5",
|
"content-type": "^1.0.5",
|
||||||
"date-fns": "^2.30.0",
|
"date-fns": "^2.30.0",
|
||||||
"jsdom": "^22.1.0",
|
"jsdom": "^22.1.0",
|
||||||
"lucide-react": "^0.279.0",
|
"lucide-react": "^0.554.0",
|
||||||
"next": "latest",
|
"next": "16.0.3",
|
||||||
"next-sitemap": "^4.2.3",
|
"next-sitemap": "^4.2.3",
|
||||||
"next-themes": "^0.2.1",
|
"next-themes": "^0.2.1",
|
||||||
"node-html-parser": "^6.1.10",
|
"node-html-parser": "^6.1.10",
|
||||||
"node-telegram-bot-api": "^0.63.0",
|
"node-telegram-bot-api": "^0.63.0",
|
||||||
"react": "latest",
|
"react": "19.2.0",
|
||||||
"react-dom": "latest",
|
"react-dom": "19.2.0",
|
||||||
"react-icons": "^4.11.0",
|
"react-icons": "^4.11.0",
|
||||||
"sass": "^1.69.3",
|
"sass": "^1.69.3",
|
||||||
"sharp": "^0.32.6",
|
"sharp": "^0.32.6",
|
||||||
@@ -39,16 +43,16 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jsdom": "^21.1.3",
|
"@types/jsdom": "^21.1.3",
|
||||||
"@types/node": "latest",
|
"@types/node": "22.0.0",
|
||||||
"@types/node-telegram-bot-api": "^0.61.8",
|
"@types/node-telegram-bot-api": "^0.61.8",
|
||||||
"@types/react": "latest",
|
"@types/react": "19.0.0",
|
||||||
"@types/react-dom": "latest",
|
"@types/react-dom": "19.0.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.7.3",
|
"@typescript-eslint/eslint-plugin": "^6.7.3",
|
||||||
"autoprefixer": "latest",
|
"autoprefixer": "10.4.20",
|
||||||
"eslint": "latest",
|
"eslint": "9.0.0",
|
||||||
"eslint-config-next": "latest",
|
"eslint-config-next": "16.0.3",
|
||||||
"postcss": "latest",
|
"postcss": "8.4.47",
|
||||||
"tailwindcss": "^3.4.18",
|
"tailwindcss": "^3.4.18",
|
||||||
"typescript": "latest"
|
"typescript": "5.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,21 +16,31 @@ const parseLesson = (row: Element): Lesson | null => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const cells = Array.from(row.querySelectorAll(':scope > td'))
|
const cells = Array.from(row.querySelectorAll(':scope > td'))
|
||||||
if (cells[3].textContent!.trim() === 'Свободное время') return null
|
if (!cells[3] || cells[3].textContent?.trim() === 'Свободное время') return null
|
||||||
|
|
||||||
lesson.isChange = cells.every(td => td.getAttribute('bgcolor') === 'ffffbb')
|
lesson.isChange = cells.every(td => td.getAttribute('bgcolor') === 'ffffbb')
|
||||||
|
|
||||||
|
if (!cells[1] || !cells[1].childNodes[0]) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
const timeCell = cells[1].childNodes
|
const timeCell = cells[1].childNodes
|
||||||
const [startTime, endTime] = timeCell[0].textContent!.trim().split(' – ')
|
const timeText = timeCell[0].textContent?.trim()
|
||||||
|
if (!timeText) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
const [startTime, endTime] = timeText.split(' – ')
|
||||||
lesson.time = {
|
lesson.time = {
|
||||||
start: startTime ?? '',
|
start: startTime ?? '',
|
||||||
end: endTime ?? ''
|
end: endTime ?? ''
|
||||||
}
|
}
|
||||||
if (timeCell[2]) {
|
if (timeCell[2]) {
|
||||||
lesson.time.hint = timeCell[2].textContent!.trim()
|
lesson.time.hint = timeCell[2].textContent?.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
if (!cells[3].childNodes[0]) {
|
||||||
|
throw new Error('Subject node not found')
|
||||||
|
}
|
||||||
lesson.subject = cells[3].childNodes[0].textContent!.trim()
|
lesson.subject = cells[3].childNodes[0].textContent!.trim()
|
||||||
|
|
||||||
const teacherCell = cells[3].childNodes[2]
|
const teacherCell = cells[3].childNodes[2]
|
||||||
@@ -40,10 +50,21 @@ const parseLesson = (row: Element): Lesson | null => {
|
|||||||
|
|
||||||
const placeCell = cells[3].childNodes[3]
|
const placeCell = cells[3].childNodes[3]
|
||||||
|
|
||||||
if (placeCell) {
|
if (placeCell && placeCell.childNodes.length > 0) {
|
||||||
|
const addressNode = placeCell.childNodes[1]
|
||||||
|
const classroomNode = placeCell.childNodes[3]
|
||||||
|
|
||||||
|
if (addressNode && classroomNode) {
|
||||||
|
const address = addressNode.textContent?.trim()
|
||||||
|
const classroomText = classroomNode.textContent?.trim()
|
||||||
|
const classroomMatch = classroomText?.match(/^Кабинет: ([^ ]+)(-2)?$/)
|
||||||
|
|
||||||
|
if (address && classroomMatch) {
|
||||||
lesson.place = {
|
lesson.place = {
|
||||||
address: placeCell.childNodes[1].textContent!.trim(),
|
address,
|
||||||
classroom: placeCell.childNodes[3].textContent!.trim().match(/^Кабинет: ([^ ]+)(-2)?$/)![1]
|
classroom: classroomMatch[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
@@ -51,17 +72,25 @@ const parseLesson = (row: Element): Lesson | null => {
|
|||||||
lesson.fallbackDiscipline = cells[3].textContent?.trim()
|
lesson.fallbackDiscipline = cells[3].textContent?.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
lesson.topic = cells[4].textContent!.trim()
|
if (cells[4]) {
|
||||||
|
lesson.topic = cells[4].textContent?.trim() || ''
|
||||||
|
}
|
||||||
|
|
||||||
lesson.resources = []
|
lesson.resources = []
|
||||||
|
if (cells[5]) {
|
||||||
Array.from(cells[5].querySelectorAll('a'))
|
Array.from(cells[5].querySelectorAll('a'))
|
||||||
.forEach(a => {
|
.forEach(a => {
|
||||||
|
const title = a.textContent?.trim()
|
||||||
|
const url = a.getAttribute('href')
|
||||||
|
if (title && url) {
|
||||||
lesson.resources.push({
|
lesson.resources.push({
|
||||||
type: 'link',
|
type: 'link',
|
||||||
title: a.textContent!.trim(),
|
title,
|
||||||
url: a.getAttribute('href')!
|
url
|
||||||
})
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return lesson
|
return lesson
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "es5",
|
"target": "ES2022",
|
||||||
"lib": [
|
"lib": [
|
||||||
"dom",
|
"dom",
|
||||||
"dom.iterable",
|
"dom.iterable",
|
||||||
"esnext"
|
"ES2022"
|
||||||
],
|
],
|
||||||
"allowJs": true,
|
"allowJs": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user