diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index d9bd4a0..0250664 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: @@ -17,12 +19,12 @@ jobs: # https://github.com/docker/setup-qemu-action#usage - name: Set up QEMU - uses: docker/setup-qemu-action@v2.2.0 + uses: docker/setup-qemu-action@v3.2.0 # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.6.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -33,12 +35,12 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push Website - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v6.7.0 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 + platforms: linux/amd64,linux/arm64 pull: true push: true tags: | diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index a8d6df0..cee166c 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: @@ -17,12 +19,12 @@ jobs: # https://github.com/docker/setup-qemu-action#usage - name: Set up QEMU - uses: docker/setup-qemu-action@v2.2.0 + uses: docker/setup-qemu-action@v3.2.0 # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.6.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -33,12 +35,12 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push Website - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v6.7.0 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 + platforms: linux/amd64,linux/arm64 pull: true push: true tags: | diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index 49e2f7d..d3770bd 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -19,12 +19,12 @@ jobs: # https://github.com/docker/setup-qemu-action#usage - name: Set up QEMU - uses: docker/setup-qemu-action@v2.2.0 + uses: docker/setup-qemu-action@v3.2.0 # https://github.com/marketplace/actions/docker-setup-buildx - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.6.1 # https://github.com/docker/login-action#docker-hub - name: Login to Docker Hub @@ -35,12 +35,12 @@ jobs: # https://github.com/docker/build-push-action#multi-platform-image - name: Build and push Website - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v6.7.0 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 + platforms: linux/amd64,linux/arm64 pull: true push: true tags: | diff --git a/Dockerfile b/Dockerfile index d178671..9a9592a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ FROM nginx:alpine3.17-slim -COPY . /usr/share/nginx/html +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/Website/index.html b/Website/index.html index 74e58a9..f618366 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..6f57bc9 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'; }); @@ -176,7 +174,7 @@ function Setup(){ } setInterval(() => { UpdateJobs(); - }, 1000); + }, 5000); }); //Clear the previous values if any exist. searchBox.value = ""; @@ -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,14 +555,13 @@ function OpenSettings(){ coverRL.value = ""; imageRL.value = ""; infoRL.value = ""; - mDexAuthorRL.value = ""; mDexFeedRL.value = ""; mDexImageRL.value = ""; GetSettings().then((json) => { //console.log(json); - settingApiUri.value = apiUri; - settingUserAgent.value = json.userAgent; + settingApiUri.placeholder = apiUri; + settingUserAgent.placeholder = json.userAgent; //console.log(json.styleSheet); }); GetRateLimits().then((json) => { @@ -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'; }); @@ -583,15 +578,15 @@ function OpenSettings(){ switch(libraryConnectorTypes[connector.libraryType]){ case "Kavita": settingKavitaConfigured.setAttribute("configuration", "Active"); - settingKavitaUrl.value = connector.baseUrl; - settingKavitaUser.value = "***"; - settingKavitaPass.value = "***"; + settingKavitaUrl.placeholder = connector.baseUrl; + settingKavitaUser.placeholder = "***"; + settingKavitaPass.placeholder = "***"; break; case "Komga": settingKomgaConfigured.setAttribute("configuration", "Active"); - settingKomgaUrl.value = connector.baseUrl; - settingKomgaUser.value = "***"; - settingKomgaPass.value = "***"; + settingKomgaUrl.placeholder = connector.baseUrl; + settingKomgaUser.placeholder = "***"; + settingKomgaPass.placeholder = "***"; break; default: console.log("Unknown type"); @@ -604,18 +599,18 @@ function OpenSettings(){ json.forEach(connector => { switch(notificationConnectorTypes[connector.notificationConnectorType]){ case "Gotify": - settingGotifyUrl.value = connector.endpoint; - settingGotifyAppToken.value = "***"; + settingGotifyUrl.placeholder = connector.endpoint; + settingGotifyAppToken.placeholder = "***"; settingGotifyConfigured.setAttribute("configuration", "Active"); break; case "LunaSea": settingLunaseaConfigured.setAttribute("configuration", "Active"); - settingLunaseaWebhook.value = connector.id; + settingLunaseaWebhook.placeholder = connector.id; break; case "Ntfy": settingNtfyConfigured.setAttribute("configuration", "Active"); - settingNtfyEndpoint.value = connector.endpoint; - settingNtfyAuth.value = "***"; + settingNtfyEndpoint.placeholder = connector.endpoint; + settingNtfyAuth.placeholder = "***"; break; default: console.log("Unknown type"); @@ -716,10 +711,6 @@ function UpdateSettings(){ UpdateRateLimit(6, infoRL.value); } - if (mDexAuthorRL.value != "") { - UpdateRateLimit(5, mDexAuthorRL.value); - } - if (mDexFeedRL.value != "") { UpdateRateLimit(1, mDexFeedRL.value); } @@ -882,4 +873,4 @@ const stringToColour = (str) => { colour += value.toString(16).padStart(2, '0') } return colour -} \ 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/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 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