From c0fbc4fce483fbb5abd977fc0f19a3347a69da7a Mon Sep 17 00:00:00 2001 From: Xymorot Date: Sun, 30 Jun 2019 02:00:26 +0200 Subject: [PATCH] adjust prettier config --- .prettierrc.yml | 2 +- index.html | 5 +- package.json | 4 +- src/main/entities/library/copy.ts | 9 +- .../1561252345968-initial_migration.ts | 188 +++++------------- .../components/2-molecules/Divide.svelte | 10 +- src/renderer/services/utils.ts | 2 +- 7 files changed, 55 insertions(+), 165 deletions(-) diff --git a/.prettierrc.yml b/.prettierrc.yml index aba85ec..0086f8a 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -3,7 +3,7 @@ tabWidth: 2 semi: true singleQuote: true arrowParens: always -printWidth: 80 +printWidth: 120 overrides: - files: '*.svelte' options: diff --git a/index.html b/index.html index f6de57e..9c59fa5 100644 --- a/index.html +++ b/index.html @@ -2,10 +2,7 @@ - + Renai diff --git a/package.json b/package.json index 5d2adc5..79ace9c 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ "eslint": "eslint .", "tslint-check": "tslint-config-prettier-check ./tslint.json", "tslint": "tslint -t stylish -c tslint.json -p tsconfig.json", - "prettier": "prettier --ignore-path .gitignore -c **/*.{html,json,{c,sc,sa,le}ss,yml,svelte,md}", - "prettier:write": "prettier --ignore-path .gitignore --write **/*.{html,json,{c,sc,sa,le}ss,yml,svelte,md}" + "prettier": "prettier --ignore-path .gitignore -c **/*.{html,json,{c,sc,sa,le}ss,yml,svelte,md,ts,js}", + "prettier:write": "prettier --ignore-path .gitignore --write **/*.{html,json,{c,sc,sa,le}ss,yml,svelte,md,ts,js}" }, "dependencies": {}, "devDependencies": { diff --git a/src/main/entities/library/copy.ts b/src/main/entities/library/copy.ts index 6b265ce..258827b 100644 --- a/src/main/entities/library/copy.ts +++ b/src/main/entities/library/copy.ts @@ -1,11 +1,4 @@ -import { - Column, - Entity, - JoinTable, - ManyToMany, - ManyToOne, - OneToMany, -} from 'typeorm'; +import { Column, Entity, JoinTable, ManyToMany, ManyToOne, OneToMany } from 'typeorm'; import { Base } from './bases/base'; import { Book } from './book'; import { CopyType } from './copy-type'; diff --git a/src/main/migrations/library/1561252345968-initial_migration.ts b/src/main/migrations/library/1561252345968-initial_migration.ts index e484e57..82bd4c9 100644 --- a/src/main/migrations/library/1561252345968-initial_migration.ts +++ b/src/main/migrations/library/1561252345968-initial_migration.ts @@ -42,18 +42,12 @@ export class initialMigration1561296682728 implements MigrationInterface { await queryRunner.query( `CREATE TABLE "copy_sources_source" ("copyId" integer NOT NULL, "sourceId" integer NOT NULL, PRIMARY KEY ("copyId", "sourceId"))` ); - await queryRunner.query( - `CREATE INDEX "IDX_653c33c5db26b8736e592ff3f6" ON "copy_sources_source" ("copyId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_946af3644f779b7cc7e7eb04eb" ON "copy_sources_source" ("sourceId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_653c33c5db26b8736e592ff3f6" ON "copy_sources_source" ("copyId") `); + await queryRunner.query(`CREATE INDEX "IDX_946af3644f779b7cc7e7eb04eb" ON "copy_sources_source" ("sourceId") `); await queryRunner.query( `CREATE TABLE "copy_languages_language" ("copyId" integer NOT NULL, "languageId" integer NOT NULL, PRIMARY KEY ("copyId", "languageId"))` ); - await queryRunner.query( - `CREATE INDEX "IDX_056de447bd9e4b2efdf5eafe49" ON "copy_languages_language" ("copyId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_056de447bd9e4b2efdf5eafe49" ON "copy_languages_language" ("copyId") `); await queryRunner.query( `CREATE INDEX "IDX_c6adacfab107dc725d4fb5864b" ON "copy_languages_language" ("languageId") ` ); @@ -69,39 +63,25 @@ export class initialMigration1561296682728 implements MigrationInterface { await queryRunner.query( `CREATE TABLE "book_authors_author" ("bookId" integer NOT NULL, "authorId" integer NOT NULL, PRIMARY KEY ("bookId", "authorId"))` ); - await queryRunner.query( - `CREATE INDEX "IDX_9bf58ffb2a12a8609a738ee8ca" ON "book_authors_author" ("bookId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_a4cafdf2ec9974524a5321c751" ON "book_authors_author" ("authorId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_9bf58ffb2a12a8609a738ee8ca" ON "book_authors_author" ("bookId") `); + await queryRunner.query(`CREATE INDEX "IDX_a4cafdf2ec9974524a5321c751" ON "book_authors_author" ("authorId") `); await queryRunner.query( `CREATE TABLE "book_fictions_fiction" ("bookId" integer NOT NULL, "fictionId" integer NOT NULL, PRIMARY KEY ("bookId", "fictionId"))` ); - await queryRunner.query( - `CREATE INDEX "IDX_893dfbd84bd3a5a62e8a0758b3" ON "book_fictions_fiction" ("bookId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_842bd3a8cb49dc7a92058b7f7a" ON "book_fictions_fiction" ("fictionId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_893dfbd84bd3a5a62e8a0758b3" ON "book_fictions_fiction" ("bookId") `); + await queryRunner.query(`CREATE INDEX "IDX_842bd3a8cb49dc7a92058b7f7a" ON "book_fictions_fiction" ("fictionId") `); await queryRunner.query( `CREATE TABLE "book_characters_character" ("bookId" integer NOT NULL, "characterId" integer NOT NULL, PRIMARY KEY ("bookId", "characterId"))` ); - await queryRunner.query( - `CREATE INDEX "IDX_261dcea7cb50a485906440f91f" ON "book_characters_character" ("bookId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_261dcea7cb50a485906440f91f" ON "book_characters_character" ("bookId") `); await queryRunner.query( `CREATE INDEX "IDX_51615a52cc3ef773766afbcc43" ON "book_characters_character" ("characterId") ` ); await queryRunner.query( `CREATE TABLE "book_tags_tag" ("bookId" integer NOT NULL, "tagId" integer NOT NULL, PRIMARY KEY ("bookId", "tagId"))` ); - await queryRunner.query( - `CREATE INDEX "IDX_918a7b7552fe5fd66f328d4fe8" ON "book_tags_tag" ("bookId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_5274aca0a1468ed55afdfaba24" ON "book_tags_tag" ("tagId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_918a7b7552fe5fd66f328d4fe8" ON "book_tags_tag" ("bookId") `); + await queryRunner.query(`CREATE INDEX "IDX_5274aca0a1468ed55afdfaba24" ON "book_tags_tag" ("tagId") `); await queryRunner.query( `CREATE TABLE "temporary_copy_type" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar NOT NULL, "comment" varchar, "copyId" integer NOT NULL, CONSTRAINT "FK_156b15213d57b5dbbbc33e94050" FOREIGN KEY ("copyId") REFERENCES "copy" ("id") ON DELETE CASCADE ON UPDATE CASCADE)` ); @@ -109,9 +89,7 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_copy_type"("id", "type", "comment", "copyId") SELECT "id", "type", "comment", "copyId" FROM "copy_type"` ); await queryRunner.query(`DROP TABLE "copy_type"`); - await queryRunner.query( - `ALTER TABLE "temporary_copy_type" RENAME TO "copy_type"` - ); + await queryRunner.query(`ALTER TABLE "temporary_copy_type" RENAME TO "copy_type"`); await queryRunner.query( `CREATE TABLE "temporary_source" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "uri" varchar NOT NULL, "siteId" integer NOT NULL, CONSTRAINT "UQ_028f4c3a05a9bfcddb95a4916b9" UNIQUE ("uri"), CONSTRAINT "FK_73b253e679f350d140bdb104e49" FOREIGN KEY ("siteId") REFERENCES "site" ("id") ON DELETE CASCADE ON UPDATE CASCADE)` ); @@ -119,9 +97,7 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_source"("id", "uri", "siteId") SELECT "id", "uri", "siteId" FROM "source"` ); await queryRunner.query(`DROP TABLE "source"`); - await queryRunner.query( - `ALTER TABLE "temporary_source" RENAME TO "source"` - ); + await queryRunner.query(`ALTER TABLE "temporary_source" RENAME TO "source"`); await queryRunner.query( `CREATE TABLE "temporary_copy" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "favorited" boolean NOT NULL DEFAULT (0), "isDigital" boolean NOT NULL, "originalId" integer NOT NULL, CONSTRAINT "FK_e8ce0011cf0a8b9fdc8ad908a44" FOREIGN KEY ("originalId") REFERENCES "book" ("id") ON DELETE CASCADE ON UPDATE CASCADE)` ); @@ -139,15 +115,9 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_copy_sources_source"("copyId", "sourceId") SELECT "copyId", "sourceId" FROM "copy_sources_source"` ); await queryRunner.query(`DROP TABLE "copy_sources_source"`); - await queryRunner.query( - `ALTER TABLE "temporary_copy_sources_source" RENAME TO "copy_sources_source"` - ); - await queryRunner.query( - `CREATE INDEX "IDX_653c33c5db26b8736e592ff3f6" ON "copy_sources_source" ("copyId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_946af3644f779b7cc7e7eb04eb" ON "copy_sources_source" ("sourceId") ` - ); + await queryRunner.query(`ALTER TABLE "temporary_copy_sources_source" RENAME TO "copy_sources_source"`); + await queryRunner.query(`CREATE INDEX "IDX_653c33c5db26b8736e592ff3f6" ON "copy_sources_source" ("copyId") `); + await queryRunner.query(`CREATE INDEX "IDX_946af3644f779b7cc7e7eb04eb" ON "copy_sources_source" ("sourceId") `); await queryRunner.query(`DROP INDEX "IDX_056de447bd9e4b2efdf5eafe49"`); await queryRunner.query(`DROP INDEX "IDX_c6adacfab107dc725d4fb5864b"`); await queryRunner.query( @@ -157,12 +127,8 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_copy_languages_language"("copyId", "languageId") SELECT "copyId", "languageId" FROM "copy_languages_language"` ); await queryRunner.query(`DROP TABLE "copy_languages_language"`); - await queryRunner.query( - `ALTER TABLE "temporary_copy_languages_language" RENAME TO "copy_languages_language"` - ); - await queryRunner.query( - `CREATE INDEX "IDX_056de447bd9e4b2efdf5eafe49" ON "copy_languages_language" ("copyId") ` - ); + await queryRunner.query(`ALTER TABLE "temporary_copy_languages_language" RENAME TO "copy_languages_language"`); + await queryRunner.query(`CREATE INDEX "IDX_056de447bd9e4b2efdf5eafe49" ON "copy_languages_language" ("copyId") `); await queryRunner.query( `CREATE INDEX "IDX_c6adacfab107dc725d4fb5864b" ON "copy_languages_language" ("languageId") ` ); @@ -193,15 +159,9 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_book_authors_author"("bookId", "authorId") SELECT "bookId", "authorId" FROM "book_authors_author"` ); await queryRunner.query(`DROP TABLE "book_authors_author"`); - await queryRunner.query( - `ALTER TABLE "temporary_book_authors_author" RENAME TO "book_authors_author"` - ); - await queryRunner.query( - `CREATE INDEX "IDX_9bf58ffb2a12a8609a738ee8ca" ON "book_authors_author" ("bookId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_a4cafdf2ec9974524a5321c751" ON "book_authors_author" ("authorId") ` - ); + await queryRunner.query(`ALTER TABLE "temporary_book_authors_author" RENAME TO "book_authors_author"`); + await queryRunner.query(`CREATE INDEX "IDX_9bf58ffb2a12a8609a738ee8ca" ON "book_authors_author" ("bookId") `); + await queryRunner.query(`CREATE INDEX "IDX_a4cafdf2ec9974524a5321c751" ON "book_authors_author" ("authorId") `); await queryRunner.query(`DROP INDEX "IDX_893dfbd84bd3a5a62e8a0758b3"`); await queryRunner.query(`DROP INDEX "IDX_842bd3a8cb49dc7a92058b7f7a"`); await queryRunner.query( @@ -211,15 +171,9 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_book_fictions_fiction"("bookId", "fictionId") SELECT "bookId", "fictionId" FROM "book_fictions_fiction"` ); await queryRunner.query(`DROP TABLE "book_fictions_fiction"`); - await queryRunner.query( - `ALTER TABLE "temporary_book_fictions_fiction" RENAME TO "book_fictions_fiction"` - ); - await queryRunner.query( - `CREATE INDEX "IDX_893dfbd84bd3a5a62e8a0758b3" ON "book_fictions_fiction" ("bookId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_842bd3a8cb49dc7a92058b7f7a" ON "book_fictions_fiction" ("fictionId") ` - ); + await queryRunner.query(`ALTER TABLE "temporary_book_fictions_fiction" RENAME TO "book_fictions_fiction"`); + await queryRunner.query(`CREATE INDEX "IDX_893dfbd84bd3a5a62e8a0758b3" ON "book_fictions_fiction" ("bookId") `); + await queryRunner.query(`CREATE INDEX "IDX_842bd3a8cb49dc7a92058b7f7a" ON "book_fictions_fiction" ("fictionId") `); await queryRunner.query(`DROP INDEX "IDX_261dcea7cb50a485906440f91f"`); await queryRunner.query(`DROP INDEX "IDX_51615a52cc3ef773766afbcc43"`); await queryRunner.query( @@ -229,12 +183,8 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_book_characters_character"("bookId", "characterId") SELECT "bookId", "characterId" FROM "book_characters_character"` ); await queryRunner.query(`DROP TABLE "book_characters_character"`); - await queryRunner.query( - `ALTER TABLE "temporary_book_characters_character" RENAME TO "book_characters_character"` - ); - await queryRunner.query( - `CREATE INDEX "IDX_261dcea7cb50a485906440f91f" ON "book_characters_character" ("bookId") ` - ); + await queryRunner.query(`ALTER TABLE "temporary_book_characters_character" RENAME TO "book_characters_character"`); + await queryRunner.query(`CREATE INDEX "IDX_261dcea7cb50a485906440f91f" ON "book_characters_character" ("bookId") `); await queryRunner.query( `CREATE INDEX "IDX_51615a52cc3ef773766afbcc43" ON "book_characters_character" ("characterId") ` ); @@ -247,23 +197,15 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "temporary_book_tags_tag"("bookId", "tagId") SELECT "bookId", "tagId" FROM "book_tags_tag"` ); await queryRunner.query(`DROP TABLE "book_tags_tag"`); - await queryRunner.query( - `ALTER TABLE "temporary_book_tags_tag" RENAME TO "book_tags_tag"` - ); - await queryRunner.query( - `CREATE INDEX "IDX_918a7b7552fe5fd66f328d4fe8" ON "book_tags_tag" ("bookId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_5274aca0a1468ed55afdfaba24" ON "book_tags_tag" ("tagId") ` - ); + await queryRunner.query(`ALTER TABLE "temporary_book_tags_tag" RENAME TO "book_tags_tag"`); + await queryRunner.query(`CREATE INDEX "IDX_918a7b7552fe5fd66f328d4fe8" ON "book_tags_tag" ("bookId") `); + await queryRunner.query(`CREATE INDEX "IDX_5274aca0a1468ed55afdfaba24" ON "book_tags_tag" ("tagId") `); } public async down(queryRunner: QueryRunner): Promise { await queryRunner.query(`DROP INDEX "IDX_5274aca0a1468ed55afdfaba24"`); await queryRunner.query(`DROP INDEX "IDX_918a7b7552fe5fd66f328d4fe8"`); - await queryRunner.query( - `ALTER TABLE "book_tags_tag" RENAME TO "temporary_book_tags_tag"` - ); + await queryRunner.query(`ALTER TABLE "book_tags_tag" RENAME TO "temporary_book_tags_tag"`); await queryRunner.query( `CREATE TABLE "book_tags_tag" ("bookId" integer NOT NULL, "tagId" integer NOT NULL, PRIMARY KEY ("bookId", "tagId"))` ); @@ -271,17 +213,11 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "book_tags_tag"("bookId", "tagId") SELECT "bookId", "tagId" FROM "temporary_book_tags_tag"` ); await queryRunner.query(`DROP TABLE "temporary_book_tags_tag"`); - await queryRunner.query( - `CREATE INDEX "IDX_5274aca0a1468ed55afdfaba24" ON "book_tags_tag" ("tagId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_918a7b7552fe5fd66f328d4fe8" ON "book_tags_tag" ("bookId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_5274aca0a1468ed55afdfaba24" ON "book_tags_tag" ("tagId") `); + await queryRunner.query(`CREATE INDEX "IDX_918a7b7552fe5fd66f328d4fe8" ON "book_tags_tag" ("bookId") `); await queryRunner.query(`DROP INDEX "IDX_51615a52cc3ef773766afbcc43"`); await queryRunner.query(`DROP INDEX "IDX_261dcea7cb50a485906440f91f"`); - await queryRunner.query( - `ALTER TABLE "book_characters_character" RENAME TO "temporary_book_characters_character"` - ); + await queryRunner.query(`ALTER TABLE "book_characters_character" RENAME TO "temporary_book_characters_character"`); await queryRunner.query( `CREATE TABLE "book_characters_character" ("bookId" integer NOT NULL, "characterId" integer NOT NULL, PRIMARY KEY ("bookId", "characterId"))` ); @@ -292,14 +228,10 @@ export class initialMigration1561296682728 implements MigrationInterface { await queryRunner.query( `CREATE INDEX "IDX_51615a52cc3ef773766afbcc43" ON "book_characters_character" ("characterId") ` ); - await queryRunner.query( - `CREATE INDEX "IDX_261dcea7cb50a485906440f91f" ON "book_characters_character" ("bookId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_261dcea7cb50a485906440f91f" ON "book_characters_character" ("bookId") `); await queryRunner.query(`DROP INDEX "IDX_842bd3a8cb49dc7a92058b7f7a"`); await queryRunner.query(`DROP INDEX "IDX_893dfbd84bd3a5a62e8a0758b3"`); - await queryRunner.query( - `ALTER TABLE "book_fictions_fiction" RENAME TO "temporary_book_fictions_fiction"` - ); + await queryRunner.query(`ALTER TABLE "book_fictions_fiction" RENAME TO "temporary_book_fictions_fiction"`); await queryRunner.query( `CREATE TABLE "book_fictions_fiction" ("bookId" integer NOT NULL, "fictionId" integer NOT NULL, PRIMARY KEY ("bookId", "fictionId"))` ); @@ -307,17 +239,11 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "book_fictions_fiction"("bookId", "fictionId") SELECT "bookId", "fictionId" FROM "temporary_book_fictions_fiction"` ); await queryRunner.query(`DROP TABLE "temporary_book_fictions_fiction"`); - await queryRunner.query( - `CREATE INDEX "IDX_842bd3a8cb49dc7a92058b7f7a" ON "book_fictions_fiction" ("fictionId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_893dfbd84bd3a5a62e8a0758b3" ON "book_fictions_fiction" ("bookId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_842bd3a8cb49dc7a92058b7f7a" ON "book_fictions_fiction" ("fictionId") `); + await queryRunner.query(`CREATE INDEX "IDX_893dfbd84bd3a5a62e8a0758b3" ON "book_fictions_fiction" ("bookId") `); await queryRunner.query(`DROP INDEX "IDX_a4cafdf2ec9974524a5321c751"`); await queryRunner.query(`DROP INDEX "IDX_9bf58ffb2a12a8609a738ee8ca"`); - await queryRunner.query( - `ALTER TABLE "book_authors_author" RENAME TO "temporary_book_authors_author"` - ); + await queryRunner.query(`ALTER TABLE "book_authors_author" RENAME TO "temporary_book_authors_author"`); await queryRunner.query( `CREATE TABLE "book_authors_author" ("bookId" integer NOT NULL, "authorId" integer NOT NULL, PRIMARY KEY ("bookId", "authorId"))` ); @@ -325,12 +251,8 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "book_authors_author"("bookId", "authorId") SELECT "bookId", "authorId" FROM "temporary_book_authors_author"` ); await queryRunner.query(`DROP TABLE "temporary_book_authors_author"`); - await queryRunner.query( - `CREATE INDEX "IDX_a4cafdf2ec9974524a5321c751" ON "book_authors_author" ("authorId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_9bf58ffb2a12a8609a738ee8ca" ON "book_authors_author" ("bookId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_a4cafdf2ec9974524a5321c751" ON "book_authors_author" ("authorId") `); + await queryRunner.query(`CREATE INDEX "IDX_9bf58ffb2a12a8609a738ee8ca" ON "book_authors_author" ("bookId") `); await queryRunner.query(`DROP INDEX "IDX_e19e5193f168ce07f52f15be06"`); await queryRunner.query(`DROP INDEX "IDX_2a20d8eaf28ebc28438271899f"`); await queryRunner.query( @@ -342,9 +264,7 @@ export class initialMigration1561296682728 implements MigrationInterface { await queryRunner.query( `INSERT INTO "copy_translators_translator"("copyId", "translatorId") SELECT "copyId", "translatorId" FROM "temporary_copy_translators_translator"` ); - await queryRunner.query( - `DROP TABLE "temporary_copy_translators_translator"` - ); + await queryRunner.query(`DROP TABLE "temporary_copy_translators_translator"`); await queryRunner.query( `CREATE INDEX "IDX_e19e5193f168ce07f52f15be06" ON "copy_translators_translator" ("translatorId") ` ); @@ -353,9 +273,7 @@ export class initialMigration1561296682728 implements MigrationInterface { ); await queryRunner.query(`DROP INDEX "IDX_c6adacfab107dc725d4fb5864b"`); await queryRunner.query(`DROP INDEX "IDX_056de447bd9e4b2efdf5eafe49"`); - await queryRunner.query( - `ALTER TABLE "copy_languages_language" RENAME TO "temporary_copy_languages_language"` - ); + await queryRunner.query(`ALTER TABLE "copy_languages_language" RENAME TO "temporary_copy_languages_language"`); await queryRunner.query( `CREATE TABLE "copy_languages_language" ("copyId" integer NOT NULL, "languageId" integer NOT NULL, PRIMARY KEY ("copyId", "languageId"))` ); @@ -366,14 +284,10 @@ export class initialMigration1561296682728 implements MigrationInterface { await queryRunner.query( `CREATE INDEX "IDX_c6adacfab107dc725d4fb5864b" ON "copy_languages_language" ("languageId") ` ); - await queryRunner.query( - `CREATE INDEX "IDX_056de447bd9e4b2efdf5eafe49" ON "copy_languages_language" ("copyId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_056de447bd9e4b2efdf5eafe49" ON "copy_languages_language" ("copyId") `); await queryRunner.query(`DROP INDEX "IDX_946af3644f779b7cc7e7eb04eb"`); await queryRunner.query(`DROP INDEX "IDX_653c33c5db26b8736e592ff3f6"`); - await queryRunner.query( - `ALTER TABLE "copy_sources_source" RENAME TO "temporary_copy_sources_source"` - ); + await queryRunner.query(`ALTER TABLE "copy_sources_source" RENAME TO "temporary_copy_sources_source"`); await queryRunner.query( `CREATE TABLE "copy_sources_source" ("copyId" integer NOT NULL, "sourceId" integer NOT NULL, PRIMARY KEY ("copyId", "sourceId"))` ); @@ -381,12 +295,8 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "copy_sources_source"("copyId", "sourceId") SELECT "copyId", "sourceId" FROM "temporary_copy_sources_source"` ); await queryRunner.query(`DROP TABLE "temporary_copy_sources_source"`); - await queryRunner.query( - `CREATE INDEX "IDX_946af3644f779b7cc7e7eb04eb" ON "copy_sources_source" ("sourceId") ` - ); - await queryRunner.query( - `CREATE INDEX "IDX_653c33c5db26b8736e592ff3f6" ON "copy_sources_source" ("copyId") ` - ); + await queryRunner.query(`CREATE INDEX "IDX_946af3644f779b7cc7e7eb04eb" ON "copy_sources_source" ("sourceId") `); + await queryRunner.query(`CREATE INDEX "IDX_653c33c5db26b8736e592ff3f6" ON "copy_sources_source" ("copyId") `); await queryRunner.query(`ALTER TABLE "copy" RENAME TO "temporary_copy"`); await queryRunner.query( `CREATE TABLE "copy" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "favorited" boolean NOT NULL DEFAULT (0), "isDigital" boolean NOT NULL, "originalId" integer NOT NULL)` @@ -395,9 +305,7 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "copy"("id", "favorited", "isDigital", "originalId") SELECT "id", "favorited", "isDigital", "originalId" FROM "temporary_copy"` ); await queryRunner.query(`DROP TABLE "temporary_copy"`); - await queryRunner.query( - `ALTER TABLE "source" RENAME TO "temporary_source"` - ); + await queryRunner.query(`ALTER TABLE "source" RENAME TO "temporary_source"`); await queryRunner.query( `CREATE TABLE "source" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "uri" varchar NOT NULL, "siteId" integer NOT NULL, CONSTRAINT "UQ_028f4c3a05a9bfcddb95a4916b9" UNIQUE ("uri"))` ); @@ -405,9 +313,7 @@ export class initialMigration1561296682728 implements MigrationInterface { `INSERT INTO "source"("id", "uri", "siteId") SELECT "id", "uri", "siteId" FROM "temporary_source"` ); await queryRunner.query(`DROP TABLE "temporary_source"`); - await queryRunner.query( - `ALTER TABLE "copy_type" RENAME TO "temporary_copy_type"` - ); + await queryRunner.query(`ALTER TABLE "copy_type" RENAME TO "temporary_copy_type"`); await queryRunner.query( `CREATE TABLE "copy_type" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "type" varchar NOT NULL, "comment" varchar, "copyId" integer NOT NULL)` ); diff --git a/src/renderer/components/2-molecules/Divide.svelte b/src/renderer/components/2-molecules/Divide.svelte index cd65de2..30fd83d 100644 --- a/src/renderer/components/2-molecules/Divide.svelte +++ b/src/renderer/components/2-molecules/Divide.svelte @@ -44,9 +44,7 @@ function handleMousemove(event) { if (dragging) { const dragPos = - mode === 'h' - ? event.x - divide.getBoundingClientRect().x - : event.y - divide.getBoundingClientRect().y; + mode === 'h' ? event.x - divide.getBoundingClientRect().x : event.y - divide.getBoundingClientRect().y; basisFirst = dragPos / total; basisSecond = 1 - basisFirst; } @@ -125,11 +123,7 @@
-
+
diff --git a/src/renderer/services/utils.ts b/src/renderer/services/utils.ts index e7ca2b6..390efae 100644 --- a/src/renderer/services/utils.ts +++ b/src/renderer/services/utils.ts @@ -1,6 +1,6 @@ export function c(input: Array | object): string { const array = Array.isArray(input) - ? input.filter(el => typeof el === 'string') + ? input.filter((el: any) => typeof el === 'string') : Object.keys(input).filter((key: keyof object) => !!input[key]); return array.join(' '); }