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.

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

chore: web redirect for test subdomain. #202

Merged
merged 4 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion copilot/.workspace

This file was deleted.

162 changes: 15 additions & 147 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.2.1",
"browser-sync": "^2.29.3",
"browser-sync": "^3.0.2",
"express": "^4.18.2",
"morgan": "^1.10.0",
"vite": "^5.0.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const Aside = styled.aside<{ mode: Mode; collapsed: boolean }>`
position: fixed;
top: 0;
left: 48px;
z-index: 9999;
z-index: 999;
height: 100%;
width: calc(100% - 48px);
max-width: 385px;
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Nav = styled.nav<{ mode: Mode; isSignedIn: boolean }>`
position: fixed;
left: 0;
height: 100%;
z-index: 99999;
z-index: 9999;
background: ${({ mode }) => (mode === 'light' ? PB90T : DARK_MODE_FIELD)};
ul {
Expand Down
11 changes: 11 additions & 0 deletions packages/web/templates/default.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@ server {
return 301 https://$host$request_uri;
}

server {
listen 443 ssl;
listen [::]:443 ssl;
http2 on;
server_name test.busmap.online;
server_tokens off;
include /etc/nginx/conf.d/core/ssl.conf;

return 301 https://try.busmap.online$request_uri;
}

server {
listen 443 ssl;
listen [::]:443 ssl;
Expand Down