diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index cf3f8c0..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/app" - schedule: - interval: "daily" - - - package-ecosystem: "gomod" - directory: "/api" - schedule: - interval: "daily" - - - package-ecosystem: "docker" - directory: "/app" - schedule: - interval: "weekly" - - - package-ecosystem: "docker" - directory: "/api" - schedule: - interval: "weekly" diff --git a/README.md b/README.md index 6ea749e..ae7723d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # website | my personal website -![Version](https://img.shields.io/github/package-json/v/ngn13/ngn13.fun?filename=app%2Fpackage.json&color=blue) -![Website Status](https://img.shields.io/website?up_color=green&down_color=red&url=https%3A%2F%2Fngn.tf&label=Website%20Status) -![API Status](https://img.shields.io/website?up_color=green&down_color=red&url=https%3A%2F%2Fapi.ngn.tf&label=API%20Status) + +![](https://git.ngn.tf/ngn/website/actions/workflows/build-app.yml/badge.svg) +![](https://git.ngn.tf/ngn/website/actions/workflows/build-api.yml/badge.svg) +![](https://git.ngn.tf/ngn/website/actions/workflows/build-doc.yml/badge.svg) This repo contains all the source code for my personal website, [ngn.tf](https://ngn.tf) All code is licensed under AGPL version 3 (see [LICENSE.txt](LICENSE.txt)) @@ -68,6 +69,7 @@ on my local git server until I deleted it when I was done with 6.0. This website - **v4.0 (2023 november - 2024 october)**: In this version the frontend was still similar to 3.0, the big changes are in the API. I rewrote the API with Fiber. This version was the first version hosted on `ngn.tf` which is my new domain name. +Here is a [picture of the index](assets/4.0_index.png) and the [blog page](assets/4.0_blog.png). - **v5.0 (2024 october - 2025 january)**: This version just had simple frontend UI changes compared to 4.0, at this point I was thinking about doing a massive rework (which I did with 6.0), however I was working on some other shit at @@ -81,6 +83,6 @@ and Turkish, which was something I wanted to do for the longest time ever. Damn it has been 4 years since I wrote that shit HTML page huh? Time flies... -## Screenshots (from v4.0) -![](assets/4.0_index.png) -![](assets/4.0_blog.png) +## Screenshots (from v6.0) +![](assets/6.0_index.png) +![](assets/6.0_services.png) diff --git a/admin/admin.py b/admin/admin.py index a9f8525..65f4d95 100644 --- a/admin/admin.py +++ b/admin/admin.py @@ -218,6 +218,7 @@ class AdminScript: "logs": self.get_logs, } self.api_url_env = "API_URL" + self.password_env = "API_PASSWORD" def __format_time(self, ts: int) -> str: return datetime.fromtimestamp(ts, UTC).strftime("%H:%M:%S %d/%m/%Y") @@ -264,7 +265,10 @@ class AdminScript: return False try: - password = self.log.password("Please enter the admin password") + password = getenv(self.password_env) + if password is None: + password = self.log.password("Please enter the admin password") + self.api = AdminAPI(url, password) if len(argv) == 2: diff --git a/app/Dockerfile b/app/Dockerfile index 9d5af1a..03128f5 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,5 +1,5 @@ # build the application with node -FROM node:23.5.0 AS build +FROM node:23.6.0 AS build ARG WEBSITE_REPORT_URL ARG WEBSITE_SOURCE_URL diff --git a/app/package-lock.json b/app/package-lock.json index 2a50ba2..10edb91 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -8,7 +8,6 @@ "name": "website", "version": "6.0", "dependencies": { - "@types/dompurify": "^3.2.0", "dompurify": "^3.2.3", "marked": "^15.0.6", "svelte-i18n": "^4.0.1" @@ -845,10 +844,11 @@ } }, "node_modules/@sveltejs/adapter-node": { - "version": "5.2.11", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-5.2.11.tgz", - "integrity": "sha512-lR7/dfUaKFf3aI408KRDy/BVDYoqUws7zNOJz2Hl4JoshlTnMgdha3brXBRFXB+cWtYvJjjPhvmq3xqpbioi4w==", + "version": "5.2.12", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-5.2.12.tgz", + "integrity": "sha512-0bp4Yb3jKIEcZWVcJC/L1xXp9zzJS4hDwfb4VITAkfT4OVdkspSHsx7YhqJDbb2hgLl6R9Vs7VQR+fqIVOxPUQ==", "dev": true, + "license": "MIT", "dependencies": { "@rollup/plugin-commonjs": "^28.0.1", "@rollup/plugin-json": "^6.1.0", @@ -892,10 +892,11 @@ } }, "node_modules/@sveltejs/vite-plugin-svelte": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-4.0.3.tgz", - "integrity": "sha512-J7nC5gT5qpmvyD2pmzPUntLUgoinyEaNy9sTpGGE6N7pblggO0A1NyneJJvR2ELlzK6ti28aF2SLXG1yJdnJeA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-4.0.4.tgz", + "integrity": "sha512-0ba1RQ/PHen5FGpdSrW7Y3fAMQjrXantECALeOiOdBdzR5+5vPP6HVZRLmZaQL+W8m++o+haIAKq5qT+MiZ7VA==", "dev": true, + "license": "MIT", "dependencies": { "@sveltejs/vite-plugin-svelte-inspector": "^3.0.0-next.0||^3.0.0", "debug": "^4.3.7", @@ -912,11 +913,12 @@ "vite": "^5.0.0" } }, - "node_modules/@sveltejs/vite-plugin-svelte/node_modules/@sveltejs/vite-plugin-svelte-inspector": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-3.0.0.tgz", - "integrity": "sha512-hBxSYW/66989cq9dN248omD/ziskSdIV1NqfuueuAI1z6jGcg14k9Zd98pDIEnoA6wC9kWUGuQ6adzBbWwQyRg==", + "node_modules/@sveltejs/vite-plugin-svelte-inspector": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-3.0.1.tgz", + "integrity": "sha512-2CKypmj1sM4GE7HjllT7UKmo4Q6L5xFRd7VMGEWhYnZ+wc6AUVU01IBd7yUi6WnFndEwWoMNOd6e8UjoN0nbvQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.7" }, @@ -936,15 +938,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/dompurify": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.2.0.tgz", - "integrity": "sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==", - "deprecated": "This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.", - "dependencies": { - "dompurify": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", @@ -1547,9 +1540,9 @@ } }, "node_modules/prettier-plugin-svelte": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.3.2.tgz", - "integrity": "sha512-kRPjH8wSj2iu+dO+XaUv4vD8qr5mdDmlak3IT/7AOgGIMRG86z/EHOLauFcClKEnOUf4A4nOA7sre5KrJD4Raw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.3.3.tgz", + "integrity": "sha512-yViK9zqQ+H2qZD1w/bH7W8i+bVfKrD8GIFjkFe4Thl6kCT9SlAsXVNmt3jCvQOCsnOhcvYgsoVlRV/Eu6x5nNw==", "dev": true, "license": "MIT", "peerDependencies": { diff --git a/assets/6.0_index.png b/assets/6.0_index.png new file mode 100644 index 0000000..157844b Binary files /dev/null and b/assets/6.0_index.png differ diff --git a/assets/6.0_services.png b/assets/6.0_services.png new file mode 100644 index 0000000..5652209 Binary files /dev/null and b/assets/6.0_services.png differ