Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 2025 migration #588

Merged
merged 6 commits into from
Jan 26, 2025
Merged

feat: 2025 migration #588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f890f1
feat: 2025 migration
Ritabear Jan 7, 2025
ed61d3c
fix: landing page and nav bar
SivanYeh Jan 10, 2025
a0cf03c
fix: some wrong year, and close some settings for this year
Ritabear Jan 12, 2025
2301b2d
Merge branch '2025_migration' into related_updates
Ritabear Jan 14, 2025
7a598aa
Merge pull request #589 from pycontw/related_updates
Ritabear Jan 14, 2025
8dcba63
fix: linter
Ritabear Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ COPY store ./store
COPY utils ./utils
COPY nuxt.config.js tailwind.config.js .babelrc .env ./

ENV ROUTER_BASE /2024/
ENV BASE_URL http://pycontw-2024:8000
ENV ROUTER_BASE /2025/
ENV BASE_URL http://pycontw-2025:8000
ENV BUILD_TARGET server
ENV HOST 0.0.0.0
ENV API_URL_BROWSER https://tw.pycon.org/prs
Expand Down
6 changes: 3 additions & 3 deletions docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ services:
context: .
dockerfile: mock-server.Dockerfile

pycontw-2024:
container_name: pycontw-2024-frontend-dev
pycontw-2025:
container_name: pycontw-2025-frontend-dev
build:
context: .
dockerfile: dev.Dockerfile
Expand All @@ -19,7 +19,7 @@ services:
- ./node_modules:/app/node_modules:delegated
environment:
- BUILD_TARGET=server
- ROUTER_BASE=/2024/
- ROUTER_BASE=/2025/
- HOST=0.0.0.0
- BASE_URL=http://mock-server:9876
- API_URL_BROWSER=http://0.0.0.0:9876
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3.5'

services:
pycontw-2024-frontend:
container_name: pycontw-2024-frontend
pycontw-2025-frontend:
container_name: pycontw-2025-frontend
restart: always
build:
context: .
Expand All @@ -12,4 +12,4 @@ services:
networks:
network:
external: true
name: network-2024
name: network-2025
2 changes: 1 addition & 1 deletion nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from 'axios'
const DEFAULT_BASE_URL = 'https://tw.pycon.org/prs'
const DEFAULT_ROUTER_BASE = '/2024/'
const DEFAULT_ROUTER_BASE = '/2025/'
const DEFAULT_BUILD_TARGET = 'static'
const DEFAULT_VUE_DEVTOOL = false

Expand Down
Loading