Compare commits
No commits in common. "4c27af6d09991a895e7301d87b3542af89ec0f27" and "308e40ee9cd45955ee15f090ce539a3b997d47b1" have entirely different histories.
4c27af6d09
...
308e40ee9c
|
|
@ -10,6 +10,7 @@ trim_trailing_whitespace = true
|
||||||
|
|
||||||
[*.ts]
|
[*.ts]
|
||||||
quote_type = single
|
quote_type = single
|
||||||
|
ij_typescript_use_double_quotes = false
|
||||||
|
|
||||||
[*.md]
|
[*.md]
|
||||||
max_line_length = off
|
max_line_length = off
|
||||||
|
|
|
||||||
|
|
@ -36,14 +36,7 @@ yarn-error.log
|
||||||
/libpeerconnection.log
|
/libpeerconnection.log
|
||||||
testem.log
|
testem.log
|
||||||
/typings
|
/typings
|
||||||
drizzle
|
|
||||||
# System files
|
# System files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
|
|
||||||
*.db
|
|
||||||
|
|
||||||
.nx/cache
|
|
||||||
.nx/workspace-data
|
|
||||||
.aider*
|
|
||||||
.env
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"plugins": {
|
||||||
|
"@tailwindcss/postcss": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
# Add files here to ignore them from prettier formatting
|
|
||||||
/dist
|
|
||||||
/coverage
|
|
||||||
/.nx/cache
|
|
||||||
/.nx/workspace-data
|
|
||||||
32
.prettierrc
32
.prettierrc
|
|
@ -1,18 +1,18 @@
|
||||||
{
|
{
|
||||||
"arrowParens": "avoid",
|
"arrowParens": "avoid",
|
||||||
"embeddedLanguageFormatting": "auto",
|
"embeddedLanguageFormatting": "auto",
|
||||||
"htmlWhitespaceSensitivity": "css",
|
"htmlWhitespaceSensitivity": "css",
|
||||||
"insertPragma": false,
|
"insertPragma": false,
|
||||||
"jsxBracketSameLine": false,
|
"jsxBracketSameLine": false,
|
||||||
"jsxSingleQuote": false,
|
"jsxSingleQuote": false,
|
||||||
"printWidth": 220,
|
"printWidth": 220,
|
||||||
"proseWrap": "always",
|
"proseWrap": "always",
|
||||||
"quoteProps": "as-needed",
|
"quoteProps": "as-needed",
|
||||||
"requirePragma": false,
|
"requirePragma": false,
|
||||||
"semi": true,
|
"semi": true,
|
||||||
"singleQuote": true,
|
"singleQuote": true,
|
||||||
"tabWidth": 2,
|
"tabWidth": 2,
|
||||||
"trailingComma": "all",
|
"trailingComma": "all",
|
||||||
"useTabs": false,
|
"useTabs": false,
|
||||||
"vueIndentScriptAndStyle": false
|
"vueIndentScriptAndStyle": false
|
||||||
}
|
}
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{
|
||||||
"recommendations": [
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
|
||||||
"angular.ng-template",
|
"recommendations": ["angular.ng-template"]
|
||||||
"nrwl.angular-console",
|
|
||||||
"esbenp.prettier-vscode"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,39 @@
|
||||||
{
|
{
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "ng serve",
|
||||||
|
"type": "chrome",
|
||||||
|
"request": "launch",
|
||||||
|
"preLaunchTask": "npm: start",
|
||||||
|
"url": "http://localhost:4200/"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type": "node",
|
"type": "node",
|
||||||
"request": "attach",
|
"request": "launch",
|
||||||
"name": "Attach to Nx Serve",
|
"name": "Debug Nest Framework",
|
||||||
"port": 9229,
|
"runtimeExecutable": "npm",
|
||||||
|
"runtimeArgs": ["run", "start:debug", "--", "--inspect-brk"],
|
||||||
|
"autoAttachChildProcesses": true,
|
||||||
|
"restart": true,
|
||||||
"sourceMaps": true,
|
"sourceMaps": true,
|
||||||
"outFiles": ["${workspaceFolder}/dist/api/**/*.js"],
|
"stopOnEntry": false,
|
||||||
|
"console": "integratedTerminal",
|
||||||
|
"env": {
|
||||||
|
"HOST_NAME": "localhost"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Debug NestJS API",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"runtimeExecutable": "npx",
|
||||||
|
"runtimeArgs": ["nest", "start", "--debug", "--watch"],
|
||||||
|
"port": 9229,
|
||||||
|
"cwd": "${workspaceFolder}/api",
|
||||||
|
"envFile": "${workspaceFolder}/api/.env",
|
||||||
|
"console": "integratedTerminal",
|
||||||
"skipFiles": ["<node_internals>/**"]
|
"skipFiles": ["<node_internals>/**"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,24 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "test",
|
||||||
|
"isBackground": true,
|
||||||
|
"problemMatcher": {
|
||||||
|
"owner": "typescript",
|
||||||
|
"pattern": "$tsc",
|
||||||
|
"background": {
|
||||||
|
"activeOnStart": true,
|
||||||
|
"beginsPattern": {
|
||||||
|
"regexp": "(.*?)"
|
||||||
|
},
|
||||||
|
"endsPattern": {
|
||||||
|
"regexp": "bundle generation complete"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
27
README.md
27
README.md
|
|
@ -1,27 +0,0 @@
|
||||||
# Vokabeltraining
|
|
||||||
|
|
||||||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.2.12.
|
|
||||||
|
|
||||||
## Development server
|
|
||||||
|
|
||||||
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
|
|
||||||
|
|
||||||
## Code scaffolding
|
|
||||||
|
|
||||||
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
|
|
||||||
|
|
||||||
## Build
|
|
||||||
|
|
||||||
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
|
|
||||||
|
|
||||||
## Running unit tests
|
|
||||||
|
|
||||||
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
|
|
||||||
|
|
||||||
## Running end-to-end tests
|
|
||||||
|
|
||||||
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
|
|
||||||
|
|
||||||
## Further help
|
|
||||||
|
|
||||||
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
|
|
||||||
|
|
@ -0,0 +1,137 @@
|
||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"haiky": {
|
||||||
|
"projectType": "application",
|
||||||
|
"schematics": {
|
||||||
|
"@schematics/angular:component": {
|
||||||
|
"style": "scss",
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:class": {
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:directive": {
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:guard": {
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:interceptor": {
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:pipe": {
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:resolver": {
|
||||||
|
"skipTests": true
|
||||||
|
},
|
||||||
|
"@schematics/angular:service": {
|
||||||
|
"skipTests": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"prefix": "app",
|
||||||
|
"architect": {
|
||||||
|
"build": {
|
||||||
|
"builder": "@angular-devkit/build-angular:application",
|
||||||
|
"options": {
|
||||||
|
"outputPath": "dist/haiky",
|
||||||
|
"index": "src/index.html",
|
||||||
|
"browser": "src/main.ts",
|
||||||
|
"polyfills": [
|
||||||
|
"zone.js"
|
||||||
|
],
|
||||||
|
"tsConfig": "tsconfig.app.json",
|
||||||
|
"inlineStyleLanguage": "scss",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"glob": "**/*",
|
||||||
|
"input": "public"
|
||||||
|
},
|
||||||
|
"src/assets"
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"src/styles.scss"
|
||||||
|
],
|
||||||
|
"scripts": [],
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/app/environments/environment.ts",
|
||||||
|
"with": "src/app/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"budgets": [
|
||||||
|
{
|
||||||
|
"type": "initial",
|
||||||
|
"maximumWarning": "500kB",
|
||||||
|
"maximumError": "1MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "anyComponentStyle",
|
||||||
|
"maximumWarning": "4kB",
|
||||||
|
"maximumError": "8kB"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"outputHashing": "all"
|
||||||
|
},
|
||||||
|
"development": {
|
||||||
|
"optimization": false,
|
||||||
|
"extractLicenses": false,
|
||||||
|
"sourceMap": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultConfiguration": "production"
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"options": {
|
||||||
|
"proxyConfig": "proxy.conf.json"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"buildTarget": "haiky:build:production"
|
||||||
|
},
|
||||||
|
"development": {
|
||||||
|
"buildTarget": "haiky:build:development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultConfiguration": "development"
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n"
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"polyfills": [
|
||||||
|
"zone.js",
|
||||||
|
"zone.js/testing"
|
||||||
|
],
|
||||||
|
"tsConfig": "tsconfig.spec.json",
|
||||||
|
"inlineStyleLanguage": "scss",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"glob": "**/*",
|
||||||
|
"input": "public"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"src/styles.scss"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cli": {
|
||||||
|
"analytics": false
|
||||||
|
}
|
||||||
|
}
|
||||||
6
api/.env
6
api/.env
|
|
@ -1,6 +0,0 @@
|
||||||
DB_FILE_NAME=file:local.db
|
|
||||||
PORT=3002
|
|
||||||
FIREBASE_PROJECT_ID=haiki-452bd
|
|
||||||
FIREBASE_CLIENT_EMAIL=firebase-adminsdk-fbsvc@haiki-452bd.iam.gserviceaccount.com
|
|
||||||
FIREBASE_PRIVATE_KEY=-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDyCsRhtPYwozBy\n60A4LguqsFzJG0WwCMhvi7PIxoh1kVenwxXBBQHvgssF/jPTkqbK6orL9r15gdRc\nZK2S73OdESYlO9xCE+gq/pop1F432DrHBA6ftQIl2NHSQfkKgTKFM6Pt85e6s5mb\neIxxHr7AzGMlqu7UJbnw8Vk2+8LP3NZXwsyCEi5vg4+8UgPFVxhLnB4HYZIM8JOj\nM3q1N/KqKgl2qGl5ekZLN7QLPs6+znlVZVIeHo1vuX9xTUaa6XUA0xeZfFO3pNUd\nKLlQNAy7OFQ6GlTFTWWHnShecLPHLQdWP15rkwBPv1q7qDmtLMy4E2XLvsoErhJM\niFsbEczxAgMBAAECggEAJqGJTn7vfDvPk8fwbAcNXaTgakisCricJRGLFFR7mygj\ncWc1paUC9hNODBrScsZJUMG2fW9YNnh+SHDZM0Z8kWkXSYIQWYuL1rDkMiDvGMKu\nPu1q2BqvyRKeCoz1DrQoOBJR67yhTu8zaRkIcVWS5Hq6qFxr2fhbgRVEQ/5SzZIG\nPh+Npxdp62Xe66MB0OzmF/A5qSrXTpOOk4/Lmpoqf6PtmrOD+SetE+Aa6ELYX3pK\n30XPLiUyDS+EFPjHLA1U7frOawLRpMP6Iobu7hUzu9ASzgLKxpzbcGRsPtbVRuAQ\nzP+iV+Nyn/wMFbnnjrjlwk/jqE+NLGJnf7Jrc9vwQQKBgQD5lfRWR6MKDezty5Qu\nPGrSlKXOM+aOoTmZiaPTutYzwWHeqzfUfYsghbgR3jl7I0BTqMaGrOnYU60IDWZi\nJeK6iu68pUe8Mme3vXm15Go55UhZD9U5/4W+x0/+AVivBPUBwKUXFdgmPFkb2jBY\np1LJmXaelx2jvPM3yMXQN+5flQKBgQD4Qy6aF3V7DIVxo/F88KCGNUpEobyXsxv6\nakSV+7WEtuSf6amXHxZyiJPtjCIwzCUL458gUd6mwiQgWRy7awdKreU6BCHgqNVf\nAE5ahjeeiLOc1uu0ocNLL+g35DbBXSgSlB+hUE0+bxAxU9xjNc9UZKqIi/kGRP/G\nlxi2ZUIQ7QKBgQDUH5Ku0evL29IGuQOT2F2h5ByXiJznlDd0Ovs2NJFhI3ae3T5y\nJtFcLsomxYxtD6TYdZVlWQjWhyeEtH7T5AczLGmDg6XYWa61ByCuaxetZSV8LGy5\nAmcVoihmZZaOCdSCTM0DNdmjhZ7mgSad8nf2R6v9VconI6xDOSyGr0K1kQKBgQCp\nuhxxIpqhzlSo9aFSfpvwRRyKQVzTBZOaJu7O7zARFIzHOxNDivBoyzD/FXAGlnq5\nXxvaF761mULjjqjTBQAOMUbm3A5hLmv5sBbhUqNR0jmhf1nTu0ft7km/dFlu5wZP\ndU8OlPzKM1oJr0Cb3xzooI3qHm/YtnF7Tq+Jez6onQKBgQCfbqG5dyTAduhPZzmp\n6m4ndzzdYVoh8KiM3fUApo/u9zF3GixUFgcKKFzP1/zmD6A6UfbVT+JVmUfIVtor\nAA42lqJyOaNH9ttQjZeDXfPpbAyAoZzH0l7/U9KSOkh+2I8tMscjWFqyQ1/DGNcY\nptIRECjQrk5jL0yea0+tbpMmJQ==\n-----END PRIVATE KEY-----\n
|
|
||||||
DATABASE_URL=postgresql://haiky:xieng7Seih@localhost:15432/haiky
|
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
# compiled output
|
||||||
|
/dist
|
||||||
|
/node_modules
|
||||||
|
/build
|
||||||
|
|
||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
# OS
|
||||||
|
.DS_Store
|
||||||
|
|
||||||
|
# Tests
|
||||||
|
/coverage
|
||||||
|
/.nyc_output
|
||||||
|
|
||||||
|
# IDEs and editors
|
||||||
|
/.idea
|
||||||
|
.project
|
||||||
|
.classpath
|
||||||
|
.c9/
|
||||||
|
*.launch
|
||||||
|
.settings/
|
||||||
|
*.sublime-workspace
|
||||||
|
|
||||||
|
# IDE - VSCode
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/settings.json
|
||||||
|
!.vscode/tasks.json
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/extensions.json
|
||||||
|
|
||||||
|
# dotenv environment variable files
|
||||||
|
.env
|
||||||
|
.env.development.local
|
||||||
|
.env.test.local
|
||||||
|
.env.production.local
|
||||||
|
.env.local
|
||||||
|
|
||||||
|
# temp directory
|
||||||
|
.temp
|
||||||
|
.tmp
|
||||||
|
|
||||||
|
# Runtime data
|
||||||
|
pids
|
||||||
|
*.pid
|
||||||
|
*.seed
|
||||||
|
*.pid.lock
|
||||||
|
|
||||||
|
# Diagnostic reports (https://nodejs.org/api/report.html)
|
||||||
|
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"singleQuote": true,
|
||||||
|
"trailingComma": "all"
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
// @ts-check
|
||||||
|
|
||||||
|
// export default tseslint.config(
|
||||||
|
// {
|
||||||
|
// ignores: ['eslint.config.mjs'],
|
||||||
|
// },
|
||||||
|
// eslint.configs.recommended,
|
||||||
|
// ...tseslint.configs.recommendedTypeChecked,
|
||||||
|
// eslintPluginPrettierRecommended,
|
||||||
|
// {
|
||||||
|
// languageOptions: {
|
||||||
|
// globals: {
|
||||||
|
// ...globals.node,
|
||||||
|
// ...globals.jest,
|
||||||
|
// },
|
||||||
|
// ecmaVersion: 5,
|
||||||
|
// sourceType: 'module',
|
||||||
|
// parserOptions: {
|
||||||
|
// projectService: true,
|
||||||
|
// tsconfigRootDir: import.meta.dirname,
|
||||||
|
// },
|
||||||
|
// },
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// rules: {
|
||||||
|
// '@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
// 'eslint-disable-next-line prettier/prettier': 'off',
|
||||||
|
// // '@typescript-eslint/no-floating-promises': 'warn',
|
||||||
|
// // '@typescript-eslint/no-unsafe-argument': 'warn'
|
||||||
|
// },
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"$schema": "https://json.schemastore.org/nest-cli",
|
||||||
|
"collection": "@nestjs/schematics",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"compilerOptions": {
|
||||||
|
"deleteOutDir": true
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,77 @@
|
||||||
|
{
|
||||||
|
"name": "api",
|
||||||
|
"version": "0.0.1",
|
||||||
|
"description": "",
|
||||||
|
"author": "",
|
||||||
|
"private": true,
|
||||||
|
"license": "UNLICENSED",
|
||||||
|
"scripts": {
|
||||||
|
"build": "nest build",
|
||||||
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
|
"start": "nest start",
|
||||||
|
"start:dev": "nest start --watch",
|
||||||
|
"start:debug": "nest start --debug --watch",
|
||||||
|
"start:prod": "node dist/main",
|
||||||
|
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
||||||
|
"test": "jest",
|
||||||
|
"test:watch": "jest --watch",
|
||||||
|
"test:cov": "jest --coverage",
|
||||||
|
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||||
|
"test:e2e": "jest --config ./test/jest-e2e.json"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@nestjs/common": "^11.0.1",
|
||||||
|
"@nestjs/core": "^11.0.1",
|
||||||
|
"@nestjs/platform-express": "^11.0.1",
|
||||||
|
"chalk": "^5.4.1",
|
||||||
|
"drizzle-kit": "^0.30.4",
|
||||||
|
"drizzle-orm": "^0.39.3",
|
||||||
|
"pg": "^8.13.3",
|
||||||
|
"reflect-metadata": "^0.2.2",
|
||||||
|
"rxjs": "^7.8.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@eslint/js": "^9.18.0",
|
||||||
|
"@nestjs/cli": "^11.0.0",
|
||||||
|
"@nestjs/schematics": "^11.0.0",
|
||||||
|
"@nestjs/testing": "^11.0.1",
|
||||||
|
"@swc/cli": "^0.6.0",
|
||||||
|
"@swc/core": "^1.10.7",
|
||||||
|
"@types/express": "^5.0.0",
|
||||||
|
"@types/jest": "^29.5.14",
|
||||||
|
"@types/node": "^22.10.7",
|
||||||
|
"@types/supertest": "^6.0.2",
|
||||||
|
"eslint": "^9.18.0",
|
||||||
|
"eslint-config-prettier": "^10.0.1",
|
||||||
|
"eslint-plugin-prettier": "^5.2.2",
|
||||||
|
"globals": "^15.14.0",
|
||||||
|
"jest": "^29.7.0",
|
||||||
|
"prettier": "^3.4.2",
|
||||||
|
"source-map-support": "^0.5.21",
|
||||||
|
"supertest": "^7.0.0",
|
||||||
|
"ts-jest": "^29.2.5",
|
||||||
|
"ts-loader": "^9.5.2",
|
||||||
|
"ts-node": "^10.9.2",
|
||||||
|
"tsconfig-paths": "^4.2.0",
|
||||||
|
"typescript": "^5.7.3",
|
||||||
|
"typescript-eslint": "^8.20.0"
|
||||||
|
},
|
||||||
|
"jest": {
|
||||||
|
"moduleFileExtensions": [
|
||||||
|
"js",
|
||||||
|
"json",
|
||||||
|
"ts"
|
||||||
|
],
|
||||||
|
"rootDir": "src",
|
||||||
|
"testRegex": ".*\\.spec\\.ts$",
|
||||||
|
"transform": {
|
||||||
|
"^.+\\.(t|j)s$": "ts-jest"
|
||||||
|
},
|
||||||
|
"collectCoverageFrom": [
|
||||||
|
"**/*.(t|j)s"
|
||||||
|
],
|
||||||
|
"coverageDirectory": "../coverage",
|
||||||
|
"testEnvironment": "node"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
{
|
|
||||||
"name": "api",
|
|
||||||
"$schema": "../node_modules/nx/schemas/project-schema.json",
|
|
||||||
"sourceRoot": "api/src",
|
|
||||||
"projectType": "application",
|
|
||||||
"targets": {
|
|
||||||
"build": {
|
|
||||||
"executor": "nx:run-commands",
|
|
||||||
"options": {
|
|
||||||
"command": "webpack-cli build",
|
|
||||||
"args": ["node-env=production"]
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"development": {
|
|
||||||
"args": ["node-env=development"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"serve": {
|
|
||||||
"executor": "@nx/js:node",
|
|
||||||
"defaultConfiguration": "development",
|
|
||||||
"dependsOn": ["build"],
|
|
||||||
"options": {
|
|
||||||
"buildTarget": "api:build",
|
|
||||||
"runBuildTargetDependencies": false
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"development": {
|
|
||||||
"buildTarget": "api:build:development"
|
|
||||||
},
|
|
||||||
"production": {
|
|
||||||
"buildTarget": "api:build:production"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tags": []
|
|
||||||
}
|
|
||||||
|
|
@ -1,329 +0,0 @@
|
||||||
// drizzle.service.ts
|
|
||||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
|
||||||
import { and, eq, sql } from 'drizzle-orm';
|
|
||||||
//import { drizzle } from 'drizzle-orm/libsql';
|
|
||||||
import { drizzle } from 'drizzle-orm/node-postgres';
|
|
||||||
import { deck, InsertUser, SelectDeck, User, users } from '../db/schema';
|
|
||||||
import { SqlLoggerService } from './sql-logger.service';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class DrizzleService {
|
|
||||||
// private readonly logger = new Logger(DrizzleService.name);
|
|
||||||
private db: any;
|
|
||||||
constructor(private sqlLogger: SqlLoggerService) {
|
|
||||||
this.db = drizzle(process.env['DATABASE_URL']!, {
|
|
||||||
logger: {
|
|
||||||
logQuery: (query: string, params: any[]) => {
|
|
||||||
this.sqlLogger.logQuery(query, params);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}); //drizzle(process.env.DATABASE_URL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Abrufen aller Decks eines Benutzers
|
|
||||||
*/
|
|
||||||
async getDecks(user: User) {
|
|
||||||
return this.db.select().from(deck).where(eq(deck.user, user.email));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Erstellen eines neuen Decks
|
|
||||||
*/
|
|
||||||
async createDeck(deckname: string, user: User) {
|
|
||||||
// 'inserted' und 'updated' werden automatisch von der Datenbank gesetzt
|
|
||||||
const result = await this.db
|
|
||||||
.insert(deck)
|
|
||||||
.values({
|
|
||||||
deckname,
|
|
||||||
user: user.email,
|
|
||||||
// 'inserted' und 'updated' werden von der DB automatisch gesetzt
|
|
||||||
})
|
|
||||||
.returning();
|
|
||||||
return { status: 'success', deck: result };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Abrufen eines Decks nach Name
|
|
||||||
*/
|
|
||||||
async getDeckByName(deckname: string, user: User) {
|
|
||||||
return this.db
|
|
||||||
.select()
|
|
||||||
.from(deck)
|
|
||||||
.where(and(eq(deck.deckname, deckname), eq(deck.user, user.email)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Löschen eines Decks
|
|
||||||
*/
|
|
||||||
async deleteDeck(deckname: string, user: User) {
|
|
||||||
const existingDeck = await this.getDeckByName(deckname, user);
|
|
||||||
if (existingDeck.length === 0) {
|
|
||||||
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.db.delete(deck).where(and(eq(deck.deckname, deckname), eq(deck.user, user.email)));
|
|
||||||
return { status: 'success' };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Umbenennen eines Decks
|
|
||||||
*/
|
|
||||||
async renameDeck(oldDeckname: string, newDeckname: string, user: User) {
|
|
||||||
const existingDeck = await this.getDeckByName(oldDeckname, user);
|
|
||||||
if (existingDeck.length === 0) {
|
|
||||||
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
const existingNewDeck = await this.getDeckByName(newDeckname, user);
|
|
||||||
if (existingNewDeck.length > 0) {
|
|
||||||
throw new HttpException('Deck with the new name already exists', HttpStatus.CONFLICT);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.db
|
|
||||||
.update(deck)
|
|
||||||
.set({
|
|
||||||
deckname: newDeckname,
|
|
||||||
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
|
|
||||||
})
|
|
||||||
.where(and(eq(deck.deckname, oldDeckname), eq(deck.user, user.email)));
|
|
||||||
return { status: 'success', message: 'Deck renamed successfully' };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Aktualisieren eines Bildes innerhalb eines Decks
|
|
||||||
*/
|
|
||||||
async updateImage(
|
|
||||||
data: {
|
|
||||||
deckname: string;
|
|
||||||
bildname: string;
|
|
||||||
bildid: string;
|
|
||||||
boxes: Array<{ x1: number; x2: number; y1: number; y2: number; id?: number }>;
|
|
||||||
},
|
|
||||||
user: User,
|
|
||||||
) {
|
|
||||||
// Schritt 1: Überprüfen, ob das Deck existiert
|
|
||||||
const existingDecks: SelectDeck[] = await this.getDeckByName(data.deckname, user);
|
|
||||||
if (existingDecks.length === 0) {
|
|
||||||
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Schritt 2: Trennen der neuen und bestehenden Einträge
|
|
||||||
const newEntries = data.boxes.filter(b => !b.id);
|
|
||||||
const existingEntries = data.boxes.filter(b => b.id);
|
|
||||||
|
|
||||||
// Schritt 3: Einfügen neuer Einträge
|
|
||||||
const insertedImages: any = [];
|
|
||||||
for (let index = 0; index < newEntries.length; index++) {
|
|
||||||
const box = newEntries[index];
|
|
||||||
const result = await this.db
|
|
||||||
.insert(deck)
|
|
||||||
.values({
|
|
||||||
deckname: data.deckname,
|
|
||||||
bildname: data.bildname,
|
|
||||||
bildid: data.bildid,
|
|
||||||
x1: box.x1,
|
|
||||||
x2: box.x2,
|
|
||||||
y1: box.y1,
|
|
||||||
y2: box.y2,
|
|
||||||
user: user.email,
|
|
||||||
// 'inserted' und 'updated' werden automatisch von der DB gesetzt
|
|
||||||
})
|
|
||||||
.returning();
|
|
||||||
insertedImages.push(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Schritt 4: Aktualisieren bestehender Einträge
|
|
||||||
for (let index = 0; index < existingEntries.length; index++) {
|
|
||||||
const box = existingEntries[index];
|
|
||||||
const existingDeck = existingDecks.find(d => d.id === box.id);
|
|
||||||
if (existingDeck && (existingDeck.x1 !== box.x1 || existingDeck.x2 !== box.x2 || existingDeck.y1 !== box.y1 || existingDeck.y2 !== box.y2)) {
|
|
||||||
const result = await this.db
|
|
||||||
.update(deck)
|
|
||||||
.set({
|
|
||||||
x1: box.x1,
|
|
||||||
x2: box.x2,
|
|
||||||
y1: box.y1,
|
|
||||||
y2: box.y2,
|
|
||||||
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
|
|
||||||
})
|
|
||||||
.where(and(eq(deck.user, user.email), eq(deck.bildid, data.bildid), eq(deck.deckname, data.deckname), eq(deck.id, box.id!!)));
|
|
||||||
if (result.rowsAffected === 0) {
|
|
||||||
throw new HttpException(`Box with id ${box.id} not found`, HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Schritt 5: Löschen von nicht mehr vorhandenen Einträgen
|
|
||||||
// Sammle alle bestehenden IDs aus der Datenbank für das gegebene deckname und bildid
|
|
||||||
const existingIdsInDb = existingDecks.filter(entry => entry.bildid === data.bildid && entry.deckname === data.deckname).map(entry => entry.id);
|
|
||||||
|
|
||||||
// Sammle alle eingehenden IDs aus den vorhandenen Einträgen
|
|
||||||
const incomingIds = existingEntries.map(entry => entry.id);
|
|
||||||
|
|
||||||
// Bestimme die IDs, die in der Datenbank existieren, aber nicht mehr in den eingehenden Daten vorhanden sind
|
|
||||||
const idsToDelete = existingIdsInDb.filter(id => !incomingIds.includes(id));
|
|
||||||
|
|
||||||
if (idsToDelete.length > 0) {
|
|
||||||
await this.db.delete(deck).where(and(eq(deck.deckname, data.deckname), eq(deck.bildid, data.bildid), eq(deck.user, user.email), sql`id in ${idsToDelete}`));
|
|
||||||
}
|
|
||||||
|
|
||||||
return { status: 'success', inserted_images: insertedImages };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Löschen von Bildern anhand der bildid
|
|
||||||
*/
|
|
||||||
async deleteImagesByBildId(bildid: string, user: User) {
|
|
||||||
const affectedDecks = await this.db
|
|
||||||
.select({ deckname: deck.deckname })
|
|
||||||
.from(deck)
|
|
||||||
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
|
||||||
|
|
||||||
if (affectedDecks.length === 0) {
|
|
||||||
throw new HttpException('No entries found for the given image ID', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.db.delete(deck).where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
|
||||||
|
|
||||||
return {
|
|
||||||
status: 'success',
|
|
||||||
message: `All entries for image ID "${bildid}" have been deleted.`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Verschieben eines Bildes in ein anderes Deck
|
|
||||||
*/
|
|
||||||
async moveImage(bildid: string, targetDeckId: string, user: User) {
|
|
||||||
const existingImages = await this.db
|
|
||||||
.select()
|
|
||||||
.from(deck)
|
|
||||||
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
|
||||||
|
|
||||||
if (existingImages.length === 0) {
|
|
||||||
throw new HttpException('No entries found for the given image ID', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.db
|
|
||||||
.update(deck)
|
|
||||||
.set({
|
|
||||||
deckname: targetDeckId,
|
|
||||||
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
|
|
||||||
})
|
|
||||||
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
|
||||||
|
|
||||||
return { status: 'success', moved_entries: existingImages.length };
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Methode zum Umbenennen eines Decks
|
|
||||||
*/
|
|
||||||
async renameImage(bildId: string, newImagename: string, user: User) {
|
|
||||||
const existingImages = this.db
|
|
||||||
.select()
|
|
||||||
.from(deck)
|
|
||||||
.where(and(eq(deck.bildid, bildId), eq(deck.user, user.email)));
|
|
||||||
if (existingImages.length === 0) {
|
|
||||||
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.db
|
|
||||||
.update(deck)
|
|
||||||
.set({
|
|
||||||
bildname: newImagename,
|
|
||||||
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
|
|
||||||
})
|
|
||||||
.where(and(eq(deck.bildid, bildId), eq(deck.user, user.email)));
|
|
||||||
return { status: 'success', message: 'Image Entries renamed successfully' };
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Methode zum Aktualisieren einer Box
|
|
||||||
*/
|
|
||||||
async updateBox(
|
|
||||||
id: number,
|
|
||||||
data: {
|
|
||||||
due?: number;
|
|
||||||
ivl?: number;
|
|
||||||
factor?: number;
|
|
||||||
reps?: number;
|
|
||||||
lapses?: number;
|
|
||||||
isGraduated?: boolean;
|
|
||||||
inserted?: string;
|
|
||||||
},
|
|
||||||
user: User,
|
|
||||||
) {
|
|
||||||
const updateData: any = { ...data };
|
|
||||||
if (typeof data.isGraduated === 'boolean') {
|
|
||||||
updateData.isGraduated = Number(data.isGraduated);
|
|
||||||
}
|
|
||||||
updateData.updated = new Date(); //sql`CURRENT_TIMESTAMP`; // Setze 'updated' auf CURRENT_TIMESTAMP
|
|
||||||
updateData.inserted = new Date(data.inserted as string);
|
|
||||||
|
|
||||||
const result = await this.db
|
|
||||||
.update(deck)
|
|
||||||
.set(updateData)
|
|
||||||
.where(and(eq(deck.id, id), eq(deck.user, user.email)));
|
|
||||||
|
|
||||||
if (result.rowsAffected === 0) {
|
|
||||||
throw new HttpException('Box not found', HttpStatus.NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
return { status: 'success' };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode zum Abrufen aller eindeutigen Bild-IDs aus der Datenbank
|
|
||||||
*/
|
|
||||||
async getDistinctBildIds(user: User): Promise<string[]> {
|
|
||||||
try {
|
|
||||||
const result = await this.db.selectDistinct([deck.bildid]).from(deck).all();
|
|
||||||
|
|
||||||
// Extrahiere die bildid Werte aus dem Ergebnis
|
|
||||||
const usedIds = result.map((row: any) => row['0']).filter((id: string | null) => id !== null) as string[];
|
|
||||||
console.log(usedIds);
|
|
||||||
return usedIds;
|
|
||||||
} catch (error) {
|
|
||||||
this.sqlLogger.logQuery('Error fetching distinct bildids', []);
|
|
||||||
throw new HttpException(`Fehler beim Abrufen der Bild-IDs - ${error}`, HttpStatus.INTERNAL_SERVER_ERROR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Führt den Login-Vorgang durch:
|
|
||||||
* - Existiert der Benutzer bereits (überprüft via E-Mail), wird das Feld `lastLogin` (und ggf. weitere Felder) aktualisiert.
|
|
||||||
* - Existiert der Benutzer nicht, wird ein neuer Datensatz mit `role: 'guest'` und `lastLogin` auf den aktuellen Zeitpunkt angelegt.
|
|
||||||
*/
|
|
||||||
async logIn(createUserDto: InsertUser) {
|
|
||||||
// Prüfen, ob der Benutzer bereits existiert (hier anhand der E-Mail)
|
|
||||||
const existingUser = await this.db.select().from(users).where(eq(users.email, createUserDto.email)).limit(1);
|
|
||||||
|
|
||||||
if (existingUser.length > 0) {
|
|
||||||
// Benutzer existiert: Update des letzten Logins und ggf. weiterer Felder
|
|
||||||
const updatedUser = await this.db
|
|
||||||
.update(users)
|
|
||||||
.set({
|
|
||||||
lastLogin: new Date(), // Setzt lastLogin explizit auf den aktuellen Zeitpunkt
|
|
||||||
// Optional: Aktualisierung von Name und sign_in_provider, falls sich diese ändern sollten
|
|
||||||
name: createUserDto.name,
|
|
||||||
sign_in_provider: createUserDto.sign_in_provider,
|
|
||||||
numberOfLogins: sql`${users.numberOfLogins} + 1`,
|
|
||||||
})
|
|
||||||
.where(eq(users.email, createUserDto.email))
|
|
||||||
.returning();
|
|
||||||
return updatedUser;
|
|
||||||
} else {
|
|
||||||
// Neuer Benutzer: Insert mit role per Default 'guest' und lastLogin auf now
|
|
||||||
const insertedUser = await this.db
|
|
||||||
.insert(users)
|
|
||||||
.values({
|
|
||||||
name: createUserDto.name,
|
|
||||||
email: createUserDto.email,
|
|
||||||
sign_in_provider: createUserDto.sign_in_provider,
|
|
||||||
lastLogin: new Date(), // Setzt lastLogin auf now
|
|
||||||
role: 'guest', // Default-Wert 'guest'
|
|
||||||
})
|
|
||||||
.returning();
|
|
||||||
return insertedUser;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +1,20 @@
|
||||||
// decks.controller.ts
|
// decks.controller.ts
|
||||||
import { Body, Controller, Delete, Get, HttpException, HttpStatus, Param, Post, Put, Request, UseGuards } from '@nestjs/common';
|
import {
|
||||||
import { User } from '../db/schema';
|
Body,
|
||||||
import { AuthGuard } from '../service/auth.guard';
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
HttpException,
|
||||||
|
HttpStatus,
|
||||||
|
Param,
|
||||||
|
Post,
|
||||||
|
Put,
|
||||||
|
Request,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { User } from './db/schema';
|
||||||
import { DrizzleService } from './drizzle.service';
|
import { DrizzleService } from './drizzle.service';
|
||||||
|
import { AuthGuard } from './service/auth.guard';
|
||||||
|
|
||||||
@Controller('decks')
|
@Controller('decks')
|
||||||
@UseGuards(AuthGuard)
|
@UseGuards(AuthGuard)
|
||||||
|
|
@ -98,9 +110,16 @@ export class DecksController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put(':oldDeckname/rename')
|
@Put(':oldDeckname/rename')
|
||||||
async renameDeck(@Request() req, @Param('oldDeckname') oldDeckname: string, @Body() data: { newDeckName: string }) {
|
async renameDeck(
|
||||||
|
@Request() req,
|
||||||
|
@Param('oldDeckname') oldDeckname: string,
|
||||||
|
@Body() data: { newDeckName: string },
|
||||||
|
) {
|
||||||
if (!data.newDeckName) {
|
if (!data.newDeckName) {
|
||||||
throw new HttpException('New deck name is required', HttpStatus.BAD_REQUEST);
|
throw new HttpException(
|
||||||
|
'New deck name is required',
|
||||||
|
HttpStatus.BAD_REQUEST,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
const user: User = req['user'];
|
const user: User = req['user'];
|
||||||
return this.drizzleService.renameDeck(oldDeckname, data.newDeckName, user);
|
return this.drizzleService.renameDeck(oldDeckname, data.newDeckName, user);
|
||||||
|
|
@ -113,21 +132,31 @@ export class DecksController {
|
||||||
}
|
}
|
||||||
const user: User = req['user'];
|
const user: User = req['user'];
|
||||||
const requiredFields = ['deckname', 'bildname', 'bildid', 'boxes'];
|
const requiredFields = ['deckname', 'bildname', 'bildid', 'boxes'];
|
||||||
if (!requiredFields.every(field => field in data)) {
|
if (!requiredFields.every((field) => field in data)) {
|
||||||
throw new HttpException('Missing fields in data', HttpStatus.BAD_REQUEST);
|
throw new HttpException('Missing fields in data', HttpStatus.BAD_REQUEST);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Array.isArray(data.boxes) || data.boxes.length === 0) {
|
if (!Array.isArray(data.boxes) || data.boxes.length === 0) {
|
||||||
throw new HttpException("'boxes' must be a non-empty list", HttpStatus.BAD_REQUEST);
|
throw new HttpException(
|
||||||
|
"'boxes' must be a non-empty list",
|
||||||
|
HttpStatus.BAD_REQUEST,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.drizzleService.updateImage(data, user);
|
return this.drizzleService.updateImage(data, user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('image/:bildid/rename')
|
@Put('image/:bildid/rename')
|
||||||
async renameImage(@Request() req, @Param('bildid') bildid: string, @Body() data: { newImageName: string }) {
|
async renameImage(
|
||||||
|
@Request() req,
|
||||||
|
@Param('bildid') bildid: string,
|
||||||
|
@Body() data: { newImageName: string },
|
||||||
|
) {
|
||||||
if (!data.newImageName) {
|
if (!data.newImageName) {
|
||||||
throw new HttpException('New image name is required', HttpStatus.BAD_REQUEST);
|
throw new HttpException(
|
||||||
|
'New image name is required',
|
||||||
|
HttpStatus.BAD_REQUEST,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
const user: User = req['user'];
|
const user: User = req['user'];
|
||||||
return this.drizzleService.renameImage(bildid, data.newImageName, user);
|
return this.drizzleService.renameImage(bildid, data.newImageName, user);
|
||||||
|
|
@ -140,9 +169,16 @@ export class DecksController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('images/:bildid/move')
|
@Post('images/:bildid/move')
|
||||||
async moveImage(@Request() req, @Param('bildid') bildid: string, @Body() data: { targetDeckId: string }) {
|
async moveImage(
|
||||||
|
@Request() req,
|
||||||
|
@Param('bildid') bildid: string,
|
||||||
|
@Body() data: { targetDeckId: string },
|
||||||
|
) {
|
||||||
if (!data.targetDeckId) {
|
if (!data.targetDeckId) {
|
||||||
throw new HttpException('No targetDeckId provided', HttpStatus.BAD_REQUEST);
|
throw new HttpException(
|
||||||
|
'No targetDeckId provided',
|
||||||
|
HttpStatus.BAD_REQUEST,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
const user: User = req['user'];
|
const user: User = req['user'];
|
||||||
return this.drizzleService.moveImage(bildid, data.targetDeckId, user);
|
return this.drizzleService.moveImage(bildid, data.targetDeckId, user);
|
||||||
|
|
@ -0,0 +1,505 @@
|
||||||
|
// drizzle.service.ts
|
||||||
|
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
||||||
|
import { and, eq, sql } from 'drizzle-orm';
|
||||||
|
import { drizzle } from 'drizzle-orm/node-postgres';
|
||||||
|
import { deck, InsertUser, SelectDeck, User, users } from './db/schema';
|
||||||
|
import { SqlLoggerService } from './sql-logger.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class DrizzleService {
|
||||||
|
// private readonly logger = new Logger(DrizzleService.name);
|
||||||
|
private db: any;
|
||||||
|
constructor(private sqlLogger: SqlLoggerService) {
|
||||||
|
this.db = drizzle(process.env['DATABASE_URL']!, {
|
||||||
|
logger: {
|
||||||
|
logQuery: (query: string, params: any[]) => {
|
||||||
|
this.sqlLogger.logQuery(query, params);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hilfsmethode: Ermittelt die Rolle eines Users anhand der E-Mail.
|
||||||
|
*/
|
||||||
|
private async getUserRole(email: string): Promise<'guest' | 'pro' | 'admin'> {
|
||||||
|
const result = await this.db
|
||||||
|
.select({ role: users.role })
|
||||||
|
.from(users)
|
||||||
|
.where(eq(users.email, email))
|
||||||
|
.limit(1);
|
||||||
|
if (result.length === 0) {
|
||||||
|
// Falls der User nicht gefunden wird, gehen wir von "guest" aus.
|
||||||
|
return 'guest';
|
||||||
|
}
|
||||||
|
return result[0].role;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Abrufen der Decks eines Benutzers.
|
||||||
|
* Hier wird unterschieden in Deck-Header (deck.bildid IS NULL) und
|
||||||
|
* zugehörige Bilder (deck.bildid IS NOT NULL). Zudem werden
|
||||||
|
* - für "guest" maximal 2 Decks und 20 Bilder pro Deck
|
||||||
|
* - für "pro" maximal 10 Decks und 40 Bilder pro Deck
|
||||||
|
* zurückgegeben.
|
||||||
|
*/
|
||||||
|
async getDecks(user: User) {
|
||||||
|
const role = await this.getUserRole(user.email);
|
||||||
|
const maxDecks =
|
||||||
|
role === 'guest' ? 2 : role === 'pro' ? 10 : Number.MAX_SAFE_INTEGER;
|
||||||
|
const maxImages =
|
||||||
|
role === 'guest' ? 20 : role === 'pro' ? 40 : Number.MAX_SAFE_INTEGER;
|
||||||
|
|
||||||
|
// Abrufen der Deck-Header (d.h. Einträge ohne Bilddaten)
|
||||||
|
const deckHeaders = await this.db
|
||||||
|
.select()
|
||||||
|
.from(deck)
|
||||||
|
.where(and(eq(deck.user, user.email), sql`bildid IS NULL`))
|
||||||
|
.limit(maxDecks);
|
||||||
|
|
||||||
|
// Für jedes Deck werden nun die zugehörigen Bilder (Einträge mit bildid) abgerufen.
|
||||||
|
const imagesForDecks = await Promise.all(
|
||||||
|
deckHeaders.map(async (header: any) => {
|
||||||
|
const images: Array<any> = await this.db
|
||||||
|
.select()
|
||||||
|
.from(deck)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(deck.user, user.email),
|
||||||
|
eq(deck.deckname, header.deckname),
|
||||||
|
sql`bildid IS NOT NULL`,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
const minimizedImagesArray = (() => {
|
||||||
|
const selectedBildnamen: Array<any> = [];
|
||||||
|
// Sammle die ersten maxImages verschiedenen Bildnamen
|
||||||
|
for (const item of images) {
|
||||||
|
if (
|
||||||
|
!selectedBildnamen.includes(item.bildname) &&
|
||||||
|
selectedBildnamen.length < maxImages
|
||||||
|
) {
|
||||||
|
selectedBildnamen.push(item.bildname);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Filtere das Array, um nur Einträge mit diesen Bildnamen zu behalten
|
||||||
|
return images.filter((item) =>
|
||||||
|
selectedBildnamen.includes(item.bildname),
|
||||||
|
);
|
||||||
|
})();
|
||||||
|
return { minimizedImagesArray };
|
||||||
|
//return { images };
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
return imagesForDecks.flatMap((item) => item.minimizedImagesArray);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Erstellen eines neuen Decks.
|
||||||
|
* Hier wird geprüft, ob der User (basierend auf seiner Rolle) bereits
|
||||||
|
* die maximale Anzahl an Decks erstellt hat.
|
||||||
|
*/
|
||||||
|
async createDeck(deckname: string, user: User) {
|
||||||
|
const role = await this.getUserRole(user.email);
|
||||||
|
const maxDecks =
|
||||||
|
role === 'guest' ? 2 : role === 'pro' ? 10 : Number.MAX_SAFE_INTEGER;
|
||||||
|
|
||||||
|
// Zähle nur die Deck-Header (Einträge ohne Bilddaten)
|
||||||
|
const deckCountResult = await this.db
|
||||||
|
.select({ count: sql`count(*) as count` })
|
||||||
|
.from(deck)
|
||||||
|
.where(and(eq(deck.user, user.email), sql`bildid IS NULL`))
|
||||||
|
.all();
|
||||||
|
const deckCount = Number(deckCountResult[0].count);
|
||||||
|
if (deckCount >= maxDecks) {
|
||||||
|
throw new HttpException(
|
||||||
|
`Maximale Anzahl an Decks (${maxDecks}) erreicht für Rolle "${role}"`,
|
||||||
|
HttpStatus.FORBIDDEN,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 'inserted' und 'updated' werden automatisch von der Datenbank gesetzt
|
||||||
|
const result = await this.db
|
||||||
|
.insert(deck)
|
||||||
|
.values({
|
||||||
|
deckname,
|
||||||
|
user: user.email,
|
||||||
|
})
|
||||||
|
.returning();
|
||||||
|
return { status: 'success', deck: result };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Abrufen eines Decks nach Name.
|
||||||
|
* (Hinweis: Diese Methode wird intern z. B. in updateImage verwendet.
|
||||||
|
* Daher wird hier nicht die Limitierung angewendet.)
|
||||||
|
*/
|
||||||
|
async getDeckByName(deckname: string, user: User) {
|
||||||
|
return this.db
|
||||||
|
.select()
|
||||||
|
.from(deck)
|
||||||
|
.where(and(eq(deck.deckname, deckname), eq(deck.user, user.email)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Löschen eines Decks.
|
||||||
|
*/
|
||||||
|
async deleteDeck(deckname: string, user: User) {
|
||||||
|
const existingDeck = await this.getDeckByName(deckname, user);
|
||||||
|
if (existingDeck.length === 0) {
|
||||||
|
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.db
|
||||||
|
.delete(deck)
|
||||||
|
.where(and(eq(deck.deckname, deckname), eq(deck.user, user.email)));
|
||||||
|
return { status: 'success' };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Umbenennen eines Decks.
|
||||||
|
*/
|
||||||
|
async renameDeck(oldDeckname: string, newDeckname: string, user: User) {
|
||||||
|
const existingDeck = await this.getDeckByName(oldDeckname, user);
|
||||||
|
if (existingDeck.length === 0) {
|
||||||
|
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingNewDeck = await this.getDeckByName(newDeckname, user);
|
||||||
|
if (existingNewDeck.length > 0) {
|
||||||
|
throw new HttpException(
|
||||||
|
'Deck with the new name already exists',
|
||||||
|
HttpStatus.CONFLICT,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.db
|
||||||
|
.update(deck)
|
||||||
|
.set({
|
||||||
|
deckname: newDeckname,
|
||||||
|
updated: new Date(),
|
||||||
|
})
|
||||||
|
.where(and(eq(deck.deckname, oldDeckname), eq(deck.user, user.email)));
|
||||||
|
return {
|
||||||
|
status: 'success',
|
||||||
|
message: 'Deck renamed successfully',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Aktualisieren eines Bildes innerhalb eines Decks.
|
||||||
|
* Hier wird vor dem Anlegen eines neuen Bildes geprüft, ob das
|
||||||
|
* maximale Limit pro Deck (basierend auf der User-Rolle) erreicht wurde.
|
||||||
|
*/
|
||||||
|
async updateImage(
|
||||||
|
data: {
|
||||||
|
deckname: string;
|
||||||
|
bildname: string;
|
||||||
|
bildid: string;
|
||||||
|
boxes: Array<{
|
||||||
|
x1: number;
|
||||||
|
x2: number;
|
||||||
|
y1: number;
|
||||||
|
y2: number;
|
||||||
|
id?: number;
|
||||||
|
}>;
|
||||||
|
},
|
||||||
|
user: User,
|
||||||
|
) {
|
||||||
|
// Schritt 1: Überprüfen, ob das Deck existiert
|
||||||
|
const existingDecks: SelectDeck[] = await this.getDeckByName(
|
||||||
|
data.deckname,
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
if (existingDecks.length === 0) {
|
||||||
|
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rollenbasierte Limitierung: max. Bilder pro Deck
|
||||||
|
const role = await this.getUserRole(user.email);
|
||||||
|
const maxImages =
|
||||||
|
role === 'guest' ? 20 : role === 'pro' ? 40 : Number.MAX_SAFE_INTEGER;
|
||||||
|
|
||||||
|
// Prüfen, ob für die angegebene bildid bereits Einträge existieren.
|
||||||
|
const imageGroupExists = existingDecks.some(
|
||||||
|
(row) => row.bildid === data.bildid,
|
||||||
|
);
|
||||||
|
if (!imageGroupExists) {
|
||||||
|
// Zähle die unterschiedlichen Bilder (distinct bildid, wobei nur Einträge mit gesetzter bildid zählen)
|
||||||
|
const distinctImagesResult = await this.db
|
||||||
|
.select({ count: sql`count(distinct bildid) as count` })
|
||||||
|
.from(deck)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(deck.user, user.email),
|
||||||
|
eq(deck.deckname, data.deckname),
|
||||||
|
sql`bildid IS NOT NULL`,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.all();
|
||||||
|
const distinctImageCount = Number(distinctImagesResult[0].count);
|
||||||
|
if (distinctImageCount >= maxImages) {
|
||||||
|
throw new HttpException(
|
||||||
|
`Maximale Anzahl an Bildern (${maxImages}) für Deck "${data.deckname}" erreicht`,
|
||||||
|
HttpStatus.FORBIDDEN,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Schritt 2: Trennen der neuen und bestehenden Einträge
|
||||||
|
const newEntries = data.boxes.filter((b) => !b.id);
|
||||||
|
const existingEntries = data.boxes.filter((b) => b.id);
|
||||||
|
|
||||||
|
// Schritt 3: Einfügen neuer Einträge
|
||||||
|
const insertedImages: any = [];
|
||||||
|
for (let index = 0; index < newEntries.length; index++) {
|
||||||
|
const box = newEntries[index];
|
||||||
|
const result = await this.db
|
||||||
|
.insert(deck)
|
||||||
|
.values({
|
||||||
|
deckname: data.deckname,
|
||||||
|
bildname: data.bildname,
|
||||||
|
bildid: data.bildid,
|
||||||
|
x1: box.x1,
|
||||||
|
x2: box.x2,
|
||||||
|
y1: box.y1,
|
||||||
|
y2: box.y2,
|
||||||
|
user: user.email,
|
||||||
|
})
|
||||||
|
.returning();
|
||||||
|
insertedImages.push(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Schritt 4: Aktualisieren bestehender Einträge
|
||||||
|
for (let index = 0; index < existingEntries.length; index++) {
|
||||||
|
const box = existingEntries[index];
|
||||||
|
const existingDeck = existingDecks.find((d) => d.id === box.id);
|
||||||
|
if (
|
||||||
|
existingDeck &&
|
||||||
|
(existingDeck.x1 !== box.x1 ||
|
||||||
|
existingDeck.x2 !== box.x2 ||
|
||||||
|
existingDeck.y1 !== box.y1 ||
|
||||||
|
existingDeck.y2 !== box.y2)
|
||||||
|
) {
|
||||||
|
const result = await this.db
|
||||||
|
.update(deck)
|
||||||
|
.set({
|
||||||
|
x1: box.x1,
|
||||||
|
x2: box.x2,
|
||||||
|
y1: box.y1,
|
||||||
|
y2: box.y2,
|
||||||
|
updated: new Date(),
|
||||||
|
})
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(deck.user, user.email),
|
||||||
|
eq(deck.bildid, data.bildid),
|
||||||
|
eq(deck.deckname, data.deckname),
|
||||||
|
eq(deck.id, box.id!),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (result.rowsAffected === 0) {
|
||||||
|
throw new HttpException(
|
||||||
|
`Box with id ${box.id} not found`,
|
||||||
|
HttpStatus.NOT_FOUND,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Schritt 5: Löschen von nicht mehr vorhandenen Einträgen
|
||||||
|
const existingIdsInDb = existingDecks
|
||||||
|
.filter(
|
||||||
|
(entry) =>
|
||||||
|
entry.bildid === data.bildid && entry.deckname === data.deckname,
|
||||||
|
)
|
||||||
|
.map((entry) => entry.id);
|
||||||
|
const incomingIds = existingEntries.map((entry) => entry.id);
|
||||||
|
const idsToDelete = existingIdsInDb.filter(
|
||||||
|
(id) => !incomingIds.includes(id),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (idsToDelete.length > 0) {
|
||||||
|
await this.db
|
||||||
|
.delete(deck)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(deck.deckname, data.deckname),
|
||||||
|
eq(deck.bildid, data.bildid),
|
||||||
|
eq(deck.user, user.email),
|
||||||
|
sql`id in ${idsToDelete}`,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return { status: 'success', inserted_images: insertedImages };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Löschen von Bildern anhand der bildid.
|
||||||
|
*/
|
||||||
|
async deleteImagesByBildId(bildid: string, user: User) {
|
||||||
|
const affectedDecks = await this.db
|
||||||
|
.select({ deckname: deck.deckname })
|
||||||
|
.from(deck)
|
||||||
|
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
||||||
|
if (affectedDecks.length === 0) {
|
||||||
|
throw new HttpException(
|
||||||
|
'No entries found for the given image ID',
|
||||||
|
HttpStatus.NOT_FOUND,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await this.db
|
||||||
|
.delete(deck)
|
||||||
|
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
||||||
|
return {
|
||||||
|
status: 'success',
|
||||||
|
message: `All entries for image ID "${bildid}" have been deleted.`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Verschieben eines Bildes in ein anderes Deck.
|
||||||
|
*/
|
||||||
|
async moveImage(bildid: string, targetDeckId: string, user: User) {
|
||||||
|
const existingImages = await this.db
|
||||||
|
.select()
|
||||||
|
.from(deck)
|
||||||
|
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
||||||
|
if (existingImages.length === 0) {
|
||||||
|
throw new HttpException(
|
||||||
|
'No entries found for the given image ID',
|
||||||
|
HttpStatus.NOT_FOUND,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await this.db
|
||||||
|
.update(deck)
|
||||||
|
.set({
|
||||||
|
deckname: targetDeckId,
|
||||||
|
updated: new Date(),
|
||||||
|
})
|
||||||
|
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
|
||||||
|
return { status: 'success', moved_entries: existingImages.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Umbenennen eines Bildes.
|
||||||
|
*/
|
||||||
|
async renameImage(bildId: string, newImagename: string, user: User) {
|
||||||
|
const existingImages = await this.db
|
||||||
|
.select()
|
||||||
|
.from(deck)
|
||||||
|
.where(and(eq(deck.bildid, bildId), eq(deck.user, user.email)))
|
||||||
|
.all();
|
||||||
|
if (existingImages.length === 0) {
|
||||||
|
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
await this.db
|
||||||
|
.update(deck)
|
||||||
|
.set({
|
||||||
|
bildname: newImagename,
|
||||||
|
updated: new Date(),
|
||||||
|
})
|
||||||
|
.where(and(eq(deck.bildid, bildId), eq(deck.user, user.email)));
|
||||||
|
return {
|
||||||
|
status: 'success',
|
||||||
|
message: 'Image Entries renamed successfully',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Aktualisieren einer Box.
|
||||||
|
*/
|
||||||
|
async updateBox(
|
||||||
|
id: number,
|
||||||
|
data: {
|
||||||
|
due?: number;
|
||||||
|
ivl?: number;
|
||||||
|
factor?: number;
|
||||||
|
reps?: number;
|
||||||
|
lapses?: number;
|
||||||
|
isGraduated?: boolean;
|
||||||
|
inserted?: string;
|
||||||
|
},
|
||||||
|
user: User,
|
||||||
|
) {
|
||||||
|
const updateData: any = { ...data };
|
||||||
|
if (typeof data.isGraduated === 'boolean') {
|
||||||
|
updateData.isGraduated = Number(data.isGraduated);
|
||||||
|
}
|
||||||
|
updateData.updated = new Date();
|
||||||
|
updateData.inserted = new Date(data.inserted as string);
|
||||||
|
|
||||||
|
const result = await this.db
|
||||||
|
.update(deck)
|
||||||
|
.set(updateData)
|
||||||
|
.where(and(eq(deck.id, id), eq(deck.user, user.email)));
|
||||||
|
if (result.rowsAffected === 0) {
|
||||||
|
throw new HttpException('Box not found', HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
return { status: 'success' };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Methode zum Abrufen aller eindeutigen Bild-IDs aus der Datenbank.
|
||||||
|
*/
|
||||||
|
async getDistinctBildIds(user: User): Promise<string[]> {
|
||||||
|
try {
|
||||||
|
const result = await this.db
|
||||||
|
.selectDistinct([deck.bildid])
|
||||||
|
.from(deck)
|
||||||
|
.all();
|
||||||
|
const usedIds = result
|
||||||
|
.map((row: any) => row['0'])
|
||||||
|
.filter((id: string | null) => id !== null) as string[];
|
||||||
|
console.log(usedIds);
|
||||||
|
return usedIds;
|
||||||
|
} catch (error) {
|
||||||
|
this.sqlLogger.logQuery('Error fetching distinct bildids', []);
|
||||||
|
throw new HttpException(
|
||||||
|
`Fehler beim Abrufen der Bild-IDs - ${error}`,
|
||||||
|
HttpStatus.INTERNAL_SERVER_ERROR,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Führt den Login-Vorgang durch:
|
||||||
|
* - Existiert der Benutzer bereits (überprüft via E-Mail), wird das Feld `lastLogin`
|
||||||
|
* (und ggf. weitere Felder) aktualisiert.
|
||||||
|
* - Existiert der Benutzer nicht, wird ein neuer Datensatz angelegt.
|
||||||
|
*/
|
||||||
|
async logIn(createUserDto: InsertUser) {
|
||||||
|
const existingUser = await this.db
|
||||||
|
.select()
|
||||||
|
.from(users)
|
||||||
|
.where(eq(users.email, createUserDto.email))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (existingUser.length > 0) {
|
||||||
|
const updatedUser = await this.db
|
||||||
|
.update(users)
|
||||||
|
.set({
|
||||||
|
lastLogin: new Date(),
|
||||||
|
name: createUserDto.name,
|
||||||
|
sign_in_provider: createUserDto.sign_in_provider,
|
||||||
|
numberOfLogins: sql`${users.numberOfLogins} + 1`,
|
||||||
|
})
|
||||||
|
.where(eq(users.email, createUserDto.email))
|
||||||
|
.returning();
|
||||||
|
return updatedUser;
|
||||||
|
} else {
|
||||||
|
const insertedUser = await this.db
|
||||||
|
.insert(users)
|
||||||
|
.values({
|
||||||
|
name: createUserDto.name,
|
||||||
|
email: createUserDto.email,
|
||||||
|
sign_in_provider: createUserDto.sign_in_provider,
|
||||||
|
lastLogin: new Date(),
|
||||||
|
role: 'guest',
|
||||||
|
})
|
||||||
|
.returning();
|
||||||
|
return insertedUser;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,12 +1,7 @@
|
||||||
/**
|
|
||||||
* This is not a production server yet!
|
|
||||||
* This is only a minimal backend to get started.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { Logger } from '@nestjs/common';
|
import { Logger } from '@nestjs/common';
|
||||||
import { NestFactory } from '@nestjs/core';
|
import { NestFactory } from '@nestjs/core';
|
||||||
import { json, urlencoded } from 'express';
|
import { json, urlencoded } from 'express';
|
||||||
import { AppModule } from './app/app.module';
|
import { AppModule } from './app.module';
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = await NestFactory.create(AppModule, {
|
const app = await NestFactory.create(AppModule, {
|
||||||
|
|
@ -18,7 +13,9 @@ async function bootstrap() {
|
||||||
app.setGlobalPrefix(globalPrefix);
|
app.setGlobalPrefix(globalPrefix);
|
||||||
const port = process.env['PORT'] || 3000;
|
const port = process.env['PORT'] || 3000;
|
||||||
await app.listen(port);
|
await app.listen(port);
|
||||||
Logger.log(`🚀 Application is running on: http://localhost:${port}/${globalPrefix}`);
|
Logger.log(
|
||||||
|
`🚀 Application is running on: http://localhost:${port}/${globalPrefix}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
bootstrap();
|
void bootstrap();
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,16 @@
|
||||||
// decks.controller.ts
|
// decks.controller.ts
|
||||||
import { Body, Controller, HttpException, HttpStatus, Post, Res, UseGuards } from '@nestjs/common';
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
HttpException,
|
||||||
|
HttpStatus,
|
||||||
|
Post,
|
||||||
|
Res,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
import express from 'express';
|
import express from 'express';
|
||||||
import { AuthGuard } from '../service/auth.guard';
|
|
||||||
import { DrizzleService } from './drizzle.service';
|
import { DrizzleService } from './drizzle.service';
|
||||||
|
import { AuthGuard } from './service/auth.guard';
|
||||||
|
|
||||||
@Controller('')
|
@Controller('')
|
||||||
@UseGuards(AuthGuard)
|
@UseGuards(AuthGuard)
|
||||||
|
|
@ -12,7 +20,10 @@ export class ProxyController {
|
||||||
// Proxy Endpoints
|
// Proxy Endpoints
|
||||||
// --------------------
|
// --------------------
|
||||||
@Post('ocr')
|
@Post('ocr')
|
||||||
async ocrEndpoint(@Body() data: { image: string }, @Res() res: express.Response) {
|
async ocrEndpoint(
|
||||||
|
@Body() data: { image: string },
|
||||||
|
@Res() res: express.Response,
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
if (!data || !data.image) {
|
if (!data || !data.image) {
|
||||||
throw new HttpException('No image provided', HttpStatus.BAD_REQUEST);
|
throw new HttpException('No image provided', HttpStatus.BAD_REQUEST);
|
||||||
|
|
@ -32,7 +43,10 @@ export class ProxyController {
|
||||||
if (response.status === 400) {
|
if (response.status === 400) {
|
||||||
throw new HttpException(result.error, HttpStatus.BAD_REQUEST);
|
throw new HttpException(result.error, HttpStatus.BAD_REQUEST);
|
||||||
}
|
}
|
||||||
throw new HttpException(result.error || 'OCR processing failed', HttpStatus.INTERNAL_SERVER_ERROR);
|
throw new HttpException(
|
||||||
|
result.error || 'OCR processing failed',
|
||||||
|
HttpStatus.INTERNAL_SERVER_ERROR,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bei erfolgreicher Verarbeitung mit Warnung
|
// Bei erfolgreicher Verarbeitung mit Warnung
|
||||||
|
|
@ -52,7 +66,10 @@ export class ProxyController {
|
||||||
if (error instanceof HttpException) {
|
if (error instanceof HttpException) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
throw new HttpException('Internal server error', HttpStatus.INTERNAL_SERVER_ERROR);
|
throw new HttpException(
|
||||||
|
'Internal server error',
|
||||||
|
HttpStatus.INTERNAL_SERVER_ERROR,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -60,7 +77,10 @@ export class ProxyController {
|
||||||
// Cleanup Endpoint
|
// Cleanup Endpoint
|
||||||
// --------------------
|
// --------------------
|
||||||
@Post('cleanup')
|
@Post('cleanup')
|
||||||
async cleanupEndpoint(@Body() data: { dryrun?: boolean }, @Res() res: express.Response) {
|
async cleanupEndpoint(
|
||||||
|
@Body() data: { dryrun?: boolean },
|
||||||
|
@Res() res: express.Response,
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
const user = res.req['user']; // Benutzerinformationen aus dem Request
|
const user = res.req['user']; // Benutzerinformationen aus dem Request
|
||||||
|
|
||||||
|
|
@ -74,7 +94,10 @@ export class ProxyController {
|
||||||
// 3. Verarbeitung des dryrun Parameters
|
// 3. Verarbeitung des dryrun Parameters
|
||||||
const dryrun = data.dryrun !== undefined ? data.dryrun : true;
|
const dryrun = data.dryrun !== undefined ? data.dryrun : true;
|
||||||
if (typeof dryrun !== 'boolean') {
|
if (typeof dryrun !== 'boolean') {
|
||||||
throw new HttpException("'dryrun' muss ein boolescher Wert sein.", HttpStatus.BAD_REQUEST);
|
throw new HttpException(
|
||||||
|
"'dryrun' muss ein boolescher Wert sein.",
|
||||||
|
HttpStatus.BAD_REQUEST,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 4. Aufruf des Flask-Backend-Endpunkts
|
// 4. Aufruf des Flask-Backend-Endpunkts
|
||||||
|
|
@ -89,7 +112,10 @@ export class ProxyController {
|
||||||
const result = await response.json();
|
const result = await response.json();
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new HttpException(result.error || 'Cleanup failed', response.status);
|
throw new HttpException(
|
||||||
|
result.error || 'Cleanup failed',
|
||||||
|
response.status,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 5. Rückgabe der Ergebnisse an den Client
|
// 5. Rückgabe der Ergebnisse an den Client
|
||||||
|
|
@ -98,7 +124,10 @@ export class ProxyController {
|
||||||
if (error instanceof HttpException) {
|
if (error instanceof HttpException) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
throw new HttpException('Interner Serverfehler', HttpStatus.INTERNAL_SERVER_ERROR);
|
throw new HttpException(
|
||||||
|
'Interner Serverfehler',
|
||||||
|
HttpStatus.INTERNAL_SERVER_ERROR,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
// user.controller.ts
|
// user.controller.ts
|
||||||
import { Body, Controller, Post, UseGuards } from '@nestjs/common';
|
import { Body, Controller, Post, UseGuards } from '@nestjs/common';
|
||||||
import type { InsertUser } from '../db/schema';
|
import type { InsertUser } from './db/schema';
|
||||||
import { AuthGuard } from '../service/auth.guard';
|
|
||||||
import { DrizzleService } from './drizzle.service';
|
import { DrizzleService } from './drizzle.service';
|
||||||
|
import { AuthGuard } from './service/auth.guard';
|
||||||
|
|
||||||
@Controller('users')
|
@Controller('users')
|
||||||
@UseGuards(AuthGuard)
|
@UseGuards(AuthGuard)
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"extends": "./tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"outDir": "../dist/out-tsc",
|
|
||||||
"module": "ES2020",
|
|
||||||
"types": ["node"],
|
|
||||||
"emitDecoratorMetadata": true,
|
|
||||||
"isolatedModules": true,
|
|
||||||
"target": "es2021",
|
|
||||||
"strictNullChecks": true
|
|
||||||
},
|
|
||||||
"include": ["src/**/*.ts"]
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
|
||||||
|
}
|
||||||
|
|
@ -1,13 +1,21 @@
|
||||||
{
|
{
|
||||||
"extends": "../tsconfig.json",
|
|
||||||
"files": [],
|
|
||||||
"include": [],
|
|
||||||
"references": [
|
|
||||||
{
|
|
||||||
"path": "./tsconfig.app.json"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"esModuleInterop": true
|
"module": "commonjs",
|
||||||
|
"declaration": true,
|
||||||
|
"removeComments": true,
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"target": "ES2021",
|
||||||
|
"sourceMap": true,
|
||||||
|
"outDir": "./dist",
|
||||||
|
"baseUrl": "./",
|
||||||
|
"incremental": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"strictNullChecks": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"noImplicitAny": false,
|
||||||
|
"strictBindCallApply": false,
|
||||||
|
"noFallthroughCasesInSwitch": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
|
|
||||||
const { join } = require('path');
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
output: {
|
|
||||||
path: join(__dirname, '../dist/api'),
|
|
||||||
},
|
|
||||||
plugins: [
|
|
||||||
new NxAppWebpackPlugin({
|
|
||||||
target: 'node',
|
|
||||||
compiler: 'tsc',
|
|
||||||
main: './src/main.ts',
|
|
||||||
tsConfig: './tsconfig.app.json',
|
|
||||||
assets: ['./src/assets'],
|
|
||||||
optimization: false,
|
|
||||||
outputHashing: 'none',
|
|
||||||
generatePackageJson: true,
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
import 'dotenv/config';
|
|
||||||
import { defineConfig } from 'drizzle-kit';
|
|
||||||
export default defineConfig({
|
|
||||||
out: './drizzle',
|
|
||||||
schema: './api/src/db/schema.ts',
|
|
||||||
dialect: 'postgresql',
|
|
||||||
dbCredentials: {
|
|
||||||
url: process.env['DATABASE_URL'],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"migrations": [
|
|
||||||
{
|
|
||||||
"version": "19.0.0",
|
|
||||||
"factory": "./use-application-builder/migration",
|
|
||||||
"description": "Migrate application projects to the new build system. Application projects that are using the '@angular-devkit/build-angular' package's 'browser' and/or 'browser-esbuild' builders will be migrated to use the new 'application' builder. You can read more about this, including known issues and limitations, here: https://angular.dev/tools/cli/build-system-migration",
|
|
||||||
"optional": true,
|
|
||||||
"recommended": true,
|
|
||||||
"documentation": "tools/cli/build-system-migration",
|
|
||||||
"package": "@angular/cli",
|
|
||||||
"name": "use-application-builder"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "19.0.0",
|
|
||||||
"factory": "./update-workspace-config/migration",
|
|
||||||
"description": "Update the workspace configuration by replacing deprecated options in 'angular.json' for compatibility with the latest Angular CLI changes.",
|
|
||||||
"package": "@angular/cli",
|
|
||||||
"name": "update-workspace-config"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "19.0.0",
|
|
||||||
"factory": "./update-ssr-imports/migration",
|
|
||||||
"description": "Update '@angular/ssr' import paths to use the new '/node' entry point when 'CommonEngine' is detected.",
|
|
||||||
"package": "@angular/cli",
|
|
||||||
"name": "update-ssr-imports"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
26
nx.json
26
nx.json
|
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
"$schema": "./node_modules/nx/schemas/nx-schema.json",
|
|
||||||
"targetDefaults": {
|
|
||||||
"build": {
|
|
||||||
"cache": true,
|
|
||||||
"dependsOn": ["^build"],
|
|
||||||
"inputs": ["production", "^production"]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultBase": "master",
|
|
||||||
"namedInputs": {
|
|
||||||
"sharedGlobals": [],
|
|
||||||
"default": ["{projectRoot}/**/*", "sharedGlobals"],
|
|
||||||
"production": ["default"]
|
|
||||||
},
|
|
||||||
"plugins": [
|
|
||||||
{
|
|
||||||
"plugin": "@nx/webpack/plugin",
|
|
||||||
"options": {
|
|
||||||
"buildTargetName": "build",
|
|
||||||
"serveTargetName": "serve",
|
|
||||||
"previewTargetName": "preview"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
88
package.json
88
package.json
|
|
@ -1,72 +1,48 @@
|
||||||
{
|
{
|
||||||
"name": "vokabeltraining",
|
"name": "haiky",
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "nx serve",
|
"start": "ng serve --port=4202",
|
||||||
"start:all": "concurrently 'nx serve' 'http-server ../vocab-backend'",
|
"start-all": "concurrently 'ng serve --port=4202' 'http-server ../vocab-backend'",
|
||||||
"build": "nx build",
|
"build": "ng build",
|
||||||
"watch": "nx build --watch --configuration development"
|
"watch": "ng build --watch --configuration development",
|
||||||
|
"test": "ng test"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "19.1.1",
|
"@angular/animations": "^19.1.0",
|
||||||
"@angular/common": "19.1.1",
|
"@angular/common": "^19.1.0",
|
||||||
"@angular/compiler": "19.1.1",
|
"@angular/compiler": "^19.1.0",
|
||||||
"@angular/core": "19.1.1",
|
"@angular/core": "^19.1.0",
|
||||||
"@angular/fire": "^19.0.0",
|
"@angular/fire": "^19.0.0",
|
||||||
"@angular/forms": "19.1.1",
|
"@angular/forms": "^19.1.0",
|
||||||
"@angular/platform-browser": "19.1.1",
|
"@angular/platform-browser": "^19.1.0",
|
||||||
"@angular/platform-browser-dynamic": "19.1.1",
|
"@angular/platform-browser-dynamic": "^19.1.0",
|
||||||
"@angular/router": "19.1.1",
|
"@angular/router": "^19.1.0",
|
||||||
"@libsql/client": "^0.14.0",
|
"@tailwindcss/postcss": "^4.0.6",
|
||||||
"@nestjs/common": "^10.0.2",
|
|
||||||
"@nestjs/core": "^10.0.2",
|
|
||||||
"@nestjs/platform-express": "^10.0.2",
|
|
||||||
"axios": "^1.6.0",
|
|
||||||
"dotenv": "^16.4.7",
|
|
||||||
"fabric": "^5.4.1",
|
"fabric": "^5.4.1",
|
||||||
"firebase": "^11.2.0",
|
"firebase": "^11.3.1",
|
||||||
"firebase-admin": "^13.0.2",
|
"firebase-admin": "^13.1.0",
|
||||||
"flowbite": "^2.5.2",
|
"flowbite": "^3.1.2",
|
||||||
"http-server": "^14.1.1",
|
"postcss": "^8.5.2",
|
||||||
"pg": "^8.13.1",
|
|
||||||
"reflect-metadata": "^0.1.13",
|
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
|
"tailwindcss": "^4.0.6",
|
||||||
"tslib": "^2.3.0",
|
"tslib": "^2.3.0",
|
||||||
"zone.js": "~0.15.0"
|
"zone.js": "~0.15.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/core": "19.1.2",
|
"@angular-devkit/build-angular": "^19.1.7",
|
||||||
"@angular-devkit/schematics": "19.1.2",
|
"@angular/cli": "^19.1.7",
|
||||||
"@angular/build": "^19.1.2",
|
"@angular/compiler-cli": "^19.1.0",
|
||||||
"@angular/cli": "19.1.2",
|
"@types/jasmine": "~5.1.0",
|
||||||
"@angular/compiler-cli": "19.1.1",
|
|
||||||
"@nestjs/schematics": "^10.0.1",
|
|
||||||
"@nestjs/testing": "^10.0.2",
|
|
||||||
"@nx/angular": "20.3.2",
|
|
||||||
"@nx/js": "20.3.2",
|
|
||||||
"@nx/nest": "20.3.2",
|
|
||||||
"@nx/node": "20.3.2",
|
|
||||||
"@nx/web": "20.3.2",
|
|
||||||
"@nx/webpack": "20.3.2",
|
|
||||||
"@nx/workspace": "20.3.2",
|
|
||||||
"@schematics/angular": "^19.1.2",
|
|
||||||
"@swc-node/register": "~1.9.1",
|
|
||||||
"@swc/core": "~1.5.7",
|
|
||||||
"@swc/helpers": "~0.5.11",
|
|
||||||
"@types/fabric": "^5.3.9",
|
|
||||||
"@types/node": "~18.16.9",
|
|
||||||
"@types/pg": "^8.11.11",
|
|
||||||
"chalk": "^5.4.1",
|
|
||||||
"concurrently": "^9.1.2",
|
"concurrently": "^9.1.2",
|
||||||
"drizzle-kit": "^0.30.4",
|
"jasmine-core": "~5.5.0",
|
||||||
"drizzle-orm": "^0.39.2",
|
"karma": "~6.4.0",
|
||||||
"nx": "20.3.2",
|
"karma-chrome-launcher": "~3.2.0",
|
||||||
"prettier": "^2.6.2",
|
"karma-coverage": "~2.2.0",
|
||||||
"tailwindcss": "^3.4.15",
|
"karma-jasmine": "~5.1.0",
|
||||||
"tsx": "^4.19.2",
|
"karma-jasmine-html-reporter": "~2.1.0",
|
||||||
"typescript": "~5.5.2",
|
"typescript": "~5.7.2"
|
||||||
"webpack-cli": "^5.1.4"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
110
project.json
110
project.json
|
|
@ -1,110 +0,0 @@
|
||||||
{
|
|
||||||
"$schema": "node_modules/nx/schemas/project-schema.json",
|
|
||||||
"name": "vokabeltraining",
|
|
||||||
"projectType": "application",
|
|
||||||
"generators": {
|
|
||||||
"@schematics/angular:component": {
|
|
||||||
"inlineTemplate": true,
|
|
||||||
"inlineStyle": true,
|
|
||||||
"style": "scss",
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:class": {
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:directive": {
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:guard": {
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:interceptor": {
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:pipe": {
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:resolver": {
|
|
||||||
"skipTests": true
|
|
||||||
},
|
|
||||||
"@schematics/angular:service": {
|
|
||||||
"skipTests": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sourceRoot": "src",
|
|
||||||
"prefix": "app",
|
|
||||||
"targets": {
|
|
||||||
"build": {
|
|
||||||
"executor": "@angular/build:application",
|
|
||||||
"options": {
|
|
||||||
"outputPath": "dist/vokabeltraining",
|
|
||||||
"index": "src/index.html",
|
|
||||||
"browser": "src/main.ts",
|
|
||||||
"polyfills": [
|
|
||||||
"zone.js"
|
|
||||||
],
|
|
||||||
"tsConfig": "tsconfig.app.json",
|
|
||||||
"inlineStyleLanguage": "scss",
|
|
||||||
"assets": [
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "public"
|
|
||||||
},
|
|
||||||
"src/assets"
|
|
||||||
],
|
|
||||||
"styles": [
|
|
||||||
"src/styles.scss"
|
|
||||||
],
|
|
||||||
"scripts": [],
|
|
||||||
"fileReplacements": [
|
|
||||||
{
|
|
||||||
"replace": "src/app/environments/environment.ts",
|
|
||||||
"with": "src/app/environments/environment.prod.ts"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"budgets": [
|
|
||||||
{
|
|
||||||
"type": "initial",
|
|
||||||
"maximumWarning": "500kB",
|
|
||||||
"maximumError": "1MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "anyComponentStyle",
|
|
||||||
"maximumWarning": "2kB",
|
|
||||||
"maximumError": "4kB"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"outputHashing": "all"
|
|
||||||
},
|
|
||||||
"development": {
|
|
||||||
"optimization": false,
|
|
||||||
"extractLicenses": false,
|
|
||||||
"sourceMap": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultConfiguration": "production"
|
|
||||||
},
|
|
||||||
"serve": {
|
|
||||||
"executor": "@angular/build:dev-server",
|
|
||||||
"options": {
|
|
||||||
"proxyConfig": "proxy.conf.json",
|
|
||||||
"port": 4202
|
|
||||||
},
|
|
||||||
"configurations": {
|
|
||||||
"production": {
|
|
||||||
"buildTarget": "vokabeltraining:build:production"
|
|
||||||
},
|
|
||||||
"development": {
|
|
||||||
"buildTarget": "vokabeltraining:build:development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultConfiguration": "development"
|
|
||||||
},
|
|
||||||
"extract-i18n": {
|
|
||||||
"executor": "@angular/build:extract-i18n"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"/api": {
|
"/api": {
|
||||||
"target": "http://localhost:3002",
|
"target": "http://localhost:3002",
|
||||||
"secure": false,
|
"secure": false,
|
||||||
"changeOrigin": true
|
"changeOrigin": true
|
||||||
},
|
},
|
||||||
"/images": {
|
"/images": {
|
||||||
"target": "http://localhost:8080",
|
"target": "http://localhost:8080",
|
||||||
"secure": false,
|
"secure": false,
|
||||||
"changeOrigin": true
|
"changeOrigin": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,336 @@
|
||||||
|
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * to get started with your project! * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
||||||
|
|
||||||
|
<style>
|
||||||
|
:host {
|
||||||
|
--bright-blue: oklch(51.01% 0.274 263.83);
|
||||||
|
--electric-violet: oklch(53.18% 0.28 296.97);
|
||||||
|
--french-violet: oklch(47.66% 0.246 305.88);
|
||||||
|
--vivid-pink: oklch(69.02% 0.277 332.77);
|
||||||
|
--hot-red: oklch(61.42% 0.238 15.34);
|
||||||
|
--orange-red: oklch(63.32% 0.24 31.68);
|
||||||
|
|
||||||
|
--gray-900: oklch(19.37% 0.006 300.98);
|
||||||
|
--gray-700: oklch(36.98% 0.014 302.71);
|
||||||
|
--gray-400: oklch(70.9% 0.015 304.04);
|
||||||
|
|
||||||
|
--red-to-pink-to-purple-vertical-gradient: linear-gradient(
|
||||||
|
180deg,
|
||||||
|
var(--orange-red) 0%,
|
||||||
|
var(--vivid-pink) 50%,
|
||||||
|
var(--electric-violet) 100%
|
||||||
|
);
|
||||||
|
|
||||||
|
--red-to-pink-to-purple-horizontal-gradient: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
var(--orange-red) 0%,
|
||||||
|
var(--vivid-pink) 50%,
|
||||||
|
var(--electric-violet) 100%
|
||||||
|
);
|
||||||
|
|
||||||
|
--pill-accent: var(--bright-blue);
|
||||||
|
|
||||||
|
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
||||||
|
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
||||||
|
"Segoe UI Symbol";
|
||||||
|
box-sizing: border-box;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3.125rem;
|
||||||
|
color: var(--gray-900);
|
||||||
|
font-weight: 500;
|
||||||
|
line-height: 100%;
|
||||||
|
letter-spacing: -0.125rem;
|
||||||
|
margin: 0;
|
||||||
|
font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
||||||
|
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
||||||
|
"Segoe UI Symbol";
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--gray-700);
|
||||||
|
}
|
||||||
|
|
||||||
|
main {
|
||||||
|
width: 100%;
|
||||||
|
min-height: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
padding: 1rem;
|
||||||
|
box-sizing: inherit;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.angular-logo {
|
||||||
|
max-width: 9.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-around;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 700px;
|
||||||
|
margin-bottom: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content h1 {
|
||||||
|
margin-top: 1.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content p {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.divider {
|
||||||
|
width: 1px;
|
||||||
|
background: var(--red-to-pink-to-purple-vertical-gradient);
|
||||||
|
margin-inline: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pill-group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: start;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pill {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
--pill-accent: var(--bright-blue);
|
||||||
|
background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
|
||||||
|
color: var(--pill-accent);
|
||||||
|
padding-inline: 0.75rem;
|
||||||
|
padding-block: 0.375rem;
|
||||||
|
border-radius: 2.75rem;
|
||||||
|
border: 0;
|
||||||
|
transition: background 0.3s ease;
|
||||||
|
font-family: var(--inter-font);
|
||||||
|
font-size: 0.875rem;
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 500;
|
||||||
|
line-height: 1.4rem;
|
||||||
|
letter-spacing: -0.00875rem;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pill:hover {
|
||||||
|
background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.pill-group .pill:nth-child(6n + 1) {
|
||||||
|
--pill-accent: var(--bright-blue);
|
||||||
|
}
|
||||||
|
.pill-group .pill:nth-child(6n + 2) {
|
||||||
|
--pill-accent: var(--french-violet);
|
||||||
|
}
|
||||||
|
.pill-group .pill:nth-child(6n + 3),
|
||||||
|
.pill-group .pill:nth-child(6n + 4),
|
||||||
|
.pill-group .pill:nth-child(6n + 5) {
|
||||||
|
--pill-accent: var(--hot-red);
|
||||||
|
}
|
||||||
|
|
||||||
|
.pill-group svg {
|
||||||
|
margin-inline-start: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-links {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.73rem;
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-links path {
|
||||||
|
transition: fill 0.3s ease;
|
||||||
|
fill: var(--gray-400);
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-links a:hover svg path {
|
||||||
|
fill: var(--gray-900);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 650px) {
|
||||||
|
.content {
|
||||||
|
flex-direction: column;
|
||||||
|
width: max-content;
|
||||||
|
}
|
||||||
|
|
||||||
|
.divider {
|
||||||
|
height: 1px;
|
||||||
|
width: 100%;
|
||||||
|
background: var(--red-to-pink-to-purple-horizontal-gradient);
|
||||||
|
margin-block: 1.5rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<main class="main">
|
||||||
|
<div class="content">
|
||||||
|
<div class="left-side">
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
viewBox="0 0 982 239"
|
||||||
|
fill="none"
|
||||||
|
class="angular-logo"
|
||||||
|
>
|
||||||
|
<g clip-path="url(#a)">
|
||||||
|
<path
|
||||||
|
fill="url(#b)"
|
||||||
|
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
fill="url(#c)"
|
||||||
|
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<radialGradient
|
||||||
|
id="c"
|
||||||
|
cx="0"
|
||||||
|
cy="0"
|
||||||
|
r="1"
|
||||||
|
gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
>
|
||||||
|
<stop stop-color="#FF41F8" />
|
||||||
|
<stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
|
||||||
|
<stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
|
||||||
|
</radialGradient>
|
||||||
|
<linearGradient
|
||||||
|
id="b"
|
||||||
|
x1="0"
|
||||||
|
x2="982"
|
||||||
|
y1="192"
|
||||||
|
y2="192"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
>
|
||||||
|
<stop stop-color="#F0060B" />
|
||||||
|
<stop offset="0" stop-color="#F0070C" />
|
||||||
|
<stop offset=".526" stop-color="#CC26D5" />
|
||||||
|
<stop offset="1" stop-color="#7702FF" />
|
||||||
|
</linearGradient>
|
||||||
|
<clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
|
||||||
|
</defs>
|
||||||
|
</svg>
|
||||||
|
<h1>Hello, {{ title }}</h1>
|
||||||
|
<p>Congratulations! Your app is running. 🎉</p>
|
||||||
|
</div>
|
||||||
|
<div class="divider" role="separator" aria-label="Divider"></div>
|
||||||
|
<div class="right-side">
|
||||||
|
<div class="pill-group">
|
||||||
|
@for (item of [
|
||||||
|
{ title: 'Explore the Docs', link: 'https://angular.dev' },
|
||||||
|
{ title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
|
||||||
|
{ title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
|
||||||
|
{ title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
|
||||||
|
{ title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
|
||||||
|
]; track item.title) {
|
||||||
|
<a
|
||||||
|
class="pill"
|
||||||
|
[href]="item.link"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener"
|
||||||
|
>
|
||||||
|
<span>{{ item.title }}</span>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
height="14"
|
||||||
|
viewBox="0 -960 960 960"
|
||||||
|
width="14"
|
||||||
|
fill="currentColor"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
<div class="social-links">
|
||||||
|
<a
|
||||||
|
href="https://github.com/angular/angular"
|
||||||
|
aria-label="Github"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
width="25"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 25 24"
|
||||||
|
fill="none"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
alt="Github"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</a>
|
||||||
|
<a
|
||||||
|
href="https://twitter.com/angular"
|
||||||
|
aria-label="Twitter"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
width="24"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
alt="Twitter"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</a>
|
||||||
|
<a
|
||||||
|
href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
|
||||||
|
aria-label="Youtube"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
width="29"
|
||||||
|
height="20"
|
||||||
|
viewBox="0 0 29 20"
|
||||||
|
fill="none"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
alt="Youtube"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
fill-rule="evenodd"
|
||||||
|
clip-rule="evenodd"
|
||||||
|
d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * * -->
|
||||||
|
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
||||||
|
|
||||||
|
|
||||||
|
<router-outlet />
|
||||||
|
|
@ -518,11 +518,9 @@ export class DeckListComponent implements OnInit {
|
||||||
}
|
}
|
||||||
// Methode zur Berechnung der Anzahl der zu bearbeitenden Wörter
|
// Methode zur Berechnung der Anzahl der zu bearbeitenden Wörter
|
||||||
getWordsToReview(deck: Deck): number {
|
getWordsToReview(deck: Deck): number {
|
||||||
// const nextTraining = this.getNextTrainingDate(deck);
|
const nextTraining = this.getNextTrainingDate(deck);
|
||||||
// return deck.images.flatMap(image => image.boxes.filter(box => (box.due && new Date(box.due * 86400000) <= new Date(nextTraining)) || !box.due)).length;
|
|
||||||
const today = this.getTodayInDays();
|
const today = this.getTodayInDays();
|
||||||
return deck.images.flatMap(image => image.boxes.filter(box => (box.due && box.due <= today) || !box.due)).length;
|
return deck.images.flatMap(image => image.boxes.map(box => (box.due ? box.due : null))).filter(e=>e===nextTraining).length;
|
||||||
// this.currentImageData.boxes.filter(box => box.due === undefined || box.due <= today);
|
|
||||||
}
|
}
|
||||||
getTodayInDays(): number {
|
getTodayInDays(): number {
|
||||||
const epoch = new Date(1970, 0, 1); // Anki uses UNIX epoch
|
const epoch = new Date(1970, 0, 1); // Anki uses UNIX epoch
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* You can add global styles to this file, and also import other style files */
|
@use 'tailwindcss' as *;
|
||||||
@tailwind base;
|
button {
|
||||||
@tailwind components;
|
cursor: pointer;
|
||||||
@tailwind utilities;
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
/** @type {import('tailwindcss').Config} */
|
/** @type {import('tailwindcss').Config} */
|
||||||
module.exports = {
|
module.exports = {
|
||||||
content: [
|
content: [
|
||||||
"./src/**/*.{html,ts}",
|
"./src/**/*.{html,ts}",
|
||||||
"./node_modules/flowbite/**/*.js" // add this line
|
"./node_modules/flowbite/**/*.js" // add this line
|
||||||
],
|
],
|
||||||
theme: {
|
theme: {
|
||||||
extend: {},
|
extend: {},
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
require('flowbite/plugin')
|
require('flowbite/plugin')
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
|
||||||
|
/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
|
||||||
{
|
{
|
||||||
"compileOnSave": false,
|
"compileOnSave": false,
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
|
|
@ -10,14 +12,11 @@
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"sourceMap": true,
|
|
||||||
"declaration": false,
|
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"moduleResolution": "bundler",
|
"moduleResolution": "bundler",
|
||||||
"importHelpers": true,
|
"importHelpers": true,
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "ES2022",
|
"module": "ES2022"
|
||||||
"lib": ["ES2022", "dom"]
|
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
"enableI18nLegacyMessageIdFormat": false,
|
"enableI18nLegacyMessageIdFormat": false,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue