chore(version): bump version to 0.5.1

Increment version number from 0.5.0 to 0.5.1 for the upcoming release.

.gitignore

@@ -33,6 +33,3 @@ environment.go
 
 # REST (http files)
 http-client.private.env.json
-
-# Build artifacts
-build/*.tar.gz

AniListFunctions.go

@@ -3,7 +3,6 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io"
 	"log"
 	"net/http"
@@ -184,7 +183,7 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 	return post
 }
 
-func (a *App) AniListSearch(query string) (interface{}, error) {
+func (a *App) AniListSearch(query string) any {
 	type Variables struct {
 		Search   string `json:"search"`
 		ListType string `json:"listType"`
@@ -243,20 +242,18 @@ func (a *App) AniListSearch(query string) (interface{}, error) {
 			ListType: "ANIME",
 		},
 	}
-	returnedBody, status := AniListQuery(body, false)
+	returnedBody, _ := AniListQuery(body, false)
-	if status != "200 OK" {
+
-		return nil, fmt.Errorf("API search failed with status: %s", status)
-	}
 	var post interface{}
 	err := json.Unmarshal(returnedBody, &post)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return nil, fmt.Errorf("Failed to parse search results")
 	}
-	return post, nil
+
+	return post
 }
 
-func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) (AniListCurrentUserWatchList, error) {
+func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) AniListCurrentUserWatchList {
 	user := a.GetAniListLoggedInUser()
 	type Variables struct {
 		Page     int    `json:"page"`
@@ -407,15 +404,11 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) (An
 		err := json.Unmarshal(returnedBody, &badPost)
 		if err != nil {
 			log.Printf("Failed at unmarshal, %s\n", err)
-			return post, fmt.Errorf("API authentication error")
 		}
-		return post, fmt.Errorf("AniList API error: %s", badPost.Errors[0].Message)
+		log.Fatal(badPost.Errors[0].Message)
-	}
-	if status != "200 OK" {
-		return post, fmt.Errorf("API request failed with status: %s", status)
 	}
 
-	return post, nil
+	return post
 }
 
 func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSingleAnime {

MALFunctions.go

@@ -11,19 +11,10 @@ import (
 	"strings"
 )
 
-func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage, string, error) {
+func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage, string) {
 	client := &http.Client{}
 
-	req, err := http.NewRequest(method, malUrl, strings.NewReader(body.Encode()))
+	req, _ := http.NewRequest(method, malUrl, strings.NewReader(body.Encode()))
-
-	if err != nil {
-		message, _ := json.Marshal(struct {
-			Message string `json:"message"`
-		}{
-			Message: "Failed to create request: " + err.Error(),
-		})
-		return message, "", fmt.Errorf("failed to create request: %w", err)
-	}
 
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Add("Authorization", "Bearer "+myAnimeListJwt.AccessToken)
@@ -31,57 +22,47 @@ func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage,
 	resp, err := client.Do(req)
 
 	if err != nil {
+		fmt.Println("Errored when sending request to the server")
 		message, _ := json.Marshal(struct {
-			Message string `json:"message"`
+			Message string `json:"message" ts_type:"message"`
 		}{
-			Message: "Network error: " + err.Error(),
+			Message: "Errored when sending request to the server" + err.Error(),
 		})
-		return message, "", fmt.Errorf("network error: %w", err)
+
+		return message, resp.Status
 	}
 
 	defer resp.Body.Close()
-	respBody, err := io.ReadAll(resp.Body)
+	respBody, _ := io.ReadAll(resp.Body)
-
-	if err != nil {
-		return nil, resp.Status, fmt.Errorf("failed to read response: %w", err)
-	}
 
 	if resp.Status == "401 Unauthorized" {
 		refreshMyAnimeListAuthorizationToken()
-		return MALHelper(method, malUrl, body)
+		MALHelper(method, malUrl, body)
 	}
 
-	if resp.Status != "200 OK" && resp.Status != "201 Created" && resp.Status != "202 Accepted" {
+	return respBody, resp.Status
-		return respBody, resp.Status, fmt.Errorf("API returned status: %s", resp.Status)
-	}
-	return respBody, resp.Status, nil
 }
 
-func (a *App) GetMyAnimeList(count int) (MALWatchlist, error) {
+func (a *App) GetMyAnimeList(count int) MALWatchlist {
 	limit := strconv.Itoa(count)
 	user := a.GetMyAnimeListLoggedInUser()
 	malUrl := "https://api.myanimelist.net/v2/users/" + user.Name + "/animelist?fields=list_status&status=watching&limit=" + limit
 
 	var malList MALWatchlist
 
-	respBody, resStatus, err := MALHelper("GET", malUrl, nil)
+	respBody, resStatus := MALHelper("GET", malUrl, nil)
-
-	if err != nil {
-		return malList, fmt.Errorf("failed to get MAL watchlist: %w", err)
-	}
 
 	if resStatus == "200 OK" {
 		err := json.Unmarshal(respBody, &malList)
 		if err != nil {
 			log.Printf("Failed to unmarshal json response, %s\n", err)
-			return malList, fmt.Errorf("failed to parse response: %w", err)
 		}
 	}
 
-	return malList, nil
+	return malList
 }
 
-func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) (MalListStatus, error) {
+func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) MalListStatus {
 	if update.NumTimesRewatched >= 1 {
 		update.IsRewatching = true
 	} else {
@@ -97,52 +78,39 @@ func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) (MalList
 
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(anime.Id) + "/my_list_status"
 	var status MalListStatus
-	respBody, respStatus, err := MALHelper("PATCH", malUrl, body)
+	respBody, respStatus := MALHelper("PATCH", malUrl, body)
-
-	if err != nil {
-		return status, fmt.Errorf("failed to update MAL entry: %w", err)
-	}
 
 	if respStatus == "200 OK" {
 		err := json.Unmarshal(respBody, &status)
 		if err != nil {
 			log.Printf("Failed to unmarshal json response, %s\n", err)
-			return status, fmt.Errorf("failed to parse response: %w", err)
 		}
 	}
-	return status, nil
+
+	return status
 }
 
-func (a *App) GetMyAnimeListAnime(id int) (MALAnime, error) {
+func (a *App) GetMyAnimeListAnime(id int) MALAnime {
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(id) + "?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics"
+	respBody, respStatus := MALHelper("GET", malUrl, nil)
 	var malAnime MALAnime
-	respBody, respStatus, err := MALHelper("GET", malUrl, nil)
-
-	if err != nil {
-		return malAnime, fmt.Errorf("failed to get MAL anime: %w", err)
-	}
 
 	if respStatus == "200 OK" {
 		err := json.Unmarshal(respBody, &malAnime)
 		if err != nil {
 			log.Printf("Failed to unmarshal json response, %s\n", err)
-			return malAnime, fmt.Errorf("failed to parse response: %w", err)
 		}
 	}
-	return malAnime, nil
+
+	return malAnime
 }
 
-func (a *App) DeleteMyAnimeListEntry(id int) (bool, error) {
+func (a *App) DeleteMyAnimeListEntry(id int) bool {
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(id) + "/my_list_status"
-	_, respStatus, err := MALHelper("DELETE", malUrl, nil)
+	_, respStatus := MALHelper("DELETE", malUrl, nil)
-
-	if err != nil {
-		return false, fmt.Errorf("failed to delete MAL entry: %w", err)
-	}
-
 	if respStatus == "200 OK" {
-		return true, nil
+		return true
 	} else {
-		return false, fmt.Errorf("delete failed with status: %s", respStatus)
+		return false
 	}
 }

MALUserFunctions.go

@@ -176,7 +176,7 @@ func (a *App) handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifi
 	go func() {
 		defer wg.Done()
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Printf("Server error: %s\n", err)
+			log.Fatalf("listen: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
 	}()

SimklFunctions.go

@@ -14,24 +14,16 @@ import (
 
 var SimklWatchList SimklWatchListType
 
-func SimklHelper(method string, url string, body interface{}) (json.RawMessage, error) {
+func SimklHelper(method string, url string, body interface{}) json.RawMessage {
-	reader, err := json.Marshal(body)
+	reader, _ := json.Marshal(body)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal body: %w", err)
-	}
-
 	var req *http.Request
 
 	client := &http.Client{}
 
 	if body != nil {
-		req, err = http.NewRequest(method, url, bytes.NewBuffer(reader))
+		req, _ = http.NewRequest(method, url, bytes.NewBuffer(reader))
 	} else {
-		req, err = http.NewRequest(method, url, nil)
+		req, _ = http.NewRequest(method, url, nil)
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
 	req.Header.Add("Content-Type", "application/json")
@@ -40,45 +32,41 @@ func SimklHelper(method string, url string, body interface{}) (json.RawMessage,
 
 	resp, err := client.Do(req)
 	if err != nil {
-		return nil, fmt.Errorf("network error: %w", err)
+		fmt.Println("Errored when sending request to the server")
+		message, _ := json.Marshal(struct {
+			Message string `json:"message"`
+		}{
+			Message: "Errored when sending request to the server" + err.Error(),
+		})
+
+		return message
 	}
 
 	defer resp.Body.Close()
-	respBody, err := io.ReadAll(resp.Body)
+	respBody, _ := io.ReadAll(resp.Body)
 
-	if err != nil {
+	return respBody
-		return nil, fmt.Errorf("failed to read response: %w", err)
-	}
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return respBody, fmt.Errorf("API returned status: %d", resp.StatusCode)
-	}
-	return respBody, nil
 }
 
-func (a *App) SimklGetUserWatchlist() (SimklWatchListType, error) {
+func (a *App) SimklGetUserWatchlist() SimklWatchListType {
 	method := "GET"
 	url := "https://api.simkl.com/sync/all-items/anime"
 
-	respBody, err := SimklHelper(method, url, nil)
+	respBody := SimklHelper(method, url, nil)
-
-	if err != nil {
-		return SimklWatchListType{}, fmt.Errorf("failed to get Simkl watchlist: %w", err)
-	}
 
 	var errCheck struct {
 		Error   string `json:"error"`
 		Message string `json:"message"`
 	}
 
-	err = json.Unmarshal(respBody, &errCheck)
+	err := json.Unmarshal(respBody, &errCheck)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return SimklWatchListType{}, fmt.Errorf("failed to parse error response: %w", err)
 	}
 
 	if errCheck.Error != "" {
 		a.LogoutSimkl()
-		return SimklWatchListType{}, fmt.Errorf("Simkl API error: %s", errCheck.Message)
+		return SimklWatchListType{}
 	}
 
 	var watchlist SimklWatchListType
@@ -86,15 +74,14 @@ func (a *App) SimklGetUserWatchlist() (SimklWatchListType, error) {
 	err = json.Unmarshal(respBody, &watchlist)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return SimklWatchListType{}, fmt.Errorf("failed to parse watchlist: %w", err)
 	}
 
 	SimklWatchList = watchlist
 
-	return watchlist, nil
+	return watchlist
 }
 
-func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) (SimklAnime, error) {
+func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {
 	var episodes []Episode
 	var url string
 	var shows []SimklPostShow
@@ -125,19 +112,13 @@ func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) (SimklAnime, err
 
 	simklSync := SimklSyncHistoryType{shows}
 
-	respBody, err := SimklHelper("POST", url, simklSync)
+	respBody := SimklHelper("POST", url, simklSync)
-
-	if err != nil {
-		log.Printf("Failed to sync episodes: %s\n", err)
-		return anime, fmt.Errorf("failed to sync episodes: %w", err)
-	}
 
 	var success interface{}
 
-	err = json.Unmarshal(respBody, &success)
+	err := json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return anime, fmt.Errorf("failed to parse response: %w", err)
 	}
 
 	for i, simklAnime := range SimklWatchList.Anime {
@@ -150,10 +131,10 @@ func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) (SimklAnime, err
 
 	WatchListUpdate(anime)
 
-	return anime, nil
+	return anime
 }
 
-func (a *App) SimklSyncRating(anime SimklAnime, rating int) (SimklAnime, error) {
+func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
 	var url string
 	showWithRating := ShowWithRating{
 		Title: anime.Show.Title,
@@ -188,17 +169,13 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) (SimklAnime, error)
 		Shows []interface{} `json:"shows" ts_type:"shows"`
 	}{shows}
 
-	respBody, err := SimklHelper("POST", url, simklSync)
+	respBody := SimklHelper("POST", url, simklSync)
-	if err != nil {
+
-		log.Printf("Failed to sync rating: %s\n", err)
-		return anime, fmt.Errorf("failed to sync rating: %w", err)
-	}
 	var success interface{}
 
-	err = json.Unmarshal(respBody, &success)
+	err := json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return anime, fmt.Errorf("failed to parse response: %w", err)
 	}
 
 	for i, simklAnime := range SimklWatchList.Anime {
@@ -211,10 +188,10 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) (SimklAnime, error)
 
 	WatchListUpdate(anime)
 
-	return anime, nil
+	return anime
 }
 
-func (a *App) SimklSyncStatus(anime SimklAnime, status string) (SimklAnime, error) {
+func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {
 	url := "https://api.simkl.com/sync/add-to-list"
 	show := SimklShowStatus{
 		Title: anime.Show.Title,
@@ -234,17 +211,13 @@ func (a *App) SimklSyncStatus(anime SimklAnime, status string) (SimklAnime, erro
 		Shows []SimklShowStatus `json:"shows" ts_type:"shows"`
 	}{shows}
 
-	respBody, err := SimklHelper("POST", url, simklSync)
+	respBody := SimklHelper("POST", url, simklSync)
-	if err != nil {
+
-		log.Printf("Failed to sync status: %s\n", err)
-		return anime, fmt.Errorf("failed to sync status: %w", err)
-	}
 	var success interface{}
 
-	err = json.Unmarshal(respBody, &success)
+	err := json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return anime, fmt.Errorf("failed to parse response: %w", err)
 	}
 
 	for i, simklAnime := range SimklWatchList.Anime {
@@ -257,20 +230,15 @@ func (a *App) SimklSyncStatus(anime SimklAnime, status string) (SimklAnime, erro
 
 	WatchListUpdate(anime)
 
-	return anime, nil
+	return anime
 }
 
-func (a *App) SimklSearch(aniListAnime MediaList) (SimklAnime, error) {
+func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
 	var result SimklAnime
 
 	if reflect.DeepEqual(SimklWatchList, SimklWatchListType{}) {
 		fmt.Println("Watchlist empty. Calling...")
-		watchlist, err := a.SimklGetUserWatchlist()
+		SimklWatchList = a.SimklGetUserWatchlist()
-		if err != nil {
-			log.Printf("Failed to get watchlist: %s\n", err)
-			return result, fmt.Errorf("failed to load watchlist for search: %w", err)
-		}
-		SimklWatchList = watchlist
 	}
 
 	for _, anime := range SimklWatchList.Anime {
@@ -287,30 +255,22 @@ func (a *App) SimklSearch(aniListAnime MediaList) (SimklAnime, error) {
 		var anime SimklSearchType
 		url := "https://api.simkl.com/search/id?anilist=" + strconv.Itoa(aniListAnime.Media.ID)
 
-		respBody, err := SimklHelper("GET", url, nil)
+		respBody := SimklHelper("GET", url, nil)
-		if err != nil {
+
-			log.Printf("Failed to search Simkl: %s\n", err)
+		err := json.Unmarshal(respBody, &anime)
-			return result, fmt.Errorf("failed to search Simkl by AniList ID: %w", err)
-		}
-		err = json.Unmarshal(respBody, &anime)
 
 		if len(anime) == 0 {
 			url = "https://api.simkl.com/search/id?mal=" + strconv.Itoa(aniListAnime.Media.IDMal)
-			respBody, err = SimklHelper("GET", url, nil)
+			respBody = SimklHelper("GET", url, nil)
-			if err != nil {
-				log.Printf("Failed to search Simkl by MAL ID: %s\n", err)
-				return result, fmt.Errorf("failed to search by MAL ID: %w", err)
-			}
 			err = json.Unmarshal(respBody, &anime)
 		}
 
 		if err != nil {
 			log.Printf("Failed at unmarshal, %s\n", err)
-			return result, fmt.Errorf("failed to parse search results: %w", err)
 		}
 
 		if len(anime) == 0 {
-			return result, nil
+			return result
 		}
 
 		for _, watchListAnime := range SimklWatchList.Anime {
@@ -328,10 +288,10 @@ func (a *App) SimklSearch(aniListAnime MediaList) (SimklAnime, error) {
 		}
 	}
 
-	return result, nil
+	return result
 }
 
-func (a *App) SimklSyncRemove(anime SimklAnime) (bool, error) {
+func (a *App) SimklSyncRemove(anime SimklAnime) bool {
 	url := "https://api.simkl.com/sync/history/remove"
 	var showArray []SimklShowStatus
 
@@ -352,28 +312,25 @@ func (a *App) SimklSyncRemove(anime SimklAnime) (bool, error) {
 		Shows: showArray,
 	}
 
-	respBody, err := SimklHelper("POST", url, show)
+	respBody := SimklHelper("POST", url, show)
 
-	if err != nil {
-		log.Printf("Failed to sync remove: %s\n", err)
-		return false, fmt.Errorf("failed to sync remove: %w", err)
-	}
 	var success SimklDeleteType
-	err = json.Unmarshal(respBody, &success)
+
+	err := json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
-		return false, fmt.Errorf("failed to parse response: %w", err)
 	}
+
 	if success.Deleted.Shows >= 1 {
 		for i, simklAnime := range SimklWatchList.Anime {
 			if simklAnime.Show.Ids.Simkl == anime.Show.Ids.Simkl {
 				SimklWatchList.Anime = slices.Delete(SimklWatchList.Anime, i, i+1)
 			}
 		}
-		return true, nil
+		return true
+	} else {
+		return false
 	}
-
-	return false, fmt.Errorf("no shows were deleted")
 }
 
 func WatchListUpdate(anime SimklAnime) {

SimklUserFunctions.go

@@ -116,7 +116,7 @@ func (a *App) handleSimklCallback(wg *sync.WaitGroup) {
 	go func() {
 		defer wg.Done()
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Printf("Server error: %s\n", err)
+			log.Fatalf("listen: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
 	}()
@@ -138,8 +138,7 @@ func getSimklAuthorizationToken(content string) SimklJWT {
 	}
 	jsonData, err := json.Marshal(data)
 	if err != nil {
-		log.Printf("Failed to marshal data: %s\n", err)
+		log.Fatal(err)
-		return SimklJWT{}
 	}
 
 	response, err := http.NewRequest("POST", "https://api.simkl.com/oauth/token", bytes.NewBuffer(jsonData))

frontend/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "svelte.svelte-vscode"
+  ]
+}

frontend/src/App.svelte

@@ -1,72 +1,42 @@
 <script lang="ts">
-  import {
+    import {
-    aniListLoggedIn,
+        aniListLoggedIn,
-    malLoggedIn,
+        malLoggedIn,
-    simklLoggedIn,
+        simklLoggedIn,
-    watchlistNeedsRefresh,
+    } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
-    aniListPrimary,
+    import {onMount} from "svelte";
-    malPrimary,
+    import Router from "svelte-spa-router"
-    simklPrimary,
+    import Home from "./routes/Home.svelte";
-    malWatchList,
+    import {wrap} from "svelte-spa-router/wrap";
-    simklWatchList,
+    import Spinner from "./helperComponents/Spinner.svelte";
-  } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    import Header from "./helperComponents/Header.svelte";
-  import { onMount } from "svelte";
+    import {CheckIfAniListLoggedInAndLoadWatchList} from "./helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
-  import Router from "svelte-spa-router";
+    import { CheckIfMALLoggedInAndSetUser } from "./helperModules/CheckIfMyAnimeListLoggedIn.svelte";
-  import Home from "./routes/Home.svelte";
+    import {CheckIfSimklLoggedInAndSetUser} from "./helperModules/CheckIsSimklLoggedIn.svelte"
-  import { wrap } from "svelte-spa-router/wrap";
+    import {CheckIfAniListLoggedIn} from "../wailsjs/go/main/App";
-  import Spinner from "./helperComponents/Spinner.svelte";
-  import Header from "./helperComponents/Header.svelte";
-  import { CheckIfAniListLoggedInAndLoadWatchList } from "./helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
-  import { CheckIfMALLoggedInAndSetUser } from "./helperModules/CheckIfMyAnimeListLoggedIn.svelte";
-  import { CheckIfSimklLoggedInAndSetUser } from "./helperModules/CheckIsSimklLoggedIn.svelte";
-  import {
-    CheckIfAniListLoggedIn,
-    GetMyAnimeList,
-    SimklGetUserWatchlist,
-  } from "../wailsjs/go/main/App";
-  import { loc } from "svelte-spa-router";
-  import ErrorModal from "./helperComponents/ErrorModal.svelte";
 
-  onMount(async () => {
+    onMount(async () => {
-    let isAniListLoggedIn: boolean;
+        let isAniListLoggedIn: boolean
-    let isMALLoggedIn: boolean;
+        let isMALLoggedIn: boolean
-    let isSimklLoggedIn: boolean;
+        let isSimklLoggedIn: boolean
-    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+        aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-    malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
+        malLoggedIn.subscribe((value) => isMALLoggedIn = value)
-    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+        simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
 
-    !isAniListLoggedIn && (await CheckIfAniListLoggedInAndLoadWatchList());
+        console.log(isAniListLoggedIn)
-    !isMALLoggedIn && (await CheckIfMALLoggedInAndSetUser());
+        !isAniListLoggedIn && await CheckIfAniListLoggedInAndLoadWatchList()
-    !isSimklLoggedIn && (await CheckIfSimklLoggedInAndSetUser());
+        !isMALLoggedIn && await CheckIfMALLoggedInAndSetUser()
-  });
+        !isSimklLoggedIn && await CheckIfSimklLoggedInAndSetUser()
-
+    })
-  $: if ($loc?.location === "/" && $watchlistNeedsRefresh) {
-    (async () => {
-      if ($aniListLoggedIn && $aniListPrimary) {
-        await CheckIfAniListLoggedInAndLoadWatchList();
-      }
-      if ($malLoggedIn && $malPrimary) {
-        await GetMyAnimeList(1000).then((w) => malWatchList.set(w));
-      }
-      if ($simklLoggedIn && $simklPrimary) {
-        await SimklGetUserWatchlist().then((w) => simklWatchList.set(w));
-      }
-
-      watchlistNeedsRefresh.set(false);
-    })();
-  }
 </script>
 
 <Header />
-<ErrorModal />
+<Router routes={{
-<Router
+    '/': Home,
-  routes={{
+    '/anime/:id': wrap({
-    "/": Home,
+        asyncComponent: () => import('./routes/AnimeRoutePage.svelte'),
-    "/anime/:id": wrap({
+        conditions: [async () => await CheckIfAniListLoggedIn()],
-      asyncComponent: () => import("./routes/AnimeRoutePage.svelte"),
+        loadingComponent: Spinner
-      conditions: [async () => await CheckIfAniListLoggedIn()],
-      loadingComponent: Spinner,
     }),
     // '*': "Not Found"
-  }}
+}} />
-/>

frontend/src/helperComponents/AvatarMenu.svelte

@@ -1,177 +1,163 @@
 <script lang="ts">
-  import { Avatar } from "flowbite-svelte";
+    import { Avatar } from "flowbite-svelte";
-  import type { AniListUser } from "../anilist/types/AniListTypes";
+    import type { AniListUser } from "../anilist/types/AniListTypes";
-  import {
+    import {
-    aniListLoggedIn,
+        aniListLoggedIn,
-    aniListUser,
+        aniListUser,
-    malUser,
+        malUser,
-    simklUser,
+        simklUser,
-    malLoggedIn,
+        malLoggedIn,
-    simklLoggedIn,
+        simklLoggedIn,
-    loginToAniList,
+        loginToAniList,
-    loginToMAL,
+        loginToMAL,
-    loginToSimkl,
+        loginToSimkl,
-    logoutOfAniList,
+        logoutOfAniList,
-    logoutOfMAL,
+        logoutOfMAL,
-    logoutOfSimkl,
+        logoutOfSimkl
-  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-  import * as runtime from "../../wailsjs/runtime";
+    import * as runtime from "../../wailsjs/runtime";
-  import type { MyAnimeListUser } from "../mal/types/MALTypes";
+    import type {MyAnimeListUser} from "../mal/types/MALTypes";
-  import type { SimklUser } from "../simkl/types/simklTypes";
+    import type {SimklUser} from "../simkl/types/simklTypes";
-  import { ShowVersion } from "../../wailsjs/go/main/App";
+    import { ShowVersion } from "../../wailsjs/go/main/App";
 
-  let currentAniListUser: AniListUser;
+    let currentAniListUser: AniListUser;
-  let currentMALUser: MyAnimeListUser;
+    let currentMALUser: MyAnimeListUser;
-  let currentSimklUser: SimklUser;
+    let currentSimklUser: SimklUser;
-  let isAniListLoggedIn: boolean;
+    let isAniListLoggedIn: boolean;
-  let isSimklLoggedIn: boolean;
+    let isSimklLoggedIn: boolean;
-  let isMALLoggedIn: boolean;
+    let isMALLoggedIn: boolean;
 
-  aniListUser.subscribe((value) => (currentAniListUser = value));
+    aniListUser.subscribe((value) => (currentAniListUser = value));
-  malUser.subscribe((value) => (currentMALUser = value));
+    malUser.subscribe((value) => (currentMALUser = value))
-  simklUser.subscribe((value) => (currentSimklUser = value));
+    simklUser.subscribe(value => currentSimklUser = value)
-  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
-  simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
-  malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
+    malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
 
-  function dropdownUser(): void {
+    function dropdownUser(): void {
-    let dropdown = document.querySelector("#userDropdown");
+        let dropdown = document.querySelector("#userDropdown");
-    dropdown.classList.toggle("hidden");
+        dropdown.classList.toggle("hidden");
 
-    if (!dropdown.classList.contains("hidden")) {
+        if (!dropdown.classList.contains("hidden")) {
-      document.addEventListener("click", clickOutside);
+            document.addEventListener("click", clickOutside)
+        }
     }
-  }
 
-  function clickOutside(event: Event): void {
+    function clickOutside(event: Event): void {
-    let dropdown = document.querySelector("#userDropdown");
+        let dropdown = document.querySelector("#userDropdown")
-    let toggleBtn = document.querySelector("#userDropdownButton");
+        let toggleBtn = document.querySelector("#userDropdownButton")
 
-    if (
+        if (!dropdown.contains(event.target as Node) && !toggleBtn.contains(event.target as Node)) {
-      !dropdown.contains(event.target as Node) &&
+            dropdown.classList.add("hidden")
-      !toggleBtn.contains(event.target as Node)
+            document.removeEventListener("click", clickOutside)
-    ) {
+        }
-      dropdown.classList.add("hidden");
-      document.removeEventListener("click", clickOutside);
     }
-  }
 </script>
 
 <div class="relative">
-  <button id="userDropdownButton" on:click={dropdownUser}>
+    <button id="userDropdownButton" on:click={dropdownUser}>
-    {#if isAniListLoggedIn}
+        {#if isAniListLoggedIn}
-      <Avatar
+            <Avatar
-        src={currentAniListUser.data.Viewer.avatar.medium}
+                src={currentAniListUser.data.Viewer.avatar.medium}
-        class="cursor-pointer"
+                class="cursor-pointer"
-        dot={isAniListLoggedIn && isMALLoggedIn && isSimklLoggedIn
+                dot={{ color: "green" }}
-          ? { color: "green" }
+            />
-          : { color: "yellow" }}
+        {:else}
-      />
+            <Avatar class="cursor-pointer" dot={{ color: "red" }} />
-    {:else}
+        {/if}
-      <Avatar class="cursor-pointer" dot={{ color: "red" }} />
+    </button>
-    {/if}
+    <div
-  </button>
+        id="userDropdown"
-  <div
+        class="absolute hidden right-0 2xl:left-1/2 2xl:-translate-x-1/2 z-10 divide-y rounded-lg shadow w-44 bg-gray-700 divide-gray-600"
-    id="userDropdown"
-    class="absolute hidden right-0 2xl:left-1/2 2xl:-translate-x-1/2 z-10 divide-y rounded-lg shadow w-44 bg-gray-700 divide-gray-600"
-  >
-    <div class="px-4 py-3 text-sm text-white">
-      {#if isAniListLoggedIn}
-        <div>{currentAniListUser.data.Viewer.name}</div>
-      {:else}
-        <div>You are not logged into AniList</div>
-      {/if}
-    </div>
-    <ul
-      class="py-2 text-sm text-gray-200"
-      aria-labelledby="dropdownUserAvatarButton"
     >
-      {#if isAniListLoggedIn}
+        <div class="px-4 py-3 text-sm text-white">
-        <li>
+            {#if isAniListLoggedIn}
-          <button
+                <div>{currentAniListUser.data.Viewer.name}</div>
-            on:click={logoutOfAniList}
+            {:else}
-            class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-green-800 hover:text-white"
+                <div>You are not logged into AniList</div>
-          >
+            {/if}
-            <span class="maple-font text-lg text-green-200 mr-4">A</span>Logout {currentAniListUser
+        </div>
-              .data.Viewer.name}
+        <ul
-          </button>
+            class="py-2 text-sm text-gray-200"
-        </li>
+            aria-labelledby="dropdownUserAvatarButton"
-      {:else}
+        >
-        <li>
+            {#if isAniListLoggedIn}
-          <button
+                <li>
-            on:click={() => {
+                    <button
-              dropdownUser();
+                        on:click={logoutOfAniList}
-              loginToAniList();
+                        class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-green-800 hover:text-white"
-            }}
+                    >
-            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white"
+                        <span class="maple-font text-lg text-green-200 mr-4">A</span>Logout {currentAniListUser.data.Viewer.name}
-          >
+                    </button>
-            <span class="maple-font text-lg mr-4">A</span>Login to AniList
+                </li>
-          </button>
+                {:else}
-        </li>
+                <li>
-      {/if}
+                    <button on:click={() => {
-      {#if isMALLoggedIn}
+                        dropdownUser()
-        <li>
+                        loginToAniList()
-          <button
+                    }}
-            on:click={logoutOfMAL}
+                            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
-            class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-blue-800 hover:text-white"
+                        <span class="maple-font text-lg mr-4">A</span>Login to AniList
-          >
+                    </button>
-            <span class="maple-font text-lg text-blue-200 mr-4">M</span>Logout {currentMALUser.name}
+                </li>
-          </button>
+            {/if}
-        </li>
+            {#if isMALLoggedIn}
-      {:else}
+                <li>
-        <li>
+                    <button
-          <button
+                        on:click={logoutOfMAL}
-            on:click={() => {
+                        class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-blue-800 hover:text-white"
-              dropdownUser();
+                    >
-              loginToMAL();
+                        <span class="maple-font text-lg text-blue-200 mr-4">M</span>Logout {currentMALUser.name}
-            }}
+                    </button>
-            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white"
+                </li>
-          >
+            {:else}
-            <span class="maple-font text-lg mr-4">M</span>Login to MyAnimeList
+                <li>
-          </button>
+                    <button on:click={() => {
-        </li>
+                        dropdownUser()
-      {/if}
+                        loginToMAL()
-      {#if isSimklLoggedIn}
+                    }}
-        <li>
+                            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
-          <button
+                        <span class="maple-font text-lg mr-4">M</span>Login to MyAnimeList
-            on:click={logoutOfSimkl}
+                    </button>
-            class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-indigo-800 hover:text-white"
+                </li>
-          >
+            {/if}
-            <span class="maple-font text-lg text-indigo-200 mr-4">S</span>Logout {currentSimklUser
+            {#if isSimklLoggedIn}
-              .user.name}
+                <li>
-          </button>
+                    <button
-        </li>
+                        on:click={logoutOfSimkl}
-      {:else}
+                        class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-indigo-800 hover:text-white"
-        <li>
+                    >
-          <button
+                        <span class="maple-font text-lg text-indigo-200 mr-4">S</span>Logout {currentSimklUser.user.name}
-            on:click={() => {
+                    </button>
-              dropdownUser();
+                </li>
-              loginToSimkl();
+            {:else}
-            }}
+                <li>
-            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white"
+                    <button on:click={() => {
-          >
+                        dropdownUser()
-            <span class="maple-font text-lg mr-4">S</span>Login to Simkl
+                        loginToSimkl()
-          </button>
+                    }}
-        </li>
+                            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
-      {/if}
+                        <span class="maple-font text-lg mr-4">S</span>Login to Simkl
-    </ul>
+                    </button>
-    <div class="py-2">
+                </li>
-      <button
+            {/if}
-        on:click={() => {
+        </ul>
-          dropdownUser();
+        <div class="py-2">
-          ShowVersion();
+            <button
-        }}
+                    on:click={() => {
-        class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"
+                        dropdownUser()
-      >
+                        ShowVersion()
-        Version
+                    }}
-      </button>
+                    class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"
-      <button
+            >
-        on:click={() => runtime.Quit()}
+               Version
-        class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"
+            </button>
-      >
+            <button
-        Exit Application
+                on:click={() => runtime.Quit()}
-      </button>
+                class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"
+            >
+                Exit Application
+            </button>
+        </div>
     </div>
-  </div>
 </div>
-

frontend/src/helperComponents/ErrorModal.svelte

@@ -1,73 +0,0 @@
-<script lang="ts">
-  import {
-    apiError,
-    isApiDown,
-    clearApiError,
-    setApiError,
-  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-  import { CheckIfAniListLoggedInAndLoadWatchList } from "../helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
-  import { CheckIfMALLoggedInAndSetUser } from "../helperModules/CheckIfMyAnimeListLoggedIn.svelte";
-  import { CheckIfSimklLoggedInAndSetUser } from "../helperModules/CheckIsSimklLoggedIn.svelte";
-  import { Modal, Button } from "flowbite-svelte";
-  let showModal = false;
-  $: if ($apiError) {
-    showModal = true;
-  }
-  async function handleRetry() {
-    const service = $apiError?.service;
-    clearApiError();
-
-    try {
-      if (service === "anilist") {
-        await CheckIfAniListLoggedInAndLoadWatchList();
-      } else if (service === "mal") {
-        await CheckIfMALLoggedInAndSetUser();
-      } else if (service === "simkl") {
-        await CheckIfSimklLoggedInAndSetUser();
-      }
-    } catch (err) {
-      const errorMsg = err instanceof Error ? err.message : String(err);
-      setApiError(
-        service || "unknown",
-        `Retry failed: ${errorMsg}`,
-        undefined,
-        true,
-      );
-    }
-  }
-  function handleDismiss() {
-    clearApiError();
-    showModal = false;
-  }
-</script>
-
-{#if showModal && $apiError}
-  <Modal
-    open={showModal}
-    title="{$apiError.service.toUpperCase()} API Error"
-    size="md"
-  >
-    <div class="space-y-4">
-      <div class="p-4 bg-red-50 border border-red-200 rounded-lg">
-        <p class="text-red-800 font-medium">{$apiError.message}</p>
-        {#if $apiError.statusCode}
-          <p class="text-red-600 text-sm mt-2">
-            Status: {$apiError.statusCode}
-          </p>
-        {/if}
-      </div>
-      <p class="text-gray-600">
-        The application will remain open. You can retry the connection or
-        dismiss this message to continue with limited functionality.
-      </p>
-    </div>
-    <div slot="footer" class="flex gap-3 justify-end">
-      {#if $apiError.canRetry}
-        <Button on:click={handleRetry} class="bg-blue-600 hover:bg-blue-700">
-          Retry Connection
-        </Button>
-      {/if}
-      <Button on:click={handleDismiss} color="alternative">Dismiss</Button>
-    </div>
-  </Modal>
-{/if}

frontend/src/helperComponents/Pagination.svelte

@@ -1,220 +1,145 @@
 <script lang="ts">
-  import {
+    import {
-    aniListLoggedIn,
+        aniListLoggedIn,
-    aniListSort,
+        aniListWatchlist,
-    aniListWatchlist,
+        animePerPage,
-    animePerPage,
+        watchListPage,
-    watchListPage,
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
 
-  import type { AniListCurrentUserWatchList } from "../anilist/types/AniListCurrentUserWatchListType";
+    import type {AniListCurrentUserWatchList} from "../anilist/types/AniListCurrentUserWatchListType"
-  import { GetAniListUserWatchingList } from "../../wailsjs/go/main/App";
+    import {GetAniListUserWatchingList} from "../../wailsjs/go/main/App";
+    import {MediaListSort} from "../anilist/types/AniListTypes";
 
-  let aniListWatchListLoaded: AniListCurrentUserWatchList;
+    let aniListWatchListLoaded: AniListCurrentUserWatchList
-  let page: number;
+    let page: number
-  let perPage: number;
+    let perPage: number
-  let sort: string;
 
-  watchListPage.subscribe((value) => (page = value));
+    watchListPage.subscribe(value => page = value)
-  animePerPage.subscribe((value) => (perPage = value));
+    animePerPage.subscribe(value => perPage = value)
-  aniListWatchlist.subscribe((value) => (aniListWatchListLoaded = value));
+    aniListWatchlist.subscribe((value) => aniListWatchListLoaded = value)
-  aniListSort.subscribe((value) => (sort = value));
 
-  const perPageOptions = [10, 20, 50];
+    const perPageOptions = [10, 20, 50]
 
-  function ChangeWatchListPage(newPage: number) {
+    function ChangeWatchListPage(newPage: number) {
-    GetAniListUserWatchingList(newPage, perPage, sort).then((result) => {
+        GetAniListUserWatchingList(newPage, perPage, MediaListSort.UpdatedTimeDesc).then((result) => {
-      watchListPage.set(newPage);
+            watchListPage.set(newPage)
-      aniListWatchlist.set(result);
+            aniListWatchlist.set(result)
-      aniListLoggedIn.set(true);
+            aniListLoggedIn.set(true)
-    });
+        })
-  }
+    }
 
-  function changePage(
+    function changePage(e): void {
-    e: KeyboardEvent & { currentTarget: HTMLInputElement },
+        if ((e.key === "Enter" || e.key === "Tab") && Number(e.target.value) !== page) ChangeWatchListPage(Number(e.target.value))
-  ): void {
+    }
-    if (
+
-      (e.key === "Enter" || e.key === "Tab") &&
+    function changeCountPerPage(e): void {
-      Number(e.currentTarget.value) !== page
+        GetAniListUserWatchingList(1, Number(e.target.value), MediaListSort.UpdatedTimeDesc).then((result) => {
-    )
+            animePerPage.set(Number(e.target.value))
-      ChangeWatchListPage(Number(e.currentTarget.value));
+            watchListPage.set(1)
-  }
+            aniListWatchlist.set(result)
+            aniListLoggedIn.set(true)
+        })
+    }
 
-  function changeCountPerPage(
-    e: Event & { currentTarget: HTMLSelectElement },
-  ): void {
-    GetAniListUserWatchingList(1, Number(e.currentTarget.value), sort).then(
-      (result) => {
-        animePerPage.set(Number(e.currentTarget.value));
-        watchListPage.set(1);
-        aniListWatchlist.set(result);
-        aniListLoggedIn.set(true);
-      },
-    );
-  }
 </script>
 
 <div class="mb-8">
-  {#if aniListWatchListLoaded.data.Page.pageInfo.lastPage <= 12}
+    {#if aniListWatchListLoaded.data.Page.pageInfo.lastPage <= 12}
-    <nav aria-label="Page navigation" class="hidden md:block">
+        <nav aria-label="Page navigation" class="hidden md:block">
-      <ul class="inline-flex -space-x-px text-base h-10">
+            <ul class="inline-flex -space-x-px text-base h-10">
-        {#if page === 1}
+                {#if page === 1}
-          <li>
+                    <li>
-            <button
+                        <button disabled
-              disabled
+                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 cursor-default">
-              class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 cursor-default"
+                            Previous
-            >
+                        </button>
-              Previous
+                    </li>
-            </button>
+                {:else}
-          </li>
+                    <li>
-        {:else}
+                        <button on:click={() => ChangeWatchListPage(page-1)}
-          <li>
+                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">
-            <button
+                            Previous
-              on:click={() => ChangeWatchListPage(page - 1)}
+                        </button>
-              class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white"
+                    </li>
-            >
+                {/if}
-              Previous
+                {#each {length: aniListWatchListLoaded.data.Page.pageInfo.lastPage} as _, i}
-            </button>
+                    {#if i + 1 === page}
-          </li>
+                        <li>
-        {/if}
+                            <button on:click={() => ChangeWatchListPage(i+1)}
-        {#each { length: aniListWatchListLoaded.data.Page.pageInfo.lastPage } as _, i}
+                                    class="flex items-center justify-center px-4 h-10 leading-tight border bg-gray-100 border-gray-700 bg-gray-700 text-white">{i + 1}</button>
-          {#if i + 1 === page}
+                        </li>
-            <li>
+                    {:else}
-              <button
+                        <li>
-                on:click={() => ChangeWatchListPage(i + 1)}
+                            <button on:click={() => ChangeWatchListPage(i+1)}
-                class="flex items-center justify-center px-4 h-10 leading-tight border hover:bg-gray-100 border-gray-700 bg-gray-700 text-white"
+                                    class="flex items-center justify-center px-4 h-10 leading-tight border dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">{i + 1}</button>
-                >{i + 1}</button
+                        </li>
-              >
+                    {/if}
-            </li>
+                {/each}
-          {:else}
+                {#if page === aniListWatchListLoaded.data.Page.pageInfo.lastPage}
-            <li>
+                    <li>
-              <button
+                        <button disabled
-                on:click={() => ChangeWatchListPage(i + 1)}
+                                class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 cursor-default">
-                class="flex items-center justify-center px-4 h-10 leading-tight border dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white"
+                            Next
-                >{i + 1}</button
+                        </button>
-              >
+                    </li>
-            </li>
+                {:else}
-          {/if}
+                    <li>
-        {/each}
+                        <button on:click={() => ChangeWatchListPage(page+1)}
-        {#if page === aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+                                class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">
-          <li>
+                            Next
-            <button
+                        </button>
-              disabled
+                    </li>
-              class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 cursor-default"
+                {/if}
-            >
+            </ul>
-              Next
+        </nav>
-            </button>
+    {/if}
-          </li>
+    <div class="flex mt-5">
-        {:else}
+        <div class="w-20 mx-auto">
-          <li>
+            <select bind:value={perPage} on:change={(e) => changeCountPerPage(e)} id="countPerPage"
-            <button
+                    class="border text-sm rounded-lg block w-full p-2.5 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500">
-              on:click={() => ChangeWatchListPage(page + 1)}
+                {#each perPageOptions as option}
-              class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white"
+                    <option value={option}>
-            >
+                        {option}
-              Next
+                    </option>
-            </button>
+                {/each}
-          </li>
+            </select>
-        {/if}
-      </ul>
-    </nav>
-  {/if}
-  <div class="flex mt-5">
-    <div class="w-20 mx-auto">
-      <select
-        bind:value={perPage}
-        on:change={(e) => changeCountPerPage(e)}
-        id="countPerPage"
-        class="border text-sm rounded-lg block w-full p-2.5 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
-      >
-        {#each perPageOptions as option}
-          <option value={option}>
-            {option}
-          </option>
-        {/each}
-      </select>
-    </div>
-
-    <div>
-      <div>Total Anime: {aniListWatchListLoaded.data.Page.pageInfo.total}</div>
-      {#if aniListWatchListLoaded.data.Page.pageInfo.lastPage <= 12}
-        <div class="md:hidden">
-          Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}
         </div>
-      {:else}
+
         <div>
-          Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+            <div>Total Anime: {aniListWatchListLoaded.data.Page.pageInfo.total}</div>
+            {#if aniListWatchListLoaded.data.Page.pageInfo.lastPage <= 12}
+                <div class="md:hidden">Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}</div>
+            {:else}
+                <div>Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}</div>
+            {/if}
         </div>
-      {/if}
-    </div>
 
-    <div class="max-w-xs mx-auto">
+        <div class="max-w-xs mx-auto">
-      <div class="relative flex items-center max-w-[11rem]">
+            <div class="relative flex items-center max-w-[11rem]">
-        <button
+                <button type="button" id="decrement-button" on:click={() => ChangeWatchListPage(page-1)}
-          type="button"
+                        class="bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none">
-          id="decrement-button"
+                    <svg class="w-3 h-3 text-white" aria-hidden="true"
-          on:click={() => ChangeWatchListPage(page - 1)}
+                         xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 2">
-          class={page <= 1
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-            ? "border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+                              d="M1 1h16"/>
-            : "bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
+                    </svg>
-          disabled={page <= 1}
+                </button>
-        >
+                <input type="number" min="1" max="{aniListWatchListLoaded.data.Page.pageInfo.lastPage}"
-          <svg
+                       on:keydown={changePage} id="page-counter"
-            class="w-3 h-3 text-white"
+                       class="[appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none border-x-0 h-11 font-medium text-center text-sm block w-full pb-6 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
-            aria-hidden="true"
+                       value={page} required/>
-            xmlns="http://www.w3.org/2000/svg"
+                <div class="absolute bottom-1 start-1/2 -translate-x-1/2 rtl:translate-x-1/2 flex items-center text-xs text-gray-400 space-x-1 rtl:space-x-reverse">
-            fill="none"
+                    <span>Page #</span>
-            viewBox="0 0 18 2"
+                </div>
-          >
+                <button type="button" id="increment-button" on:click={() => ChangeWatchListPage(page+1)}
-            <path
+                        class="hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none">
-              stroke="currentColor"
+                    <svg class="w-3 h-3 text-white" aria-hidden="true"
-              stroke-linecap="round"
+                         xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 18">
-              stroke-linejoin="round"
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-              stroke-width="2"
+                              d="M9 1v16M1 9h16"/>
-              d="M1 1h16"
+                    </svg>
-            />
+                </button>
-          </svg>
+            </div>
-        </button>
-        <input
-          type="number"
-          min="1"
-          max={aniListWatchListLoaded.data.Page.pageInfo.lastPage}
-          on:keydown={changePage}
-          id="page-counter"
-          class="[appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none border-x-0 h-11 font-medium text-center text-sm block w-full pb-6 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
-          value={page}
-          required
-        />
-        <div
-          class="absolute bottom-1 start-1/2 -translate-x-1/2 rtl:translate-x-1/2 flex items-center text-xs text-gray-400 space-x-1 rtl:space-x-reverse"
-        >
-          <span>Page #</span>
         </div>
-        <button
-          type="button"
-          id="increment-button"
-          on:click={() => ChangeWatchListPage(page + 1)}
-          class={page >= aniListWatchListLoaded.data.Page.pageInfo.lastPage
-            ? "border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
-            : "bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
-          disabled={page >= aniListWatchListLoaded.data.Page.pageInfo.lastPage}
-        >
-          <svg
-            class="w-3 h-3 text-white"
-            aria-hidden="true"
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 18 18"
-          >
-            <path
-              stroke="currentColor"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
-              d="M9 1v16M1 9h16"
-            />
-          </svg>
-        </button>
-      </div>
     </div>
-  </div>
 </div>

frontend/src/helperComponents/WatchList.svelte

@@ -1,99 +1,68 @@
 <script lang="ts">
-  import {
+    import {
-    aniListLoggedIn,
+        aniListLoggedIn,
-    aniListWatchlist,
+        aniListWatchlist,
-    GetAnimeSingleItem,
+        GetAnimeSingleItem,
-    loading,
+        loading,
-  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-  import { push } from "svelte-spa-router";
+    import {push} from "svelte-spa-router";
-  import type { AniListCurrentUserWatchList } from "../anilist/types/AniListCurrentUserWatchListType";
+    import type {AniListCurrentUserWatchList} from "../anilist/types/AniListCurrentUserWatchListType"
-  import { Rating } from "flowbite-svelte";
+    import {Rating} from "flowbite-svelte";
-  import loader from "../helperFunctions/loader";
+    import loader from '../helperFunctions/loader'
-  import { CheckIfAniListLoggedInAndLoadWatchList } from "../helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
 
-  let isAniListLoggedIn: boolean;
-  let aniListWatchListLoaded: AniListCurrentUserWatchList;
 
-  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    let isAniListLoggedIn: boolean
-  aniListWatchlist.subscribe((value) => (aniListWatchListLoaded = value));
+    let aniListWatchListLoaded: AniListCurrentUserWatchList
+
+    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
+    aniListWatchlist.subscribe((value) => aniListWatchListLoaded = value)
+
 </script>
 
 <div>
-  {#if isAniListLoggedIn}
+    {#if isAniListLoggedIn}
-    <div
+        <div class="mx-auto max-w-2xl p-4 sm:p-6 lg:max-w-7xl lg:px-8 relative items-center">
-      class="mx-auto max-w-2xl p-4 sm:p-6 lg:max-w-7xl lg:px-8 relative items-center"
+            <h1 class="text-left text-xl font-bold mb-4">Your AniList WatchList</h1>
-    >
-      <div class="flex justify-between items-center mb-4">
-        <h1 class="text-left text-xl font-bold">Your AniList WatchList</h1>
-        <button
-          type="button"
-          class="py-2 px-4 bg-gray-700 rounded-lg"
-          on:click={async () => {
-            loading.set(true);
-            await CheckIfAniListLoggedInAndLoadWatchList();
-            loading.set(false);
-          }}
-        >
-          Refresh WatchList
-        </button>
-      </div>
 
-      <div
+            <div class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8">
-        class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8"
+                {#each aniListWatchListLoaded.data.Page.mediaList as media}
-      >
+                    <div use:loader={loading} class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg xl:aspect-h-8 xl:aspect-w-7">
-        {#each aniListWatchListLoaded.data.Page.mediaList as media}
+                        <div class="flex flex-col items-center group">
-          <div
+                            <button on:click={() => {
-            use:loader={loading}
+                                push(`#/anime/${media.media.id}`)
-            class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg xl:aspect-h-8 xl:aspect-w-7"
+                                // loading.set(true)
-          >
+                                // GetAniListSingleItem(media.media.id, true).then(() => {
-            <div class="flex flex-col items-center group">
+                                //     loading.set(false)
-              <button
+                                //
-                on:click={() => {
+                                // })
-                  push(`#/anime/${media.media.id}`);
+                            }}
-                  // loading.set(true)
+                            >
-                  // GetAniListSingleItem(media.media.id, true).then(() => {
+                                <img class="rounded-lg" src={media.media.coverImage.large} alt={
-                  //     loading.set(false)
+                                media.media.title.english === "" ?
-                  //
+                                    media.media.title.romaji :
-                  // })
+                                    media.media.title.english
-                }}
+                            }/>
-              >
+                            </button>
-                <img
+                            <Rating id="anime-rating" total={5} size={35} rating={media.score/2.0}/>
-                  class="rounded-lg w-[230px] h-[330px] object-cover"
+                            <button class="mt-4 text-md font-semibold text-white-700"
-                  src={media.media.coverImage.large}
+                                    on:click={() => GetAnimeSingleItem(media.media.id, true)}>
-                  alt={media.media.title.english === ""
+                                {
-                    ? media.media.title.romaji
+                                    media.media.title.english === "" ?
-                    : media.media.title.english}
+                                        media.media.title.romaji :
-                />
+                                        media.media.title.english
-              </button>
+                                }
-              <Rating
+                            </button>
-                id="anime-rating"
+                            <p class="mt-1 text-lg font-medium text-white-900">{media.progress}
-                total={5}
+                                / {media.media.nextAiringEpisode.episode !== 0 ?
-                size={35}
+                                    media.media.nextAiringEpisode.episode - 1 : media.media.episodes}</p>
-                rating={media.score / 2.0}
+                            {#if media.media.episodes > 0}
-              />
+                                <p class="mt-1 text-lg font-medium text-white-900">Total
-              <button
+                                    Episodes: {media.media.episodes}</p>
-                class="mt-4 text-md font-semibold text-white-700"
+                            {/if}
-                on:click={() => GetAnimeSingleItem(media.media.id, true)}
+                        </div>
-              >
+                    </div>
-                {media.media.title.english === ""
+                {/each}
-                  ? media.media.title.romaji
-                  : media.media.title.english}
-              </button>
-              <p class="mt-1 text-lg font-medium text-white-900">
-                {media.progress}
-                / {media.media.nextAiringEpisode.episode !== 0
-                  ? media.media.nextAiringEpisode.episode - 1
-                  : media.media.episodes}
-              </p>
-              {#if media.media.episodes > 0}
-                <p class="mt-1 text-lg font-medium text-white-900">
-                  Total Episodes: {media.media.episodes}
-                </p>
-              {/if}
             </div>
-          </div>
+        </div>
-        {/each}
+    {/if}
-      </div>
-    </div>
-  {/if}
 </div>

frontend/src/helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte

@@ -1,81 +1,34 @@
 <script lang="ts" context="module">
-  import {
+    import {CheckIfAniListLoggedIn, GetAniListLoggedInUser, GetAniListUserWatchingList} from "../../wailsjs/go/main/App";
-    CheckIfAniListLoggedIn,
+    import {MediaListSort} from "../anilist/types/AniListTypes";
-    GetAniListLoggedInUser,
+    import { aniListUser, watchListPage, animePerPage, aniListPrimary, aniListLoggedIn, aniListWatchlist } from "./GlobalVariablesAndHelperFunctions.svelte"
-    GetAniListUserWatchingList,
-  } from "../../wailsjs/go/main/App";
-  import {
-    aniListUser,
-    watchListPage,
-    animePerPage,
-    aniListPrimary,
-    aniListLoggedIn,
-    aniListWatchlist,
-    aniListSort,
-    clearApiError,
-    setApiError,
-  } from "./GlobalVariablesAndHelperFunctions.svelte";
 
-  let isAniListPrimary: boolean;
+    let isAniListPrimary: boolean
-  let page: number;
+    let page: number
-  let perPage: number;
+    let perPage: number
-  let sort: string;
 
-  aniListPrimary.subscribe((value) => (isAniListPrimary = value));
+    aniListPrimary.subscribe(value => isAniListPrimary = value)
-  watchListPage.subscribe((value) => (page = value));
+    watchListPage.subscribe(value => page = value)
-  animePerPage.subscribe((value) => (perPage = value));
+    animePerPage.subscribe(value => perPage = value)
-  aniListSort.subscribe((value) => (sort = value));
 
-  export const LoadAniListUser = async () => {
+    export const LoadAniListUser = async () => {
-    try {
+        await GetAniListLoggedInUser().then(user => {
-      await GetAniListLoggedInUser().then((user) => {
+            aniListUser.set(user)
-        aniListUser.set(user);
+        })
-      });
-    } catch (err) {
-      const errorMsg = err instanceof Error ? err.message : String(err);
-      setApiError(
-        "anilist",
-        `Failed to load user: ${errorMsg}`,
-        undefined,
-        true,
-      );
-      throw err;
     }
-  };
 
-  export const LoadAniListWatchList = async () => {
+    export const LoadAniListWatchList = async () => {
-    try {
+        await GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((watchList) => {
-      const watchList = await GetAniListUserWatchingList(page, perPage, sort);
+            aniListWatchlist.set(watchList)
-      aniListWatchlist.set(watchList);
+        })
-      clearApiError();
-    } catch (err) {
-      const errorMsg = err instanceof Error ? err.message : String(err);
-      setApiError(
-        "anilist",
-        `Failed to load watch list: ${errorMsg}`,
-        undefined,
-        true,
-      );
-      throw err;
     }
-  };
+
-  export const CheckIfAniListLoggedInAndLoadWatchList = async () => {
+    export const CheckIfAniListLoggedInAndLoadWatchList = async () => {
-    try {
+        const loggedIn = await CheckIfAniListLoggedIn()
-      const loggedIn = await CheckIfAniListLoggedIn();
+        if (loggedIn) {
-      if (loggedIn) {
+            await LoadAniListUser()
-        await LoadAniListUser();
+            if (isAniListPrimary) await LoadAniListWatchList()
-        if (isAniListPrimary) await LoadAniListWatchList();
+        }
-      }
+        aniListLoggedIn.set(loggedIn)
-      aniListLoggedIn.set(loggedIn);
-    } catch (err) {
-      const errorMsg = err instanceof Error ? err.message : String(err);
-      setApiError(
-        "anilist",
-        `Authentication failed: ${errorMsg}`,
-        undefined,
-        true,
-      );
-      aniListLoggedIn.set(false);
     }
-  };
 </script>

frontend/src/helperModules/GlobalVariablesAndHelperFunctions.svelte

@@ -1,212 +1,162 @@
 <script lang="ts" context="module">
-  import {
+    import {
-    GetAniListItem,
+        GetAniListItem,
-    GetAniListLoggedInUser,
+        GetAniListLoggedInUser,
-    GetAniListUserWatchingList,
+        GetAniListUserWatchingList,
-    GetMyAnimeListAnime,
+        GetMyAnimeListAnime,
-    GetMyAnimeListLoggedInUser,
+        GetMyAnimeListLoggedInUser,
-    GetSimklLoggedInUser,
+        GetSimklLoggedInUser,
-    LogoutAniList,
+        LogoutAniList,
-    LogoutMyAnimeList,
+        LogoutMyAnimeList,
-    LogoutSimkl,
+        LogoutSimkl,
-    SimklGetUserWatchlist,
+        SimklGetUserWatchlist,
-    SimklSearch,
+        SimklSearch
-  } from "../../wailsjs/go/main/App";
+    } from "../../wailsjs/go/main/App";
-  import type {
+    import type {
-    AniListCurrentUserWatchList,
+        AniListCurrentUserWatchList,
-    AniListGetSingleAnime,
+        AniListGetSingleAnime
-  } from "../anilist/types/AniListCurrentUserWatchListType.js";
+    } from "../anilist/types/AniListCurrentUserWatchListType.js";
-  import { writable } from "svelte/store";
+    import {writable} from 'svelte/store'
-  import type {
+    import type {SimklAnime, SimklUser, SimklWatchList} from "../simkl/types/simklTypes";
-    SimklAnime,
+    import {type AniListUser, MediaListSort} from "../anilist/types/AniListTypes";
-    SimklUser,
+    import type {MALAnime, MALWatchlist, MyAnimeListUser} from "../mal/types/MALTypes";
-    SimklWatchList,
+    import type {TableItems} from "../helperTypes/TableTypes";
-  } from "../simkl/types/simklTypes";
+    import {AniListGetSingleAnimeDefaultData} from "../helperDefaults/AniListGetSingleAnime";
-  import {
-    type AniListUser,
-    MediaListSort,
-  } from "../anilist/types/AniListTypes";
-  import type {
-    MALAnime,
-    MALWatchlist,
-    MyAnimeListUser,
-  } from "../mal/types/MALTypes";
-  import type { TableItems } from "../helperTypes/TableTypes";
-  import { AniListGetSingleAnimeDefaultData } from "../helperDefaults/AniListGetSingleAnime";
 
-  export let aniListAnime = writable(AniListGetSingleAnimeDefaultData);
+    export let aniListAnime = writable(AniListGetSingleAnimeDefaultData)
-  export let title = writable("");
+    export let title = writable("")
-  export let aniListLoggedIn = writable(false);
+    export let aniListLoggedIn = writable(false)
-  export let simklLoggedIn = writable(false);
+    export let simklLoggedIn = writable(false)
-  export let malLoggedIn = writable(false);
+    export let malLoggedIn = writable(false)
-  export let simklWatchList = writable({} as SimklWatchList);
+    export let simklWatchList = writable({} as SimklWatchList)
-  export let aniListPrimary = writable(true);
+    export let aniListPrimary = writable(true)
-  export let simklPrimary = writable(false);
+    export let simklPrimary = writable(false)
-  export let malPrimary = writable(false);
+    export let malPrimary = writable(false)
-  export let simklUser = writable({} as SimklUser);
+    export let simklUser = writable({} as SimklUser)
-  export let aniListUser = writable({} as AniListUser);
+    export let aniListUser = writable({} as AniListUser)
-  export let malUser = writable({} as MyAnimeListUser);
+    export let malUser = writable({} as MyAnimeListUser)
-  export let aniListWatchlist = writable({} as AniListCurrentUserWatchList);
+    export let aniListWatchlist = writable({} as AniListCurrentUserWatchList)
-  export let malWatchList = writable({} as MALWatchlist);
+    export let malWatchList = writable({} as MALWatchlist)
-  export let malAnime = writable({} as MALAnime);
+    export let malAnime = writable({} as MALAnime)
-  export let simklAnime = writable({} as SimklAnime);
+    export let simklAnime = writable({} as SimklAnime)
-  export let loading = writable(false);
+    export let loading = writable(false)
-  export let tableItems = writable([] as TableItems);
+    export let tableItems = writable([] as TableItems)
-  export let watchlistNeedsRefresh = writable(false);
-  export let aniListSort = writable(MediaListSort.UpdatedTimeDesc);
 
-  export let watchListPage = writable(1);
+    export let watchListPage = writable(1)
-  export let animePerPage = writable(20);
+    export let animePerPage = writable(20)
 
-  let isAniListPrimary: boolean;
+    let isAniListPrimary: boolean
-  let page: number;
+    let page: number
-  let perPage: number;
+    let perPage: number
-  let sort: string;
+    let aniWatchlist: AniListCurrentUserWatchList
-  let aniWatchlist: AniListCurrentUserWatchList;
+    let currentAniListAnime: AniListGetSingleAnime
-  let currentAniListAnime: AniListGetSingleAnime;
 
-  let isMalLoggedIn: boolean;
+    let isMalLoggedIn: boolean
-  let isSimklLoggedIn: boolean;
+    let isSimklLoggedIn: boolean
 
-  aniListPrimary.subscribe((value) => (isAniListPrimary = value));
+    aniListPrimary.subscribe(value => isAniListPrimary = value)
-  watchListPage.subscribe((value) => (page = value));
+    watchListPage.subscribe(value => page = value)
-  animePerPage.subscribe((value) => (perPage = value));
+    animePerPage.subscribe(value => perPage = value)
-  aniListWatchlist.subscribe((value) => (aniWatchlist = value));
+    aniListWatchlist.subscribe(value => aniWatchlist = value)
-  malLoggedIn.subscribe((value) => (isMalLoggedIn = value));
+    malLoggedIn.subscribe(value => isMalLoggedIn = value)
-  simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+    simklLoggedIn.subscribe(value => isSimklLoggedIn = value)
-  aniListAnime.subscribe((value) => (currentAniListAnime = value));
+    aniListAnime.subscribe(value => currentAniListAnime = value)
-  aniListSort.subscribe((value) => (sort = value));
 
-  export interface ApiError {
-    service: string;
-    message: string;
-    statusCode?: string;
-    canRetry: boolean;
-  }
-  export const apiError = writable<ApiError | null>(null);
-  export const isApiDown = writable(false);
-  export function setApiError(
-    service: string,
-    message: string,
-    statusCode?: string,
-    canRetry: boolean = true,
-  ) {
-    apiError.set({
-      service,
-      message,
-      statusCode,
-      canRetry,
-    });
-    isApiDown.set(true);
-  }
-  export function clearApiError() {
-    apiError.set(null);
-    isApiDown.set(false);
-  }
 
-  export async function GetAnimeSingleItem(
+    export async function GetAnimeSingleItem(aniId: number, login: boolean): Promise<""> {
-    aniId: number,
+        await GetAniListItem(aniId, login).then(aniListResult => {
-    login: boolean,
+            let finalResult: AniListGetSingleAnime
-  ): Promise<""> {
+            finalResult = aniListResult
-    await GetAniListItem(aniId, login).then((aniListResult) => {
+            if (login === false) {
-      let finalResult: AniListGetSingleAnime;
+                finalResult.data.MediaList.status = ""
-      finalResult = aniListResult;
+                finalResult.data.MediaList.score = 0
-      if (login === false) {
+                finalResult.data.MediaList.progress = 0
-        finalResult.data.MediaList.status = "";
+                finalResult.data.MediaList.notes = ""
-        finalResult.data.MediaList.score = 0;
+                finalResult.data.MediaList.repeat = 0
-        finalResult.data.MediaList.progress = 0;
+                finalResult.data.MediaList.startedAt.day = 0
-        finalResult.data.MediaList.notes = "";
+                finalResult.data.MediaList.startedAt.month = 0
-        finalResult.data.MediaList.repeat = 0;
+                finalResult.data.MediaList.startedAt.year = 0
-        finalResult.data.MediaList.startedAt.day = 0;
+                finalResult.data.MediaList.completedAt.day = 0
-        finalResult.data.MediaList.startedAt.month = 0;
+                finalResult.data.MediaList.completedAt.month = 0
-        finalResult.data.MediaList.startedAt.year = 0;
+                finalResult.data.MediaList.completedAt.year = 0
-        finalResult.data.MediaList.completedAt.day = 0;
+            }
-        finalResult.data.MediaList.completedAt.month = 0;
+            aniListAnime.set(finalResult)
-        finalResult.data.MediaList.completedAt.year = 0;
+            title.set(currentAniListAnime.data.MediaList.media.title.english === "" ?
-      }
+                currentAniListAnime.data.MediaList.media.title.romaji :
-      aniListAnime.set(finalResult);
+                currentAniListAnime.data.MediaList.media.title.english)
-      title.set(
+        })
-        currentAniListAnime.data.MediaList.media.title.english === ""
+        if (isMalLoggedIn) {
-          ? currentAniListAnime.data.MediaList.media.title.romaji
+            await GetMyAnimeListAnime(currentAniListAnime.data.MediaList.media.idMal).then(malResult => {
-          : currentAniListAnime.data.MediaList.media.title.english,
+                malAnime.set(malResult)
-      );
+            })
-    });
+        }
-    if (isMalLoggedIn) {
+        if (isSimklLoggedIn) {
-      await GetMyAnimeListAnime(
+            await SimklSearch(currentAniListAnime.data.MediaList).then((value: SimklAnime) => {
-        currentAniListAnime.data.MediaList.media.idMal,
+                simklAnime.set(value)
-      ).then((malResult) => {
+            })
-        malAnime.set(malResult);
+        }
-      });
+        return ""
     }
-    if (isSimklLoggedIn) {
+
-      await SimklSearch(currentAniListAnime.data.MediaList).then(
+    export function loginToSimkl(): void {
-        (value: SimklAnime) => {
+        GetSimklLoggedInUser().then(user => {
-          simklAnime.set(value);
+            if (Object.keys(user).length === 0) {
-        },
+                simklLoggedIn.set(false)
-      );
+            } else {
+                simklUser.set(user)
+                SimklGetUserWatchlist().then(result => {
+                    simklWatchList.set(result)
+                    simklLoggedIn.set(true)
+                })
+            }
+        })
     }
-    return "";
-  }
 
-  export function loginToSimkl(): void {
+    export function loginToAniList(): void {
-    GetSimklLoggedInUser().then((user) => {
+        GetAniListLoggedInUser().then(result => {
-      if (Object.keys(user).length === 0) {
+            aniListUser.set(result)
-        simklLoggedIn.set(false);
+            if (isAniListPrimary) {
-      } else {
+                GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((result) => {
-        simklUser.set(user);
+                    aniListWatchlist.set(result)
-        SimklGetUserWatchlist().then((result) => {
+                    aniListLoggedIn.set(true)
-          simklWatchList.set(result);
+                })
-          simklLoggedIn.set(true);
+            } else {
-        });
+                aniListLoggedIn.set(true)
-      }
+            }
-    });
+        })
-  }
+    }
 
-  export function loginToAniList(): void {
+    export function loginToMAL(): void {
-    GetAniListLoggedInUser().then((result) => {
+        GetMyAnimeListLoggedInUser().then(result => {
-      aniListUser.set(result);
+            malUser.set(result)
-      if (isAniListPrimary) {
+            malLoggedIn.set(true)
-        GetAniListUserWatchingList(page, perPage, sort).then((result) => {
+        })
-          aniListWatchlist.set(result);
+    }
-          aniListLoggedIn.set(true);
-        });
-      } else {
-        aniListLoggedIn.set(true);
-      }
-    });
-  }
 
-  export function loginToMAL(): void {
+    export function logoutOfAniList(): void {
-    GetMyAnimeListLoggedInUser().then((result) => {
+        LogoutAniList().then(result => {
-      malUser.set(result);
+            console.log(result)
-      malLoggedIn.set(true);
+            if (Object.keys(aniWatchlist).length !== 0) {
-    });
+                aniListWatchlist.set({} as AniListCurrentUserWatchList)
-  }
+            }
+            aniListUser.set({} as AniListUser)
+            aniListLoggedIn.set(false)
+        })
+    }
 
-  export function logoutOfAniList(): void {
+    export function logoutOfMAL(): void {
-    LogoutAniList().then((result) => {
+        LogoutMyAnimeList().then(result => {
-      console.log(result);
+            console.log(result)
-      if (Object.keys(aniWatchlist).length !== 0) {
+            malUser.set({} as MyAnimeListUser)
-        aniListWatchlist.set({} as AniListCurrentUserWatchList);
+            malLoggedIn.set(false)
-      }
+        })
-      aniListUser.set({} as AniListUser);
+    }
-      aniListLoggedIn.set(false);
-    });
-  }
 
-  export function logoutOfMAL(): void {
+    export function logoutOfSimkl(): void {
-    LogoutMyAnimeList().then((result) => {
+        LogoutSimkl().then(result => {
-      console.log(result);
+            console.log(result)
-      malUser.set({} as MyAnimeListUser);
+            simklUser.set({} as SimklUser)
-      malLoggedIn.set(false);
+            simklLoggedIn.set(false)
-    });
+        })
-  }
+    }
-
-  export function logoutOfSimkl(): void {
-    LogoutSimkl().then((result) => {
-      console.log(result);
-      simklUser.set({} as SimklUser);
-      simklLoggedIn.set(false);
-    });
-  }
 </script>

frontend/src/routes/Home.svelte

@@ -1,55 +1,25 @@
 <script lang="ts">
-  import Pagination from "../helperComponents/Pagination.svelte";
+import Pagination from "../helperComponents/Pagination.svelte";
-  import WatchList from "../helperComponents/WatchList.svelte";
+import WatchList from "../helperComponents/WatchList.svelte";
-  import {
+import {
     aniListLoggedIn,
     aniListPrimary,
     loading,
-    isApiDown,
+} from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-    apiError,
+import loader from '../helperFunctions/loader'
-  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-  import loader from "../helperFunctions/loader";
 
-  let isAniListPrimary: boolean;
+let isAniListPrimary: boolean
-  let isAniListLoggedIn: boolean;
+let isAniListLoggedIn: boolean
 
-  aniListPrimary.subscribe((value) => (isAniListPrimary = value));
+aniListPrimary.subscribe((value) => isAniListPrimary = value)
-  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
 </script>
-
+{#if isAniListLoggedIn && isAniListPrimary}
-{#if $isApiDown}
+<div class="container py-10">
-  <div class="container py-10">
-    <div
-      class="bg-yellow-50 border border-yellow-200 rounded-lg p-6 text-center"
-    >
-      <svg
-        class="mx-auto h-12 w-12 text-yellow-600 mb-4"
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke="currentColor"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
-        />
-      </svg>
-      <h2 class="text-xl font-semibold text-yellow-900 mb-2">
-        API Unavailable
-      </h2>
-      <p class="text-yellow-700 mb-4">
-        The {$apiError?.service || "service"} is currently unavailable. The app will
-        remain open, and you can retry when the service is back online.
-      </p>
-    </div>
-  </div>
-{:else if isAniListLoggedIn && isAniListPrimary}
-  <div class="container py-10">
     <Pagination />
     <WatchList />
     <Pagination />
-  </div>
+</div>
 {:else}
-  <div use:loader={loading}></div>
+    <div use:loader={loading}></div>
 {/if}

frontend/vite.config.ts.timestamp-1728705194404-dee8a4363963c.mjs

@@ -0,0 +1,10 @@
+// vite.config.ts
+import { defineConfig } from "file:///home/nymusicman/Code/AniTrack/frontend/node_modules/vite/dist/node/index.js";
+import { svelte } from "file:///home/nymusicman/Code/AniTrack/frontend/node_modules/@sveltejs/vite-plugin-svelte/src/index.js";
+var vite_config_default = defineConfig({
+  plugins: [svelte()]
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS9ueW11c2ljbWFuL0NvZGUvQW5pVHJhY2svZnJvbnRlbmRcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIi9ob21lL255bXVzaWNtYW4vQ29kZS9BbmlUcmFjay9mcm9udGVuZC92aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vaG9tZS9ueW11c2ljbWFuL0NvZGUvQW5pVHJhY2svZnJvbnRlbmQvdml0ZS5jb25maWcudHNcIjtpbXBvcnQge2RlZmluZUNvbmZpZ30gZnJvbSAndml0ZSdcbmltcG9ydCB7c3ZlbHRlfSBmcm9tICdAc3ZlbHRlanMvdml0ZS1wbHVnaW4tc3ZlbHRlJ1xuXG4vLyBodHRwczovL3ZpdGVqcy5kZXYvY29uZmlnL1xuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKHtcbiAgcGx1Z2luczogW3N2ZWx0ZSgpXVxufSlcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBdVMsU0FBUSxvQkFBbUI7QUFDbFUsU0FBUSxjQUFhO0FBR3JCLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzFCLFNBQVMsQ0FBQyxPQUFPLENBQUM7QUFDcEIsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K

wails.json

@@ -12,6 +12,6 @@
   },
   "info": {
     "productName": "AniTrack",
-    "productVersion": "0.7.0"
+    "productVersion": "0.5.1"
   }
 }