Skip to content

Commit

Permalink
Newcastle-2.0.5 (#1116)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@gloriajw @teddyfullstack
@jenkins-fans @dependabot
4 people committed Dec 20, 2023
1 parent 88d351e commit e8270d4
Show file tree
Hide file tree
Showing 204 changed files with 3,700 additions and 1,511 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/devapp1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: DEVAPP1 CI
on:
# Triggers the workflow on push or approved pull request on R1-2021 branch
push:
branches: [ Modelo-2.0.4 ]
branches: [ Newcastle-2.0.5 ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -32,7 +32,7 @@ jobs:
script: |
cd /home/upstage/upstage/dashboard/
git fetch
git checkout Modelo-2.0.4
git checkout Newcastle-2.0.5
git pull
yarn
yarn build:dev
Expand Down
4 changes: 4 additions & 0 deletions config/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,9 @@
# SQLALCHEMY_DATABASE_URI = 'mysql+mysqldb://{0}:{1}@{2}:{3}/{4}'.format(DB_USER,DB_PASSWD,DB_HOST,DB_PORT,DB_NAME)
NGINX_CONFIG_FILE = "config/dev/dev_app1_nginx_upstage.conf"

CLOUDFLARE_CAPTCHA_VERIFY_ENDPOINT = (
"https://challenges.cloudflare.com/turnstile/v0/siteverify"
)

if __name__ == "__main__":
print("Copy-paste this secret:{}".format(secrets.token_urlsafe(64)))
190 changes: 95 additions & 95 deletions config/dev/dev_app1_nginx_upstage.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,104 +2,104 @@
#limit_req_zone $binary_remote_addr zone=limittwo:10m rate=5r/s;

server {
server_name _;
listen 80;
rewrite ^ https://dev-app1.upstage.live$request_uri? permanent;
server_name _;
listen 80;
rewrite ^ https://dev-app1.upstage.live$request_uri? permanent;
}

server {
server_name dev-app1.upstage.live;
listen 443 ssl;
ssl_dhparam /etc/nginx/ssl/dhparam.pem;
ssl_ecdh_curve secp384r1;

ssl_certificate /etc/letsencrypt/live/dev-app1.upstage.live/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/dev-app1.upstage.live/privkey.pem; # managed by Certbo

ssl_protocols TLSv1.2 TLSv1.3;
#ssl_protocols TLSv1.3;
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;

ssl_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m;

set_real_ip_from 10.0.0.0/8;
set_real_ip_from 172.16.0.0/12;
set_real_ip_from 192.168.0.0/16;
real_ip_header X-Forwarded-For;

#security directives
#server_tokens off;
#add_header X-Frame-Options SAMEORIGIN;
#add_header X-Content-Type-Options nosniff;
#add_header X-XSS-Protection "1; mode=block";
#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'";
#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'";

add_header Referrer-Policy "no-referrer";

client_body_in_file_only clean;
client_body_buffer_size 32K;

client_max_body_size 300M;

#sendfile on;
send_timeout 300s;

location / {
#limit_req zone=limitone burst=20 nodelay;
#auth_basic "Enter password.";
#auth_basic_user_file /etc/nginx/htpasswd;
alias /home/upstage/upstage/dashboard/dist/;
try_files $uri $uri/ /index.html;
add_header Last-Modified $date_gmt;
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
if_modified_since off;
expires off;
etag off;
gzip on;
gzip_types *;
gzip_proxied no-cache no-store private expired auth;
gzip_min_length 1000;
}

location /studio {
alias /home/upstage/upstage/studio/dist/;
try_files $uri $uri/ /V4.0/studio/index.html;
add_header Last-Modified $date_gmt;
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
if_modified_since off;
expires off;
etag off;
gzip on;
gzip_types *;
gzip_proxied no-cache no-store private expired auth;
gzip_min_length 1000;
}

location /static {
alias /home/upstage/upstage/uploads;
expires off;
add_header Cache-Control 'no-cache, must-revalidate';
}

location /V4.0/static {
# Keep this path for not breaking replays
alias /home/upstage/upstage/uploads;
expires off;
add_header Cache-Control 'no-cache, must-revalidate';
}

location /api {
#limit_req zone=limitone burst=20 nodelay;
uwsgi_pass unix:///home/upstage/uwsgi_sockets/upstage.socket;
uwsgi_read_timeout 1800s;
uwsgi_send_timeout 900s;
uwsgi_ignore_client_abort on;
include uwsgi_params;
uwsgi_hide_header Content-Security-Policy;
uwsgi_hide_header X-Content-Security-Policy;
}
server_name dev-app1.upstage.live;
listen 443 ssl;
ssl_dhparam /etc/nginx/ssl/dhparam.pem;
ssl_ecdh_curve secp384r1;

ssl_certificate /etc/letsencrypt/live/dev-app1.upstage.live/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/dev-app1.upstage.live/privkey.pem; # managed by Certbo

ssl_protocols TLSv1.2 TLSv1.3;
#ssl_protocols TLSv1.3;
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;

ssl_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m;

set_real_ip_from 10.0.0.0/8;
set_real_ip_from 172.16.0.0/12;
set_real_ip_from 192.168.0.0/16;
real_ip_header X-Forwarded-For;

#security directives
#server_tokens off;
#add_header X-Frame-Options SAMEORIGIN;
#add_header X-Content-Type-Options nosniff;
#add_header X-XSS-Protection "1; mode=block";
#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'";
#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'";

add_header Referrer-Policy "no-referrer";

client_body_in_file_only clean;
client_body_buffer_size 32K;

client_max_body_size 300M;

#sendfile on;
send_timeout 300s;

location / {
#limit_req zone=limitone burst=20 nodelay;
#auth_basic "Enter password.";
#auth_basic_user_file /etc/nginx/htpasswd;
alias /home/upstage/upstage/dashboard/dist/;
try_files $uri $uri/ /index.html;
add_header Last-Modified $date_gmt;
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
if_modified_since off;
expires off;
etag off;
gzip on;
gzip_types *;
gzip_proxied no-cache no-store private expired auth;
gzip_min_length 1000;
}

location /studio {
alias /home/upstage/upstage/studio/dist/;
try_files $uri $uri/ /studio/index.html;
add_header Last-Modified $date_gmt;
add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
if_modified_since off;
expires off;
etag off;
gzip on;
gzip_types *;
gzip_proxied no-cache no-store private expired auth;
gzip_min_length 1000;
}

location /static {
alias /home/upstage/upstage/uploads;
expires off;
add_header Cache-Control 'no-cache, must-revalidate';
}

location /V4.0/static {
# Keep this path for not breaking replays
alias /home/upstage/upstage/uploads;
expires off;
add_header Cache-Control 'no-cache, must-revalidate';
}

location /api {
#limit_req zone=limitone burst=20 nodelay;
uwsgi_pass unix:///home/upstage/uwsgi_sockets/upstage.socket;
uwsgi_read_timeout 1800s;
uwsgi_send_timeout 900s;
uwsgi_ignore_client_abort on;
include uwsgi_params;
uwsgi_hide_header Content-Security-Policy;
uwsgi_hide_header X-Content-Security-Policy;
}


}
Loading

0 comments on commit e8270d4

Please sign in to comment.