diff --git a/assets/api.ts b/assets/api.ts index 5e3374c..aa45b9c 100644 --- a/assets/api.ts +++ b/assets/api.ts @@ -26,6 +26,16 @@ export interface IEntry { tag: string[] } +export interface ILibrary { + id: string + title: string + list: string[] + type: IType + description: string + tag: string[] + isShared?: boolean +} + export type ILookup = T & { offset?: number limit?: number @@ -48,9 +58,9 @@ class Api { async setWanikaniApiKey(apiKey?: string) { const setApiKey = () => { if (apiKey) { - this.axios.defaults.headers.common.Authorization = `Bearer ${apiKey}` + this.axios.defaults.headers.common['Authorization'] = `Bearer ${apiKey}` } else { - delete this.axios.defaults.headers.common.Authorization + delete this.axios.defaults.headers.common['Authorization'] } } @@ -99,20 +109,17 @@ class Api { return r } - async user_updateSettings(u: { - levelMin?: number - level_browser?: ILevelBrowser - }) { + async user_updateSettings(u: Omit) { return await this.axios.patch('/api/user', u) } - async quiz_getMany(params: { + async quiz_getMany(payload: { entries: string[] select: string[] type?: string direction?: string }) { - return await this.axios.post('/api/quiz/getMany', params).then( + return await this.axios.post('/api/quiz/getMany', payload).then( (r) => r.data as { result: { @@ -123,6 +130,18 @@ class Api { ) } + async quiz_getSrsLevel(payload: { entries: string[]; type: IType }) { + return await this.axios.post('/api/quiz/getSrsLevel', payload).then( + (r) => + r.data as { + result: { + entry: string + srsLevel: number + }[] + } + ) + } + async quiz_create(payload: { entries: string[]; type: IType }) { return await this.axios.put('/api/quiz', payload).then( (r) => @@ -224,7 +243,9 @@ class Api { ) } - async all_getLookup(params: ILookup<{ entry: string; type: IType }>) { + async all_getLookup( + params: ILookup<{ entry: string; type: IType; forced?: boolean }> + ) { params.offset = params.offset || 0 params.limit = params.limit || 5 @@ -271,6 +292,12 @@ class Api { ) } + async library_getQuery(params: ILookup<{ q: string }>) { + return await this.axios + .get('/api/library/q', { params }) + .then((r) => r.data as ILookupResult) + } + async library_getLevelList(payload: { type: ITypeLevel settings: ILevelBrowserByType @@ -285,6 +312,25 @@ class Api { } ) } + + async library_create(payload: Omit) { + return await this.axios.put('/api/library', payload).then( + (r) => + r.data as { + id: string + } + ) + } + + async library_update(payload: ILibrary) { + return await this.axios.patch('/api/library', payload, { + params: { id: payload.id }, + }) + } + + async library_delete(params: { id: string }) { + return await this.axios.delete('/api/library', { params }) + } } export const api = new Api() diff --git a/assets/util.ts b/assets/util.ts index b75e646..897d6a7 100644 --- a/assets/util.ts +++ b/assets/util.ts @@ -45,7 +45,7 @@ export const doMapKeypress = ( export function shuffle(a: T[]) { for (let i = a.length - 1; i > 0; i--) { const j = Math.floor(Math.random() * (i + 1)) - ;[a[i], a[j]] = [a[j], a[i]] + ;[a[i], a[j]] = [a[j]!, a[i]!] } return a } @@ -60,7 +60,7 @@ export function sample(arr: T[], size: number): T[] { outN.push(...allN.splice(Math.floor(Math.random() * allN.length), 1)) } - return outN.map((n) => arr[n]) + return outN.map((n) => arr[n]!) } export function capitalize(s: string): string { @@ -72,7 +72,7 @@ export function capitalize(s: string): string { } if (!s) return s - return s[0].toLocaleUpperCase() + s.substr(1) + return s[0]!.toLocaleUpperCase() + s.substr(1) } export function jsonClone(o: T): T { diff --git a/components/cards/LibraryCard.vue b/components/cards/LibraryCard.vue new file mode 100644 index 0000000..782953b --- /dev/null +++ b/components/cards/LibraryCard.vue @@ -0,0 +1,329 @@ + + + + + diff --git a/components/tabs/BrowseTab.vue b/components/tabs/BrowseTab.vue index 78a1e09..110e335 100644 --- a/components/tabs/BrowseTab.vue +++ b/components/tabs/BrowseTab.vue @@ -257,7 +257,7 @@ export default class BrowseTab extends Vue { this.selected.reading = [ await api .all_getReading({ - entry: this.selected.entry[0], + entry: this.selected.entry[0]!, }) .then((r) => r.result), ] @@ -266,7 +266,7 @@ export default class BrowseTab extends Vue { if (!this.selected.translation.length) { this.selected.translation = await api .all_getMeaning({ - entry: this.selected.entry[0], + entry: this.selected.entry[0]!, }) .then((r) => r.result.filter((r0) => !r0.entry).map((r0) => r0.meaning) @@ -360,7 +360,7 @@ export default class BrowseTab extends Vue { const o = jsonClone(row) this.selected = { ...o, - entry: o.entry[0], + entry: o.entry[0]!, list: o.entry, } this.context.open(evt) diff --git a/components/tabs/CharacterTab.vue b/components/tabs/CharacterTab.vue index 02f539b..96f4109 100644 --- a/components/tabs/CharacterTab.vue +++ b/components/tabs/CharacterTab.vue @@ -1,6 +1,6 @@ + + + + diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 0000000..afb6c89 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,71 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + // "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ + // "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + // "lib": [], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */ + // "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + "strictNullChecks": true, /* Enable strict null checks. */ + "strictFunctionTypes": true, /* Enable strict checking of function types. */ + "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + "noUnusedLocals": true, /* Report errors on unused locals. */ + "noUnusedParameters": true, /* Report errors on unused parameters. */ + "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true, /* Skip type checking of declaration files. */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } +} diff --git a/tsconfig.json b/tsconfig.json index 86bb182..1ed71ec 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,4 +1,5 @@ { + "extends": "./tsconfig.base.json", "compilerOptions": { "target": "ES2018", "module": "ESNext",