From 0a68da2b492b0e6417d7828d4fc016a77fc75353 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Fri, 1 Mar 2024 13:48:20 -0500 Subject: [PATCH 01/21] Fix docker workflow files for cuttingedge and dev branches --- .github/workflows/docker-image-cuttingedge.yml | 2 ++ .github/workflows/docker-image-dev.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index ba4f83d..8394e12 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -3,6 +3,8 @@ name: Docker Image CI on: push: branches: [ "cuttingedge" ] + pull_request: + branches: [ "cuttingedge" ] workflow_dispatch: jobs: diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index 9e95c2a..2bed583 100644 --- a/.github/workflows/docker-image-dev.yml +++ b/.github/workflows/docker-image-dev.yml @@ -2,7 +2,9 @@ name: Docker Image CI on: push: - branches: [ "cuttingedge" ] + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] workflow_dispatch: jobs: From 657a3d18573061d3c3d1649115697c736c2e59e1 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Tue, 5 Mar 2024 23:04:11 -0500 Subject: [PATCH 02/21] Reverse Proxy api automatically test --- .github/workflows/docker-image-dev.yml | 2 +- Dockerfile | 3 +- Website/apiConnector.js | 10 +-- nginx/conf.d/tranga.conf | 49 +++++++++++++ nginx/fastcgi.conf | 26 +++++++ nginx/fastcgi_params | 25 +++++++ nginx/mimes.types | 99 ++++++++++++++++++++++++++ nginx/nginx.conf | 32 +++++++++ nginx/scgi_params | 17 +++++ nginx/uwsgi_params | 17 +++++ 10 files changed, 273 insertions(+), 7 deletions(-) create mode 100644 nginx/conf.d/tranga.conf create mode 100644 nginx/fastcgi.conf create mode 100644 nginx/fastcgi_params create mode 100644 nginx/mimes.types create mode 100644 nginx/nginx.conf create mode 100644 nginx/scgi_params create mode 100644 nginx/uwsgi_params diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index 2bed583..d88b2db 100644 --- a/.github/workflows/docker-image-dev.yml +++ b/.github/workflows/docker-image-dev.yml @@ -37,7 +37,7 @@ jobs: - name: Build and push Website uses: docker/build-push-action@v4.1.1 with: - context: ./Website + context: ./ file: ./Dockerfile #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 platforms: linux/amd64 diff --git a/Dockerfile b/Dockerfile index d178671..6f11182 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM nginx:alpine3.17-slim -COPY . /usr/share/nginx/html +COPY ./Website /usr/share/nginx/html +COPY ./nginx /etc/nginx EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/Website/apiConnector.js b/Website/apiConnector.js index 64dca93..be5f878 100644 --- a/Website/apiConnector.js +++ b/Website/apiConnector.js @@ -1,9 +1,9 @@ -let apiUri = `${window.location.protocol}//${window.location.host.split(':')[0]}:6531` +let apiUri = `${window.location.protocol}//${window.location.host}/api` -if(getCookie("apiUri") != ""){ - apiUri = getCookie("apiUri"); -} -setCookie("apiUri", apiUri); +// if(getCookie("apiUri") != ""){ +// apiUri = getCookie("apiUri"); +// } +// setCookie("apiUri", apiUri); function setCookie(cname, cvalue) { const d = new Date(); diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf new file mode 100644 index 0000000..bd8a797 --- /dev/null +++ b/nginx/conf.d/tranga.conf @@ -0,0 +1,49 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + location /api/ { + proxy_pass_request_headers on; + proxy_pass http://tranga-api:6531/ + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} \ No newline at end of file diff --git a/nginx/fastcgi.conf b/nginx/fastcgi.conf new file mode 100644 index 0000000..d94b57f --- /dev/null +++ b/nginx/fastcgi.conf @@ -0,0 +1,26 @@ + +fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200; \ No newline at end of file diff --git a/nginx/fastcgi_params b/nginx/fastcgi_params new file mode 100644 index 0000000..4a4c037 --- /dev/null +++ b/nginx/fastcgi_params @@ -0,0 +1,25 @@ + +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; + +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param REQUEST_SCHEME $scheme; +fastcgi_param HTTPS $https if_not_empty; + +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; + +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; + +# PHP only, required if PHP was built with --enable-force-cgi-redirect +fastcgi_param REDIRECT_STATUS 200 \ No newline at end of file diff --git a/nginx/mimes.types b/nginx/mimes.types new file mode 100644 index 0000000..16191d8 --- /dev/null +++ b/nginx/mimes.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 0000000..94cdc0b --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,32 @@ + +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + include /etc/nginx/conf.d/*.conf; +} \ No newline at end of file diff --git a/nginx/scgi_params b/nginx/scgi_params new file mode 100644 index 0000000..1d56c8b --- /dev/null +++ b/nginx/scgi_params @@ -0,0 +1,17 @@ + +scgi_param REQUEST_METHOD $request_method; +scgi_param REQUEST_URI $request_uri; +scgi_param QUERY_STRING $query_string; +scgi_param CONTENT_TYPE $content_type; + +scgi_param DOCUMENT_URI $document_uri; +scgi_param DOCUMENT_ROOT $document_root; +scgi_param SCGI 1; +scgi_param SERVER_PROTOCOL $server_protocol; +scgi_param REQUEST_SCHEME $scheme; +scgi_param HTTPS $https if_not_empty; + +scgi_param REMOTE_ADDR $remote_addr; +scgi_param REMOTE_PORT $remote_port; +scgi_param SERVER_PORT $server_port; +scgi_param SERVER_NAME $server_name; \ No newline at end of file diff --git a/nginx/uwsgi_params b/nginx/uwsgi_params new file mode 100644 index 0000000..e42d9a9 --- /dev/null +++ b/nginx/uwsgi_params @@ -0,0 +1,17 @@ + +uwsgi_param QUERY_STRING $query_string; +uwsgi_param REQUEST_METHOD $request_method; +uwsgi_param CONTENT_TYPE $content_type; +uwsgi_param CONTENT_LENGTH $content_length; + +uwsgi_param REQUEST_URI $request_uri; +uwsgi_param PATH_INFO $document_uri; +uwsgi_param DOCUMENT_ROOT $document_root; +uwsgi_param SERVER_PROTOCOL $server_protocol; +uwsgi_param REQUEST_SCHEME $scheme; +uwsgi_param HTTPS $https if_not_empty; + +uwsgi_param REMOTE_ADDR $remote_addr; +uwsgi_param REMOTE_PORT $remote_port; +uwsgi_param SERVER_PORT $server_port; +uwsgi_param SERVER_NAME $server_name; \ No newline at end of file From 4b86cd71046ca00393b66d6f301bf73bf2016ea0 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Tue, 5 Mar 2024 23:09:17 -0500 Subject: [PATCH 03/21] A little fucking semi-colon --- nginx/conf.d/tranga.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index bd8a797..89341d6 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -12,7 +12,7 @@ server { location /api/ { proxy_pass_request_headers on; - proxy_pass http://tranga-api:6531/ + proxy_pass http://tranga-api:6531/; } #error_page 404 /404.html; From ef5524d7b65649546441563b62a64f8610ea73b2 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Tue, 5 Mar 2024 23:53:46 -0500 Subject: [PATCH 04/21] conf tweaks --- nginx/conf.d/tranga.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index 89341d6..3a9dffb 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -10,7 +10,7 @@ server { index index.html index.htm; } - location /api/ { + location ~ /api/ { proxy_pass_request_headers on; proxy_pass http://tranga-api:6531/; } From d05b8ea76b42f4a29749c4ef87382388e30b4ecf Mon Sep 17 00:00:00 2001 From: db-2001 Date: Wed, 6 Mar 2024 00:06:16 -0500 Subject: [PATCH 05/21] more conf tweaks --- nginx/conf.d/tranga.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index 3a9dffb..fc02585 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -12,7 +12,10 @@ server { location ~ /api/ { proxy_pass_request_headers on; - proxy_pass http://tranga-api:6531/; + set $upstream_app tranga-api; + set $upstream_port 6531; + set $upstream_proto http: + proxy_pass $upstream_proto://$upstream_app:$upstream_port; } #error_page 404 /404.html; From a2e0a2375a1f85d60b88bb67c522b2711d98713f Mon Sep 17 00:00:00 2001 From: db-2001 Date: Wed, 6 Mar 2024 00:10:33 -0500 Subject: [PATCH 06/21] another freaking semicolon mistake --- nginx/conf.d/tranga.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf index fc02585..fbc3270 100644 --- a/nginx/conf.d/tranga.conf +++ b/nginx/conf.d/tranga.conf @@ -14,7 +14,7 @@ server { proxy_pass_request_headers on; set $upstream_app tranga-api; set $upstream_port 6531; - set $upstream_proto http: + set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; } From 5af30051793849fa17846be69245d90398dc56e3 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 7 Mar 2024 12:16:19 +1100 Subject: [PATCH 07/21] feat: enable API_URL in Dockerfile fix tranga.conf not redirecting /api/ requests --- Dockerfile | 1 + nginx/conf.d/tranga.conf | 52 --------------------------- nginx/templates/default.conf.template | 29 +++++++++++++++ 3 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 nginx/conf.d/tranga.conf create mode 100644 nginx/templates/default.conf.template diff --git a/Dockerfile b/Dockerfile index 6f11182..9a9592a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,5 @@ COPY ./Website /usr/share/nginx/html COPY ./nginx /etc/nginx EXPOSE 80 +ENV API_URL=http://tranga-api:6531 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/nginx/conf.d/tranga.conf b/nginx/conf.d/tranga.conf deleted file mode 100644 index fbc3270..0000000 --- a/nginx/conf.d/tranga.conf +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; - - #access_log /var/log/nginx/host.access.log main; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location ~ /api/ { - proxy_pass_request_headers on; - set $upstream_app tranga-api; - set $upstream_port 6531; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - } - - #error_page 404 /404.html; - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 - # - #location ~ \.php$ { - # proxy_pass http://127.0.0.1; - #} - - # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 - # - #location ~ \.php$ { - # root html; - # fastcgi_pass 127.0.0.1:9000; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; - # include fastcgi_params; - #} - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # - #location ~ /\.ht { - # deny all; - #} -} \ No newline at end of file diff --git a/nginx/templates/default.conf.template b/nginx/templates/default.conf.template new file mode 100644 index 0000000..cf526c7 --- /dev/null +++ b/nginx/templates/default.conf.template @@ -0,0 +1,29 @@ +server { + listen 80 default_server; + listen [::]:80 default_server; + + http2 on; + + server_name _; + + access_log /dev/stdout main; + error_log /dev/stderr; + + location /api/ { + proxy_pass_request_headers on; + rewrite ^/api/(.*)$ /$1 break; + proxy_pass $API_URL; + } + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} \ No newline at end of file From 3eb7b63fa63584e923e5c0cc6fa833a4c4b2f861 Mon Sep 17 00:00:00 2001 From: glax Date: Tue, 2 Apr 2024 02:07:04 +0200 Subject: [PATCH 08/21] Fix https://github.com/C9Glax/tranga-website/issues/76 wrong context --- .github/workflows/docker-image-cuttingedge.yml | 2 +- .github/workflows/docker-image-master.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 8394e12..abeb0df 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -37,7 +37,7 @@ jobs: - name: Build and push Website uses: docker/build-push-action@v4.1.1 with: - context: ./Website + context: ./ file: ./Dockerfile #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 platforms: linux/amd64 diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index dccd18c..ddba6a9 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -37,7 +37,7 @@ jobs: - name: Build and push Website uses: docker/build-push-action@v4.1.1 with: - context: ./Website + context: ./ file: ./Dockerfile #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 platforms: linux/amd64 From 3b99dbd487474fe922235c3e995f250909a859a4 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Thu, 18 Apr 2024 17:33:08 -0400 Subject: [PATCH 09/21] Remove Mangadex Author Rate Limit --- Website/index.html | 1 - Website/interaction.js | 9 --------- 2 files changed, 10 deletions(-) diff --git a/Website/index.html b/Website/index.html index 1bb8c4c..804b644 100644 --- a/Website/index.html +++ b/Website/index.html @@ -131,7 +131,6 @@ -->
MangaDex -
diff --git a/Website/interaction.js b/Website/interaction.js index 889ade9..5133e19 100644 --- a/Website/interaction.js +++ b/Website/interaction.js @@ -40,7 +40,6 @@ const imageRL = document.querySelector("#imageRL"); const infoRL = document.querySelector("#infoRL"); //MangaDex Rate Limits -const mDexAuthorRL = document.querySelector("#mDexAuthorRL"); const mDexFeedRL = document.querySelector("#mDexFeedRL"); const mDexImageRL = document.querySelector("#mDexImageRL"); @@ -158,7 +157,6 @@ function Setup(){ coverRL.placeholder = json.MangaCover + ' Requests/Minute'; imageRL.placeholder = json.MangaImage + ' Requests/Minute'; infoRL.placeholder = json.MangaInfo + ' Requests/Minute'; - mDexAuthorRL.placeholder = json.MangaDexAuthor + ' Requests/Minute'; mDexFeedRL.placeholder = json.MangaDexFeed + ' Requests/Minute'; mDexImageRL.placeholder = json.MangaDexImage + ' Requests/Minute'; }); @@ -530,7 +528,6 @@ defaultRL.addEventListener("keypress", (event) => { if(event.key === "Enter") Up coverRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();}); imageRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();}); infoRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();}); -mDexAuthorRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();}); mDexFeedRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();}); mDexImageRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();}); @@ -558,7 +555,6 @@ function OpenSettings(){ coverRL.value = ""; imageRL.value = ""; infoRL.value = ""; - mDexAuthorRL.value = ""; mDexFeedRL.value = ""; mDexImageRL.value = ""; @@ -573,7 +569,6 @@ function OpenSettings(){ coverRL.placeholder = json.MangaCover + ' Requests/Minute'; imageRL.placeholder = json.MangaImage + ' Requests/Minute'; infoRL.placeholder = json.MangaInfo + ' Requests/Minute'; - mDexAuthorRL.placeholder = json.MangaDexAuthor + ' Requests/Minute'; mDexFeedRL.placeholder = json.MangaDexFeed + ' Requests/Minute'; mDexImageRL.placeholder = json.MangaDexImage + ' Requests/Minute'; }); @@ -716,10 +711,6 @@ function UpdateSettings(){ UpdateRateLimit(6, infoRL.value); } - if (mDexAuthorRL.value != "") { - UpdateRateLimit(5, mDexAuthorRL.value); - } - if (mDexFeedRL.value != "") { UpdateRateLimit(1, mDexFeedRL.value); } From b8efc3f601ee07d4e45ed5c7f4340704341e9cf4 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Sun, 21 Apr 2024 13:36:25 -0400 Subject: [PATCH 10/21] C9Glax/tranga-website#83 --- Website/apiConnector.js | 7 +++++ Website/index.html | 7 +++++ Website/interaction.js | 2 ++ Website/styles/base.css | 69 ++++++++++++++++++++++++++++++++++++++--- 4 files changed, 80 insertions(+), 5 deletions(-) diff --git a/Website/apiConnector.js b/Website/apiConnector.js index be5f878..33a3886 100644 --- a/Website/apiConnector.js +++ b/Website/apiConnector.js @@ -237,6 +237,13 @@ Date.prototype.timeNow = function () { return ((this.getHours() < 10)?"0":"") + this.getHours() +"_"+ ((this.getMinutes() < 10)?"0":"") + this.getMinutes() +"_"+ ((this.getSeconds() < 10)?"0":"") + this.getSeconds(); } +function UpdateAprilFoolsMode() { + checkBox = document.getElementById("aprilFoolsMode"); + var uri = `${apiUri}/Settings/AprilFoolsMode?enabled=${checkBox.checked}`; + console.log(uri); + PostData(uri); +} + //Komga function UpdateKomga(komgaUrl, komgaAuth){ var uri = `${apiUri}/LibraryConnectors/Update?libraryConnector=Komga&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`; diff --git a/Website/index.html b/Website/index.html index 804b644..b7f9c6c 100644 --- a/Website/index.html +++ b/Website/index.html @@ -96,6 +96,13 @@ API Settings + + + + Refresh Library Metadata Download Logs diff --git a/Website/interaction.js b/Website/interaction.js index 5133e19..6ca3e58 100644 --- a/Website/interaction.js +++ b/Website/interaction.js @@ -73,6 +73,7 @@ const settingNtfyConfigured = document.querySelector("#ntfyConfigured"); const settingUserAgent = document.querySelector("#userAgent"); const settingApiUri = document.querySelector("#settingApiUri"); +const settingAprilFoolsMode = document.querySelector("#aprilFoolsMode"); const settingCSSStyle = document.querySelector('#cssStyle'); const newMangaPopup = document.querySelector("#newMangaPopup"); const newMangaConnector = document.querySelector("#newMangaConnector"); @@ -562,6 +563,7 @@ function OpenSettings(){ //console.log(json); settingApiUri.value = apiUri; settingUserAgent.value = json.userAgent; + settingAprilFoolsMode.checked = json.aprilFoolsMode; //console.log(json.styleSheet); }); GetRateLimits().then((json) => { diff --git a/Website/styles/base.css b/Website/styles/base.css index ee80fc5..007506b 100644 --- a/Website/styles/base.css +++ b/Website/styles/base.css @@ -421,10 +421,10 @@ popup popup-window { } popup#jobStatusView popup-window { - left: 20%; - top: 20%; - height: 60%; - width: 60%; + left: 10%; + top: 10%; + height: 80%; + width: 80%; } popup-content{ @@ -957,4 +957,63 @@ footer-tag-popup::before{ font-size: 12pt; color: var(--secondary-color); cursor: pointer; -} \ No newline at end of file +} + + + /* The switch - the box around the slider */ + .switch-toggle { + position: relative; + width: 40px; + height: 20px; + margin-left: auto; + float: right; + margin-right: 2px; + } + + /* Hide default HTML checkbox */ + .switch-toggle input { + opacity: 0; + width: 0; + height: 0; + } + + /* The slider */ + .slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + -webkit-transition: .4s; + transition: .4s; + border-radius: 34px; + } + + .slider:before { + position: absolute; + content: ""; + height: 12px; + width: 12px; + left: 4px; + bottom: 4px; + background-color: white; + -webkit-transition: .4s; + transition: .4s; + border-radius: 50%; + } + + input:checked + .slider { + background-color: var(--primary-color); + } + + input:focus + .slider { + box-shadow: 0 0 1px var(--primary-color); + } + + input:checked + .slider:before { + -webkit-transform: translateX(20px); + -ms-transform: translateX(20px); + transform: translateX(20px); + } \ No newline at end of file From 4c840bf318a02639bdfc826444ee0fb8bffd934c Mon Sep 17 00:00:00 2001 From: db-2001 Date: Sun, 21 Apr 2024 13:51:44 -0400 Subject: [PATCH 11/21] C9Glax/tranga-website#59 --- Website/apiConnector.js | 13 ++++++++++++- Website/index.html | 12 +++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Website/apiConnector.js b/Website/apiConnector.js index 33a3886..aa5f40a 100644 --- a/Website/apiConnector.js +++ b/Website/apiConnector.js @@ -240,10 +240,21 @@ Date.prototype.timeNow = function () { function UpdateAprilFoolsMode() { checkBox = document.getElementById("aprilFoolsMode"); var uri = `${apiUri}/Settings/AprilFoolsMode?enabled=${checkBox.checked}`; - console.log(uri); PostData(uri); } +function ResetRateLimits() { + var uri = `${apiUri}/Settings/customRequestLimit/Reset`; + PostData(uri); + OpenSettings(); +} + +function ResetUserAgent() { + var uri = `${apiUri}/Settings/userAgent/Reset`; + PostData(uri); + OpenSettings(); +} + //Komga function UpdateKomga(komgaUrl, komgaAuth){ var uri = `${apiUri}/LibraryConnectors/Update?libraryConnector=Komga&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`; diff --git a/Website/index.html b/Website/index.html index b7f9c6c..7142dba 100644 --- a/Website/index.html +++ b/Website/index.html @@ -104,7 +104,7 @@ - Refresh Library Metadata + Reset User Agent Download Logs @@ -114,13 +114,19 @@ + + Reset All Rate Limits +
- Appearance - + + Refresh Library Metadata +
From a3479bcf8b313e217abd23fb9b8213c379735710 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Sun, 21 Apr 2024 14:18:30 -0400 Subject: [PATCH 12/21] C9Glax/tranga-website#79 --- Website/index.html | 2 +- Website/interaction.js | 12 +++++++++++- Website/styles/base.css | 4 ---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Website/index.html b/Website/index.html index 7142dba..c5ea14a 100644 --- a/Website/index.html +++ b/Website/index.html @@ -23,7 +23,7 @@ Filter by: - × + ×
diff --git a/Website/interaction.js b/Website/interaction.js index 6ca3e58..7700f8b 100644 --- a/Website/interaction.js +++ b/Website/interaction.js @@ -15,6 +15,7 @@ let statusNameMatch = []; const searchBox = document.querySelector("#searchbox"); const settingsPopup = document.querySelector("#settingsPopup"); const filterBox = document.querySelector("#filterBox"); +const filterContent = document.querySelector("#filterContent"); const settingsCog = document.querySelector("#settingscog"); const filterFunnel = document.querySelector("#filterFunnel"); const tasksContent = document.querySelector("content"); @@ -184,6 +185,15 @@ function Setup(){ } Setup(); +function ToggleFilterBox() { + if (filterBox.style.display == 'none') { + filterBox.style.display = 'flex'; + } else { + filterBox.style.display = 'none'; + } + filterContent.scrollTop = 0; +} + function ToggleFilterConnector(connector, event) { //console.log("Initial Array:"); //console.log(connectorMatch); @@ -508,7 +518,7 @@ settingsCog.addEventListener("click", () => { }); filterFunnel.addEventListener("click", () => { - filterBox.classList.toggle("animate"); + ToggleFilterBox(); }); settingKomgaUrl.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); diff --git a/Website/styles/base.css b/Website/styles/base.css index 007506b..714cdd2 100644 --- a/Website/styles/base.css +++ b/Website/styles/base.css @@ -95,10 +95,6 @@ filter-box { height: 600px; } -filter-box.animate { - display: flex; -} - filter-box border-bar popup-title{ font-size: 12pt; } From 2c045740fc9de96c5cdc2222aa8942bbcda1d257 Mon Sep 17 00:00:00 2001 From: db-2001 Date: Wed, 24 Apr 2024 22:23:49 -0400 Subject: [PATCH 13/21] Search Window refresh --- Website/apiConnector.js | 11 +- Website/index.html | 32 ++-- Website/interaction.js | 224 ++++++++++++++++++++++-- Website/media/check-circle.svg | 4 + Website/media/person.svg | 3 + Website/styles/base.css | 306 +++++++++++++++++++++++++++++---- 6 files changed, 519 insertions(+), 61 deletions(-) create mode 100644 Website/media/check-circle.svg create mode 100644 Website/media/person.svg diff --git a/Website/apiConnector.js b/Website/apiConnector.js index aa5f40a..9bf7d7d 100644 --- a/Website/apiConnector.js +++ b/Website/apiConnector.js @@ -1,4 +1,6 @@ -let apiUri = `${window.location.protocol}//${window.location.host}/api` +//let apiUri = `${window.location.protocol}//${window.location.host}/api` + +let apiUri = `http://192.168.1.79:6531`; // if(getCookie("apiUri") != ""){ // apiUri = getCookie("apiUri"); @@ -150,9 +152,10 @@ async function GetRateLimits() { return json; } -function CreateMonitorJob(connector, internalId, language){ - var uri = `${apiUri}/Jobs/MonitorManga?connector=${connector}&internalId=${internalId}&interval=03:00:00&translatedLanguage=${language}`; - PostData(uri); +function CreateMonitorJob(connector, internalId, language, interval, folder, chapterNo){ + var uri = `${apiUri}/Jobs/MonitorManga?connector=${connector}&internalId=${internalId}&interval=${interval}&translatedLanguage=${language}&ignoreBelowChapterNum=${chapterNo}&customFolderName=${folder}`; + //console.log(uri); + PostData(uri); } function CreateDownloadNewChaptersJob(connector, internalId, language){ diff --git a/Website/index.html b/Website/index.html index c5ea14a..9df5fba 100644 --- a/Website/index.html +++ b/Website/index.html @@ -68,16 +68,27 @@ -
- - -
-
+ + + Search + × + + +
+
+
+
+ + +
+
+ + @@ -294,6 +305,7 @@ +
diff --git a/Website/interaction.js b/Website/interaction.js index 5434535..6ad91ed 100644 --- a/Website/interaction.js +++ b/Website/interaction.js @@ -60,7 +60,8 @@ const settingLunaseaWebhook = document.querySelector("#lunaseaWebhook"); //Ntfy const settingNtfyEndpoint = document.querySelector("#ntfyEndpoint"); -const settingNtfyAuth = document.querySelector("#ntfyAuth"); +const settingNtfyUser = document.querySelector("#ntfyUser"); +const settingNtfyPass = document.querySelector("#ntfyPass"); //Connector Configured const settingKomgaConfigured = document.querySelector("#komgaConfigured"); @@ -758,7 +759,7 @@ settingGotifyUrl.addEventListener("keypress", (event) => { if(event.key === "Ent settingGotifyAppToken.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingLunaseaWebhook.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingNtfyEndpoint.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); -settingNtfyAuth.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); +settingNtfyPass.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingUserAgent.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingApiUri.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); @@ -785,7 +786,8 @@ function OpenSettings(){ settingGotifyUrl.value = ""; settingGotifyAppToken.value = ""; settingLunaseaWebhook.value = ""; - settingNtfyAuth.value = ""; + settingNtfyUser.value = ""; + settingNtfyPass.value = ""; settingNtfyEndpoint.value = ""; settingUserAgent.value = ""; settingApiUri.value = ""; @@ -850,7 +852,8 @@ function OpenSettings(){ case "Ntfy": settingNtfyConfigured.setAttribute("configuration", "Active"); settingNtfyEndpoint.placeholder = connector.endpoint; - settingNtfyAuth.placeholder = "***"; + settingNtfyUser.placeholder = "***" + settingNtfyPass.placeholder = "***"; break; default: console.log("Unknown type"); @@ -893,7 +896,8 @@ function ClearLunasea(){ function ClearNtfy(){ settingNtfyEndpoint.value = ""; - settingNtfyAuth.value = ""; + settingNtfyUser.value = ""; + settingNtfyPass.value = ""; settingNtfyConfigured.setAttribute("configuration", "Not Configured"); ResetNtfy(); } @@ -927,8 +931,8 @@ function UpdateSettings(){ } if(settingNtfyEndpoint.value != "" && - settingNtfyAuth.value != ""){ - UpdateNtfy(settingNtfyEndpoint.value, settingNtfyAuth.value); + settingNtfyUser.value != ""){ + UpdateNtfy(settingNtfyEndpoint.value, settingNtfyUser.value, settingNtfyPass.value); } if(settingUserAgent.value != ""){