Fix import issues reported by linting

client/src/components/AiSummaries.vue

@@ -42,13 +42,13 @@
 
 <script setup lang="ts">
 import AiSummaryDialog from "@client/components/AiSummaryDialog.vue";
-import AiSummary from "@client/components/AiSummary.vue";
 import LoadingSpinner from "@client/components/LoadingSpinner.vue";
-import { useI18n } from "vue-i18n";
 import { OpenAiEndpoints } from "@client/util/api-client.js";
 import type { AiSummaryData } from "@fumix/fu-blog-common";
-import { onMounted, ref } from "vue";
 import type { PropType } from "vue";
+import { ref } from "vue";
+import { useI18n } from "vue-i18n";
+
 const { t } = useI18n();
 
 const props = defineProps({

client/src/components/AiSummaryDialog.vue

@@ -26,8 +26,8 @@
 </template>
 
 <script setup lang="ts">
-import { t } from "@client/plugins/i18n.js";
 import AiSummary from "@client/components/AiSummary.vue";
+import { t } from "@client/plugins/i18n.js";
 import type { AiSummaryData } from "@fumix/fu-blog-common";
 import { Modal } from "bootstrap";
 import type { PropType } from "vue";

client/src/components/BooleanDisplay.vue

@@ -9,5 +9,6 @@
 <script setup lang="ts">
 import { faCheck, faQuestion, faX } from "@fortawesome/free-solid-svg-icons";
 import type { PropType } from "vue";
+
 const props = defineProps({ value: { type: Boolean as PropType<boolean | null>, required: true } });
 </script>

client/src/components/LightDarkToggler.vue

@@ -72,9 +72,9 @@
 </style>
 
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
-import { saveCssPreference, loadCssPreference } from "@client/util/storage.js";
+import { loadCssPreference, saveCssPreference } from "@client/util/storage.js";
 import type { UserTheme } from "@fumix/fu-blog-common";
+import { onMounted, ref } from "vue";
 
 const emit = defineEmits(["themeChanged"]);
 

client/src/components/MarkDown.vue

@@ -27,8 +27,6 @@ import { blobToArray, bytesToDataUrl } from "@fumix/fu-blog-common";
 import type { PropType } from "vue";
 import { ref, watch } from "vue";
 import { MarkdownConverterClient } from "../markdown-converter-client.js";
-import highlightjs from "highlight.js";
-import { marked } from "marked";
 
 const sanitizedHtml = ref<string>("");
 

client/src/components/MultiselectDialog.vue

@@ -49,11 +49,11 @@
 </style>
 
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
+import type { User } from "@fumix/fu-blog-common";
+import { Modal } from "bootstrap";
 import type { PropType } from "vue";
 import { ref, watch } from "vue";
-import { Modal } from "bootstrap";
-import type { User } from "@fumix/fu-blog-common";
+import { useI18n } from "vue-i18n";
 
 const { t } = useI18n();
 const value = ref<string[]>([]);

client/src/components/PostPreview.vue

@@ -68,14 +68,13 @@
 </style>
 
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
-import type { PropType } from "vue";
-import type { Post } from "@fumix/fu-blog-common";
-import { faBookReader, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons";
+import DisplayTags from "@client/components/DisplayTags.vue";
 import { faClock } from "@fortawesome/free-regular-svg-icons";
-import type { UserRolePermissionsType } from "@fumix/fu-blog-common";
+import { faBookReader, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons";
+import type { Post, UserRolePermissionsType } from "@fumix/fu-blog-common";
+import type { PropType } from "vue";
+import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
-import DisplayTags from "@client/components/DisplayTags.vue";
 
 const router = useRouter();
 const { t } = useI18n();

client/src/components/SplitFlapDisplay.vue

@@ -17,7 +17,7 @@
 
 <script setup lang="ts">
 import SplitFlap from "@client/components/SplitFlap.vue";
-import { computed, reactive } from "vue";
+import { computed } from "vue";
 
 const props = defineProps({ text: { type: String, required: true }, width: { type: Number, required: true } });
 const chars = computed(() => {

client/src/components/UserName.vue

@@ -20,9 +20,9 @@
 </style>
 
 <script setup lang="ts">
-import type { PropType } from "vue";
 import { faSignOut } from "@fortawesome/free-solid-svg-icons";
 import type { User } from "@fumix/fu-blog-common";
+import type { PropType } from "vue";
 
 const props = defineProps({
   user: {

client/src/components/WordCloud.vue

@@ -5,8 +5,8 @@
 <style lang="scss"></style>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
 import type { Word } from "@fumix/fu-blog-common";
+import { onMounted, ref } from "vue";
 import WordCloud from "wordcloud";
 
 const words = ref<Word[]>([]);

client/src/main.ts

@@ -1,12 +1,12 @@
+import i18n from "@client/plugins/i18n.js";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import "bootstrap";
+import { DateTime } from "luxon";
 import { createApp } from "vue";
 import App from "./App.vue";
-import router from "./router/index.js";
-import { DateTime } from "luxon";
 import "./assets/scss/custom.scss";
 import "./assets/scss/style.scss";
-import "bootstrap";
-import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import i18n from "@client/plugins/i18n.js";
+import router from "./router/index.js";
 
 declare module "@vue/runtime-core" {
   export interface ComponentCustomProperties {

client/src/util/api-client.ts

@@ -1,5 +1,4 @@
 import { loadIdToken } from "@client/util/storage.js";
-import { imageBytesToDataUrl } from "@fumix/fu-blog-common";
 import type {
   AiSummaryData,
   DataUrl,
@@ -10,6 +9,7 @@ import type {
   OAuthAccount,
   SupportedImageMimeType,
 } from "@fumix/fu-blog-common";
+import { imageBytesToDataUrl } from "@fumix/fu-blog-common";
 
 export type ApiUrl = `/api/${string}`;
 

client/src/util/storage.ts

@@ -1,5 +1,5 @@
-import { isOAuthType } from "@fumix/fu-blog-common";
 import type { SavedOAuthToken, UserTheme } from "@fumix/fu-blog-common";
+import { isOAuthType } from "@fumix/fu-blog-common";
 
 type OAuthState = { key: string; redirect_uri?: string };
 const idTokenKey = "id_token";

client/src/views/ErrorView.vue

@@ -20,6 +20,7 @@
 <script setup lang="ts">
 import SplitFlapDisplay from "@client/components/SplitFlapDisplay.vue";
 import { ref } from "vue";
+
 const text = ref<string>("404 NOT FOUND");
 const length = ref<number>(13);
 </script>

client/src/views/LoginView.vue

@@ -55,7 +55,7 @@
 import LoginButton from "@client/components/LoginButton.vue";
 import router from "@client/router/index.js";
 import { loadOauthStateByKey, saveIdToken } from "@client/util/storage.js";
-import type { OAuthCodeDto, OAuthUserInfoDto, OAuthType } from "@fumix/fu-blog-common";
+import type { OAuthCodeDto, OAuthType, OAuthUserInfoDto } from "@fumix/fu-blog-common";
 import { bytesToBase64URL, isOAuthType } from "@fumix/fu-blog-common";
 import { onMounted, ref } from "vue";
 import { useI18n } from "vue-i18n";

client/src/views/PostFormView.vue

@@ -202,20 +202,20 @@
 </style>
 
 <script setup lang="ts">
-import PostNotAvailable from "@client/components/PostNotAvailable.vue";
+import AiSummaries from "@client/components/AiSummaries.vue";
 import ImagePreview from "@client/components/ImagePreview.vue";
 import LoadingSpinner from "@client/components/LoadingSpinner.vue";
 import MarkDown from "@client/components/MarkDown.vue";
-import AiSummaries from "@client/components/AiSummaries.vue";
+import PostNotAvailable from "@client/components/PostNotAvailable.vue";
 import { debounce } from "@client/debounce.js";
-import Vue3TagsInput from "vue3-tags-input";
 import { PostEndpoints } from "@client/util/api-client.js";
 import { faUpload } from "@fortawesome/free-solid-svg-icons";
 import { t, tc } from "@fumix/fu-blog-client/src/plugins/i18n.js";
 import type { DraftResponseDto, NewPostRequestDto, Post } from "@fumix/fu-blog-common";
 import { bytesToBase64URL, convertToHumanReadableFileSize } from "@fumix/fu-blog-common";
 import { computed, onMounted, reactive, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import Vue3TagsInput from "vue3-tags-input";
 
 const md = ref<string | null>(null);
 const loading = ref<boolean>(false);

client/src/views/PostView.vue

@@ -81,14 +81,14 @@
 </style>
 
 <script setup lang="ts">
-import PostNotAvailable from "@client/components/PostNotAvailable.vue";
-import DisplayTags from "@client/components/DisplayTags.vue";
 import ConfirmDialog from "@client/components/ConfirmDialog.vue";
+import DisplayTags from "@client/components/DisplayTags.vue";
 import LoadingSpinner from "@client/components/LoadingSpinner.vue";
+import PostNotAvailable from "@client/components/PostNotAvailable.vue";
 import { faClock } from "@fortawesome/free-regular-svg-icons";
 import { faArrowLeft, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons";
 import type { ConfirmDialogData, Post, UserRolePermissionsType } from "@fumix/fu-blog-common";
-import { ref, onMounted, type PropType } from "vue";
+import { onMounted, type PropType, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 

client/src/views/admin/UsersView.vue

@@ -110,7 +110,7 @@ import MultiselectDialog from "@client/components/MultiselectDialog.vue";
 import { faPencil } from "@fortawesome/free-solid-svg-icons";
 import type { User, UserRolePermissionsType, UserWithOAuthProviders } from "@fumix/fu-blog-common";
 import { permissionsForUser, UserRoles } from "@fumix/fu-blog-common";
-import { type PropType, ref, onMounted } from "vue";
+import { onMounted, type PropType, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
 const { t } = useI18n();

common/src/entity/Post.ts

@@ -1,6 +1,6 @@
 import { Attachment } from "./Attachment.js";
-import type { PublicUserInfo } from "./User.js";
 import type { Tag } from "./Tag.js";
+import type { PublicUserInfo } from "./User.js";
 
 export type Post = {
   id?: number;

common/src/util/base64.ts

@@ -1,6 +1,6 @@
-import { determineMimeType } from "./mimeType.js";
 import { Buffer } from "buffer";
 import { Blob } from "node-fetch";
+import { determineMimeType } from "./mimeType.js";
 
 export type DataUrl = `data:${string};base64,${string}`;
 

portal/src/routes/token.ts

@@ -1,8 +1,8 @@
 import { faker } from "@faker-js/faker/locale/de";
-import { createJwtToken } from "../util/jwt.js";
 import express, { Router } from "express";
-import { UserInfo } from "../user-info.js";
 import { userInfosById } from "../index.js";
+import { UserInfo } from "../user-info.js";
+import { createJwtToken } from "../util/jwt.js";
 
 const OAUTH_SECRET = "secret";
 

server/src/entity/Attachment.entity.ts

@@ -1,7 +1,7 @@
 import { Attachment } from "@fumix/fu-blog-common";
-import { FileEntity } from "./File.entity.js";
 import type { Relation } from "typeorm";
 import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import { FileEntity } from "./File.entity.js";
 import { PostEntity } from "./Post.entity.js";
 
 @Entity("attachment")

server/src/entity/File.entity.ts

@@ -1,5 +1,4 @@
-import { determineMimeType, File } from "@fumix/fu-blog-common";
-import { SupportedImageMimeType } from "@fumix/fu-blog-common";
+import { determineMimeType, File, SupportedImageMimeType } from "@fumix/fu-blog-common";
 import { Buffer } from "buffer";
 import * as crypto from "crypto";
 import { Column, Entity, PrimaryColumn } from "typeorm";

server/src/entity/OAuthAccount.entity.ts

@@ -1,5 +1,5 @@
-import { OAUTH_TYPES, OAuthAccount } from "@fumix/fu-blog-common";
 import type { OAuthType } from "@fumix/fu-blog-common";
+import { OAUTH_TYPES, OAuthAccount } from "@fumix/fu-blog-common";
 import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
 import { UserEntity } from "./User.entity.js";
 

server/src/entity/Post.entity.ts

@@ -1,8 +1,8 @@
 import { Post } from "@fumix/fu-blog-common";
-import { AttachmentEntity } from "./Attachment.entity.js";
-import { UserEntity } from "./User.entity.js";
 import { Column, Entity, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
+import { AttachmentEntity } from "./Attachment.entity.js";
 import { TagEntity } from "./Tag.entity.js";
+import { UserEntity } from "./User.entity.js";
 
 /**
  * Blog post

server/src/markdown-converter-server.ts

@@ -1,7 +1,7 @@
 import { MarkdownConverter } from "@fumix/fu-blog-common";
-import fetch from "node-fetch";
 import DOMPurify from "dompurify";
 import { JSDOM } from "jsdom";
+import fetch from "node-fetch";
 
 export class MarkdownConverterServer extends MarkdownConverter {
   private static instance: MarkdownConverterServer;

server/src/routes/admin.ts

@@ -1,7 +1,7 @@
 import { toProviderId, UserWithOAuthProviders } from "@fumix/fu-blog-common";
-import { OAuthAccountEntity } from "../entity/OAuthAccount.entity.js";
 import express, { Request, Response, Router } from "express";
 import { AppDataSource } from "../data-source.js";
+import { OAuthAccountEntity } from "../entity/OAuthAccount.entity.js";
 
 const router: Router = express.Router();
 

server/src/routes/file.ts

@@ -1,6 +1,6 @@
+import express, { Router } from "express";
 import { AppDataSource } from "../data-source.js";
 import { FileEntity } from "../entity/File.entity.js";
-import express, { Router } from "express";
 
 const router: Router = express.Router();
 

server/src/routes/posts.ts

@@ -1,5 +1,4 @@
 import { DraftResponseDto, EditPostRequestDto, NewPostRequestDto, permissionsForUser, PostRequestDto } from "@fumix/fu-blog-common";
-import logger from "../logger.js";
 import express, { NextFunction, Request, Response, Router } from "express";
 import { AppDataSource } from "../data-source.js";
 import { AttachmentEntity } from "../entity/Attachment.entity.js";

server/src/routes/utility.ts

@@ -1,16 +1,14 @@
-import { determineMimeType, permissionsForUser, Word } from "@fumix/fu-blog-common";
+import { permissionsForUser } from "@fumix/fu-blog-common";
 import express, { Request, Response, Router } from "express";
 import fetch from "node-fetch";
-import { Not } from "typeorm";
 import { AppDataSource } from "../data-source.js";
-import { PostEntity } from "../entity/Post.entity.js";
+import { TagEntity } from "../entity/Tag.entity.js";
 import { BadRequestError } from "../errors/BadRequestError.js";
 import { ForbiddenError } from "../errors/ForbiddenError.js";
 import { UnauthorizedError } from "../errors/UnauthorizedError.js";
 import { authMiddleware } from "../service/middleware/auth.js";
 import { chatGptSummarize, dallEGenerateImage } from "../service/openai.js";
 import { AppSettings } from "../settings.js";
-import { TagEntity } from "../entity/Tag.entity.js";
 
 const router: Router = express.Router();
 

server/src/service/testdata-generator.ts

@@ -1,18 +1,18 @@
 import { Sex } from "@faker-js/faker";
 import { faker } from "@faker-js/faker/locale/de";
 import { DataUrl, imageBytesToDataUrl, isNeitherNullNorUndefined, OAuthAccount } from "@fumix/fu-blog-common";
-import { FileEntity } from "../entity/File.entity.js";
 import console from "console";
 import { AppDataSource } from "../data-source.js";
 import { AttachmentEntity } from "../entity/Attachment.entity.js";
+import { FileEntity } from "../entity/File.entity.js";
 import { OAuthAccountEntity } from "../entity/OAuthAccount.entity.js";
 import { PostEntity } from "../entity/Post.entity.js";
+import { TagEntity } from "../entity/Tag.entity.js";
 import { UserEntity } from "../entity/User.entity.js";
+import logger from "../logger.js";
 import { MarkdownConverterServer } from "../markdown-converter-server.js";
 import { AppSettings, OAuthSettings } from "../settings.js";
 import { generateProfilePicture, generateRandomPng } from "./testdata/images.js";
-import logger from "../logger.js";
-import { TagEntity } from "../entity/Tag.entity.js";
 
 const usersCount = 10;
 const postsPerUser = 15;