finally fixed being able to reload the anime page when searching or changing the url

MALUserFunctions.go

@@ -308,7 +308,16 @@ func refreshMyAnimeListAuthorizationToken() {
 
 func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 	a.MyAnimeListLogin()
+	user := createUser()
+	if user.Name == "" {
+		refreshMyAnimeListAuthorizationToken()
+		user = createUser()
+	}
 
+	return user
+}
+
+func createUser() MyAnimeListUser {
 	client := &http.Client{}
 
 	req, _ := http.NewRequest("GET", "https://api.myanimelist.net/v2/users/@me?fields=anime_statistics", nil)
@@ -335,6 +344,7 @@ func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 	}
 
 	return user
+
 }
 
 func (a *App) LogoutMyAnimeList() string {

app.go

@@ -3,9 +3,11 @@ package main
 import (
 	"context"
 	_ "embed"
+	"log"
+	"strings"
+
 	"github.com/wailsapp/wails/v2/pkg/options"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
-	"strings"
 
 	"github.com/tidwall/gjson"
 )
@@ -43,3 +45,14 @@ func (a *App) onSecondInstanceLaunch(secondInstanceData options.SecondInstanceDa
 	runtime.Show(*wailsContext)
 	go runtime.EventsEmit(*wailsContext, "launchArgs", secondInstanceArgs)
 }
+
+func (a *App) ShowVersion() {
+	version := gjson.Get(wailsJSON, "info.productVersion")
+	_, err := runtime.MessageDialog(*wailsContext, runtime.MessageDialogOptions{
+		Title:   "Version",
+		Message: "AniTrack Version: " + version.String(),
+	})
+	if err != nil {
+		log.Println(err)
+	}
+}

build/install_linux.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# copy desktop file
+if [ -e "~/.local/share/applications/AniTrack.desktop" ]; then
+  if [ -d "~/.local/share/applications/" ]; then
+    cp ./AniTrack.desktop ~/.local/share/applications/
+  else
+    mkdir -p ~/.local/share/applications/
+    cp ./AniTrack.desktop ~/.local/share/applications/
+  fi
+fi
+
+# copy icons to xdg folders
+for size in 32 48 64 128; do
+  xdg-icon-resource install --novendor --context apps --size $size ./icon/$size/AniTrack.png AniTrack
+done
+
+# copy AniTrack Binary to $HOME/Applications/
+if ! [ -d "~/Applications" ]; then
+  mkdir -p ~/Applications
+  cp ./bin/AniTrack ~/Applications/
+elif ! [[ -e ~/Applications/AniTrack ]]; then
+  cp ./bin/AniTrack ~/Applications/
+fi
+
+echo "AniTrack has been successfully installed."

frontend/src/App.svelte

@@ -1,7 +1,10 @@
 <script lang="ts">
     import {
         aniListAnime,
+        aniListLoggedIn,
         GetAnimeSingleItem,
+        malLoggedIn,
+        simklLoggedIn,
     } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
     import {onMount} from "svelte";
     import Router from "svelte-spa-router"
@@ -16,9 +19,17 @@
     import {AniListGetSingleAnimeDefaultData} from "./helperDefaults/AniListGetSingleAnime";
 
     onMount(async () => {
-        await CheckIfAniListLoggedInAndLoadWatchList()
-        await CheckIfMALLoggedInAndSetUser()
-        await CheckIfSimklLoggedInAndSetUser()
+        let isAniListLoggedIn: boolean
+        let isMALLoggedIn: boolean
+        let isSimklLoggedIn: boolean
+        aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
+        malLoggedIn.subscribe((value) => isMALLoggedIn = value)
+        simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
+
+        console.log(isAniListLoggedIn)
+        !isAniListLoggedIn && await CheckIfAniListLoggedInAndLoadWatchList()
+        !isMALLoggedIn && await CheckIfMALLoggedInAndSetUser()
+        !isSimklLoggedIn && await CheckIfSimklLoggedInAndSetUser()
     })
 </script>
 
@@ -27,17 +38,7 @@
     '/': Home,
     '/anime/:id': wrap({
         asyncComponent: () => import('./routes/AnimeRoutePage.svelte'),
-        conditions: [
-            async () => await CheckIfAniListLoggedIn(),
-            async (detail) => {
-                aniListAnime.update(value => {
-                    value = AniListGetSingleAnimeDefaultData
-                    return value
-                })
-                await GetAnimeSingleItem(Number(detail.params.id), true)
-                return Object.keys($aniListAnime).length!==0
-            },
-        ],
+        conditions: [async () => await CheckIfAniListLoggedIn()],
         loadingComponent: Spinner
     }),
     // '*': "Not Found"

frontend/src/anilist/types/AniListCurrentUserWatchListType.ts

@@ -1,80 +1,93 @@
 export interface AniListCurrentUserWatchList {
-    data: {
-        Page: {
-            pageInfo: {
-                total: number
-                perPage: number
-                currentPage: number
-                lastPage: number
-                hasNextPage: boolean
-            },
-            mediaList: MediaList[]
-        }
-    }
+  data: {
+    Page: {
+      pageInfo: {
+        total: number;
+        perPage: number;
+        currentPage: number;
+        lastPage: number;
+        hasNextPage: boolean;
+      };
+      mediaList: MediaList[];
+    };
+  };
 }
 
 export interface AniListGetSingleAnime {
-    data: {
-        MediaList: MediaList
-    }
+  data: {
+    MediaList: MediaList;
+  };
 }
 
 export interface MediaList {
-    id: number
-    mediaId: number
-    userId: number
-    media: {
-        id: number
-        idMal: number
-        title: {
-            romaji: string
-            english?: string
-            native: string
-        }
-        description: string
-        coverImage: {
-            large: string
-        }
-        season: string
-        seasonYear: number
-        status: string
-        episodes?: number
-        nextAiringEpisode?: {
-            airingAt: number
-            timeUntilAiring: number
-            episode: number
-        }
-    }
-    status: string
-    startedAt: {
-        year: number
-        month: number
-        day: number
-    }
-    completedAt: {
-        year?: number
-        month?: number
-        day?: number
-    }
-    notes?: string
-    progress: number
-    score: number
-    repeat: number
-    user: {
-        id: number
-        name: string
-        avatar: {
-            large: string
-            medium: string
-        }
-        statistics: {
-            anime: {
-                count: number
-                statuses: [{
-                    status: string
-                    count: number
-                }]
-            }
-        }
-    }
-}
+  id: number;
+  mediaId: number;
+  userId: number;
+  media: {
+    id: number;
+    idMal: number;
+    title: {
+      romaji: string;
+      english?: string;
+      native: string;
+    };
+    description: string;
+    coverImage: {
+      large: string;
+    };
+    season: string;
+    seasonYear: number;
+    status: string;
+    episodes?: number;
+    nextAiringEpisode?: {
+      airingAt: number;
+      timeUntilAiring: number;
+      episode: number;
+    };
+    tags: [
+      {
+        id: number;
+        name: string;
+        description: string;
+        rank: number;
+        isMediaSpoiler: boolean;
+        isAdult: boolean;
+      },
+    ];
+    isAdult: boolean;
+  };
+  status: string;
+  startedAt: {
+    year: number;
+    month: number;
+    day: number;
+  };
+  completedAt: {
+    year?: number;
+    month?: number;
+    day?: number;
+  };
+  notes?: string;
+  progress: number;
+  score: number;
+  repeat: number;
+  user: {
+    id: number;
+    name: string;
+    avatar: {
+      large: string;
+      medium: string;
+    };
+    statistics: {
+      anime: {
+        count: number;
+        statuses: [
+          {
+            status: string;
+            count: number;
+          },
+        ];
+      };
+    };
+  };
+}

frontend/src/helperComponents/AvatarMenu.svelte

@@ -13,11 +13,12 @@
         loginToSimkl,
         logoutOfAniList,
         logoutOfMAL,
-        logoutOfSimkl,
+        logoutOfSimkl
     } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
     import * as runtime from "../../wailsjs/runtime";
     import type {MyAnimeListUser} from "../mal/types/MALTypes";
     import type {SimklUser} from "../simkl/types/simklTypes";
+    import { ShowVersion } from "../../wailsjs/go/main/App";
 
     let currentAniListUser: AniListUser;
     let currentMALUser: MyAnimeListUser;
@@ -36,6 +37,20 @@
     function dropdownUser(): void {
         let dropdown = document.querySelector("#userDropdown");
         dropdown.classList.toggle("hidden");
+
+        if (!dropdown.classList.contains("hidden")) {
+            document.addEventListener("click", clickOutside)
+        }
+    }
+
+    function clickOutside(event: Event): void {
+        let dropdown = document.querySelector("#userDropdown")
+        let toggleBtn = document.querySelector("#userDropdownButton")
+
+        if (!dropdown.contains(event.target as Node) && !toggleBtn.contains(event.target as Node)) {
+            dropdown.classList.add("hidden")
+            document.removeEventListener("click", clickOutside)
+        }
     }
 </script>
 
@@ -77,7 +92,10 @@
                 </li>
                 {:else}
                 <li>
-                    <button on:click={loginToAniList}
+                    <button on:click={() => {
+                        dropdownUser()
+                        loginToAniList()
+                    }}
                             class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
                         <span class="maple-font text-lg mr-4">A</span>Login to AniList
                     </button>
@@ -94,7 +112,10 @@
                 </li>
             {:else}
                 <li>
-                    <button on:click={loginToMAL}
+                    <button on:click={() => {
+                        dropdownUser()
+                        loginToMAL()
+                    }}
                             class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
                         <span class="maple-font text-lg mr-4">M</span>Login to MyAnimeList
                     </button>
@@ -111,7 +132,10 @@
                 </li>
             {:else}
                 <li>
-                    <button on:click={loginToSimkl}
+                    <button on:click={() => {
+                        dropdownUser()
+                        loginToSimkl()
+                    }}
                             class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
                         <span class="maple-font text-lg mr-4">S</span>Login to Simkl
                     </button>
@@ -119,6 +143,15 @@
             {/if}
         </ul>
         <div class="py-2">
+            <button
+                    on:click={() => {
+                        dropdownUser()
+                        ShowVersion()
+                    }}
+                    class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"
+            >
+               Version
+            </button>
             <button
                 on:click={() => runtime.Quit()}
                 class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"

frontend/src/routes/AnimeRoutePage.svelte

@@ -1,9 +1,23 @@
 <script lang="ts">
+    import { aniListAnime, GetAnimeSingleItem } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
     import Anime from "../helperComponents/Anime.svelte"
+    import { AniListGetSingleAnimeDefaultData } from "../helperDefaults/AniListGetSingleAnime";
+    import Spinner from "../helperComponents/Spinner.svelte";
 
     export let params: Record<string, string>
+    let loadPromise = load(params.id)
+    $: loadPromise = load(params.id)
+
+    async function load(id: string) {
+        aniListAnime.update(() => AniListGetSingleAnimeDefaultData)
+        await GetAnimeSingleItem(Number(id), true)
+    }
 </script>
 
 {#key params.id}
-    <Anime />
+    {#await loadPromise}
+        <Spinner />
+    {:then _}
+        <Anime />
+    {/await}
 {/key}

frontend/wailsjs/go/main/App.d.ts

@@ -42,6 +42,8 @@ export function MyAnimeListLogin():Promise<void>;
 
 export function MyAnimeListUpdate(arg1:main.MALAnime,arg2:main.MALUploadStatus):Promise<main.MalListStatus>;
 
+export function ShowVersion():Promise<void>;
+
 export function SimklGetUserWatchlist():Promise<main.SimklWatchListType>;
 
 export function SimklLogin():Promise<void>;

frontend/wailsjs/go/main/App.js

@@ -82,6 +82,10 @@ export function MyAnimeListUpdate(arg1, arg2) {
   return window['go']['main']['App']['MyAnimeListUpdate'](arg1, arg2);
 }
 
+export function ShowVersion() {
+  return window['go']['main']['App']['ShowVersion']();
+}
+
 export function SimklGetUserWatchlist() {
   return window['go']['main']['App']['SimklGetUserWatchlist']();
 }

wails.json

@@ -12,6 +12,6 @@
   },
   "info": {
     "productName": "AniTrack",
-    "productVersion": "0.1.8"
+    "productVersion": "0.5.0"
   }
 }