Clean source code

ister-app · Apr 23, 2024 · 32c44f0 · 32c44f0
1 parent 3ac4d54
commit 32c44f0
Show file tree

Hide file tree

Showing 16 changed files with 164 additions and 164 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+openapi-generator-cli.jar
 /dist
 
 # local env files

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-alpine as build-stage
+FROM node:lts-alpine AS build-stage
 
 # make the 'app' folder the current working directory
 WORKDIR /app
@@ -7,7 +7,7 @@ WORKDIR /app
 COPY package*.json ./
 
 # install project dependencies
-RUN npm install
+RUN npm ci
 
 # copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY . .
@@ -16,7 +16,7 @@ COPY . .
 RUN npm run build
 
 # production stage
-FROM nginx:stable-alpine as production-stage
+FROM nginx:stable-alpine AS production-stage
 
 COPY --from=build-stage /app/dist /usr/share/nginx/html
 

diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
     <meta charset="UTF-8" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -7,7 +7,8 @@ sonar.organization=ister-app
 
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-#sonar.sources=.
+sonar.sources=src/
+sonar.exclusions=src/generated-sources/
 
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
diff --git a/src/components/EpisodeList.vue b/src/components/EpisodeList.vue
@@ -57,7 +57,7 @@ watch(props, () => {
 })
 
 const goTo = useGoTo()
-const selected: Ref<Array<String>> = ref([]);
+const selected: Ref<Array<string>> = ref([]);
 
 function getProgressInPercent(watchStatus: { progressInMilliseconds: number }[] | undefined | null, mediaFile: {
     durationInMilliseconds?: number | undefined | null

diff --git a/src/components/Player.vue b/src/components/Player.vue
@@ -72,8 +72,8 @@ const state = reactive({
 const apiService = useApiService();
 const root = ref()
 
-const controllsVisable: Ref<Boolean> = ref(true);
-var showControllsTimeout: number | undefined;
+const controllsVisable: Ref<boolean> = ref(true);
+let showControllsTimeout: number | undefined;
 
 const video: Ref<HTMLVideoElement | undefined> = ref();
 const startedPlaying = ref(false);
@@ -214,7 +214,6 @@ function playPause() {
 
 function goToTime() {
     stop();
-    // video.value.currentTime = (progres.value * durationTime.value / 100) - offsetTime.value;
     offsetTime.value = Math.round(progress.value * durationTime.value / 100);
     startPlaying();
 }

diff --git a/src/components/Recentcarousel.vue b/src/components/Recentcarousel.vue
@@ -11,8 +11,12 @@
                                class="align-end"
                                cover gradient="to bottom, rgba(0,0,0,.1), rgba(0,0,0,.8)" height="450px">
                             <v-card-text class="text-white">
-                                <p class="text-h5">{{ MetadataUtilService.getMetadataFieldForLanguage('title', episodes.show!.metadata, $t("iso-639-3")) }}</p>
-                                s{{ episodes.season?.number }}e{{ episodes.number }} {{ MetadataUtilService.getMetadataFieldForLanguage('title', episodes.metadata, $t("iso-639-3")) }}
+                                <p class="text-h5">{{
+                                        MetadataUtilService.getMetadataFieldForLanguage('title', episodes.show!.metadata, $t("iso-639-3"))
+                                    }}</p>
+                                s{{ episodes.season?.number }}e{{ episodes.number }} {{
+                                    MetadataUtilService.getMetadataFieldForLanguage('title', episodes.metadata, $t("iso-639-3"))
+                                }}
                             </v-card-text>
                         </Image>
                     </v-card>
@@ -32,10 +36,14 @@
                                     <v-container class="pa-0 ma-0">
                                         <v-row class="flex-nowrap">
                                             <v-col class="flex-grow-1 flex-shrink-1 text-truncate">
-                                                <v-card-title class="text-h5">{{ MetadataUtilService.getMetadataFieldForLanguage('title', episodeEntity.show?.metadata, $t("iso-639-3")) }}</v-card-title>
+                                                <v-card-title class="text-h5">{{
+                                                        MetadataUtilService.getMetadataFieldForLanguage('title', episodeEntity.show?.metadata, $t("iso-639-3"))
+                                                    }}</v-card-title>
                                                 <v-card-subtitle>s{{
                                                         episodeEntity.season?.number
-                                                    }}e{{ episodeEntity.number }} {{ MetadataUtilService.getMetadataFieldForLanguage('title', episodeEntity.metadata, $t("iso-639-3")) }}
+                                                    }}e{{ episodeEntity.number }} {{
+                                                        MetadataUtilService.getMetadataFieldForLanguage('title', episodeEntity.metadata, $t("iso-639-3"))
+                                                    }}
                                                 </v-card-subtitle>
                                             </v-col>
                                             <v-col class="flex-grow-0 flex-shrink-0">

diff --git a/src/components/TVShowsSeasonExpansion.vue b/src/components/TVShowsSeasonExpansion.vue
@@ -17,8 +17,7 @@
 
 <script lang="ts" setup>
 
-import {Ref, watch} from 'vue'
-import {ref} from 'vue'
+import {Ref, ref, watch} from 'vue'
 import {useQuery} from "@urql/vue";
 import {graphql} from "@/generated-sources/gql";
 import {ShowByIdSeasonsQuery} from "@/generated-sources/gql/graphql";
@@ -29,7 +28,7 @@ const props = defineProps<{
     selectedSeasonId?: string
 }>()
 
-const selected: Ref<String | undefined> = ref();
+const selected: Ref<string | undefined> = ref();
 
 const fetching: Ref<boolean | undefined> = ref(true);
 const error: Ref<any | undefined> = ref();
@@ -46,7 +45,7 @@ watch(props, () => {
 })
 
 useQuery({
-    variables: { id },
+    variables: {id},
     query: graphql(`
         query showByIdSeasons($id: ID!) {
           showById(id: $id) {

diff --git a/src/pages/shows/[id].vue b/src/pages/shows/[id].vue
@@ -41,8 +41,8 @@ import {graphql} from "@/generated-sources/gql";
 
 const route = useRoute("/shows/[id]/");
 
-const selectedEpisodeId: Ref<String | undefined> = ref();
-const selectedSeasonId: Ref<String | undefined> = ref();
+const selectedEpisodeId: Ref<string | undefined> = ref();
+const selectedSeasonId: Ref<string | undefined> = ref();
 
 const id = route.params.id;
 

diff --git a/src/pages/shows/[id]/episodes.[episodeId].vue b/src/pages/shows/[id]/episodes.[episodeId].vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import {computed, Ref, ref, watch} from 'vue'
+import {computed, watch} from 'vue'
 import {useRoute} from 'vue-router/auto';
 import {useQuery} from "@urql/vue";
 import {graphql} from "@/generated-sources/gql";
@@ -22,7 +22,6 @@ const emit = defineEmits<{
 
 const route = useRoute("/shows/[id]/episodes.[episodeId]");
 
-// const id: Ref<string> = ref(route.params.episodeId);
 const id = computed(() => route.params.episodeId);
 const shouldPause = computed(() => route.params.episodeId == null);
 

diff --git a/src/pages/shows/[id]/index.vue b/src/pages/shows/[id]/index.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import MetadataUtilService from "@/services/metadataUtil.service";
-import {Episode, Show} from "@/generated-sources/gql/graphql";
+import {Show} from "@/generated-sources/gql/graphql";
 
 defineProps<{
     show: Show | undefined,

diff --git a/src/plugins/index.ts b/src/plugins/index.ts
@@ -20,8 +20,6 @@ import {AuthConfig, authExchange} from "@urql/exchange-auth";
 function initializeAuthState() {
     const tokenJson = sessionStorage.getItem('oidc.user:https://keycloak.droogers.cloud/realms/Thuis:ister');
     const token = tokenJson ? JSON.parse(tokenJson).access_token : undefined;
-    // const refreshToken = localStorage.getItem('refreshToken');
-    console.log(token);
     return { token };
 }
 

diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
@@ -20,7 +20,7 @@ export default class AuthService {
         return this.userManager.getUser();
     }
 
-    async getToken(): Promise<String | undefined> {
+    async getToken(): Promise<string | undefined> {
         const user = await this.getUser();
         return user?.access_token;
     }

diff --git a/src/services/imageUtil.service.ts b/src/services/imageUtil.service.ts
@@ -1,5 +1,5 @@
 export interface Image {
-    language?: string | null | undefined;
+    language: string | null | undefined;
     id: string;
     type: string;
 }
@@ -8,7 +8,7 @@ export default class ImageUtilService {
     public static getCoverImageId(imageEntities: Image[]): string {
         const imageEntitiesCover = imageEntities.filter((image) => image.type === "COVER");
         if (imageEntitiesCover.length !== 0) {
-            return imageEntitiesCover[0].id!.toString();
+            return imageEntitiesCover[0].id.toString();
         } else {
             return '';
         }
@@ -17,7 +17,7 @@ export default class ImageUtilService {
     public static getBackgroundImageId(imageEntities: Image[]): string {
         const imageEntitiesCover = imageEntities.filter((image) => image.type === "BACKGROUND");
         if (imageEntitiesCover.length !== 0) {
-            return imageEntitiesCover[0].id!.toString();
+            return imageEntitiesCover[0].id.toString();
         } else {
             return '';
         }

diff --git a/src/services/metadataUtil.service.ts b/src/services/metadataUtil.service.ts
@@ -1,17 +1,12 @@
-import {EpisodeEntity, SeasonEntity, ShowEntity} from "@/generated-sources/openapi";
-
-
-export interface Metadata {
-    language?: string | null | undefined;
-    title?: string | null | undefined;
-}
+import {Maybe} from "graphql/jsutils/Maybe";
+import {Metadata} from "@/generated-sources/gql/graphql";
 
 /**
  * This util helps with getting the correct value for the given language.
  * If the given language doesn't exist return english then the not set language.
  */
 export default class MetadataUtilService {
-    public static getMetadataFieldForLanguage(field: string, metadataEntities: Metadata[] | null | undefined, preferredLanguage: String | undefined): string | undefined | Date | ShowEntity | SeasonEntity | EpisodeEntity {
+    public static getMetadataFieldForLanguage(field: string, metadataEntities: Maybe<Array<Metadata>> | undefined, preferredLanguage: string | undefined): string | Date | undefined {
         if (metadataEntities === undefined || metadataEntities === null) {
             return "";
         } else {