Update dependencies and run prettier
parent
c74926b8c1
commit
ee003912d5
|
|
@ -1,6 +1,3 @@
|
||||||
{
|
{
|
||||||
"recommendations": [
|
"recommendations": ["vue.volar", "dbaeumer.vscode-eslint"]
|
||||||
"vue.volar",
|
|
||||||
"dbaeumer.vscode-eslint",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"typescript.tsdk": "node_modules/typescript/lib",
|
"typescript.tsdk": "node_modules/typescript/lib",
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.eslint": true
|
"source.fixAll.eslint": "explicit"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
58
package.json
58
package.json
|
|
@ -23,57 +23,59 @@
|
||||||
"sign:firefox": "web-ext sign --use-submission-api --source-dir ./extension",
|
"sign:firefox": "web-ext sign --use-submission-api --source-dir ./extension",
|
||||||
"clear": "rimraf extension/dist extension/manifest.json extension.*",
|
"clear": "rimraf extension/dist extension/manifest.json extension.*",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"test": "vitest test"
|
"test": "vitest test",
|
||||||
|
"pretty": "prettier -w ."
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^1.2.2",
|
"axios": "^1.6.3",
|
||||||
"byte-size": "^8.1.1",
|
"byte-size": "^8.1.1",
|
||||||
"deepmerge": "^4.3.1",
|
"deepmerge": "^4.3.1",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"markdown-it": "^13.0.1",
|
"markdown-it": "^13.0.2",
|
||||||
"neo-scraper": "^0.7.3",
|
"neo-scraper": "^0.7.3",
|
||||||
"normalize.css": "^8.0.1",
|
"normalize.css": "^8.0.1",
|
||||||
"pinia": "^2.0.36",
|
"pinia": "^2.1.7",
|
||||||
"primeflex": "^3.3.1",
|
"primeflex": "^3.3.1",
|
||||||
"primevue": "^3.33.0",
|
"primevue": "^3.45.0",
|
||||||
"vue-router": "4"
|
"vue-router": "^4.2.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@ffflorian/jszip-cli": "^3.1.6",
|
"@ffflorian/jszip-cli": "^3.5.8",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.2.1",
|
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.2.1",
|
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.3",
|
"@fortawesome/vue-fontawesome": "^3.0.5",
|
||||||
"@types/byte-size": "^8.1.0",
|
"@types/byte-size": "^8.1.2",
|
||||||
"@types/fs-extra": "^9.0.13",
|
"@types/fs-extra": "^9.0.13",
|
||||||
"@types/lodash": "^4.14.194",
|
"@types/lodash": "^4.14.202",
|
||||||
"@types/markdown-it": "^12.2.3",
|
"@types/markdown-it": "^12.2.3",
|
||||||
"@types/node": "^18.11.9",
|
"@types/node": "^18.19.3",
|
||||||
"@types/webextension-polyfill": "^0.9.1",
|
"@types/webextension-polyfill": "^0.9.2",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.44.0",
|
"@typescript-eslint/eslint-plugin": "^5.62.0",
|
||||||
"@vitejs/plugin-vue": "^3.2.0",
|
"@vitejs/plugin-vue": "^3.2.0",
|
||||||
"@vue/compiler-sfc": "^3.2.45",
|
"@vue/compiler-sfc": "^3.4.0",
|
||||||
"@vue/test-utils": "^2.2.4",
|
"@vue/test-utils": "^2.4.3",
|
||||||
"@vueuse/core": "^9.6.0",
|
"@vueuse/core": "^9.13.0",
|
||||||
"chokidar": "^3.5.3",
|
"chokidar": "^3.5.3",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"crx": "^5.0.1",
|
"crx": "^5.0.1",
|
||||||
"eslint": "^8.32.0",
|
"eslint": "^8.56.0",
|
||||||
"eslint-plugin-vue": "^9.9.0",
|
"eslint-plugin-vue": "^9.19.2",
|
||||||
"esno": "^0.16.3",
|
"esno": "^0.16.3",
|
||||||
"fs-extra": "^10.1.0",
|
"fs-extra": "^10.1.0",
|
||||||
"jsdom": "^20.0.3",
|
"jsdom": "^20.0.3",
|
||||||
"kolorist": "^1.6.0",
|
"kolorist": "^1.8.0",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
|
"prettier": "^3.1.1",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"sass": "^1.57.1",
|
"sass": "^1.69.6",
|
||||||
"typescript": "^4.9.3",
|
"typescript": "^4.9.5",
|
||||||
"unplugin-auto-import": "^0.12.2",
|
"unplugin-auto-import": "^0.12.2",
|
||||||
"unplugin-vue-components": "^0.23.0",
|
"unplugin-vue-components": "^0.23.0",
|
||||||
"vite": "^3.2.4",
|
"vite": "^3.2.7",
|
||||||
"vitest": "^0.25.3",
|
"vitest": "^0.25.8",
|
||||||
"vue": "^3.2.45",
|
"vue": "^3.4.0",
|
||||||
"vue-eslint-parser": "^9.1.0",
|
"vue-eslint-parser": "^9.3.2",
|
||||||
"web-ext": "^7.5.0",
|
"web-ext": "^7.9.0",
|
||||||
"webextension-polyfill": "^0.10.0"
|
"webextension-polyfill": "^0.10.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
6016
pnpm-lock.yaml
6016
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -1,9 +1,9 @@
|
||||||
import { resolve } from 'path';
|
import { resolve } from "path";
|
||||||
import { bgCyan, black } from 'kolorist';
|
import { bgCyan, black } from "kolorist";
|
||||||
|
|
||||||
export const port = parseInt(process.env.PORT || '') || 3303;
|
export const port = parseInt(process.env.PORT || "") || 3303;
|
||||||
export const r = (...args: string[]) => resolve(__dirname, '..', ...args);
|
export const r = (...args: string[]) => resolve(__dirname, "..", ...args);
|
||||||
export const isDev = process.env.NODE_ENV !== 'production';
|
export const isDev = process.env.NODE_ENV !== "production";
|
||||||
|
|
||||||
export function log(name: string, message: string) {
|
export function log(name: string, message: string) {
|
||||||
console.log(black(bgCyan(` ${name} `)), message);
|
console.log(black(bgCyan(` ${name} `)), message);
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,8 @@ export default class SzurubooruApi {
|
||||||
offset = 0,
|
offset = 0,
|
||||||
limit = 100,
|
limit = 100,
|
||||||
fields?: PoolFields[],
|
fields?: PoolFields[],
|
||||||
cancelToken?: CancelToken): Promise<PoolsResult> {
|
cancelToken?: CancelToken,
|
||||||
|
): Promise<PoolsResult> {
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.append("offset", offset.toString());
|
params.append("offset", offset.toString());
|
||||||
params.append("limit", limit.toString());
|
params.append("limit", limit.toString());
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ async function uploadPost(data: PostUploadCommandData) {
|
||||||
} else {
|
} else {
|
||||||
// Pool exists, so add it to the existing pool.
|
// Pool exists, so add it to the existing pool.
|
||||||
const existingPool = existingPools.results[0];
|
const existingPool = existingPools.results[0];
|
||||||
const posts = existingPool.posts.map(x => x.id);
|
const posts = existingPool.posts.map((x) => x.id);
|
||||||
posts.push(createdPost.id);
|
posts.push(createdPost.id);
|
||||||
|
|
||||||
console.log(`Adding post ${createdPost.id} to existing pool ${existingPool.id}`);
|
console.log(`Adding post ${createdPost.id} to existing pool ${existingPool.id}`);
|
||||||
|
|
|
||||||
|
|
@ -99,9 +99,14 @@ watch(props, (newValue) => {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="autocomplete-items" v-bind:class="{ show: autocompleteShown }">
|
<div class="autocomplete-items" v-bind:class="{ show: autocompleteShown }">
|
||||||
<div v-for="(item, idx) in autocompleteItems" @click="onClickAutocompleteItem(item)" :key="item.name" :class="{
|
<div
|
||||||
|
v-for="(item, idx) in autocompleteItems"
|
||||||
|
@click="onClickAutocompleteItem(item)"
|
||||||
|
:key="item.name"
|
||||||
|
:class="{
|
||||||
active: idx == autocompleteIndex,
|
active: idx == autocompleteIndex,
|
||||||
}">
|
}"
|
||||||
|
>
|
||||||
<slot :item="item"></slot>
|
<slot :item="item"></slot>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -121,7 +126,7 @@ watch(props, (newValue) => {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
>div {
|
> div {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 2px 4px;
|
padding: 2px 4px;
|
||||||
|
|
||||||
|
|
@ -132,16 +137,16 @@ watch(props, (newValue) => {
|
||||||
&:hover {
|
&:hover {
|
||||||
background: var(--primary-color);
|
background: var(--primary-color);
|
||||||
|
|
||||||
>span {
|
> span {
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
>div.active {
|
> div.active {
|
||||||
background: var(--primary-color);
|
background: var(--primary-color);
|
||||||
|
|
||||||
>span {
|
> span {
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ defineEmits(["removePool"]);
|
||||||
<li v-for="pool in pools" :key="pool.name">
|
<li v-for="pool in pools" :key="pool.name">
|
||||||
<a v-if="showRemovePool" class="remove-tag" @click="$emit('removePool', pool)">x</a>
|
<a v-if="showRemovePool" class="remove-tag" @click="$emit('removePool', pool)">x</a>
|
||||||
<span class="tag-general" v-html="breakTagName(pool.name)"></span>
|
<span class="tag-general" v-html="breakTagName(pool.name)"></span>
|
||||||
<span v-if="showPostCount" class="tag-usages tag-usages-reserve-space">{{ pool.postCount ? pool.postCount : ""
|
<span v-if="showPostCount" class="tag-usages tag-usages-reserve-space">{{
|
||||||
|
pool.postCount ? pool.postCount : ""
|
||||||
}}</span>
|
}}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -22,13 +22,7 @@ function addPoolFromCurrentInput(input: string) {
|
||||||
|
|
||||||
async function autocompletePopulator(input: string, ct: CancelToken) {
|
async function autocompletePopulator(input: string, ct: CancelToken) {
|
||||||
const query = decodeURIComponent(`*${encodeTagName(input)}*`);
|
const query = decodeURIComponent(`*${encodeTagName(input)}*`);
|
||||||
const res = await props.szuru?.getPools(
|
const res = await props.szuru?.getPools(query, 0, 100, ["id", "names", "category", "description", "postCount"], ct);
|
||||||
query,
|
|
||||||
0,
|
|
||||||
100,
|
|
||||||
["id", "names", "category", "description", "postCount"],
|
|
||||||
ct,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (res) {
|
if (res) {
|
||||||
// TODO: Maybe search on hamming distance or something?
|
// TODO: Maybe search on hamming distance or something?
|
||||||
|
|
@ -40,8 +34,13 @@ async function autocompletePopulator(input: string, ct: CancelToken) {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<AutocompleteInput :autocomplete-items="autocompleteItems" @add-item="addPool"
|
<AutocompleteInput
|
||||||
@add-from-current-input="addPoolFromCurrentInput" @autocomplete-populator="autocompletePopulator" v-slot="slotProps">
|
:autocomplete-items="autocompleteItems"
|
||||||
|
@add-item="addPool"
|
||||||
|
@add-from-current-input="addPoolFromCurrentInput"
|
||||||
|
@autocomplete-populator="autocompletePopulator"
|
||||||
|
v-slot="slotProps"
|
||||||
|
>
|
||||||
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
|
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
|
||||||
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
|
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
|
||||||
</AutocompleteInput>
|
</AutocompleteInput>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,10 @@
|
||||||
import { ScrapedNote } from "neo-scraper";
|
import { ScrapedNote } from "neo-scraper";
|
||||||
|
|
||||||
class Point {
|
class Point {
|
||||||
constructor(public x: any, public y: any) {}
|
constructor(
|
||||||
|
public x: any,
|
||||||
|
public y: any,
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// HACK: Copied from old client
|
// HACK: Copied from old client
|
||||||
|
|
|
||||||
|
|
@ -22,13 +22,7 @@ function addTagFromCurrentInput(input: string) {
|
||||||
|
|
||||||
async function autocompletePopulator(input: string, ct: CancelToken) {
|
async function autocompletePopulator(input: string, ct: CancelToken) {
|
||||||
const query = decodeURIComponent(`*${encodeTagName(input)}* sort:usages`);
|
const query = decodeURIComponent(`*${encodeTagName(input)}* sort:usages`);
|
||||||
const res = await props.szuru?.getTags(
|
const res = await props.szuru?.getTags(query, 0, 100, ["names", "category", "usages", "implications"], ct);
|
||||||
query,
|
|
||||||
0,
|
|
||||||
100,
|
|
||||||
["names", "category", "usages", "implications"],
|
|
||||||
ct
|
|
||||||
);
|
|
||||||
|
|
||||||
if (res) {
|
if (res) {
|
||||||
// TODO: Maybe search on hamming distance or something?
|
// TODO: Maybe search on hamming distance or something?
|
||||||
|
|
@ -41,8 +35,13 @@ async function autocompletePopulator(input: string, ct: CancelToken) {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<AutocompleteInput :autocomplete-items="autocompleteItems" @add-item="addTag"
|
<AutocompleteInput
|
||||||
@add-from-current-input="addTagFromCurrentInput" @autocomplete-populator="autocompletePopulator" v-slot="slotProps">
|
:autocomplete-items="autocompleteItems"
|
||||||
|
@add-item="addTag"
|
||||||
|
@add-from-current-input="addTagFromCurrentInput"
|
||||||
|
@autocomplete-populator="autocompletePopulator"
|
||||||
|
v-slot="slotProps"
|
||||||
|
>
|
||||||
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
|
<span :class="getTagClasses(slotProps.item)">{{ slotProps.item.name }}</span>
|
||||||
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
|
<span class="tag-usages">{{ slotProps.item.usages ? slotProps.item.usages : "" }}</span>
|
||||||
</AutocompleteInput>
|
</AutocompleteInput>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,11 @@ import { MicroTag, Pool, Tag, UpdatePostRequest } from "~/api/models";
|
||||||
export class TagDetails {
|
export class TagDetails {
|
||||||
public implications: TagDetails[] = [];
|
public implications: TagDetails[] = [];
|
||||||
|
|
||||||
constructor(public names: string[], public category?: string, public usages?: number) { }
|
constructor(
|
||||||
|
public names: string[],
|
||||||
|
public category?: string,
|
||||||
|
public usages?: number,
|
||||||
|
) {}
|
||||||
|
|
||||||
get name() {
|
get name() {
|
||||||
return this.names[0];
|
return this.names[0];
|
||||||
|
|
@ -30,7 +34,11 @@ export class TagDetails {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PoolDetails {
|
export class PoolDetails {
|
||||||
constructor(public names: string[], public category?: string, public postCount?: number) { }
|
constructor(
|
||||||
|
public names: string[],
|
||||||
|
public category?: string,
|
||||||
|
public postCount?: number,
|
||||||
|
) {}
|
||||||
|
|
||||||
get name() {
|
get name() {
|
||||||
return this.names[0];
|
return this.names[0];
|
||||||
|
|
@ -96,7 +104,10 @@ export interface SimpleSimilarPost {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SimilarPostInfo {
|
export class SimilarPostInfo {
|
||||||
constructor(public readonly id: number, public readonly percentage: number) { }
|
constructor(
|
||||||
|
public readonly id: number,
|
||||||
|
public readonly percentage: number,
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export type PostUploadState = "uploading" | "uploaded" | "error";
|
export type PostUploadState = "uploading" | "uploaded" | "error";
|
||||||
|
|
@ -132,11 +143,18 @@ export class BrowserCommand<T = any> {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PostUploadCommandData {
|
export class PostUploadCommandData {
|
||||||
constructor(public readonly post: ScrapedPostDetails, public readonly selectedSite: SzuruSiteConfig) { }
|
constructor(
|
||||||
|
public readonly post: ScrapedPostDetails,
|
||||||
|
public readonly selectedSite: SzuruSiteConfig,
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SetPostUploadInfoData {
|
export class SetPostUploadInfoData {
|
||||||
constructor(public instanceId: string, public postId: string, public info: PostUploadInfo) { }
|
constructor(
|
||||||
|
public instanceId: string,
|
||||||
|
public postId: string,
|
||||||
|
public info: PostUploadInfo,
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SetExactPostId {
|
export class SetExactPostId {
|
||||||
|
|
@ -144,7 +162,7 @@ export class SetExactPostId {
|
||||||
public readonly instanceId: string,
|
public readonly instanceId: string,
|
||||||
public readonly postId: string,
|
public readonly postId: string,
|
||||||
public readonly exactPostId: number,
|
public readonly exactPostId: number,
|
||||||
) { }
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PostUpdateCommandData {
|
export class PostUpdateCommandData {
|
||||||
|
|
@ -152,11 +170,14 @@ export class PostUpdateCommandData {
|
||||||
public readonly postId: number,
|
public readonly postId: number,
|
||||||
public readonly updateRequest: UpdatePostRequest,
|
public readonly updateRequest: UpdatePostRequest,
|
||||||
public readonly selectedSite: SzuruSiteConfig,
|
public readonly selectedSite: SzuruSiteConfig,
|
||||||
) { }
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class FetchCommandData {
|
export class FetchCommandData {
|
||||||
constructor(public readonly url: string, public readonly options: RequestInit | undefined = undefined) { }
|
constructor(
|
||||||
|
public readonly url: string,
|
||||||
|
public readonly options: RequestInit | undefined = undefined,
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SzuruSiteConfig {
|
export class SzuruSiteConfig {
|
||||||
|
|
@ -167,7 +188,10 @@ export class SzuruSiteConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class TagCategoryColor {
|
export class TagCategoryColor {
|
||||||
constructor(public name: string, public color: string) { }
|
constructor(
|
||||||
|
public name: string,
|
||||||
|
public color: string,
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getDefaultTagCategories = () => [
|
export const getDefaultTagCategories = () => [
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ watch(
|
||||||
(value) => {
|
(value) => {
|
||||||
el = refreshTagCategoryColorMap(value.tagCategories, el);
|
el = refreshTagCategoryColorMap(value.tagCategories, el);
|
||||||
},
|
},
|
||||||
{ immediate: true }
|
{ immediate: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|
@ -93,7 +93,7 @@ onMounted(() => {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
{ urls: ["<all_urls>"] },
|
{ urls: ["<all_urls>"] },
|
||||||
extraInfoSpec
|
extraInfoSpec,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ async function mergeChanges() {
|
||||||
if (
|
if (
|
||||||
!isEqual(
|
!isEqual(
|
||||||
newTags,
|
newTags,
|
||||||
existingPostRo.tags.map((x) => x.names[0])
|
existingPostRo.tags.map((x) => x.names[0]),
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
req.tags = newTags;
|
req.tags = newTags;
|
||||||
|
|
@ -165,7 +165,7 @@ watch(
|
||||||
// TODO: Implement this.
|
// TODO: Implement this.
|
||||||
sourcesAdded.value = 0;
|
sourcesAdded.value = 0;
|
||||||
sourcesRemoved.value = 0;
|
sourcesRemoved.value = 0;
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
|
|
@ -176,7 +176,7 @@ watch(
|
||||||
} else if (existingPostRo) {
|
} else if (existingPostRo) {
|
||||||
tagsToAdd.splice(0);
|
tagsToAdd.splice(0);
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
|
|
@ -187,7 +187,7 @@ watch(
|
||||||
} else if (existingPostRo) {
|
} else if (existingPostRo) {
|
||||||
post.value.source = existingPostRo.source;
|
post.value.source = existingPostRo.source;
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
|
|
@ -198,7 +198,7 @@ watch(
|
||||||
} else if (existingPostRo) {
|
} else if (existingPostRo) {
|
||||||
post.value.safety = existingPostRo.safety;
|
post.value.safety = existingPostRo.safety;
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|
|
||||||
|
|
@ -380,13 +380,17 @@ useDark();
|
||||||
<!-- TODO: Maybe a 5px gap here? -->
|
<!-- TODO: Maybe a 5px gap here? -->
|
||||||
|
|
||||||
<div style="display: flex; background: purple; border-radius: 0 2px 2px 0">
|
<div style="display: flex; background: purple; border-radius: 0 2px 2px 0">
|
||||||
<router-link :to="{
|
<router-link
|
||||||
|
:to="{
|
||||||
name: 'merge',
|
name: 'merge',
|
||||||
params: {
|
params: {
|
||||||
siteId: cfg.selectedSiteId,
|
siteId: cfg.selectedSiteId,
|
||||||
postId: instanceSpecificData?.reverseSearchResult?.exactPostId,
|
postId: instanceSpecificData?.reverseSearchResult?.exactPostId,
|
||||||
},
|
},
|
||||||
}" style="padding: 5px 20px">Merge</router-link>
|
}"
|
||||||
|
style="padding: 5px 20px"
|
||||||
|
>Merge</router-link
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -407,10 +411,15 @@ useDark();
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- TODO: Clicking a link doesn't actually open it in a new tab, see https://stackoverflow.com/questions/8915845 -->
|
<!-- TODO: Clicking a link doesn't actually open it in a new tab, see https://stackoverflow.com/questions/8915845 -->
|
||||||
<div v-if="instanceSpecificData?.uploadState?.state == 'uploaded' && instanceSpecificData?.uploadState.instancePostId
|
<div
|
||||||
" class="bg-success">
|
v-if="
|
||||||
<a :href="getActiveSitePostUrl(instanceSpecificData.uploadState.instancePostId)">Uploaded post {{
|
instanceSpecificData?.uploadState?.state == 'uploaded' && instanceSpecificData?.uploadState.instancePostId
|
||||||
instanceSpecificData.uploadState.instancePostId }}</a>
|
"
|
||||||
|
class="bg-success"
|
||||||
|
>
|
||||||
|
<a :href="getActiveSitePostUrl(instanceSpecificData.uploadState.instancePostId)"
|
||||||
|
>Uploaded post {{ instanceSpecificData.uploadState.instancePostId }}</a
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.updateTagsState?.totalChanged" class="bg-success">
|
<div v-if="instanceSpecificData?.uploadState?.updateTagsState?.totalChanged" class="bg-success">
|
||||||
|
|
@ -423,45 +432,64 @@ useDark();
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.state == 'uploading'"><span>Uploading...</span></div>
|
<div v-if="instanceSpecificData?.uploadState?.state == 'uploading'"><span>Uploading...</span></div>
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.updateTagsState?.total &&
|
<div
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.uploadState?.updateTagsState?.total &&
|
||||||
instanceSpecificData.uploadState?.updateTagsState?.current == undefined
|
instanceSpecificData.uploadState?.updateTagsState?.current == undefined
|
||||||
">
|
"
|
||||||
|
>
|
||||||
<span>{{ instanceSpecificData.uploadState?.updateTagsState?.total }} tags need a different category</span>
|
<span>{{ instanceSpecificData.uploadState?.updateTagsState?.total }} tags need a different category</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.uploadState?.updateTagsState?.current &&
|
<div
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.uploadState?.updateTagsState?.current &&
|
||||||
instanceSpecificData?.uploadState?.updateTagsState?.totalChanged == undefined
|
instanceSpecificData?.uploadState?.updateTagsState?.totalChanged == undefined
|
||||||
">
|
"
|
||||||
<span>Updating tag {{ instanceSpecificData.uploadState?.updateTagsState?.current }}/{{
|
>
|
||||||
|
<span
|
||||||
|
>Updating tag {{ instanceSpecificData.uploadState?.updateTagsState?.current }}/{{
|
||||||
instanceSpecificData.uploadState?.updateTagsState?.total
|
instanceSpecificData.uploadState?.updateTagsState?.total
|
||||||
}}</span>
|
}}</span
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="isSearchingForSimilarPosts > 0 && instanceSpecificData?.uploadState == undefined">
|
<div v-if="isSearchingForSimilarPosts > 0 && instanceSpecificData?.uploadState == undefined">
|
||||||
<span>Searching for similar posts...</span>
|
<span>Searching for similar posts...</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="instanceSpecificData?.reverseSearchResult?.similarPosts.length == 0 &&
|
<div
|
||||||
|
v-if="
|
||||||
|
instanceSpecificData?.reverseSearchResult?.similarPosts.length == 0 &&
|
||||||
instanceSpecificData.uploadState == undefined
|
instanceSpecificData.uploadState == undefined
|
||||||
">
|
"
|
||||||
|
>
|
||||||
<span>No similar posts found</span>
|
<span>No similar posts found</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-for="similarPost in getSimilarPosts(instanceSpecificData?.reverseSearchResult)" :key="similarPost.id"
|
<div
|
||||||
class="has-merge-button">
|
v-for="similarPost in getSimilarPosts(instanceSpecificData?.reverseSearchResult)"
|
||||||
<a :href="getActiveSitePostUrl(similarPost.id)">Post {{ similarPost.id }} looks {{ similarPost.percentage }}%
|
:key="similarPost.id"
|
||||||
similar</a>
|
class="has-merge-button"
|
||||||
|
>
|
||||||
|
<a :href="getActiveSitePostUrl(similarPost.id)"
|
||||||
|
>Post {{ similarPost.id }} looks {{ similarPost.percentage }}% similar</a
|
||||||
|
>
|
||||||
|
|
||||||
<!-- TODO: Maybe a 5px gap here? -->
|
<!-- TODO: Maybe a 5px gap here? -->
|
||||||
|
|
||||||
<div style="display: flex; background: purple; border-radius: 0 2px 2px 0">
|
<div style="display: flex; background: purple; border-radius: 0 2px 2px 0">
|
||||||
<router-link :to="{
|
<router-link
|
||||||
|
:to="{
|
||||||
name: 'merge',
|
name: 'merge',
|
||||||
params: {
|
params: {
|
||||||
siteId: cfg.selectedSiteId,
|
siteId: cfg.selectedSiteId,
|
||||||
postId: similarPost.id,
|
postId: similarPost.id,
|
||||||
},
|
},
|
||||||
}" style="padding: 5px 20px">Merge</router-link>
|
}"
|
||||||
|
style="padding: 5px 20px"
|
||||||
|
>Merge</router-link
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -512,8 +540,12 @@ useDark();
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="section-row">
|
<div class="section-row">
|
||||||
<CompactTags :tags="pop.selectedPost.tags" :show-remove-tag="true" :show-usages="cfg.loadTagCounts"
|
<CompactTags
|
||||||
@remove-tag="removeTag" />
|
:tags="pop.selectedPost.tags"
|
||||||
|
:show-remove-tag="true"
|
||||||
|
:show-usages="cfg.loadTagCounts"
|
||||||
|
@remove-tag="removeTag"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</PopupSection>
|
</PopupSection>
|
||||||
|
|
||||||
|
|
@ -523,8 +555,12 @@ useDark();
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="section-row">
|
<div class="section-row">
|
||||||
<CompactPools :pools="pop.selectedPost.pools" :show-remove-pool="true" show-post-count
|
<CompactPools
|
||||||
@remove-pool="removePool" />
|
:pools="pop.selectedPost.pools"
|
||||||
|
:show-remove-pool="true"
|
||||||
|
show-post-count
|
||||||
|
@remove-pool="removePool"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</PopupSection>
|
</PopupSection>
|
||||||
|
|
||||||
|
|
@ -558,8 +594,11 @@ useDark();
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="popup-section">
|
<div class="popup-section">
|
||||||
<PostContentDisplay :content-url="pop.selectedPost.contentUrl" :content-type="pop.selectedPost.contentType"
|
<PostContentDisplay
|
||||||
@on-resolution-loaded="onResolutionLoaded" />
|
:content-url="pop.selectedPost.contentUrl"
|
||||||
|
:content-type="pop.selectedPost.contentType"
|
||||||
|
@on-resolution-loaded="onResolutionLoaded"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,9 @@
|
||||||
font-family: "Open Sans";
|
font-family: "Open Sans";
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
src: local(""), url("/assets/open-sans-v34-latin-regular.woff2") format("woff2");
|
src:
|
||||||
|
local(""),
|
||||||
|
url("/assets/open-sans-v34-latin-regular.woff2") format("woff2");
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
|
@ -141,7 +143,8 @@ ul.compact {
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.compact-tags, .compact-pools {
|
.compact-tags,
|
||||||
|
.compact-pools {
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
display: inline;
|
display: inline;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
describe('Demo', () => {
|
describe("Demo", () => {
|
||||||
it('should work', () => {
|
it("should work", () => {
|
||||||
expect(1 + 1).toBe(2);
|
expect(1 + 1).toBe(2);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,7 @@
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"target": "es2016",
|
"target": "es2016",
|
||||||
"lib": [
|
"lib": ["DOM", "ESNext"],
|
||||||
"DOM",
|
|
||||||
"ESNext"
|
|
||||||
],
|
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"incremental": false,
|
"incremental": false,
|
||||||
|
|
@ -16,17 +13,10 @@
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"forceConsistentCasingInFileNames": true,
|
"forceConsistentCasingInFileNames": true,
|
||||||
"types": [
|
"types": ["vite/client"],
|
||||||
"vite/client"
|
|
||||||
],
|
|
||||||
"paths": {
|
"paths": {
|
||||||
"~/*": [
|
"~/*": ["src/*"]
|
||||||
"src/*"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": ["dist", "node_modules"]
|
||||||
"dist",
|
|
||||||
"node_modules"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue