diff --git a/.vscode/settings.json b/.vscode/settings.json index 148f004..bdf7b11 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,7 @@ "**/CVS": true, "**/.DS_Store": true, "**/Thumbs.db": true, - "**/node_modules": true, + // "**/node_modules": true, "**/.angular": true } } diff --git a/apps/NwaifuWeb/src/app/pages/main/main.component.html b/apps/NwaifuWeb/src/app/pages/main/main.component.html index dcc3de0..5deb67b 100644 --- a/apps/NwaifuWeb/src/app/pages/main/main.component.html +++ b/apps/NwaifuWeb/src/app/pages/main/main.component.html @@ -1,3 +1,5 @@ - +
+ +
diff --git a/apps/NwaifuWeb/src/app/pages/main/main.component.less b/apps/NwaifuWeb/src/app/pages/main/main.component.less index e69de29..9aab23e 100644 --- a/apps/NwaifuWeb/src/app/pages/main/main.component.less +++ b/apps/NwaifuWeb/src/app/pages/main/main.component.less @@ -0,0 +1,9 @@ +.icons { + margin: 2rem 3rem; + position: absolute; +} +:host { + display: block; + width: 100%; + height: 100%; +} diff --git a/apps/NwaifuWeb/src/app/pages/nitroplus-translator/components/text_list/text_list.component.scss b/apps/NwaifuWeb/src/app/pages/nitroplus-translator/components/text_list/text_list.component.scss index 4ec5585..e9d9f05 100644 --- a/apps/NwaifuWeb/src/app/pages/nitroplus-translator/components/text_list/text_list.component.scss +++ b/apps/NwaifuWeb/src/app/pages/nitroplus-translator/components/text_list/text_list.component.scss @@ -6,6 +6,12 @@ margin-inline: 2rem; } +// fix scroll on router click +:host { + overflow-y: scroll; + height: fit-content; +} + h1 { color: #efdee0; text-align: center; diff --git a/apps/NwaifuWeb/src/app/pages/nitroplus-translator/nitroplus-translator.component.less b/apps/NwaifuWeb/src/app/pages/nitroplus-translator/nitroplus-translator.component.less index 4971974..3a1b149 100644 --- a/apps/NwaifuWeb/src/app/pages/nitroplus-translator/nitroplus-translator.component.less +++ b/apps/NwaifuWeb/src/app/pages/nitroplus-translator/nitroplus-translator.component.less @@ -7,3 +7,8 @@ margin: 2rem; } } +:host { + background-color: #191113; + display: block; + min-height: calc(100vh - 2rem); +} diff --git a/apps/NwaifuWeb/src/index.html b/apps/NwaifuWeb/src/index.html index 0a020d7..a516642 100644 --- a/apps/NwaifuWeb/src/index.html +++ b/apps/NwaifuWeb/src/index.html @@ -6,6 +6,7 @@ + diff --git a/apps/NwaifuWeb/src/styles.less b/apps/NwaifuWeb/src/styles.less index 722c3c2..307b72a 100644 --- a/apps/NwaifuWeb/src/styles.less +++ b/apps/NwaifuWeb/src/styles.less @@ -27,6 +27,7 @@ } html { position: relative; + height: 100%; } body { width: 100%; diff --git a/apps/NwaifuWeb/tsconfig.app.json b/apps/NwaifuWeb/tsconfig.app.json index bf1a46d..fff4a41 100644 --- a/apps/NwaifuWeb/tsconfig.app.json +++ b/apps/NwaifuWeb/tsconfig.app.json @@ -1,9 +1,10 @@ { - "extends": "./tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", "types": [] }, "files": ["src/main.ts"], - "include": ["src/**/*.d.ts"] + "include": ["src/**/*.d.ts"], + "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"] } diff --git a/apps/NwaifuWeb/tsconfig.editor.json b/apps/NwaifuWeb/tsconfig.editor.json new file mode 100644 index 0000000..a8ac182 --- /dev/null +++ b/apps/NwaifuWeb/tsconfig.editor.json @@ -0,0 +1,6 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts"], + "compilerOptions": {}, + "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"] +} diff --git a/apps/NwaifuWeb/tsconfig.json b/apps/NwaifuWeb/tsconfig.json index ef65b66..4acc9dd 100644 --- a/apps/NwaifuWeb/tsconfig.json +++ b/apps/NwaifuWeb/tsconfig.json @@ -24,7 +24,7 @@ "path": "./tsconfig.app.json" }, { - "path": "./tsconfig.lib.json" + "path": "./tsconfig.editor.json" }, { "path": "./tsconfig.spec.json" diff --git a/apps/NwaifuWeb/tsconfig.lib.json b/apps/NwaifuWeb/tsconfig.lib.json deleted file mode 100644 index f359ade..0000000 --- a/apps/NwaifuWeb/tsconfig.lib.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../dist/out-tsc", - "declaration": true, - "declarationMap": true, - "inlineSources": true, - "types": [] - }, - "exclude": [ - "src/**/*.spec.ts", - "src/**/*.test.ts" - ], - "include": [ - "src/**/*.ts" - ] -} diff --git a/bun.lockb b/bun.lockb index cc3bfd7..6506630 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/nwaifu-ui/.eslintrc.json b/nwaifu-ui/.eslintrc.json index 6701115..50cbc22 100644 --- a/nwaifu-ui/.eslintrc.json +++ b/nwaifu-ui/.eslintrc.json @@ -1,6 +1,6 @@ { "extends": [ - "../.eslintrc.base.json" + "../.eslintrc.json" ], "ignorePatterns": [ "!**/*" @@ -43,4 +43,4 @@ "rules": {} } ] -} \ No newline at end of file +} diff --git a/nwaifu-ui/tsconfig.json b/nwaifu-ui/tsconfig.json index 5e9ddb7..1913c1f 100644 --- a/nwaifu-ui/tsconfig.json +++ b/nwaifu-ui/tsconfig.json @@ -7,7 +7,8 @@ "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true + "noFallthroughCasesInSwitch": true, + "esModuleInterop": true }, "files": [], "include": [], diff --git a/package.json b/package.json index 3889c7a..5e35f00 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@fortawesome/free-regular-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", "@ngneat/dialog": "5.0.0", + "@nx/eslint-plugin": "^19.3.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.14.3"