Compare commits
3 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
8bdbe8ea36 | ||
|
|
af7ebe813b | ||
|
|
dabc4e5c47 |
264
web/package-lock.json
generated
264
web/package-lock.json
generated
@@ -32,6 +32,7 @@
|
||||
"lodash-es": "4.17.21",
|
||||
"mime-types": "3.0.1",
|
||||
"object-to-formdata": "4.5.1",
|
||||
"qrcode": "1.5.4",
|
||||
"react": "19.1.0",
|
||||
"redis": "5.0.1",
|
||||
"schema-dts": "1.1.5",
|
||||
@@ -56,6 +57,7 @@
|
||||
"@tailwindcss/typography": "0.5.16",
|
||||
"@types/eslint__js": "9.14.0",
|
||||
"@types/lodash-es": "4.17.12",
|
||||
"@types/qrcode": "1.5.5",
|
||||
"@types/react": "19.1.4",
|
||||
"@types/seedrandom": "3.0.8",
|
||||
"@typescript-eslint/parser": "8.32.1",
|
||||
@@ -3160,6 +3162,16 @@
|
||||
"pg-types": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/qrcode": {
|
||||
"version": "1.5.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.5.tgz",
|
||||
"integrity": "sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/react": {
|
||||
"version": "19.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.4.tgz",
|
||||
@@ -5686,6 +5698,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/decamelize": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
|
||||
"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/decode-named-character-reference": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.1.0.tgz",
|
||||
@@ -5907,6 +5928,12 @@
|
||||
"node": ">=0.3.1"
|
||||
}
|
||||
},
|
||||
"node_modules/dijkstrajs": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
|
||||
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/dlv": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
|
||||
@@ -11110,6 +11137,15 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/p-try": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
|
||||
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/package-manager-detector": {
|
||||
"version": "0.2.9",
|
||||
"resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.9.tgz",
|
||||
@@ -11238,7 +11274,6 @@
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
|
||||
"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
@@ -11349,6 +11384,15 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/pngjs": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
|
||||
"integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
}
|
||||
},
|
||||
"node_modules/possible-typed-array-names": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
|
||||
@@ -11724,6 +11768,206 @@
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode": {
|
||||
"version": "1.5.4",
|
||||
"resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
|
||||
"integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"dijkstrajs": "^1.0.1",
|
||||
"pngjs": "^5.0.0",
|
||||
"yargs": "^15.3.1"
|
||||
},
|
||||
"bin": {
|
||||
"qrcode": "bin/qrcode"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/ansi-regex": {
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
|
||||
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/ansi-styles": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"color-convert": "^2.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/camelcase": {
|
||||
"version": "5.3.1",
|
||||
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
|
||||
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/cliui": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
|
||||
"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"string-width": "^4.2.0",
|
||||
"strip-ansi": "^6.0.0",
|
||||
"wrap-ansi": "^6.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/emoji-regex": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
|
||||
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/qrcode/node_modules/find-up": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
|
||||
"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"locate-path": "^5.0.0",
|
||||
"path-exists": "^4.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/locate-path": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
|
||||
"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"p-locate": "^4.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/p-limit": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
|
||||
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"p-try": "^2.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/p-locate": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
|
||||
"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"p-limit": "^2.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/string-width": {
|
||||
"version": "4.2.3",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"emoji-regex": "^8.0.0",
|
||||
"is-fullwidth-code-point": "^3.0.0",
|
||||
"strip-ansi": "^6.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/strip-ansi": {
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
||||
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ansi-regex": "^5.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/wrap-ansi": {
|
||||
"version": "6.2.0",
|
||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
|
||||
"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ansi-styles": "^4.0.0",
|
||||
"string-width": "^4.1.0",
|
||||
"strip-ansi": "^6.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/y18n": {
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
|
||||
"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/qrcode/node_modules/yargs": {
|
||||
"version": "15.4.1",
|
||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
|
||||
"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cliui": "^6.0.0",
|
||||
"decamelize": "^1.2.0",
|
||||
"find-up": "^4.1.0",
|
||||
"get-caller-file": "^2.0.1",
|
||||
"require-directory": "^2.1.1",
|
||||
"require-main-filename": "^2.0.0",
|
||||
"set-blocking": "^2.0.0",
|
||||
"string-width": "^4.2.0",
|
||||
"which-module": "^2.0.0",
|
||||
"y18n": "^4.0.0",
|
||||
"yargs-parser": "^18.1.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/qrcode/node_modules/yargs-parser": {
|
||||
"version": "18.1.3",
|
||||
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
|
||||
"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"camelcase": "^5.0.0",
|
||||
"decamelize": "^1.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/queue-microtask": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
|
||||
@@ -12168,6 +12412,12 @@
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/require-main-filename": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
|
||||
"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/resolve": {
|
||||
"version": "1.22.10",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
|
||||
@@ -12539,6 +12789,12 @@
|
||||
"integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/set-blocking": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
|
||||
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/set-function-length": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
|
||||
@@ -14550,6 +14806,12 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/which-module": {
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
|
||||
"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/which-pm-runs": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz",
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
"@astrojs/node": "9.2.1",
|
||||
"@astrojs/sitemap": "3.4.0",
|
||||
"@fontsource-variable/space-grotesk": "5.2.7",
|
||||
"@fontsource/space-grotesk": "5.2.7",
|
||||
"@fontsource/inter": "5.2.5",
|
||||
"@fontsource/space-grotesk": "5.2.7",
|
||||
"@prisma/client": "6.8.2",
|
||||
"@tailwindcss/vite": "4.1.7",
|
||||
"@types/mime-types": "2.1.4",
|
||||
@@ -44,6 +44,7 @@
|
||||
"lodash-es": "4.17.21",
|
||||
"mime-types": "3.0.1",
|
||||
"object-to-formdata": "4.5.1",
|
||||
"qrcode": "1.5.4",
|
||||
"react": "19.1.0",
|
||||
"redis": "5.0.1",
|
||||
"schema-dts": "1.1.5",
|
||||
@@ -68,6 +69,7 @@
|
||||
"@tailwindcss/typography": "0.5.16",
|
||||
"@types/eslint__js": "9.14.0",
|
||||
"@types/lodash-es": "4.17.12",
|
||||
"@types/qrcode": "1.5.5",
|
||||
"@types/react": "19.1.4",
|
||||
"@types/seedrandom": "3.0.8",
|
||||
"@typescript-eslint/parser": "8.32.1",
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "Announcement" ADD COLUMN "link" TEXT;
|
||||
@@ -0,0 +1,8 @@
|
||||
/*
|
||||
Warnings:
|
||||
|
||||
- You are about to drop the column `title` on the `Announcement` table. All the data in the column will be lost.
|
||||
|
||||
*/
|
||||
-- AlterTable
|
||||
ALTER TABLE "Announcement" DROP COLUMN "title";
|
||||
@@ -0,0 +1,2 @@
|
||||
-- AlterTable
|
||||
ALTER TABLE "Announcement" ADD COLUMN "linkText" TEXT;
|
||||
@@ -613,9 +613,10 @@ model ServiceUser {
|
||||
|
||||
model Announcement {
|
||||
id Int @id @default(autoincrement())
|
||||
title String
|
||||
content String
|
||||
type AnnouncementType
|
||||
link String?
|
||||
linkText String?
|
||||
startDate DateTime
|
||||
endDate DateTime?
|
||||
isActive Boolean @default(true)
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
EventType,
|
||||
type User,
|
||||
ServiceUserRole,
|
||||
AnnouncementType,
|
||||
} from '@prisma/client'
|
||||
import { uniqBy } from 'lodash-es'
|
||||
import { generateUsername } from 'unique-username-generator'
|
||||
@@ -981,6 +982,22 @@ const generateFakeInternalNote = (userId: number, addedByUserId?: number) =>
|
||||
addedByUser: addedByUserId ? { connect: { id: addedByUserId } } : undefined,
|
||||
}) satisfies Prisma.InternalUserNoteCreateInput
|
||||
|
||||
const generateFakeAnnouncement = () => {
|
||||
const type = faker.helpers.arrayElement(Object.values(AnnouncementType))
|
||||
const startDate = faker.date.past()
|
||||
const endDate = faker.helpers.maybe(() => faker.date.future(), { probability: 0.3 })
|
||||
|
||||
return {
|
||||
content: faker.lorem.sentence(),
|
||||
type,
|
||||
link: faker.internet.url(),
|
||||
linkText: faker.lorem.word({ length: 2 }),
|
||||
startDate,
|
||||
endDate,
|
||||
isActive: true,
|
||||
} as const satisfies Prisma.AnnouncementCreateInput
|
||||
}
|
||||
|
||||
async function runFaker() {
|
||||
await prisma.$transaction(
|
||||
async (tx) => {
|
||||
@@ -1004,6 +1021,7 @@ async function runFaker() {
|
||||
await tx.category.deleteMany()
|
||||
await tx.internalUserNote.deleteMany()
|
||||
await tx.user.deleteMany()
|
||||
await tx.announcement.deleteMany()
|
||||
console.info('✅ Existing data cleaned up')
|
||||
} catch (error) {
|
||||
console.error('❌ Error cleaning up data:', error)
|
||||
@@ -1307,6 +1325,11 @@ async function runFaker() {
|
||||
)
|
||||
})
|
||||
)
|
||||
|
||||
// ---- Create announcement ----
|
||||
await tx.announcement.create({
|
||||
data: generateFakeAnnouncement(),
|
||||
})
|
||||
},
|
||||
{
|
||||
timeout: 1000 * 60 * 10, // 10 minutes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { type Prisma, type PrismaClient, type AnnouncementType } from '@prisma/client'
|
||||
import { type Prisma, type PrismaClient } from '@prisma/client'
|
||||
import { ActionError } from 'astro:actions'
|
||||
import { z } from 'zod'
|
||||
|
||||
@@ -9,9 +9,10 @@ const prisma = prismaInstance as PrismaClient
|
||||
|
||||
const selectAnnouncementReturnFields = {
|
||||
id: true,
|
||||
title: true,
|
||||
content: true,
|
||||
type: true,
|
||||
link: true,
|
||||
linkText: true,
|
||||
startDate: true,
|
||||
endDate: true,
|
||||
isActive: true,
|
||||
@@ -24,12 +25,18 @@ export const adminAnnouncementActions = {
|
||||
accept: 'form',
|
||||
permissions: 'admin',
|
||||
input: z.object({
|
||||
title: z.string().min(1, 'Title is required').max(255, 'Title must be less than 255 characters'),
|
||||
content: z
|
||||
.string()
|
||||
.min(1, 'Content is required')
|
||||
.max(1000, 'Content must be less than 1000 characters'),
|
||||
type: z.enum(['INFO', 'WARNING', 'ALERT']),
|
||||
link: z.string().url().nullable().optional(),
|
||||
linkText: z
|
||||
.string()
|
||||
.min(1, 'Link text is required')
|
||||
.max(255, 'Link text must be less than 255 characters')
|
||||
.nullable()
|
||||
.optional(),
|
||||
startDate: z.coerce.date(),
|
||||
endDate: z.coerce.date().nullable().optional(),
|
||||
isActive: z.coerce.boolean().default(true),
|
||||
@@ -37,8 +44,13 @@ export const adminAnnouncementActions = {
|
||||
handler: async (input) => {
|
||||
const announcement = await prisma.announcement.create({
|
||||
data: {
|
||||
...input,
|
||||
endDate: input.endDate || null,
|
||||
content: input.content,
|
||||
type: input.type,
|
||||
startDate: input.startDate,
|
||||
isActive: input.isActive,
|
||||
link: input.link ?? null,
|
||||
linkText: input.linkText ?? null,
|
||||
endDate: input.endDate ?? null,
|
||||
},
|
||||
select: selectAnnouncementReturnFields,
|
||||
})
|
||||
@@ -52,12 +64,18 @@ export const adminAnnouncementActions = {
|
||||
permissions: 'admin',
|
||||
input: z.object({
|
||||
id: z.coerce.number().int().positive(),
|
||||
title: z.string().min(1, 'Title is required').max(255, 'Title must be less than 255 characters'),
|
||||
content: z
|
||||
.string()
|
||||
.min(1, 'Content is required')
|
||||
.max(1000, 'Content must be less than 1000 characters'),
|
||||
type: z.enum(['INFO', 'WARNING', 'ALERT']),
|
||||
link: z.string().url().nullable().optional(),
|
||||
linkText: z
|
||||
.string()
|
||||
.min(1, 'Link text is required')
|
||||
.max(255, 'Link text must be less than 255 characters')
|
||||
.nullable()
|
||||
.optional(),
|
||||
startDate: z.coerce.date(),
|
||||
endDate: z.coerce.date().nullable().optional(),
|
||||
isActive: z.coerce.boolean().default(true),
|
||||
@@ -82,8 +100,13 @@ export const adminAnnouncementActions = {
|
||||
const updatedAnnouncement = await prisma.announcement.update({
|
||||
where: { id: announcement.id },
|
||||
data: {
|
||||
...input,
|
||||
endDate: input.endDate || null,
|
||||
content: input.content,
|
||||
type: input.type,
|
||||
startDate: input.startDate,
|
||||
isActive: input.isActive,
|
||||
link: input.link ?? null,
|
||||
linkText: input.linkText ?? null,
|
||||
endDate: input.endDate ?? null,
|
||||
},
|
||||
select: selectAnnouncementReturnFields,
|
||||
})
|
||||
|
||||
@@ -1,82 +1,92 @@
|
||||
---
|
||||
import { Icon } from 'astro-icon/components'
|
||||
import { Markdown } from 'astro-remote'
|
||||
|
||||
import type { AnnouncementType } from '@prisma/client'
|
||||
import { getAnnouncementTypeInfo } from '../constants/announcementTypes'
|
||||
import { cn } from '../lib/cn'
|
||||
|
||||
export type Announcement = {
|
||||
id: number
|
||||
title: string
|
||||
content: string
|
||||
type: AnnouncementType
|
||||
startDate: Date
|
||||
endDate: Date | null
|
||||
isActive: boolean
|
||||
import type { Prisma } from '@prisma/client'
|
||||
import type { HTMLAttributes } from 'astro/types'
|
||||
|
||||
type Props = HTMLAttributes<'div'> & {
|
||||
announcement: Prisma.AnnouncementGetPayload<{
|
||||
select: {
|
||||
id: true
|
||||
content: true
|
||||
type: true
|
||||
link: true
|
||||
linkText: true
|
||||
startDate: true
|
||||
endDate: true
|
||||
isActive: true
|
||||
}
|
||||
}>
|
||||
}
|
||||
|
||||
export type Props = {
|
||||
announcements: Announcement[]
|
||||
}
|
||||
const { announcement, class: className, ...props } = Astro.props
|
||||
|
||||
const { announcements } = Astro.props
|
||||
const typeInfo = getAnnouncementTypeInfo(announcement.type)
|
||||
|
||||
// Get icon and class based on announcement type
|
||||
const getTypeInfo = (type: AnnouncementType) => {
|
||||
switch (type) {
|
||||
case 'INFO':
|
||||
return {
|
||||
icon: 'ri:information-line',
|
||||
containerClass: 'bg-blue-900/40 border-blue-500/30',
|
||||
titleClass: 'text-blue-400',
|
||||
contentClass: 'text-blue-300',
|
||||
}
|
||||
case 'WARNING':
|
||||
return {
|
||||
icon: 'ri:alert-line',
|
||||
containerClass: 'bg-yellow-900/40 border-yellow-500/30',
|
||||
titleClass: 'text-yellow-400',
|
||||
contentClass: 'text-yellow-300',
|
||||
}
|
||||
case 'ALERT':
|
||||
return {
|
||||
icon: 'ri:error-warning-line',
|
||||
containerClass: 'bg-red-900/40 border-red-500/30',
|
||||
titleClass: 'text-red-400',
|
||||
contentClass: 'text-red-300',
|
||||
}
|
||||
default:
|
||||
return {
|
||||
icon: 'ri:information-line',
|
||||
containerClass: 'bg-blue-900/40 border-blue-500/30',
|
||||
titleClass: 'text-blue-400',
|
||||
contentClass: 'text-blue-300',
|
||||
}
|
||||
}
|
||||
}
|
||||
const Tag = announcement.link ? 'a' : 'div'
|
||||
---
|
||||
|
||||
{
|
||||
announcements.length > 0 && (
|
||||
<div class="mb-4 flex flex-col items-center space-y-1">
|
||||
{announcements.map((announcement) => {
|
||||
const typeInfo = getTypeInfo(announcement.type)
|
||||
|
||||
return (
|
||||
<div
|
||||
class={`flex flex-row items-center rounded border ${typeInfo.containerClass} mx-auto w-auto max-w-full px-3 py-2`}
|
||||
>
|
||||
<Icon name={typeInfo.icon} class={`size-4 flex-shrink-0 ${typeInfo.titleClass} mr-2`} />
|
||||
<div class="flex min-w-0 flex-col">
|
||||
<span class={`text-sm leading-tight font-bold ${typeInfo.titleClass} truncate`}>
|
||||
{announcement.title}
|
||||
</span>
|
||||
<span class={`text-xs ${typeInfo.contentClass} truncate leading-snug [&_a]:underline`}>
|
||||
<Markdown content={announcement.content} />
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
<Tag
|
||||
href={announcement.link}
|
||||
target={announcement.link ? '_blank' : undefined}
|
||||
rel="noopener noreferrer"
|
||||
class={cn(
|
||||
'group xs:px-6 2xs:px-4 relative isolate z-50 flex items-center justify-center gap-x-2 overflow-hidden border-b border-zinc-800 bg-black px-2 py-2 focus-visible:outline-none sm:gap-x-6 sm:px-3.5',
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<div
|
||||
aria-hidden="true"
|
||||
class="pointer-events-none absolute top-1/2 left-[max(-7rem,calc(50%-52rem))] -z-10 -translate-y-1/2 transform-gpu blur-2xl"
|
||||
>
|
||||
<div
|
||||
class={cn(
|
||||
'aspect-[577/310] w-[36.0625rem] bg-gradient-to-r from-green-500 to-green-700 opacity-20',
|
||||
typeInfo.classNames.bg
|
||||
)}
|
||||
style="clip-path:polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)"
|
||||
>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
<div
|
||||
aria-hidden="true"
|
||||
class="pointer-events-none absolute top-1/2 left-[max(45rem,calc(50%+8rem))] -z-10 -translate-y-1/2 transform-gpu blur-2xl"
|
||||
>
|
||||
<div
|
||||
class={cn(
|
||||
'aspect-[577/310] w-[36.0625rem] bg-gradient-to-r from-green-500 to-green-700 opacity-30',
|
||||
typeInfo.classNames.bg
|
||||
)}
|
||||
style="clip-path:polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class={cn('flex items-center justify-between gap-x-3 md:justify-center', typeInfo.classNames.icon)}>
|
||||
<Icon name={typeInfo.icon} class={cn('size-5 flex-shrink-0')} />
|
||||
<span
|
||||
class={cn(
|
||||
'font-title line-clamp-3 bg-[linear-gradient(90deg,var(--gradient-edge,#FFEBF9)_0%,var(--gradient-center,#8a56cc)_50%,var(--gradient-edge,#FFEBF9)_100%)] bg-clip-text text-sm leading-tight text-pretty text-transparent [&_a]:underline',
|
||||
typeInfo.classNames.content
|
||||
)}
|
||||
>
|
||||
{announcement.content}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="text-day-300 group-focus-visible:outline-primary transition-background 2xs:px-4 relative inline-flex h-full shrink-0 cursor-pointer items-center justify-center gap-1.5 overflow-hidden rounded-full border border-white/20 bg-black/10 p-[1px] px-1 py-1 text-sm font-medium shadow-sm backdrop-blur-3xl transition-colors group-hover:bg-white/5 group-focus-visible:ring-2 group-focus-visible:ring-blue-500 group-focus-visible:ring-offset-2 group-focus-visible:ring-offset-black/80 sm:min-w-[120px]"
|
||||
>
|
||||
<span class="2xs:inline-block hidden">
|
||||
{announcement.linkText}
|
||||
</span>
|
||||
<Icon
|
||||
name="ri:arrow-right-line"
|
||||
class="size-4 shrink-0 transition-transform group-hover:translate-x-0.5"
|
||||
/>
|
||||
</div>
|
||||
</Tag>
|
||||
|
||||
60
web/src/components/DonationAddress.astro
Normal file
60
web/src/components/DonationAddress.astro
Normal file
@@ -0,0 +1,60 @@
|
||||
---
|
||||
import { Icon } from 'astro-icon/components'
|
||||
import QRCode from 'qrcode'
|
||||
|
||||
import { cn } from '../lib/cn'
|
||||
|
||||
type Props = {
|
||||
cryptoName: string
|
||||
cryptoIcon: string
|
||||
address: string
|
||||
className?: string
|
||||
}
|
||||
|
||||
const { cryptoName, cryptoIcon, address, className } = Astro.props
|
||||
|
||||
function getAddressURI(address: string, cryptoName: string) {
|
||||
if (cryptoName.toLowerCase() === 'monero') {
|
||||
return `monero:${address}?tx_description=KYCnot.me%20Donation`
|
||||
}
|
||||
|
||||
if (cryptoName.toLowerCase() === 'bitcoin') {
|
||||
return `bitcoin:${address}?label=KYCnot.me%20Donation`
|
||||
}
|
||||
|
||||
return address
|
||||
}
|
||||
|
||||
const qrCodeDataURL = await QRCode.toDataURL(getAddressURI(address, cryptoName), {
|
||||
width: 128,
|
||||
margin: 1,
|
||||
color: {
|
||||
dark: '#ffffff',
|
||||
light: '#171721',
|
||||
},
|
||||
})
|
||||
---
|
||||
|
||||
<div class={cn('bg-night-800 border-night-600 flex items-center gap-2 rounded-lg border px-3', className)}>
|
||||
<div class="flex flex-1 flex-col gap-1 py-3">
|
||||
<div class="flex items-center gap-2 px-4 pt-3">
|
||||
<Icon name={cryptoIcon} class="size-6 text-white" />
|
||||
<span class="font-title text-base font-semibold text-white">{cryptoName}</span>
|
||||
</div>
|
||||
<p class="px-7 font-mono text-base leading-snug tracking-wide break-all text-white">
|
||||
<span
|
||||
class="cursor-pointer select-all"
|
||||
set:html={address.length > 12
|
||||
? `<span class="font-bold mr-0.5 text-green-500">${address.substring(0, 6)}</span>${address.substring(6, address.length - 6)}<span class="font-bold ml-0.5 text-green-500">${address.substring(address.length - 6)}</span>`
|
||||
: `<span class="font-bold">${address}</span>`}
|
||||
/>
|
||||
</p>
|
||||
</div>
|
||||
<img
|
||||
src={qrCodeDataURL}
|
||||
alt={`${cryptoName} QR code`}
|
||||
width="128"
|
||||
height="128"
|
||||
class="mr-4 hidden size-36 rounded sm:block"
|
||||
/>
|
||||
</div>
|
||||
@@ -35,6 +35,7 @@ const splashText = showSplashText ? sample(splashTexts) : null
|
||||
'border-red-900 bg-red-500/60': !!actualUser,
|
||||
}
|
||||
)}
|
||||
transition:name="header-container"
|
||||
>
|
||||
<nav class={cn('container mx-auto flex h-full w-full items-stretch justify-between px-4', classNames?.nav)}>
|
||||
<div class="@container -ml-4 flex max-w-[192px] grow-99999 items-center">
|
||||
|
||||
75
web/src/constants/announcementTypes.ts
Normal file
75
web/src/constants/announcementTypes.ts
Normal file
@@ -0,0 +1,75 @@
|
||||
import { makeHelpersForOptions } from '../lib/makeHelpersForOptions'
|
||||
import { transformCase } from '../lib/strings'
|
||||
|
||||
import type { AnnouncementType } from '@prisma/client'
|
||||
|
||||
type AnnouncementTypeInfo<T extends string | null | undefined = string> = {
|
||||
value: T
|
||||
label: string
|
||||
icon: string
|
||||
classNames: {
|
||||
container: string
|
||||
bg: string
|
||||
content: string
|
||||
icon: string
|
||||
badge: string
|
||||
}
|
||||
}
|
||||
export const {
|
||||
dataArray: announcementTypes,
|
||||
dataObject: announcementTypesById,
|
||||
getFn: getAnnouncementTypeInfo,
|
||||
zodEnumById: zodAnnouncementTypesById,
|
||||
} = makeHelpersForOptions(
|
||||
'value',
|
||||
(value): AnnouncementTypeInfo<typeof value> => ({
|
||||
value,
|
||||
label: value ? transformCase(value.replaceAll('_', ' '), 'title') : String(value),
|
||||
icon: 'ri:information-fill',
|
||||
classNames: {
|
||||
container: 'bg-blue-950',
|
||||
bg: 'from-blue-400 to-blue-700',
|
||||
content: '[--gradient-edge:var(--color-blue-100)] [--gradient-center:var(--color-blue-200)]',
|
||||
icon: 'text-blue-400/80',
|
||||
badge: 'bg-blue-900/30 text-blue-400',
|
||||
},
|
||||
}),
|
||||
[
|
||||
{
|
||||
value: 'INFO',
|
||||
label: 'Info',
|
||||
icon: 'ri:information-fill',
|
||||
classNames: {
|
||||
container: 'bg-green-950',
|
||||
bg: 'from-green-400 to-green-700',
|
||||
content: '[--gradient-edge:var(--color-green-100)] [--gradient-center:var(--color-lime-200)]',
|
||||
icon: 'text-green-400/80',
|
||||
badge: 'bg-blue-900/30 text-blue-400',
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 'WARNING',
|
||||
label: 'Warning',
|
||||
icon: 'ri:alert-fill',
|
||||
classNames: {
|
||||
container: 'bg-yellow-950',
|
||||
bg: 'from-yellow-400 to-yellow-700',
|
||||
content: '[--gradient-edge:var(--color-yellow-100)] [--gradient-center:var(--color-amber-200)]',
|
||||
icon: 'text-yellow-400/80',
|
||||
badge: 'bg-yellow-900/30 text-yellow-400',
|
||||
},
|
||||
},
|
||||
{
|
||||
value: 'ALERT',
|
||||
label: 'Alert',
|
||||
icon: 'ri:spam-fill',
|
||||
classNames: {
|
||||
container: 'bg-red-950',
|
||||
bg: 'from-red-400 to-red-700',
|
||||
content: '[--gradient-edge:var(--color-red-100)] [--gradient-center:var(--color-rose-200)]',
|
||||
icon: 'text-red-400/80',
|
||||
badge: 'bg-red-900/30 text-red-400',
|
||||
},
|
||||
},
|
||||
] as const satisfies AnnouncementTypeInfo<AnnouncementType>[]
|
||||
)
|
||||
@@ -14,4 +14,7 @@ export const splashTexts: string[] = [
|
||||
'Ditch the gatekeepers.',
|
||||
'Own your identity.',
|
||||
'Financial privacy matters.',
|
||||
'Surveillance is the enemy of the soul.',
|
||||
'Privacy is freedom.',
|
||||
'Privacy is the freedom to try things out.',
|
||||
]
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
---
|
||||
import AnnouncementBanner from '../components/AnnouncementBanner.astro'
|
||||
import BaseHead from '../components/BaseHead.astro'
|
||||
import Footer from '../components/Footer.astro'
|
||||
import Header from '../components/Header.astro'
|
||||
import { cn } from '../lib/cn'
|
||||
import { prisma } from '../lib/prisma'
|
||||
|
||||
import type { AstroChildren } from '../lib/astro'
|
||||
import type { ComponentProps } from 'astro/types'
|
||||
@@ -42,6 +44,31 @@ const {
|
||||
|
||||
const actualErrors = [...errors, ...Astro.locals.banners.errors]
|
||||
const actualSuccess = [...success, ...Astro.locals.banners.successes]
|
||||
|
||||
const currentDate = new Date()
|
||||
const announcement = await Astro.locals.banners.try(
|
||||
'Unable to load announcements.',
|
||||
() =>
|
||||
prisma.announcement.findFirst({
|
||||
where: {
|
||||
isActive: true,
|
||||
startDate: { lte: currentDate },
|
||||
OR: [{ endDate: null }, { endDate: { gt: currentDate } }],
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
content: true,
|
||||
type: true,
|
||||
link: true,
|
||||
linkText: true,
|
||||
startDate: true,
|
||||
endDate: true,
|
||||
isActive: true,
|
||||
},
|
||||
orderBy: [{ type: 'desc' }, { createdAt: 'desc' }],
|
||||
}),
|
||||
null
|
||||
)
|
||||
---
|
||||
|
||||
<html lang="en" transition:name="root" transition:animate="none">
|
||||
@@ -51,6 +78,7 @@ const actualSuccess = [...success, ...Astro.locals.banners.successes]
|
||||
<BaseHead {...baseHeadProps} />
|
||||
</head>
|
||||
<body class={cn('bg-night-700 text-day-300 flex min-h-dvh flex-col *:shrink-0', className?.body)}>
|
||||
{announcement && <AnnouncementBanner announcement={announcement} transition:name="header-announcement" />}
|
||||
<Header
|
||||
classNames={{
|
||||
nav: cn(
|
||||
|
||||
@@ -7,6 +7,8 @@ description: 'Learn how KYCnot.me website works and about our mission to protect
|
||||
icon: 'ri:information-line'
|
||||
---
|
||||
|
||||
import DonationAddress from '../components/DonationAddress.astro'
|
||||
|
||||
## What is this page?
|
||||
|
||||
KYCnot.me is a directory of trustworthy alternatives for buying, exchanging, trading, and using cryptocurrencies without having to disclose your identity, thus preserving your right to privacy.
|
||||
@@ -188,12 +190,15 @@ Some reviews may be spam or fake. Read comments carefully and **always do your o
|
||||
|
||||
To **see comments waiting for moderation**, toggle the switch in the comments section. These comments show up with a yellow background and a "pending" label.
|
||||
|
||||
## Support the project
|
||||
## Support
|
||||
|
||||
If you like this project, you can support it through these methods:
|
||||
If you like this project, you can **support** it through these methods:
|
||||
|
||||
- Monero:
|
||||
- `88V2Xi2mvcu3NdnHkVeZGyPtACg2w3iXZdUMJugUiPvFQHv5mVkih3o43ceVGz6cVs9uTBMt4MRMVW2xFgfGdh8DTCQ7vtp`
|
||||
<DonationAddress
|
||||
cryptoName="Monero"
|
||||
cryptoIcon="monero"
|
||||
address="86nkJeHWarEYZJh3gcPGKcQeueKbq2uRRC2NX6kopBpdHFfY1j4vmrVAwRG1T4pNBwBwfJ4U4USLUZ6CjDtacp8x4y8v3rq"
|
||||
/>
|
||||
|
||||
## Contact
|
||||
|
||||
@@ -202,8 +207,7 @@ You can contact via direct chat or via email.
|
||||
- [SimpleX Chat](https://simplex.chat/contact#/?v=2&smp=smp%3A%2F%2F0YuTwO05YJWS8rkjn9eLJDjQhFKvIYd8d4xG8X1blIU%3D%40smp8.simplex.im%2FcgKHYUYnpAIVoGb9lxb0qEMEpvYIvc1O%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAIW_JSq8wOsLKG4Xv4O54uT2D_l8MJBYKQIFj1FjZpnU%253D%26srv%3Dbeccx4yfxxbvyhqypaavemqurytl6hozr47wfc7uuecacjqdvwpw2xid.onion)
|
||||
|
||||
- If you use ProtonMail or Tutanota, you can have E2E encrypted communications with us directly. We also offer a [PGP Key](/pgp). Otherwise, we recommend reaching out via SimpleX chat for encrypted communications.
|
||||
- [tuta.io](https://tuta.io) - <kycnotme@tuta.io>
|
||||
- [proton.me](https://proton.me) - <contact@kycnot.me>
|
||||
|
||||
|
||||
## Disclaimer
|
||||
|
||||
@@ -4,9 +4,19 @@ import { actions, isInputError } from 'astro:actions'
|
||||
import { z } from 'astro:schema'
|
||||
|
||||
import { adminAnnouncementActions } from '../../../actions/admin/announcement'
|
||||
import Button from '../../../components/Button.astro'
|
||||
import InputCardGroup from '../../../components/InputCardGroup.astro'
|
||||
import InputSubmitButton from '../../../components/InputSubmitButton.astro'
|
||||
import InputText from '../../../components/InputText.astro'
|
||||
import InputTextArea from '../../../components/InputTextArea.astro'
|
||||
import SortArrowIcon from '../../../components/SortArrowIcon.astro'
|
||||
import TimeFormatted from '../../../components/TimeFormatted.astro'
|
||||
import Tooltip from '../../../components/Tooltip.astro'
|
||||
import {
|
||||
announcementTypes,
|
||||
getAnnouncementTypeInfo,
|
||||
zodAnnouncementTypesById,
|
||||
} from '../../../constants/announcementTypes'
|
||||
import BaseLayout from '../../../layouts/BaseLayout.astro'
|
||||
import { zodParseQueryParamsStoringErrors } from '../../../lib/parseUrlFilters'
|
||||
import { prisma } from '../../../lib/prisma'
|
||||
@@ -20,7 +30,7 @@ const { data: filters } = zodParseQueryParamsStoringErrors(
|
||||
.default('createdAt'),
|
||||
'sort-order': z.enum(['asc', 'desc']).default('desc'),
|
||||
search: z.string().optional(),
|
||||
type: z.enum(['INFO', 'WARNING', 'ALERT']).optional(),
|
||||
type: zodAnnouncementTypesById.optional(),
|
||||
status: z.enum(['active', 'inactive']).optional(),
|
||||
},
|
||||
Astro
|
||||
@@ -35,10 +45,7 @@ const prismaOrderBy = {
|
||||
const whereClause: Prisma.AnnouncementWhereInput = {}
|
||||
|
||||
if (filters.search) {
|
||||
whereClause.OR = [
|
||||
{ title: { contains: filters.search, mode: 'insensitive' } },
|
||||
{ content: { contains: filters.search, mode: 'insensitive' } },
|
||||
]
|
||||
whereClause.OR = [{ content: { contains: filters.search, mode: 'insensitive' } }]
|
||||
}
|
||||
|
||||
if (filters.type) {
|
||||
@@ -66,32 +73,19 @@ const makeSortUrl = (slug: NonNullable<(typeof filters)['sort-by']>) => {
|
||||
return `/admin/announcements?${searchParams.toString()}`
|
||||
}
|
||||
|
||||
// Get type badge class based on announcement type
|
||||
const getTypeBadgeClass = (type: AnnouncementType) => {
|
||||
switch (type) {
|
||||
case 'INFO':
|
||||
return 'bg-blue-900/30 text-blue-400'
|
||||
case 'WARNING':
|
||||
return 'bg-yellow-900/30 text-yellow-400'
|
||||
case 'ALERT':
|
||||
return 'bg-red-900/30 text-red-400'
|
||||
default:
|
||||
return 'bg-zinc-900/30 text-zinc-400'
|
||||
}
|
||||
}
|
||||
|
||||
// Current date for form min values
|
||||
const currentDate = new Date().toISOString().slice(0, 16) // Format: YYYY-MM-DDThh:mm
|
||||
|
||||
// Default new announcement
|
||||
const newAnnouncement = {
|
||||
title: '',
|
||||
content: '',
|
||||
type: 'INFO' as const,
|
||||
link: null,
|
||||
linkText: null,
|
||||
startDate: currentDate,
|
||||
endDate: '',
|
||||
isActive: true,
|
||||
}
|
||||
isActive: true as boolean,
|
||||
} satisfies Prisma.AnnouncementCreateInput
|
||||
|
||||
// Get action results
|
||||
const createResult = Astro.getActionResult(adminAnnouncementActions.create)
|
||||
@@ -99,6 +93,8 @@ const updateResult = Astro.getActionResult(adminAnnouncementActions.update)
|
||||
const deleteResult = Astro.getActionResult(adminAnnouncementActions.delete)
|
||||
const toggleResult = Astro.getActionResult(adminAnnouncementActions.toggleActive)
|
||||
|
||||
const createInputErrors = isInputError(createResult?.error) ? createResult.error.fields : {}
|
||||
|
||||
// Add success messages to banners
|
||||
Astro.locals.banners.addIfSuccess(createResult, 'Announcement created successfully!')
|
||||
Astro.locals.banners.addIfSuccess(updateResult, 'Announcement updated successfully!')
|
||||
@@ -176,9 +172,13 @@ if (toggleResult?.error) {
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
>
|
||||
<option value="" selected={!filters.type}>All Types</option>
|
||||
<option value="INFO" selected={filters.type === 'INFO'}>Info</option>
|
||||
<option value="WARNING" selected={filters.type === 'WARNING'}>Warning</option>
|
||||
<option value="ALERT" selected={filters.type === 'ALERT'}>Alert</option>
|
||||
{
|
||||
announcementTypes.map((type) => (
|
||||
<option value={type.value} selected={filters.type === type.value}>
|
||||
{type.label}
|
||||
</option>
|
||||
))
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
@@ -221,100 +221,91 @@ if (toggleResult?.error) {
|
||||
<h2 class="font-title mb-4 text-lg font-semibold text-blue-400">Create New Announcement</h2>
|
||||
<form method="POST" action={actions.admin.announcement.create} class="grid gap-4 md:grid-cols-2">
|
||||
<div class="space-y-3 md:col-span-2">
|
||||
<div>
|
||||
<label for="title" class="block text-xs font-medium text-zinc-400">Title*</label>
|
||||
<input
|
||||
type="text"
|
||||
name="title"
|
||||
id="title"
|
||||
required
|
||||
maxlength="255"
|
||||
placeholder="Announcement Title"
|
||||
value={newAnnouncement.title}
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 placeholder-zinc-500 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="content" class="block text-xs font-medium text-zinc-400">Content*</label>
|
||||
<textarea
|
||||
name="content"
|
||||
id="content"
|
||||
required
|
||||
maxlength="1000"
|
||||
rows="3"
|
||||
placeholder="Announcement Content"
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 placeholder-zinc-500 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
>{newAnnouncement.content}</textarea
|
||||
>
|
||||
</div>
|
||||
<InputTextArea
|
||||
label="Content"
|
||||
name="content"
|
||||
error={createInputErrors.content}
|
||||
value={newAnnouncement.content}
|
||||
inputProps={{
|
||||
required: true,
|
||||
maxlength: 1000,
|
||||
rows: 3,
|
||||
placeholder: 'Announcement Content',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<div>
|
||||
<label for="type" class="block text-xs font-medium text-zinc-400">Type*</label>
|
||||
<select
|
||||
name="type"
|
||||
id="type"
|
||||
required
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
>
|
||||
<option value="INFO" selected={true}>Info</option>
|
||||
<option value="WARNING" selected={false}>Warning</option>
|
||||
<option value="ALERT" selected={false}>Alert</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="startDate" class="block text-xs font-medium text-zinc-400">Start Date & Time*</label>
|
||||
<input
|
||||
type="datetime-local"
|
||||
name="startDate"
|
||||
id="startDate"
|
||||
required
|
||||
min={currentDate}
|
||||
value={newAnnouncement.startDate}
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="endDate" class="block text-xs font-medium text-zinc-400"
|
||||
>End Date & Time (Optional)</label
|
||||
>
|
||||
<input
|
||||
type="datetime-local"
|
||||
name="endDate"
|
||||
id="endDate"
|
||||
min={currentDate}
|
||||
value={newAnnouncement.endDate}
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
<InputText
|
||||
label="Link"
|
||||
name="link"
|
||||
error={createInputErrors.link}
|
||||
inputProps={{
|
||||
type: 'url',
|
||||
placeholder: 'https://example.com',
|
||||
}}
|
||||
/>
|
||||
<InputText
|
||||
label="Link Text "
|
||||
name="linkText"
|
||||
error={createInputErrors.linkText}
|
||||
inputProps={{
|
||||
placeholder: 'Link Text',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<div class="flex items-center">
|
||||
<input
|
||||
type="checkbox"
|
||||
name="isActive"
|
||||
id="isActive"
|
||||
value="true"
|
||||
checked={newAnnouncement.isActive}
|
||||
class="h-4 w-4 rounded border-zinc-700 bg-zinc-900 text-blue-600 focus:ring-blue-500"
|
||||
/>
|
||||
<label for="isActive" class="ml-2 block text-sm text-zinc-400">Active</label>
|
||||
</div>
|
||||
<InputCardGroup
|
||||
label="Type"
|
||||
name="type"
|
||||
options={announcementTypes.map((type) => ({
|
||||
label: type.label,
|
||||
value: type.value,
|
||||
icon: type.icon,
|
||||
}))}
|
||||
cardSize="sm"
|
||||
required
|
||||
selectedValue={newAnnouncement.type}
|
||||
/>
|
||||
|
||||
<InputText
|
||||
label="Start Date & Time"
|
||||
name="startDate"
|
||||
error={createInputErrors.startDate}
|
||||
inputProps={{
|
||||
type: 'datetime-local',
|
||||
required: true,
|
||||
value: newAnnouncement.startDate,
|
||||
}}
|
||||
/>
|
||||
|
||||
<InputText
|
||||
label="End Date & Time"
|
||||
name="endDate"
|
||||
error={createInputErrors.endDate}
|
||||
inputProps={{
|
||||
type: 'datetime-local',
|
||||
value: newAnnouncement.endDate,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<InputCardGroup
|
||||
name="isActive"
|
||||
label="Status"
|
||||
error={createInputErrors.isActive}
|
||||
options={[
|
||||
{ label: 'Active', value: 'true' },
|
||||
{ label: 'Inactive', value: 'false' },
|
||||
]}
|
||||
selectedValue={newAnnouncement.isActive ? 'true' : 'false'}
|
||||
cardSize="sm"
|
||||
/>
|
||||
|
||||
<div class="pt-4">
|
||||
<button
|
||||
type="submit"
|
||||
class="inline-flex items-center rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
|
||||
>
|
||||
<Icon name="ri:save-line" class="mr-1 h-4 w-4" />
|
||||
Create Announcement
|
||||
</button>
|
||||
|
||||
<InputSubmitButton label="Create Announcement" icon="ri:save-line" hideCancel />
|
||||
<button
|
||||
type="button"
|
||||
id="cancel-create"
|
||||
@@ -328,127 +319,6 @@ if (toggleResult?.error) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Edit Announcement Modal -->
|
||||
<dialog
|
||||
id="edit-announcement-modal"
|
||||
class="m-auto w-full max-w-2xl rounded-lg border border-zinc-700 bg-zinc-800 p-0 backdrop:bg-black/70"
|
||||
>
|
||||
<div class="p-4">
|
||||
<div class="mb-4 flex items-center justify-between border-b border-zinc-700 pb-3">
|
||||
<h3 class="font-title text-lg font-semibold text-blue-400">Edit Announcement</h3>
|
||||
<button type="button" class="close-modal text-zinc-400 hover:text-zinc-200">
|
||||
<Icon name="ri:close-line" class="h-6 w-6" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action={actions.admin.announcement.update}
|
||||
id="edit-form"
|
||||
class="grid gap-4 md:grid-cols-2"
|
||||
>
|
||||
<input type="hidden" name="id" id="edit-id" />
|
||||
|
||||
<div class="space-y-3 md:col-span-2">
|
||||
<div>
|
||||
<label for="edit-title" class="block text-xs font-medium text-zinc-400">Title*</label>
|
||||
<input
|
||||
type="text"
|
||||
name="title"
|
||||
id="edit-title"
|
||||
required
|
||||
maxlength="255"
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="edit-content" class="block text-xs font-medium text-zinc-400">Content*</label>
|
||||
<textarea
|
||||
name="content"
|
||||
id="edit-content"
|
||||
required
|
||||
maxlength="1000"
|
||||
rows="3"
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<div>
|
||||
<label for="edit-type" class="block text-xs font-medium text-zinc-400">Type*</label>
|
||||
<select
|
||||
name="type"
|
||||
id="edit-type"
|
||||
required
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
>
|
||||
<option value="INFO" selected={true}>Info</option>
|
||||
<option value="WARNING" selected={false}>Warning</option>
|
||||
<option value="ALERT" selected={false}>Alert</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="edit-startDate" class="block text-xs font-medium text-zinc-400"
|
||||
>Start Date & Time*</label
|
||||
>
|
||||
<input
|
||||
type="datetime-local"
|
||||
name="startDate"
|
||||
id="edit-startDate"
|
||||
required
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label for="edit-endDate" class="block text-xs font-medium text-zinc-400"
|
||||
>End Date & Time (Optional)</label
|
||||
>
|
||||
<input
|
||||
type="datetime-local"
|
||||
name="endDate"
|
||||
id="edit-endDate"
|
||||
class="mt-1 w-full rounded-md border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm text-zinc-200 focus:border-blue-500 focus:ring-blue-500 focus:outline-none"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<div class="flex items-center">
|
||||
<input
|
||||
type="checkbox"
|
||||
name="isActive"
|
||||
id="edit-isActive"
|
||||
value="true"
|
||||
class="h-4 w-4 rounded border-zinc-700 bg-zinc-900 text-blue-600 focus:ring-blue-500"
|
||||
/>
|
||||
<label for="edit-isActive" class="ml-2 block text-sm text-zinc-400">Active</label>
|
||||
</div>
|
||||
|
||||
<div class="pt-4">
|
||||
<button
|
||||
type="submit"
|
||||
class="inline-flex items-center rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
|
||||
>
|
||||
<Icon name="ri:save-line" class="mr-1 h-4 w-4" />
|
||||
Update Announcement
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="close-modal ml-2 inline-flex items-center rounded-md border border-zinc-600 bg-zinc-800 px-4 py-2 text-sm font-medium text-zinc-300 hover:bg-zinc-700 focus:ring-2 focus:ring-zinc-500 focus:ring-offset-2 focus:ring-offset-zinc-900 focus:outline-none"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</dialog>
|
||||
|
||||
<!-- Delete Confirmation Modal -->
|
||||
<dialog
|
||||
id="delete-confirmation-modal"
|
||||
@@ -583,97 +453,215 @@ if (toggleResult?.error) {
|
||||
)
|
||||
}
|
||||
{
|
||||
announcements.map((announcement) => (
|
||||
<tr class="group hover:bg-zinc-700/30">
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<div class="font-medium text-zinc-200">{announcement.title}</div>
|
||||
<div class="mt-1 line-clamp-1 text-xs text-zinc-400">{announcement.content}</div>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm">
|
||||
<span
|
||||
class={`inline-flex items-center rounded-md px-2.5 py-0.5 text-xs font-medium ${getTypeBadgeClass(announcement.type)}`}
|
||||
>
|
||||
{announcement.type}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm text-zinc-300">
|
||||
<TimeFormatted date={announcement.startDate} hourPrecision={false} prefix={false} />
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm text-zinc-300">
|
||||
{announcement.endDate ? (
|
||||
<TimeFormatted date={announcement.endDate} hourPrecision={false} prefix={false} />
|
||||
) : (
|
||||
<span class="text-zinc-500">—</span>
|
||||
)}
|
||||
</td>
|
||||
<td class="px-4 py-3 text-center text-sm">
|
||||
<span
|
||||
class={`inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${announcement.isActive ? 'bg-green-900/30 text-green-400' : 'bg-zinc-700/50 text-zinc-400'}`}
|
||||
>
|
||||
{announcement.isActive ? 'Active' : 'Inactive'}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm text-zinc-400">
|
||||
<TimeFormatted date={announcement.createdAt} hourPrecision hoursShort prefix={false} />
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<div class="flex justify-center gap-2">
|
||||
<Tooltip
|
||||
as="button"
|
||||
type="button"
|
||||
data-id={announcement.id}
|
||||
class="edit-button inline-flex items-center rounded-md border border-blue-500/50 bg-blue-500/20 px-1 py-1 text-xs text-blue-400 transition-colors hover:bg-blue-500/30"
|
||||
text="Edit"
|
||||
data-announcement={JSON.stringify(announcement)}
|
||||
>
|
||||
<Icon name="ri:edit-line" class="size-4" />
|
||||
</Tooltip>
|
||||
announcements.map((announcement) => {
|
||||
const announcementTypeInfo = getAnnouncementTypeInfo(announcement.type)
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action={actions.admin.announcement.toggleActive}
|
||||
class="inline-block"
|
||||
data-confirm={`Are you sure you want to ${announcement.isActive ? 'deactivate' : 'activate'} this announcement?`}
|
||||
>
|
||||
<input type="hidden" name="id" value={announcement.id} />
|
||||
<input type="hidden" name="isActive" value={String(!announcement.isActive)} />
|
||||
<button
|
||||
type="submit"
|
||||
class={`rounded-md border px-1 py-1 text-xs transition-colors ${
|
||||
announcement.isActive
|
||||
? 'border-yellow-500/50 bg-yellow-500/20 text-yellow-400 hover:bg-yellow-500/30'
|
||||
: 'border-green-500/50 bg-green-500/20 text-green-400 hover:bg-green-500/30'
|
||||
}`}
|
||||
return (
|
||||
<>
|
||||
<tr class="group hover:bg-zinc-700/30">
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<div class="line-clamp-2 text-zinc-400">{announcement.content}</div>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm">
|
||||
<span
|
||||
class={`inline-flex items-center rounded-md px-2.5 py-0.5 text-xs font-medium ${announcementTypeInfo.classNames.badge}`}
|
||||
>
|
||||
<Tooltip text={announcement.isActive ? 'Deactivate' : 'Activate'}>
|
||||
<Icon
|
||||
name={announcement.isActive ? 'ri:pause-circle-line' : 'ri:play-circle-line'}
|
||||
class="size-4"
|
||||
<Icon name={announcementTypeInfo.icon} class="me-1 size-3" />
|
||||
{announcementTypeInfo.label}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm text-zinc-300">
|
||||
<TimeFormatted date={announcement.startDate} hourPrecision={false} prefix={false} />
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm text-zinc-300">
|
||||
{announcement.endDate ? (
|
||||
<TimeFormatted date={announcement.endDate} hourPrecision={false} prefix={false} />
|
||||
) : (
|
||||
<span class="text-zinc-500">—</span>
|
||||
)}
|
||||
</td>
|
||||
<td class="px-4 py-3 text-center text-sm">
|
||||
<span
|
||||
class={`inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${announcement.isActive ? 'bg-green-900/30 text-green-400' : 'bg-zinc-700/50 text-zinc-400'}`}
|
||||
>
|
||||
{announcement.isActive ? 'Active' : 'Inactive'}
|
||||
</span>
|
||||
</td>
|
||||
<td class="px-4 py-3 text-left text-sm text-zinc-400">
|
||||
<TimeFormatted
|
||||
date={announcement.createdAt}
|
||||
hourPrecision
|
||||
hoursShort
|
||||
prefix={false}
|
||||
/>
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<div class="flex justify-center gap-2">
|
||||
<Tooltip
|
||||
as="button"
|
||||
type="button"
|
||||
data-id={announcement.id}
|
||||
class="edit-button inline-flex items-center rounded-md border border-blue-500/50 bg-blue-500/20 px-1 py-1 text-xs text-blue-400 transition-colors hover:bg-blue-500/30"
|
||||
text="Edit"
|
||||
onclick={`document.getElementById('edit-announcement-form-${announcement.id}').classList.toggle('hidden')`}
|
||||
>
|
||||
<Icon name="ri:edit-line" class="size-4" />
|
||||
</Tooltip>
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action={actions.admin.announcement.toggleActive}
|
||||
class="inline-block"
|
||||
data-confirm={`Are you sure you want to ${announcement.isActive ? 'deactivate' : 'activate'} this announcement?`}
|
||||
>
|
||||
<input type="hidden" name="id" value={announcement.id} />
|
||||
<input type="hidden" name="isActive" value={String(!announcement.isActive)} />
|
||||
<button
|
||||
type="submit"
|
||||
class={`rounded-md border px-1 py-1 text-xs transition-colors ${
|
||||
announcement.isActive
|
||||
? 'border-yellow-500/50 bg-yellow-500/20 text-yellow-400 hover:bg-yellow-500/30'
|
||||
: 'border-green-500/50 bg-green-500/20 text-green-400 hover:bg-green-500/30'
|
||||
}`}
|
||||
>
|
||||
<Tooltip text={announcement.isActive ? 'Deactivate' : 'Activate'}>
|
||||
<Icon
|
||||
name={
|
||||
announcement.isActive ? 'ri:pause-circle-line' : 'ri:play-circle-line'
|
||||
}
|
||||
class="size-4"
|
||||
/>
|
||||
</Tooltip>
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action={actions.admin.announcement.delete}
|
||||
class="inline-block"
|
||||
data-confirm="Are you sure you want to delete this announcement?"
|
||||
>
|
||||
<input type="hidden" name="id" value={announcement.id} />
|
||||
<button
|
||||
type="submit"
|
||||
class="rounded-md border border-red-500/50 bg-red-500/20 px-1 py-1 text-xs text-red-400 transition-colors hover:bg-red-500/30"
|
||||
>
|
||||
<Tooltip text="Delete">
|
||||
<Icon name="ri:delete-bin-line" class="size-4" />
|
||||
</Tooltip>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id={`edit-announcement-form-${announcement.id}`} class="hidden bg-zinc-700/20">
|
||||
<td colspan="7" class="p-4">
|
||||
<h3 class="font-title text-md mb-3 font-semibold text-blue-300">
|
||||
Edit: {announcement.content}
|
||||
</h3>
|
||||
<form
|
||||
method="POST"
|
||||
action={actions.admin.announcement.update}
|
||||
class="grid gap-4 md:grid-cols-2"
|
||||
>
|
||||
<input type="hidden" name="id" value={announcement.id} />
|
||||
|
||||
<div class="space-y-3 md:col-span-2">
|
||||
<InputTextArea
|
||||
label="Content"
|
||||
name="content"
|
||||
value={announcement.content}
|
||||
inputProps={{
|
||||
required: true,
|
||||
maxlength: 1000,
|
||||
rows: 3,
|
||||
}}
|
||||
/>
|
||||
</Tooltip>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action={actions.admin.announcement.delete}
|
||||
class="inline-block"
|
||||
data-confirm="Are you sure you want to delete this announcement?"
|
||||
>
|
||||
<input type="hidden" name="id" value={announcement.id} />
|
||||
<button
|
||||
type="submit"
|
||||
class="rounded-md border border-red-500/50 bg-red-500/20 px-1 py-1 text-xs text-red-400 transition-colors hover:bg-red-500/30"
|
||||
>
|
||||
<Tooltip text="Delete">
|
||||
<Icon name="ri:delete-bin-line" class="size-4" />
|
||||
</Tooltip>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
<div class="space-y-3">
|
||||
<InputText
|
||||
label="Link"
|
||||
name="link"
|
||||
inputProps={{
|
||||
type: 'url',
|
||||
placeholder: 'https://example.com',
|
||||
value: announcement.link,
|
||||
}}
|
||||
/>
|
||||
<InputText
|
||||
label="Link Text"
|
||||
name="linkText"
|
||||
inputProps={{
|
||||
placeholder: 'Link Text',
|
||||
value: announcement.linkText,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<InputCardGroup
|
||||
label="Type"
|
||||
name="type"
|
||||
options={announcementTypes.map((type) => ({
|
||||
label: type.label,
|
||||
value: type.value,
|
||||
icon: type.icon,
|
||||
}))}
|
||||
cardSize="sm"
|
||||
required
|
||||
selectedValue={announcement.type}
|
||||
/>
|
||||
|
||||
<InputText
|
||||
label="Start Date & Time"
|
||||
name="startDate"
|
||||
inputProps={{
|
||||
type: 'datetime-local',
|
||||
required: true,
|
||||
value: new Date(announcement.startDate).toISOString().slice(0, 16),
|
||||
}}
|
||||
/>
|
||||
<InputText
|
||||
label="End Date & Time"
|
||||
name="endDate"
|
||||
inputProps={{
|
||||
type: 'datetime-local',
|
||||
value: announcement.endDate
|
||||
? new Date(announcement.endDate).toISOString().slice(0, 16)
|
||||
: '',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="space-y-3">
|
||||
<InputCardGroup
|
||||
name="isActive"
|
||||
label="Status"
|
||||
options={[
|
||||
{ label: 'Active', value: 'true' },
|
||||
{ label: 'Inactive', value: 'false' },
|
||||
]}
|
||||
selectedValue={announcement.isActive ? 'true' : 'false'}
|
||||
cardSize="sm"
|
||||
/>
|
||||
<div class="pt-4">
|
||||
<InputSubmitButton label="Save Changes" icon="ri:save-line" hideCancel />
|
||||
<Button
|
||||
type="button"
|
||||
label="Cancel"
|
||||
color="gray"
|
||||
onclick={`document.getElementById('edit-announcement-form-${announcement.id}').classList.toggle('hidden')`}
|
||||
class="ml-2"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</>
|
||||
)
|
||||
})
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -714,6 +702,9 @@ if (toggleResult?.error) {
|
||||
input[type='date'] {
|
||||
color-scheme: dark;
|
||||
}
|
||||
input[type='datetime-local'] {
|
||||
color-scheme: dark;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
@@ -730,53 +721,18 @@ if (toggleResult?.error) {
|
||||
newAnnouncementForm?.classList.add('hidden')
|
||||
})
|
||||
|
||||
// Edit Modal functionality
|
||||
const editModal = document.getElementById('edit-announcement-modal') as HTMLDialogElement
|
||||
const editButtons = document.querySelectorAll('.edit-button')
|
||||
const editForm = document.getElementById('edit-form') as HTMLFormElement
|
||||
|
||||
editButtons.forEach((button) => {
|
||||
button.addEventListener('click', () => {
|
||||
const announcementData = JSON.parse(button.getAttribute('data-announcement') || '{}')
|
||||
|
||||
const idInput = document.getElementById('edit-id') as HTMLInputElement
|
||||
const titleInput = document.getElementById('edit-title') as HTMLInputElement
|
||||
const contentInput = document.getElementById('edit-content') as HTMLTextAreaElement
|
||||
const typeSelect = document.getElementById('edit-type') as HTMLSelectElement
|
||||
const startDateInput = document.getElementById('edit-startDate') as HTMLInputElement
|
||||
const endDateInput = document.getElementById('edit-endDate') as HTMLInputElement
|
||||
const isActiveCheckbox = document.getElementById('edit-isActive') as HTMLInputElement
|
||||
|
||||
idInput.value = announcementData.id.toString()
|
||||
titleInput.value = announcementData.title
|
||||
contentInput.value = announcementData.content
|
||||
typeSelect.value = announcementData.type
|
||||
|
||||
// Format dates for the date inputs (YYYY-MM-DDThh:mm)
|
||||
const formatDateForInput = (dateString: string | null) => {
|
||||
if (!dateString) return ''
|
||||
const date = new Date(dateString)
|
||||
return date.toISOString().slice(0, 16)
|
||||
}
|
||||
|
||||
startDateInput.value = formatDateForInput(announcementData.startDate) ?? ''
|
||||
endDateInput.value = formatDateForInput(announcementData.endDate) ?? ''
|
||||
isActiveCheckbox.checked = announcementData.isActive
|
||||
|
||||
editModal?.showModal()
|
||||
})
|
||||
})
|
||||
|
||||
// Delete Modal functionality
|
||||
const deleteModal = document.getElementById('delete-confirmation-modal') as HTMLDialogElement
|
||||
const deleteButtons = document.querySelectorAll('.delete-button')
|
||||
const deleteForm = document.getElementById('delete-form') as HTMLFormElement
|
||||
// const deleteForm = document.getElementById('delete-form') as HTMLFormElement // Not strictly needed if not manipulating it
|
||||
|
||||
deleteButtons.forEach((button) => {
|
||||
button.addEventListener('click', () => {
|
||||
const id = button.getAttribute('data-id')
|
||||
const deleteIdInput = document.getElementById('delete-id') as HTMLInputElement
|
||||
deleteIdInput.value = id || ''
|
||||
if (deleteIdInput) {
|
||||
deleteIdInput.value = id || ''
|
||||
}
|
||||
deleteModal?.showModal()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -4,7 +4,6 @@ import { z } from 'astro:schema'
|
||||
import { groupBy, orderBy } from 'lodash-es'
|
||||
import seedrandom from 'seedrandom'
|
||||
|
||||
import AnnouncementBanner from '../components/AnnouncementBanner.astro'
|
||||
import Button from '../components/Button.astro'
|
||||
import Pagination from '../components/Pagination.astro'
|
||||
import ServiceFiltersPill from '../components/ServiceFiltersPill.astro'
|
||||
@@ -489,18 +488,7 @@ const filtersOptions = {
|
||||
|
||||
export type ServicesFiltersOptions = typeof filtersOptions
|
||||
|
||||
const currentDate = new Date()
|
||||
const activeAnnouncements = await prisma.announcement.findMany({
|
||||
where: {
|
||||
isActive: true,
|
||||
startDate: { lte: currentDate },
|
||||
OR: [{ endDate: null }, { endDate: { gt: currentDate } }],
|
||||
},
|
||||
orderBy: [
|
||||
{ type: 'desc' }, // ALERT first, then WARNING, then INFO
|
||||
{ createdAt: 'desc' },
|
||||
],
|
||||
})
|
||||
//
|
||||
---
|
||||
|
||||
<BaseLayout
|
||||
@@ -516,9 +504,6 @@ const activeAnnouncements = await prisma.announcement.findMany({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<!-- Display announcements at the top of the page -->
|
||||
<AnnouncementBanner announcements={activeAnnouncements} />
|
||||
|
||||
<div class="flex flex-col gap-4 sm:flex-row sm:gap-8">
|
||||
<div
|
||||
class='[&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-night-700 flex items-stretch sm:hidden [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-2 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-green-500 [&:has(~_#show-filters:focus-visible)_[for="show-filters"]]:ring-offset-2'
|
||||
|
||||
Reference in New Issue
Block a user