Skip to content

Commit e8270d4

Browse files
gloriajwmister-teddyjenkins-fansdependabot[bot]
authored
Newcastle-2.0.5 (#1116)
* Update devapp1.yml new release * UpStage Studio V1.5.0 (#1120) * player management table * admin player query * resolve role name * username like * player table * UpStage Studio V1.5.1 (#1122) * last login field * update user mutation * upload limit * player management form * delete user & reset password * default collapsed sidebar * navigate to studio from live stage (#1123) * Batch email fix (#1126) * fix to default email, paths were all rong as well * fixed jwt. why did this change? * latest --------- Co-authored-by: gloriajw <aagg@comcast.net> * path * Issue 1083 Player Management (Cont.) (#1129) * last login field * update user mutation * upload limit * player management form * delete user & reset password * default collapsed sidebar * upload limit inside player form * fix upload limit not having effects without refreshing (#1131) * dismiss messages on click (#1134) * default english locale & input names (#1137) * default list all stages (#1138) * UpStage Studio V1.5.2 (#1141) * batch create mutation * create user panel * fix duplicate key * switch role option * update typescript types after upgrading * self duplicated check * cleanup types warnings * UpStage Studio V1.5.3 (#1158) * setup vue router * setup vue router * profile management * fix nginx index.html redirection on dev-app1 * consistent active menu * Issue 1160 Available players (#1165) * filter user by status * only show inactive users in player management page * remove backstage navigation from studio * Issue 1162 Customize foyer with Studio navigation (#1166) * update scaffolded foyer link * update foyer description on scaffolding * accurise version * wording * Issue 1133 Topbar profile editor popup (#1174) * profile popup everywhere * logout button in Studio * stricter authorization rule on studio * Issue 1104 Sidebar icons & backgrounds (#1177) * icon and sidebar menu background * other options * Issue 1151 Captcha (#1179) * add captcha to registeration form * regenerate captcha token on retry * friendlier message * Bump axios from 0.21.4 to 1.6.0 in /dashboard Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v0.21.4...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Hồng Phát <hongphat.js@gmail.com> Co-authored-by: gloriajw <aagg@comcast.net> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 88d351e commit e8270d4

File tree

204 files changed

+3700
-1511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+3700
-1511
lines changed

‎.github/workflows/devapp1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: DEVAPP1 CI
66
on:
77
# Triggers the workflow on push or approved pull request on R1-2021 branch
88
push:
9-
branches: [ Modelo-2.0.4 ]
9+
branches: [ Newcastle-2.0.5 ]
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:
@@ -32,7 +32,7 @@ jobs:
3232
script: |
3333
cd /home/upstage/upstage/dashboard/
3434
git fetch
35-
git checkout Modelo-2.0.4
35+
git checkout Newcastle-2.0.5
3636
git pull
3737
yarn
3838
yarn build:dev

‎config/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,9 @@
132132
# SQLALCHEMY_DATABASE_URI = 'mysql+mysqldb://{0}:{1}@{2}:{3}/{4}'.format(DB_USER,DB_PASSWD,DB_HOST,DB_PORT,DB_NAME)
133133
NGINX_CONFIG_FILE = "config/dev/dev_app1_nginx_upstage.conf"
134134

135+
CLOUDFLARE_CAPTCHA_VERIFY_ENDPOINT = (
136+
"https://challenges.cloudflare.com/turnstile/v0/siteverify"
137+
)
138+
135139
if __name__ == "__main__":
136140
print("Copy-paste this secret:{}".format(secrets.token_urlsafe(64)))

‎config/dev/dev_app1_nginx_upstage.conf‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -2,104 +2,104 @@
22
#limit_req_zone $binary_remote_addr zone=limittwo:10m rate=5r/s;
33

44
server {
5-
server_name _;
6-
listen 80;
7-
rewrite ^ https://dev-app1.upstage.live$request_uri? permanent;
5+
server_name _;
6+
listen 80;
7+
rewrite ^ https://dev-app1.upstage.live$request_uri? permanent;
88
}
99

1010
server {
11-
server_name dev-app1.upstage.live;
12-
listen 443 ssl;
13-
ssl_dhparam /etc/nginx/ssl/dhparam.pem;
14-
ssl_ecdh_curve secp384r1;
15-
16-
ssl_certificate /etc/letsencrypt/live/dev-app1.upstage.live/fullchain.pem; # managed by Certbot
17-
ssl_certificate_key /etc/letsencrypt/live/dev-app1.upstage.live/privkey.pem; # managed by Certbo
18-
19-
ssl_protocols TLSv1.2 TLSv1.3;
20-
#ssl_protocols TLSv1.3;
21-
ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
22-
23-
ssl_prefer_server_ciphers on;
24-
ssl_session_cache shared:SSL:10m;
25-
26-
set_real_ip_from 10.0.0.0/8;
27-
set_real_ip_from 172.16.0.0/12;
28-
set_real_ip_from 192.168.0.0/16;
29-
real_ip_header X-Forwarded-For;
30-
31-
#security directives
32-
#server_tokens off;
33-
#add_header X-Frame-Options SAMEORIGIN;
34-
#add_header X-Content-Type-Options nosniff;
35-
#add_header X-XSS-Protection "1; mode=block";
36-
#add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://s3.amazonaws.com https://dev-app.hellosign.com https://www.google.com https://www.gstatic.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; connect-src 'self' https://apis.google.com; frame-src https://dev-app.hellosign.com https://www.google.com; object-src 'none'";
37-
#add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://www.google.com https://www.gstatic.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; connect-src 'self' https://apis.google.com; frame-src https://www.google.com; object-src 'none'";
38-
39-
add_header Referrer-Policy "no-referrer";
40-
41-
client_body_in_file_only clean;
42-
client_body_buffer_size 32K;
43-
44-
client_max_body_size 300M;
45-
46-
#sendfile on;
47-
send_timeout 300s;
48-
49-
location / {
50-
#limit_req zone=limitone burst=20 nodelay;
51-
#auth_basic "Enter password.";
52-
#auth_basic_user_file /etc/nginx/htpasswd;
53-
alias /home/upstage/upstage/dashboard/dist/;
54-
try_files $uri $uri/ /index.html;
55-
add_header Last-Modified $date_gmt;
56-
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
57-
if_modified_since off;
58-
expires off;
59-
etag off;
60-
gzip on;
61-
gzip_types *;
62-
gzip_proxied no-cache no-store private expired auth;
63-
gzip_min_length 1000;
64-
}
65-
66-
location /studio {
67-
alias /home/upstage/upstage/studio/dist/;
68-
try_files $uri $uri/ /V4.0/studio/index.html;
69-
add_header Last-Modified $date_gmt;
70-
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
71-
if_modified_since off;
72-
expires off;
73-
etag off;
74-
gzip on;
75-
gzip_types *;
76-
gzip_proxied no-cache no-store private expired auth;
77-
gzip_min_length 1000;
78-
}
79-
80-
location /static {
81-
alias /home/upstage/upstage/uploads;
82-
expires off;
83-
add_header Cache-Control 'no-cache, must-revalidate';
84-
}
85-
86-
location /V4.0/static {
87-
# Keep this path for not breaking replays
88-
alias /home/upstage/upstage/uploads;
89-
expires off;
90-
add_header Cache-Control 'no-cache, must-revalidate';
91-
}
92-
93-
location /api {
94-
#limit_req zone=limitone burst=20 nodelay;
95-
uwsgi_pass unix:///home/upstage/uwsgi_sockets/upstage.socket;
96-
uwsgi_read_timeout 1800s;
97-
uwsgi_send_timeout 900s;
98-
uwsgi_ignore_client_abort on;
99-
include uwsgi_params;
100-
uwsgi_hide_header Content-Security-Policy;
101-
uwsgi_hide_header X-Content-Security-Policy;
102-
}
11+
server_name dev-app1.upstage.live;
12+
listen 443 ssl;
13+
ssl_dhparam /etc/nginx/ssl/dhparam.pem;
14+
ssl_ecdh_curve secp384r1;
15+
16+
ssl_certificate /etc/letsencrypt/live/dev-app1.upstage.live/fullchain.pem; # managed by Certbot
17+
ssl_certificate_key /etc/letsencrypt/live/dev-app1.upstage.live/privkey.pem; # managed by Certbo
18+
19+
ssl_protocols TLSv1.2 TLSv1.3;
20+
#ssl_protocols TLSv1.3;
21+
ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384;
22+
23+
ssl_prefer_server_ciphers on;
24+
ssl_session_cache shared:SSL:10m;
25+
26+
set_real_ip_from 10.0.0.0/8;
27+
set_real_ip_from 172.16.0.0/12;
28+
set_real_ip_from 192.168.0.0/16;
29+
real_ip_header X-Forwarded-For;
30+
31+
#security directives
32+
#server_tokens off;
33+
#add_header X-Frame-Options SAMEORIGIN;
34+
#add_header X-Content-Type-Options nosniff;
35+
#add_header X-XSS-Protection "1; mode=block";
36+
#add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://s3.amazonaws.com https://dev-app.hellosign.com https://www.google.com https://www.gstatic.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; connect-src 'self' https://apis.google.com; frame-src https://dev-app.hellosign.com https://www.google.com; object-src 'none'";
37+
#add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://www.google.com https://www.gstatic.com; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; connect-src 'self' https://apis.google.com; frame-src https://www.google.com; object-src 'none'";
38+
39+
add_header Referrer-Policy "no-referrer";
40+
41+
client_body_in_file_only clean;
42+
client_body_buffer_size 32K;
43+
44+
client_max_body_size 300M;
45+
46+
#sendfile on;
47+
send_timeout 300s;
48+
49+
location / {
50+
#limit_req zone=limitone burst=20 nodelay;
51+
#auth_basic "Enter password.";
52+
#auth_basic_user_file /etc/nginx/htpasswd;
53+
alias /home/upstage/upstage/dashboard/dist/;
54+
try_files $uri $uri/ /index.html;
55+
add_header Last-Modified $date_gmt;
56+
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
57+
if_modified_since off;
58+
expires off;
59+
etag off;
60+
gzip on;
61+
gzip_types *;
62+
gzip_proxied no-cache no-store private expired auth;
63+
gzip_min_length 1000;
64+
}
65+
66+
location /studio {
67+
alias /home/upstage/upstage/studio/dist/;
68+
try_files $uri $uri/ /studio/index.html;
69+
add_header Last-Modified $date_gmt;
70+
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
71+
if_modified_since off;
72+
expires off;
73+
etag off;
74+
gzip on;
75+
gzip_types *;
76+
gzip_proxied no-cache no-store private expired auth;
77+
gzip_min_length 1000;
78+
}
79+
80+
location /static {
81+
alias /home/upstage/upstage/uploads;
82+
expires off;
83+
add_header Cache-Control 'no-cache, must-revalidate';
84+
}
85+
86+
location /V4.0/static {
87+
# Keep this path for not breaking replays
88+
alias /home/upstage/upstage/uploads;
89+
expires off;
90+
add_header Cache-Control 'no-cache, must-revalidate';
91+
}
92+
93+
location /api {
94+
#limit_req zone=limitone burst=20 nodelay;
95+
uwsgi_pass unix:///home/upstage/uwsgi_sockets/upstage.socket;
96+
uwsgi_read_timeout 1800s;
97+
uwsgi_send_timeout 900s;
98+
uwsgi_ignore_client_abort on;
99+
include uwsgi_params;
100+
uwsgi_hide_header Content-Security-Policy;
101+
uwsgi_hide_header X-Content-Security-Policy;
102+
}
103103

104104

105105
}

0 commit comments

Comments
 (0)