Skip to content

Commit

Permalink
Restored function after fighting with web sockets all day
Browse files Browse the repository at this point in the history
  • Loading branch information
palmertab committed Nov 19, 2024
1 parent 37c6914 commit e113b87
Show file tree
Hide file tree
Showing 5 changed files with 242 additions and 49 deletions.
13 changes: 7 additions & 6 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
VITE_WEB_URL=new.dev.tabroom.com
VITE_API_URL=http://api.dev.tabroom.com/v1
VITE_S3_BASE=https://s3.amazonaws.com/tabroom-files
VITE_PORT=8002
VITE_CLIENT_PORT=8003
VITE_PREVIEW_PORT=8004
VITE_WEB_URL = schemats.dev.tabroom.com
VITE_API_URL = https://api.dev.tabroom.com/v1
VITE_S3_BASE = https://s3.amazonaws.com/tabroom-files
VITE_PORT = 9000
// The port on the other side of the NGINX proxy with SSL
VITE_CLIENT_PORT = 443
VITE_PREVIEW_PORT = 9003
180 changes: 180 additions & 0 deletions doc/nginx.dev.tabroom.com.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@

server {
listen 80;
listen [::]:80;
server_name mason.dev.tabroom.com mason.dev;
return 301 https://mason.dev.tabroom.com$request_uri;
}

server {
root /www/tabroom;
server_name mason.dev mason.dev.tabroom.com;

location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://mason.dev.tabroom.com:8000;
}

location /v1 {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://legacyapi.dev.tabroom.com:8001/v1;
}

access_log /var/log/nginx/mason-dev-access.log;
error_log /var/log/nginx/mason-dev-error.log;

client_max_body_size 50m;

listen [::]:443 ssl;
listen 443 ssl;
ssl_certificate /etc/ssl/certs/nsda/tabroom.com_ecc/fullchain.cer;
ssl_certificate_key /etc/ssl/certs/nsda/tabroom.com_ecc/tabroom.com.key;
include /etc/ssl/certs/nsda/options-ssl-nginx.conf;
ssl_dhparam /etc/ssl/certs/nsda/ssl-dhparams.pem;
}

server {
listen 80;
listen [::]:80;
server_name legacyapi.dev.tabroom.com legacyapi.dev;
return 301 https://legacyapi.dev.tabroom.com$request_uri;
}

server {
root /www/legacy-indexcards;
server_name legacyapi.dev.tabroom.com legacyapi.dev;

location /v1 {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://legacyapi.dev.tabroom.com:8001/v1;
}

access_log /var/log/nginx/legacyapi-dev-access.log;
error_log /var/log/nginx/legacyapi-dev-error.log;

client_max_body_size 50m;

listen [::]:443 ssl;
listen 443 ssl;
ssl_certificate /etc/ssl/certs/nsda/tabroom.com_ecc/fullchain.cer;
ssl_certificate_key /etc/ssl/certs/nsda/tabroom.com_ecc/tabroom.com.key;
include /etc/ssl/certs/nsda/options-ssl-nginx.conf;
ssl_dhparam /etc/ssl/certs/nsda/ssl-dhparams.pem;
}

server {
listen 80;
listen [::]:80;
server_name schemats.dev.tabroom.com schemats.dev;
return 301 https://schemats.dev.tabroom.com$request_uri;
}

server {
root /www/schemats;
server_name schemats.dev.tabroom.com schemats.dev;

location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://schemats.dev.tabroom.com:9000;
}

location /v1 {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://api.dev.tabroom.com:9001/v1;
}

location /ws {
proxy_pass http://schemats.dev.tabroom.com:9000;
include proxy_params;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}

access_log /var/log/nginx/schemats-dev-access.log;
error_log /var/log/nginx/schemats-dev-error.log;

client_max_body_size 50m;

listen [::]:443 ssl;
listen 443 ssl;

ssl_certificate /etc/ssl/certs/nsda/tabroom.com_ecc/fullchain.cer;
ssl_certificate_key /etc/ssl/certs/nsda/tabroom.com_ecc/tabroom.com.key;
include /etc/ssl/certs/nsda/options-ssl-nginx.conf;
ssl_dhparam /etc/ssl/certs/nsda/ssl-dhparams.pem;

}

server {
listen 80;
listen [::]:80;
server_name api.dev.tabroom.com api.dev;
return 301 https://api.dev.tabroom.com$request_uri;
}

server {
root /www/indexcards;
server_name api.dev.tabroom.com api.dev;

location /v1 {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $http_host;
proxy_pass http://api.dev.tabroom.com:9001/v1;
}

access_log /var/log/nginx/api-dev-access.log;
error_log /var/log/nginx/api-dev-error.log;

client_max_body_size 50m;

listen [::]:443 ssl;
listen 443 ssl;
ssl_certificate /etc/ssl/certs/nsda/tabroom.com_ecc/fullchain.cer;
ssl_certificate_key /etc/ssl/certs/nsda/tabroom.com_ecc/tabroom.com.key;
include /etc/ssl/certs/nsda/options-ssl-nginx.conf;
ssl_dhparam /etc/ssl/certs/nsda/ssl-dhparams.pem;
}

server {

listen [::]:443 ssl;
listen 443 ssl;

server_name preview.dev.tabroom.com preview.dev;

location / {
proxy_pass http://schemats.dev.tabroom.com:9004;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Proto $scheme;
}

ssl_certificate /etc/ssl/certs/nsda/tabroom.com_ecc/fullchain.cer;
ssl_certificate_key /etc/ssl/certs/nsda/tabroom.com_ecc/tabroom.com.key;
include /etc/ssl/certs/nsda/options-ssl-nginx.conf;
ssl_dhparam /etc/ssl/certs/nsda/ssl-dhparams.pem;
}

78 changes: 44 additions & 34 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions src/routes/+page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import type { ColumnDefinition } from 'tabulator-tables';
/** @type {import('./$types').PageLoad} */
export const load = async ({ fetch} ) => {

console.log(`Fetching from ${import.meta.env.VITE_API_URL}/invite/upcoming`);
const response = await fetch(`${import.meta.env.VITE_API_URL}/invite/upcoming`);
const rawData = await response.json();
console.log(`Fetching from ${import.meta.env.VITE_API_URL}/public/invite/upcoming`);
const response = await fetch(`${import.meta.env.VITE_API_URL}/public/invite/upcoming`);
const rawData = await response.json();

interface Tourn {
url : string,
Expand Down
Loading

0 comments on commit e113b87

Please sign in to comment.