chore: bump version to 0.6.5

Update product version in preparation for release.

.gitignore

@@ -29,4 +29,10 @@ package.json.md5
 package-lock.json
 .idea
 .env
-environment.go
+environment.go
+
+# REST (http files)
+http-client.private.env.json
+
+# Build artifacts
+build/*.tar.gz

AniListFunctions.go

@@ -17,26 +17,29 @@ func AniListQuery(body interface{}, login bool) (json.RawMessage, string) {
 	if login && (AniListJWT{}) != aniListJwt {
 		response.Header.Add("Authorization", "Bearer "+aniListJwt.AccessToken)
 	} else if login {
-		return nil, "Please login to anilist to make this request"
+		return nil, "Please login to AniList to make this request"
 	}
 	response.Header.Add("Content-Type", "application/json")
 	response.Header.Add("Accept", "application/json")
 
 	client := &http.Client{}
-	res, reserr := client.Do(response)
+	res, resErr := client.Do(response)
-	if reserr != nil {
+	if resErr != nil {
 		log.Printf("Failed at res, %s\n", err)
 	}
 
 	defer res.Body.Close()
 
 	returnedBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, "Could not read the returned body."
+	}
 
 	return returnedBody, res.Status
 }
 
 func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
-	var user = a.GetAniListLoggedInUser()
+	user := a.GetAniListLoggedInUser()
 
 	var neededVariables interface{}
 
@@ -90,6 +93,7 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 					timeUntilAiring
 					episode
 				  }
+				  genres
 				  tags{
 					id
 					name
@@ -141,11 +145,11 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 	returnedBody, status := AniListQuery(body, login)
 	var post AniListGetSingleAnime
 
-	if status == "404 Not Found" && login == false {
+	if status == "404 Not Found" && !login {
 		return post
 	}
 
-	if status == "404 Not Found" && login {
+	if status == "404 Not Found" {
 		post = a.GetAniListItem(aniId, false)
 	}
 
@@ -154,7 +158,7 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
-	if login == false {
+	if !login {
 		post.Data.MediaList.UserID = user.Data.Viewer.ID
 		post.Data.MediaList.Status = ""
 		post.Data.MediaList.StartedAt.Year = 0
@@ -199,7 +203,7 @@ func (a *App) AniListSearch(query string) any {
 					  perPage
 					}
 					media (search: $search, type: $listType) {
-						id						
+						id
 						idMal
 						title {
 						  romaji
@@ -219,6 +223,7 @@ func (a *App) AniListSearch(query string) any {
 						  timeUntilAiring
 						  episode
 						}
+						genres
 						tags{
 							id
 							name
@@ -249,7 +254,7 @@ func (a *App) AniListSearch(query string) any {
 }
 
 func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) AniListCurrentUserWatchList {
-	var user = a.GetAniListLoggedInUser()
+	user := a.GetAniListLoggedInUser()
 	type Variables struct {
 		Page     int    `json:"page"`
 		PerPage  int    `json:"perPage"`
@@ -304,6 +309,7 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) Ani
 						  timeUntilAiring
 						  episode
 						}
+						genres
 						tags{
 						  id
 						  name
@@ -360,27 +366,47 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) Ani
 		},
 	}
 
-	returnedBody, _ := AniListQuery(body, true)
+	returnedBody, status := AniListQuery(body, true)
 
+	var badPost struct {
+		Errors []struct {
+			Message   string `json:"message"`
+			Status    int    `json:"status"`
+			Locations []struct {
+				Line   int `json:"line"`
+				Column int `json:"column"`
+			} `json:"locations"`
+		} `json:"errors"`
+		Data any `json:"data"`
+	}
 	var post AniListCurrentUserWatchList
-	err := json.Unmarshal(returnedBody, &post)
+	if status == "200 OK" {
-	if err != nil {
+		err := json.Unmarshal(returnedBody, &post)
-		log.Printf("Failed at unmarshal, %s\n", err)
+		if err != nil {
-	}
+			log.Printf("Failed at unmarshal, %s\n", err)
-
-	// Getting the real total, finding the real last page and storing that in the Page info
-	statuses := post.Data.Page.MediaList[0].User.Statistics.Anime.Statuses
-	var total int
-	for _, status := range statuses {
-		if status.Status == "CURRENT" {
-			total = status.Count
 		}
+		// Getting the real total, finding the real last page and storing that in the Page info
+		statuses := post.Data.Page.MediaList[0].User.Statistics.Anime.Statuses
+		var total int
+		for _, status := range statuses {
+			if status.Status == "CURRENT" {
+				total = status.Count
+			}
+		}
+
+		lastPage := total / perPage
+
+		post.Data.Page.PageInfo.Total = total
+		post.Data.Page.PageInfo.LastPage = lastPage
 	}
 
-	lastPage := total / perPage
+	if status == "403 Forbidden" {
-
+		err := json.Unmarshal(returnedBody, &badPost)
-	post.Data.Page.PageInfo.Total = total
+		if err != nil {
-	post.Data.Page.PageInfo.LastPage = lastPage
+			log.Printf("Failed at unmarshal, %s\n", err)
+		}
+		log.Fatal(badPost.Errors[0].Message)
+	}
 
 	return post
 }
@@ -392,8 +418,8 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
 	}{
 		Query: `
 			mutation(
-			  $mediaId:Int, 
+			  $mediaId:Int,
-			  $progress:Int, 
+			  $progress:Int,
 			  $status:MediaListStatus,
 			  $score:Float,
 			  $repeat:Int,
@@ -402,15 +428,15 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
 			  $completedAt:FuzzyDateInput,
 			){
 			  SaveMediaListEntry(
-				mediaId:$mediaId, 
+				mediaId:$mediaId,
-				progress:$progress, 
+				progress:$progress,
 				status:$status,
 				score:$score,
 				repeat:$repeat,
 				notes:$notes,
 				startedAt:$startedAt
 				completedAt:$completedAt
-			  ){   
+			  ){
 				id
 				mediaId
 				userId
@@ -505,7 +531,7 @@ func (a *App) AniListDeleteEntry(mediaListId int) DeleteAniListReturn {
 			){
 			  DeleteMediaListEntry(
 				id:$id,
-			  ){   
+			  ){
 				deleted
 				}
 			}

AniListTypes.go

@@ -74,7 +74,8 @@ type MediaList struct {
 			TimeUntilAiring int `json:"timeUntilAiring"`
 			Episode         int `json:"episode"`
 		} `json:"nextAiringEpisode"`
-		Tags []struct {
+		Genres []string `json:"genres"`
+		Tags   []struct {
 			Id             int    `json:"id"`
 			Name           string `json:"name"`
 			Description    string `json:"description"`

AniListUserFunctions.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -19,18 +20,22 @@ import (
 var aniListJwt AniListJWT
 
 var aniRing, _ = keyring.Open(keyring.Config{
-	ServiceName: "AniTrack",
+	ServiceName:                    "AniTrack",
+	KeychainName:                   "AniTrack",
+	KeychainSynchronizable:         false,
+	KeychainTrustApplication:       true,
+	KeychainAccessibleWhenUnlocked: true,
 })
 
 var aniCtxShutdown, aniCancel = context.WithCancel(context.Background())
 
 func (a *App) CheckIfAniListLoggedIn() bool {
 	if (AniListJWT{} == aniListJwt) {
-		tokenType, err := aniRing.Get("anilistTokenType")
+		tokenType, tokenErr := aniRing.Get("anilistTokenType")
-		expiresIn, err := aniRing.Get("anilistTokenExpiresIn")
+		expiresIn, expiresInErr := aniRing.Get("anilistTokenExpiresIn")
-		accessToken, err := aniRing.Get("anilistAccessToken")
+		refreshToken, refreshTokenErr := aniRing.Get("anilistRefreshToken")
-		refreshToken, err := aniRing.Get("anilistRefreshToken")
+		accessToken, accessTokenErr := aniRing.Get("anilistAccessToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		if (tokenErr != nil || expiresInErr != nil || refreshTokenErr != nil || accessTokenErr != nil) || len(accessToken.Data) == 0 {
 			return false
 		} else {
 			aniListJwt.TokenType = string(tokenType.Data)
@@ -46,11 +51,11 @@ func (a *App) CheckIfAniListLoggedIn() bool {
 
 func (a *App) AniListLogin() {
 	if (AniListJWT{} == aniListJwt) {
-		tokenType, err := aniRing.Get("anilistTokenType")
+		tokenType, tokenErr := aniRing.Get("anilistTokenType")
-		expiresIn, err := aniRing.Get("anilistTokenExpiresIn")
+		expiresIn, expiresInErr := aniRing.Get("anilistTokenExpiresIn")
-		accessToken, err := aniRing.Get("anilistAccessToken")
+		refreshToken, refreshTokenErr := aniRing.Get("anilistRefreshToken")
-		refreshToken, err := aniRing.Get("anilistRefreshToken")
+		accessToken, accessTokenErr := aniRing.Get("anilistAccessToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		if (tokenErr != nil || expiresInErr != nil || refreshTokenErr != nil || accessTokenErr != nil) || len(accessToken.Data) == 0 {
 			getAniListCodeUrl := "https://anilist.co/api/v2/oauth/authorize?client_id=" + Environment.ANILIST_APP_ID + "&redirect_uri=" + Environment.ANILIST_CALLBACK_URI + "&response_type=code"
 			runtime.BrowserOpenURL(*wailsContext, getAniListCodeUrl)
 
@@ -78,7 +83,6 @@ func (a *App) handleAniListCallback(wg *sync.WaitGroup) {
 		default:
 		}
 		content := r.FormValue("code")
-
 		if content != "" {
 			aniListJwt = getAniListAuthorizationToken(content)
 			_ = aniRing.Set(keyring.Item{
@@ -120,7 +124,7 @@ func (a *App) handleAniListCallback(wg *sync.WaitGroup) {
 
 	go func() {
 		defer wg.Done()
-		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			log.Fatalf("listen: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
@@ -145,19 +149,21 @@ func getAniListAuthorizationToken(content string) AniListJWT {
 	if err != nil {
 		log.Printf("Failed at response, %s\n", err)
 	}
-	response.Header.Add("content-type", "application/x-www-form-urlencoded")
+	response.Header.Add("Content-type", "application/x-www-form-urlencoded")
-	response.Header.Add("Content-Type", "application/json")
 	response.Header.Add("Accept", "application/json")
 
 	client := &http.Client{}
-	res, reserr := client.Do(response)
+	res, resErr := client.Do(response)
-	if reserr != nil {
+	if resErr != nil {
 		log.Printf("Failed at res, %s\n", err)
 	}
 
 	defer res.Body.Close()
 
 	returnedBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		log.Printf("Could not read returned body, %s\n.", err)
+	}
 
 	var post AniListJWT
 	err = json.Unmarshal(returnedBody, &post)
@@ -202,13 +208,12 @@ func (a *App) GetAniListLoggedInUser() AniListUser {
 
 func (a *App) LogoutAniList() string {
 	if (AniListJWT{} != aniListJwt) {
-		err := aniRing.Remove("anilistTokenType")
+		typeErr := aniRing.Remove("anilistTokenType")
-		err = aniRing.Remove("anilistTokenExpiresIn")
+		expiresInErr := aniRing.Remove("anilistTokenExpiresIn")
-		err = aniRing.Remove("anilistAccessToken")
+		accessTokenErr := aniRing.Remove("anilistAccessToken")
-		err = aniRing.Remove("anilistRefreshToken")
+		refreshTokenErr := aniRing.Remove("anilistRefreshToken")
-
+		if typeErr != nil || expiresInErr != nil || accessTokenErr != nil || refreshTokenErr != nil {
-		if err != nil {
+			fmt.Println("AniList Logout Failed")
-			fmt.Println("AniList Logout Failed", err)
 		}
 		aniListJwt = AniListJWT{}
 	}

MALTypes.go

@@ -46,10 +46,10 @@ type MALWatchlist struct {
 			Id          int    `json:"id" ts_type:"id"`
 			Title       string `json:"title" ts_type:"title"`
 			MainPicture struct {
-				Medium string `json:"medium" json:"medium"`
+				Medium string `json:"medium" ts_type:"medium"`
-				Large  string `json:"large" json:"large"`
+				Large  string `json:"large" ts_type:"large"`
-			} `json:"main_picture" json:"mainPicture"`
+			} `json:"main_picture" ts_type:"mainPicture"`
-		} `json:"node" json:"node"`
+		} `json:"node" ts_type:"node"`
 		ListStatus struct {
 			Status             string    `json:"status" ts_type:"status"`
 			Score              int       `json:"score" ts_type:"score"`
@@ -59,7 +59,7 @@ type MALWatchlist struct {
 			StartDate          string    `json:"start_date" ts_type:"startDate"`
 			FinishDate         string    `json:"finish_date" ts_type:"finishDate"`
 		} `json:"list_status" ts_type:"listStatus"`
-	} `json:"data" json:"data"`
+	} `json:"data" ts_type:"data"`
 	Paging struct {
 		Previous string `json:"previous" ts_type:"previous"`
 		Next     string `json:"next" ts_type:"next"`
@@ -70,9 +70,9 @@ type MALAnime struct {
 	Id          int    `json:"id" ts_type:"id"`
 	Title       string `json:"title" ts_type:"title"`
 	MainPicture struct {
-		Large  string `json:"large" json:"large"`
+		Large  string `json:"large" ts_type:"large"`
-		Medium string `json:"medium" json:"medium"`
+		Medium string `json:"medium" ts_type:"medium"`
-	} `json:"main_picture" json:"mainPicture"`
+	} `json:"main_picture" ts_type:"mainPicture"`
 	AlternativeTitles struct {
 		Synonyms []string `json:"synonyms" ts_type:"synonyms"`
 		En       string   `json:"en" ts_type:"en"`

MALUserFunctions.go

@@ -5,6 +5,7 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -23,7 +24,11 @@ import (
 var myAnimeListJwt MyAnimeListJWT
 
 var myAnimeListRing, _ = keyring.Open(keyring.Config{
-	ServiceName: "AniTrack",
+	ServiceName:                    "AniTrack",
+	KeychainName:                   "AniTrack",
+	KeychainSynchronizable:         false,
+	KeychainTrustApplication:       true,
+	KeychainAccessibleWhenUnlocked: true,
 })
 
 var myAnimeListCtxShutdown, myAnimeListCancel = context.WithCancel(context.Background())
@@ -46,7 +51,7 @@ func base64URLEncode(str []byte) string {
 
 func verifier() (*CodeVerifier, error) {
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	b := make([]byte, length, length)
+	b := make([]byte, length)
 	for i := 0; i < length; i++ {
 		b[i] = byte(r.Intn(255))
 	}
@@ -67,16 +72,17 @@ func (v *CodeVerifier) CodeChallengeS256() string {
 
 func (a *App) CheckIfMyAnimeListLoggedIn() bool {
 	if (MyAnimeListJWT{} == myAnimeListJwt) {
-		tokenType, err := myAnimeListRing.Get("MyAnimeListTokenType")
+		tokenType, tokenErr := myAnimeListRing.Get("MyAnimeListTokenType")
-		expiresIn, err := myAnimeListRing.Get("MyAnimeListExpiresIn")
+		expiresIn, expiresInErr := myAnimeListRing.Get("MyAnimeListExpiresIn")
-		accessToken, err := myAnimeListRing.Get("MyAnimeListAccessToken")
+		refreshToken, refreshTokenErr := myAnimeListRing.Get("MyAnimeListAccessToken")
-		refreshToken, err := myAnimeListRing.Get("MyAnimeListRefreshToken")
+		accessToken, accessTokenErr := myAnimeListRing.Get("MyAnimeListRefreshToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		if (tokenErr != nil || expiresInErr != nil || refreshTokenErr != nil || accessTokenErr != nil) || len(accessToken.Data) == 0 {
 			return false
 		} else {
+			var expiresInConvertErr error
 			myAnimeListJwt.TokenType = string(tokenType.Data)
-			myAnimeListJwt.ExpiresIn, err = strconv.Atoi(string(expiresIn.Data))
+			myAnimeListJwt.ExpiresIn, expiresInConvertErr = strconv.Atoi(string(expiresIn.Data))
-			if err != nil {
+			if expiresInConvertErr != nil {
 				fmt.Println("unable to convert string to int")
 			}
 			myAnimeListJwt.AccessToken = string(accessToken.Data)
@@ -89,12 +95,13 @@ func (a *App) CheckIfMyAnimeListLoggedIn() bool {
 }
 
 func (a *App) MyAnimeListLogin() {
-	if a.CheckIfMyAnimeListLoggedIn() == false {
+	if !a.CheckIfMyAnimeListLoggedIn() {
-		tokenType, err := myAnimeListRing.Get("MyAnimeListTokenType")
+		fmt.Println("check logged in function failed")
-		expiresIn, err := myAnimeListRing.Get("MyAnimeListExpiresIn")
+		tokenType, tokenErr := myAnimeListRing.Get("MyAnimeListTokenType")
-		accessToken, err := myAnimeListRing.Get("MyAnimeListAccessToken")
+		expiresIn, expiresInErr := myAnimeListRing.Get("MyAnimeListExpiresIn")
-		refreshToken, err := myAnimeListRing.Get("MyAnimeListRefreshToken")
+		refreshToken, refreshTokenErr := myAnimeListRing.Get("MyAnimeListAccessToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		accessToken, accessTokenErr := myAnimeListRing.Get("MyAnimeListRefreshToken")
+		if (tokenErr != nil || expiresInErr != nil || refreshTokenErr != nil || accessTokenErr != nil) || len(accessToken.Data) == 0 {
 			verifier, _ := verifier()
 			getMyAnimeListCodeUrl := "https://myanimelist.net/v1/oauth2/authorize?response_type=code&client_id=" + Environment.MAL_CLIENT_ID + "&redirect_uri=" + Environment.MAL_CALLBACK_URI + "&code_challenge=" + verifier.Value + "&code_challenge_method=plain"
 			runtime.BrowserOpenURL(*wailsContext, getMyAnimeListCodeUrl)
@@ -103,9 +110,10 @@ func (a *App) MyAnimeListLogin() {
 			a.handleMyAnimeListCallback(serverDone, verifier)
 			serverDone.Wait()
 		} else {
+			var expiresInConvertErr error
 			myAnimeListJwt.TokenType = string(tokenType.Data)
-			myAnimeListJwt.ExpiresIn, err = strconv.Atoi(string(expiresIn.Data))
+			myAnimeListJwt.ExpiresIn, expiresInConvertErr = strconv.Atoi(string(expiresIn.Data))
-			if err != nil {
+			if expiresInConvertErr != nil {
 				fmt.Println("unable to convert string to int in Login function")
 			}
 			myAnimeListJwt.AccessToken = string(accessToken.Data)
@@ -167,7 +175,7 @@ func (a *App) handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifi
 
 	go func() {
 		defer wg.Done()
-		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			log.Fatalf("listen: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
@@ -206,14 +214,17 @@ func getMyAnimeListAuthorizationToken(content string, verifier *CodeVerifier) My
 	response.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 
 	client := &http.Client{}
-	res, reserr := client.Do(response)
+	res, resErr := client.Do(response)
-	if reserr != nil {
+	if resErr != nil {
 		log.Printf("Failed at res, %s\n", err)
 	}
 
 	defer res.Body.Close()
 
 	returnedBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		log.Printf("Could not read returned body, %s\n", err)
+	}
 
 	var post MyAnimeListJWT
 	err = json.Unmarshal(returnedBody, &post)
@@ -253,14 +264,17 @@ func refreshMyAnimeListAuthorizationToken() {
 	response.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 
 	client := &http.Client{}
-	res, reserr := client.Do(response)
+	res, resErr := client.Do(response)
-	if reserr != nil {
+	if resErr != nil {
 		log.Printf("Failed at res, %s\n", err)
 	}
 
 	defer res.Body.Close()
 
 	returnedBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		log.Printf("Could not read returned body, %s\n", err)
+	}
 
 	err = json.Unmarshal(returnedBody, &myAnimeListJwt)
 	if err != nil {
@@ -287,17 +301,23 @@ func refreshMyAnimeListAuthorizationToken() {
 		Title:   "MyAnimeList Authorization",
 		Message: "It is now safe to close your browser tab",
 	})
-
 	if err != nil {
 		fmt.Println(err)
 	}
-
-	return
 }
 
 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)
@@ -307,7 +327,6 @@ func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 	req.Header.Add("myAnimeList-api-key", Environment.MAL_CLIENT_ID)
 
 	response, err := client.Do(req)
-
 	if err != nil {
 		log.Printf("Failed at request, %s\n", err)
 		return MyAnimeListUser{}
@@ -325,17 +344,17 @@ func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 	}
 
 	return user
+
 }
 
 func (a *App) LogoutMyAnimeList() string {
 	if (MyAnimeListJWT{} != myAnimeListJwt) {
-		err := myAnimeListRing.Remove("MyAnimeListTokenType")
+		typeErr := myAnimeListRing.Remove("MyAnimeListTokenType")
-		err = myAnimeListRing.Remove("MyAnimeListExpiresIn")
+		expiresInErr := myAnimeListRing.Remove("MyAnimeListExpiresIn")
-		err = myAnimeListRing.Remove("MyAnimeListAccessToken")
+		accessTokenErr := myAnimeListRing.Remove("MyAnimeListAccessToken")
-		err = myAnimeListRing.Remove("MyAnimeListRefreshToken")
+		refreshTokenErr := myAnimeListRing.Remove("MyAnimeListRefreshToken")
-
+		if typeErr != nil || expiresInErr != nil || accessTokenErr != nil || refreshTokenErr != nil {
-		if err != nil {
+			fmt.Println("MAL Logout Failed")
-			fmt.Println("MAL Logout Failed", err)
 		}
 		myAnimeListJwt = MyAnimeListJWT{}
 	}

SimklFunctions.go

@@ -8,6 +8,7 @@ import (
 	"log"
 	"net/http"
 	"reflect"
+	"slices"
 	"strconv"
 )
 
@@ -30,7 +31,6 @@ func SimklHelper(method string, url string, body interface{}) json.RawMessage {
 	req.Header.Add("simkl-api-key", Environment.SIMKL_CLIENT_ID)
 
 	resp, err := client.Do(req)
-
 	if err != nil {
 		fmt.Println("Errored when sending request to the server")
 		message, _ := json.Marshal(struct {
@@ -46,12 +46,11 @@ func SimklHelper(method string, url string, body interface{}) json.RawMessage {
 	respBody, _ := io.ReadAll(resp.Body)
 
 	return respBody
-
 }
 
 func (a *App) SimklGetUserWatchlist() SimklWatchListType {
 	method := "GET"
-	url := "https://api.simkl.com/sync/all-items/anime/watching"
+	url := "https://api.simkl.com/sync/all-items/anime"
 
 	respBody := SimklHelper(method, url, nil)
 
@@ -61,7 +60,6 @@ func (a *App) SimklGetUserWatchlist() SimklWatchListType {
 	}
 
 	err := json.Unmarshal(respBody, &errCheck)
-
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
@@ -84,7 +82,6 @@ func (a *App) SimklGetUserWatchlist() SimklWatchListType {
 }
 
 func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {
-
 	var episodes []Episode
 	var url string
 	var shows []SimklPostShow
@@ -132,12 +129,14 @@ func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {
 
 	anime.WatchedEpisodesCount = progress
 
+	WatchListUpdate(anime)
+
 	return anime
 }
 
 func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
 	var url string
-	var showWithRating = ShowWithRating{
+	showWithRating := ShowWithRating{
 		Title: anime.Show.Title,
 		Ids: Ids{
 			Simkl:   anime.Show.Ids.Simkl,
@@ -147,7 +146,7 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
 		Rating: rating,
 	}
 
-	var showWithoutRating = ShowWithoutRating{
+	showWithoutRating := ShowWithoutRating{
 		Title: anime.Show.Title,
 		Ids: Ids{
 			Simkl:   anime.Show.Ids.Simkl,
@@ -187,12 +186,14 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
 
 	anime.UserRating = rating
 
+	WatchListUpdate(anime)
+
 	return anime
 }
 
 func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {
 	url := "https://api.simkl.com/sync/add-to-list"
-	var show = SimklShowStatus{
+	show := SimklShowStatus{
 		Title: anime.Show.Title,
 		Ids: Ids{
 			Simkl:   anime.Show.Ids.Simkl,
@@ -227,6 +228,8 @@ func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {
 
 	anime.Status = status
 
+	WatchListUpdate(anime)
+
 	return anime
 }
 
@@ -259,7 +262,6 @@ func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
 		if len(anime) == 0 {
 			url = "https://api.simkl.com/search/id?mal=" + strconv.Itoa(aniListAnime.Media.IDMal)
 			respBody = SimklHelper("GET", url, nil)
-			fmt.Println(string(respBody))
 			err = json.Unmarshal(respBody, &anime)
 		}
 
@@ -291,7 +293,9 @@ func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
 
 func (a *App) SimklSyncRemove(anime SimklAnime) bool {
 	url := "https://api.simkl.com/sync/history/remove"
-	var show = SimklShowStatus{
+	var showArray []SimklShowStatus
+
+	singleShow := SimklShowStatus{
 		Title: anime.Show.Title,
 		Ids: Ids{
 			Simkl:   anime.Show.Ids.Simkl,
@@ -300,6 +304,14 @@ func (a *App) SimklSyncRemove(anime SimklAnime) bool {
 		},
 	}
 
+	showArray = append(showArray, singleShow)
+
+	show := struct {
+		Shows []SimklShowStatus `json:"shows"`
+	}{
+		Shows: showArray,
+	}
+
 	respBody := SimklHelper("POST", url, show)
 
 	var success SimklDeleteType
@@ -310,8 +322,26 @@ func (a *App) SimklSyncRemove(anime SimklAnime) bool {
 	}
 
 	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
 	} else {
 		return false
 	}
 }
+
+func WatchListUpdate(anime SimklAnime) {
+	updated := false
+	for i, simklAnime := range SimklWatchList.Anime {
+		if simklAnime.Show.Ids.Simkl == anime.Show.Ids.Simkl {
+			SimklWatchList.Anime[i] = anime
+			updated = true
+		}
+	}
+	if !updated {
+		SimklWatchList.Anime = append(SimklWatchList.Anime, anime)
+	}
+}

SimklUserFunctions.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -17,17 +18,21 @@ import (
 var simklJwt SimklJWT
 
 var simklRing, _ = keyring.Open(keyring.Config{
-	ServiceName: "AniTrack",
+	ServiceName:                    "AniTrack",
+	KeychainName:                   "AniTrack",
+	KeychainSynchronizable:         false,
+	KeychainTrustApplication:       true,
+	KeychainAccessibleWhenUnlocked: true,
 })
 
 var simklCtxShutdown, simklCancel = context.WithCancel(context.Background())
 
 func (a *App) CheckIfSimklLoggedIn() bool {
 	if (SimklJWT{} == simklJwt) {
-		tokenType, err := simklRing.Get("SimklTokenType")
+		tokenType, tokenTypeErr := simklRing.Get("SimklTokenType")
-		accessToken, err := simklRing.Get("SimklAccessToken")
+		accessToken, accessTokenErr := simklRing.Get("SimklAccessToken")
-		scope, err := simklRing.Get("SimklScope")
+		scope, scopeErr := simklRing.Get("SimklScope")
-		if err != nil || len(accessToken.Data) == 0 {
+		if (tokenTypeErr != nil || accessTokenErr != nil || scopeErr != nil) || len(accessToken.Data) == 0 {
 			return false
 		} else {
 			simklJwt.TokenType = string(tokenType.Data)
@@ -41,11 +46,11 @@ func (a *App) CheckIfSimklLoggedIn() bool {
 }
 
 func (a *App) SimklLogin() {
-	if a.CheckIfSimklLoggedIn() == false {
+	if !a.CheckIfSimklLoggedIn() {
-		tokenType, err := simklRing.Get("SimklTokenType")
+		tokenType, tokenTypeErr := simklRing.Get("SimklTokenType")
-		accessToken, err := simklRing.Get("SimklAccessToken")
+		accessToken, accessTokenErr := simklRing.Get("SimklAccessToken")
-		scope, err := simklRing.Get("SimklScope")
+		scope, scopeErr := simklRing.Get("SimklScope")
-		if err != nil || len(accessToken.Data) == 0 {
+		if (tokenTypeErr != nil || accessTokenErr != nil || scopeErr != nil) || len(accessToken.Data) == 0 {
 			getSimklCodeUrl := "https://simkl.com/oauth/authorize?response_type=code&client_id=" + Environment.SIMKL_CLIENT_ID + "&redirect_uri=" + Environment.SIMKL_CALLBACK_URI
 			runtime.BrowserOpenURL(*wailsContext, getSimklCodeUrl)
 
@@ -110,7 +115,7 @@ func (a *App) handleSimklCallback(wg *sync.WaitGroup) {
 
 	go func() {
 		defer wg.Done()
-		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			log.Fatalf("listen: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
@@ -143,14 +148,17 @@ func getSimklAuthorizationToken(content string) SimklJWT {
 	response.Header.Add("Content-Type", "application/json")
 
 	client := &http.Client{}
-	res, reserr := client.Do(response)
+	res, resErr := client.Do(response)
-	if reserr != nil {
+	if resErr != nil {
 		log.Printf("Failed at res, %s\n", err)
 	}
 
 	defer res.Body.Close()
 
 	returnedBody, err := io.ReadAll(res.Body)
+	if err != nil {
+		log.Printf("Could not read returned body, %s\n.", err)
+	}
 
 	var post SimklJWT
 	err = json.Unmarshal(returnedBody, &post)
@@ -173,7 +181,6 @@ func (a *App) GetSimklLoggedInUser() SimklUser {
 	req.Header.Add("simkl-api-key", Environment.SIMKL_CLIENT_ID)
 
 	response, err := client.Do(req)
-
 	if err != nil {
 		log.Printf("Failed at request, %s\n", err)
 		return SimklUser{}
@@ -189,7 +196,6 @@ func (a *App) GetSimklLoggedInUser() SimklUser {
 	}
 
 	err = json.Unmarshal(respBody, &errCheck)
-
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
@@ -211,12 +217,12 @@ func (a *App) GetSimklLoggedInUser() SimklUser {
 
 func (a *App) LogoutSimkl() string {
 	if (SimklJWT{} != simklJwt) {
-		err := simklRing.Remove("SimklTokenType")
+		tokenTypeErr := simklRing.Remove("SimklTokenType")
-		err = simklRing.Remove("SimklAccessToken")
+		accessTokenErr := simklRing.Remove("SimklAccessToken")
-		err = simklRing.Remove("SimklScope")
+		scopeErr := simklRing.Remove("SimklScope")
 
-		if err != nil {
+		if tokenTypeErr != nil || accessTokenErr != nil || scopeErr != nil {
-			fmt.Println("Simkl Logout Failed", err)
+			fmt.Println("Simkl Logout Failed")
 		}
 		simklJwt = SimklJWT{}
 	}

app.go

@@ -2,11 +2,19 @@ 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"
 )
 
+//go:embed wails.json
+var wailsJSON string
+
 var wailsContext *context.Context
 
 // App struct
@@ -22,7 +30,9 @@ func NewApp() *App {
 // startup is called when the app starts. The context is saved
 // so we can call the runtime methods
 func (a *App) startup(ctx context.Context) {
+	version := gjson.Get(wailsJSON, "info.productVersion")
 	wailsContext = &ctx
+	runtime.WindowSetTitle(ctx, "AniTrack "+version.String())
 	//runtime.WindowMaximise(ctx)
 }
 
@@ -35,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)
+	}
+}

bruno/AniTrack/AniList/Get Items/AniChart.bru

@@ -0,0 +1,90 @@
+meta {
+  name: AniChart
+  type: graphql
+  seq: 5
+}
+
+post {
+  url: https://graphql.anilist.co
+  body: graphql
+  auth: none
+}
+
+body:graphql {
+  # Write your query or mutation here
+  query ($page: Int, $perPage: Int, $airingAt_greater:Int) {
+    Page(page: $page, perPage: $perPage) {
+      pageInfo {
+        total
+        perPage
+        currentPage
+        lastPage
+        hasNextPage
+      }
+      airingSchedules(airingAt_greater:$airingAt_greater){
+        id
+        airingAt
+        timeUntilAiring
+        episode
+        mediaId
+        media{
+          id
+          title{
+            english
+            romaji
+            native
+          }
+          type
+          format
+          status
+          startDate{
+            year
+            month
+            day
+          }
+          endDate{
+            year
+            month
+            day
+          }
+          season
+          seasonYear
+          episodes
+          duration
+          coverImage{
+            medium
+            large
+            color
+            extraLarge
+          }
+          bannerImage
+          genres
+          averageScore
+          meanScore
+          popularity
+          trending
+          favourites
+          tags{
+            id
+            name
+            description
+            category
+            rank
+            isGeneralSpoiler
+            isMediaSpoiler
+            isAdult
+          }
+          isAdult
+        }
+      }
+    }
+  }
+}
+
+body:graphql:vars {
+  {
+    "page": 50,
+    "perPage": 20,
+    "airingAt_greater": 1730260800
+  }
+}

bruno/AniTrack/AniList/Get Items/AniList Item.bru

@@ -25,7 +25,8 @@ body:graphql {
       media {
         id
         idMal
-        tags{
+        genres
+        tags {
           id
           name
           description

bruno/AniTrack/AniList/Get Items/AniList Search.bru

@@ -33,6 +33,7 @@ body:graphql {
   						  english
   						  native
   						}
+        genre
   						description
   						coverImage {
   						  large

bruno/AniTrack/AniList/GetAuthorizationToken.bru

@@ -12,7 +12,7 @@ post {
 
 headers {
   Accept: application/json
-  Content-Type: application/json
+  Content-Type: application/x-www-form-urlencoded
 }
 
 body:form-urlencoded {
@@ -20,7 +20,7 @@ body:form-urlencoded {
   client_id: {{ANILIST_APP_ID}}
   client_secret: {{ANILIST_SECRET_TOKEN}}
   redirect_uri: http://localhost:6734/callback
-  code: {{code}}
+  code: {{ANILIST_CODE}}
 }
 
 body:multipart-form {

bruno/AniTrack/Simkl/Get Items/Get Anime Full Info.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: https://api.simkl.com/anime/1579943?extended=full
+  url: https://api.simkl.com/anime/40084?extended=full
   body: none
   auth: none
 }

bruno/AniTrack/Simkl/Get Items/GetUser WatchList.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: https://api.simkl.com/sync/all-items/anime/watching
+  url: https://api.simkl.com/sync/all-items/anime/
   body: none
   auth: none
 }

bruno/AniTrack/environments/Dev.bru

@@ -9,7 +9,7 @@ vars {
 }
 vars:secret [
   ANILIST_ACCESS_TOKEN,
-  code,
+  ANILIST_CODE,
   SIMKL_AUTH_TOKEN,
   MAL_CODE,
   MAL_VERIFIER,

build/AniTrack.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=AniTrack
+Comment=A manual synchronizer for various Anime trackers.
+Exec=/home/nymusicman/Applications/AniTrack
+Icon=AniTrack
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Internet
+Keywords=anitrack;anilist;simkl;mal;myanimelist;anime;sync
+Path=

build/darwin/Info.plist

@@ -1,6 +1,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
+        <key>NSAppTransportSecurity</key>
+        <dict>
+            <key>NSAllowsLocalNetworking</key>
+            <true />
+        </dict>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleName</key>

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/.vscode/extensions.json

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

frontend/index.html

@@ -1,13 +1,16 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
+    <head>
-    <meta charset="UTF-8"/>
+        <meta charset="UTF-8" />
-    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+        <meta content="width=device-width, initial-scale=1.0" name="viewport" />
-    <title>AniTrack</title>
+        <title>AniTrack</title>
-</head>
+    </head>
-<body>
+    <body>
-<div id="app"></div>
+        <div id="app"></div>
-<script src="./src/main.ts" type="module"></script>
+        <script src="./src/main.ts" type="module"></script>
-<script src="./node_modules/flowbite/dist/flowbite.js"></script>
+        <script
-</body>
+            src="./node_modules/flowbite/dist/flowbite.js"
+            type="module"
+        ></script>
+    </body>
 </html>

frontend/package.json

@@ -16,14 +16,14 @@
     "postcss": "^8.4.45",
     "svelte": "^4.0.0",
     "svelte-check": "^3.4.3",
-    "svelte-headless-table": "^0.18.2",
+    "svelte-headless-table": "^0.18.3",
     "svelte-preprocess": "^5.0.3",
     "svelte-spa-router": "^4.0.1",
     "tailwind-merge": "^2.5.2",
     "tailwindcss": "^3.4.10",
     "tslib": "^2.7.0",
     "typescript": "^5.0.0",
-    "vite": "^4.5.3"
+    "vite": "^4.5.5"
   },
   "dependencies": {
     "@popperjs/core": "^2.11.8",

frontend/src/App.svelte

@@ -1,44 +1,70 @@
 <script lang="ts">
-    import {
+  import {
-        aniListAnime,
+    aniListLoggedIn,
-        GetAnimeSingleItem,
+    malLoggedIn,
-    } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    simklLoggedIn,
-    import {onMount} from "svelte";
+    watchlistNeedsRefresh,
-    import Router from "svelte-spa-router"
+    aniListPrimary,
-    import Home from "./routes/Home.svelte";
+    malPrimary,
-    import {wrap} from "svelte-spa-router/wrap";
+    simklPrimary,
-    import Spinner from "./helperComponents/Spinner.svelte";
+    malWatchList,
-    import Header from "./helperComponents/Header.svelte";
+    simklWatchList,
-    import {CheckIfAniListLoggedInAndLoadWatchList} from "./helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
+  } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
-    import { CheckIfMALLoggedInAndSetUser } from "./helperModules/CheckIfMyAnimeListLoggedIn.svelte";
+  import { onMount } from "svelte";
-    import {CheckIfSimklLoggedInAndSetUser} from "./helperModules/CheckIsSimklLoggedIn.svelte"
+  import Router from "svelte-spa-router";
-    import {CheckIfAniListLoggedIn} from "../wailsjs/go/main/App";
+  import Home from "./routes/Home.svelte";
-    import {AniListGetSingleAnimeDefaultData} from "./helperDefaults/AniListGetSingleAnime";
+  import { wrap } from "svelte-spa-router/wrap";
+  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";
 
-    onMount(async () => {
+  onMount(async () => {
-        await CheckIfAniListLoggedInAndLoadWatchList()
+    let isAniListLoggedIn: boolean;
-        await CheckIfMALLoggedInAndSetUser()
+    let isMALLoggedIn: boolean;
-        await CheckIfSimklLoggedInAndSetUser()
+    let isSimklLoggedIn: boolean;
-    })
+    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
+    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+
+    !isAniListLoggedIn && (await CheckIfAniListLoggedInAndLoadWatchList());
+    !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 />
-<Router routes={{
+<Router
-    '/': Home,
+  routes={{
-    '/anime/:id': wrap({
+    "/": Home,
-        asyncComponent: () => import('./routes/AnimeRoutePage.svelte'),
+    "/anime/:id": wrap({
-        conditions: [
+      asyncComponent: () => import("./routes/AnimeRoutePage.svelte"),
-            async () => await CheckIfAniListLoggedIn(),
+      conditions: [async () => await CheckIfAniListLoggedIn()],
-            async (detail) => {
+      loadingComponent: Spinner,
-                aniListAnime.update(value => {
-                    value = AniListGetSingleAnimeDefaultData
-                    return value
-                })
-                await GetAnimeSingleItem(Number(detail.params.id), true)
-                return Object.keys($aniListAnime).length!==0
-            },
-        ],
-        loadingComponent: Spinner
     }),
     // '*': "Not Found"
-}} />
+  }}
+/>

frontend/src/anilist/types/AniListCurrentUserWatchListType.ts

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

frontend/src/helperComponents/AnimeTable.svelte

@@ -1,109 +1,113 @@
 <script lang="ts">
-    import {createTable, Render, Subscribe} from "svelte-headless-table";
+    import {
+        createRender,
+        createTable,
+        Render,
+        Subscribe,
+    } from "svelte-headless-table";
     // @ts-ignore
     import { addSortBy } from "svelte-headless-table/plugins";
-    import {tableItems} from "../helperModules/GlobalVariablesAndHelperFunctions.svelte"
+    import { tableItems } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    import WebsiteLink from "./WebsiteLink.svelte";
 
     //when adding sort here is code { sort: addSortBy() }
-    const table = createTable(tableItems, { sort: addSortBy() })
+    const table = createTable(tableItems, { sort: addSortBy() });
 
     const columns = table.createColumns([
         table.column({
             header: "Service Id",
-            accessor: 'id',
+            cell: ({ value }) => createRender(WebsiteLink, { id: value }),
+            accessor: "id",
         }),
         table.column({
             header: "Anime Title",
             accessor: "title",
         }),
         table.column({
-            header: 'Service',
+            header: "Service",
-            accessor: 'service',
+            accessor: "service",
         }),
         table.column({
-            header: 'Episode Progress',
+            header: "Episode Progress",
-            accessor: 'progress',
+            accessor: "progress",
         }),
         table.column({
-            header: 'Status',
+            header: "Status",
-            accessor: 'status',
+            accessor: "status",
         }),
         table.column({
-            header: 'Started At',
+            header: "Started At",
-            accessor: 'startedAt',
+            accessor: "startedAt",
         }),
         table.column({
-            header: 'Completed At',
+            header: "Completed At",
-            accessor: 'completedAt',
+            accessor: "completedAt",
         }),
         table.column({
-            header: 'Rating',
+            header: "Rating",
-            accessor: 'score',
+            accessor: "score",
         }),
         table.column({
-            header: 'Repeat',
+            header: "Repeat",
-            accessor: 'repeat',
+            accessor: "repeat",
         }),
         table.column({
-            header: 'Notes',
+            header: "Notes",
-            accessor: 'notes',
+            accessor: "notes",
         }),
-    ])
+    ]);
 
     //add pluginStates when add sort back
-    const {
+    const { headerRows, rows, tableAttrs, tableBodyAttrs } =
-        headerRows,
+        table.createViewModel(columns);
-        rows,
-        tableAttrs,
-        tableBodyAttrs,
-    } = table.createViewModel(columns)
 </script>
 
 <div class="relative overflow-x-auto rounded-lg mb-5">
     <table
-            class="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400"
+        class="w-full text-sm text-left rtl:text-right text-gray-400"
-            {...$tableAttrs}
+        {...$tableAttrs}
     >
-        <thead
+        <thead class="text-xs uppercase bg-gray-700 text-gray-400">
-                class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"
+            {#each $headerRows as headerRow (headerRow.id)}
-        >
+                <Subscribe attrs={headerRow.attrs()} let:attrs>
-        {#each $headerRows as headerRow (headerRow.id)}
+                    <tr {...attrs}>
-            <Subscribe attrs={headerRow.attrs()} let:attrs>
+                        {#each headerRow.cells as cell (cell.id)}
-                <tr {...attrs}>
+                            <Subscribe
-                    {#each headerRow.cells as cell (cell.id)}
+                                attrs={cell.attrs()}
-                        <Subscribe attrs={cell.attrs()} let:attrs props={cell.props()} let:props>
+                                let:attrs
-                            <th
+                                props={cell.props()}
+                                let:props
+                            >
+                                <th
                                     {...attrs}
                                     on:click={props.sort.toggle}
-                                    class:sorted={props.sort.order !== undefined}
+                                    class:sorted={props.sort.order !==
+                                        undefined}
                                     class="px-6 py-3"
-                            >
+                                >
-                                <div>
+                                    <div>
-                                    <Render of={cell.render()}/>
+                                        <Render of={cell.render()} />
-                                    {#if props.sort.order === 'asc'}
+                                        {#if props.sort.order === "asc"}
-                                        ⬇️
+                                            ⬇️
-                                    {:else if props.sort.order === 'desc'}
+                                        {:else if props.sort.order === "desc"}
-                                        ⬆️
+                                            ⬆️
-                                    {/if}
+                                        {/if}
-                                </div>
+                                    </div>
-                            </th>
+                                </th>
-                        </Subscribe>
+                            </Subscribe>
-                    {/each}
+                        {/each}
-                </tr>
+                    </tr>
-            </Subscribe>
+                </Subscribe>
-        {/each}
+            {/each}
         </thead>
         <tbody {...$tableBodyAttrs}>
             {#each $rows as row (row.id)}
                 <Subscribe attrs={row.attrs()} let:attrs>
-                    <tr
+                    <tr {...attrs} class="bg-gray-800 border-gray-700">
-                            {...attrs}
-                            class="bg-white border-b dark:bg-gray-800 dark:border-gray-700"
-                    >
                         {#each row.cells as cell (cell.id)}
                             <Subscribe attrs={cell.attrs()} let:attrs>
                                 <td {...attrs} class="px-6 py-4">
-                                    <Render of={cell.render()}/>
+                                    <Render of={cell.render()} />
                                 </td>
                             </Subscribe>
                         {/each}

frontend/src/helperComponents/AvatarMenu.svelte

@@ -1,74 +1,161 @@
 <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, aniListUser, malLoggedIn, simklLoggedIn, logoutOfAniList, logoutOfMAL, logoutOfSimkl} from "../helperModules/GlobalVariablesAndHelperFunctions.svelte"
+        aniListLoggedIn,
+        aniListUser,
+        malUser,
+        simklUser,
+        malLoggedIn,
+        simklLoggedIn,
+        loginToAniList,
+        loginToMAL,
+        loginToSimkl,
+        logoutOfAniList,
+        logoutOfMAL,
+        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 currentAniListUser: AniListUser;
-    let isAniListLoggedIn: boolean
+    let currentMALUser: MyAnimeListUser;
-    let isSimklLoggedIn: boolean
+    let currentSimklUser: SimklUser;
-    let isMALLoggedIn: boolean
+    let isAniListLoggedIn: boolean;
+    let isSimklLoggedIn: boolean;
+    let isMALLoggedIn: boolean;
 
-    aniListUser.subscribe((value) => currentAniListUser = value)
+    aniListUser.subscribe((value) => (currentAniListUser = value));
-    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
+    malUser.subscribe((value) => (currentMALUser = value))
-    simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
+    simklUser.subscribe(value => currentSimklUser = value)
-    malLoggedIn.subscribe((value) => isMALLoggedIn = value)
+    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+    malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
 
     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")
-        dropdown.classList.toggle("hidden")
+        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>
 
 <div class="relative">
     <button id="userDropdownButton" on:click={dropdownUser}>
         {#if isAniListLoggedIn}
-            <Avatar src="{currentAniListUser.data.Viewer.avatar.medium}" class="cursor-pointer"
+            <Avatar
-                    dot={{ color: 'green' }}/>
+                src={currentAniListUser.data.Viewer.avatar.medium}
+                class="cursor-pointer"
+                dot={{ color: "green" }}
+            />
         {:else}
-            <Avatar class="cursor-pointer" dot={{ color: 'red' }}/>
+            <Avatar class="cursor-pointer" dot={{ color: "red" }} />
         {/if}
     </button>
-    <div id="userDropdown"
+    <div
-         class="absolute hidden right-0 2xl:left-1/2 2xl:-translate-x-1/2 z-10 bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700 dark:divide-gray-600">
+        id="userDropdown"
-        <div class="px-4 py-3 text-sm text-gray-900 dark:text-white">
+        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-700 dark:text-gray-200"
+        <ul
-            aria-labelledby="dropdownUserAvatarButton">
+            class="py-2 text-sm text-gray-200"
+            aria-labelledby="dropdownUserAvatarButton"
+        >
             {#if isAniListLoggedIn}
                 <li>
-                    <button on:click={logoutOfAniList}
+                    <button
-                            class="block px-4 py-2 w-full hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
+                        on:click={logoutOfAniList}
-                        Logout Anilist
+                        class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-green-800 hover:text-white"
+                    >
+                        <span class="maple-font text-lg text-green-200 mr-4">A</span>Logout {currentAniListUser.data.Viewer.name}
+                    </button>
+                </li>
+                {:else}
+                <li>
+                    <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>
                 </li>
             {/if}
             {#if isMALLoggedIn}
                 <li>
-                    <button on:click={logoutOfMAL}
+                    <button
-                            class="block px-4 py-2 w-full hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
+                        on:click={logoutOfMAL}
-                        Logout MAL
+                        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 text-blue-200 mr-4">M</span>Logout {currentMALUser.name}
+                    </button>
+                </li>
+            {:else}
+                <li>
+                    <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>
                 </li>
             {/if}
             {#if isSimklLoggedIn}
                 <li>
-                    <button on:click={logoutOfSimkl}
+                    <button
-                            class="block px-4 py-2 w-full hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
+                        on:click={logoutOfSimkl}
-                        Logout Simkl
+                        class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-indigo-800 hover:text-white"
+                    >
+                        <span class="maple-font text-lg text-indigo-200 mr-4">S</span>Logout {currentSimklUser.user.name}
+                    </button>
+                </li>
+            {:else}
+                <li>
+                    <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>
                 </li>
             {/if}
         </ul>
         <div class="py-2">
-            <button on:click={() => runtime.Quit()}
+            <button
-                    class="block px-4 py-2 w-full text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">
+                    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"
+            >
                 Exit Application
             </button>
         </div>

frontend/src/helperComponents/Datepicker.svelte

@@ -0,0 +1,481 @@
+<script lang="ts">
+    import { createEventDispatcher, onMount } from "svelte";
+    import { fade } from "svelte/transition";
+    import { Button } from "flowbite-svelte";
+
+    export let value: Date | null = null;
+    export let defaultDate: Date | null = null;
+    export let range: boolean = false;
+    export let rangeFrom: Date | null = null;
+    export let rangeTo: Date | null = null;
+    export let locale: string = "default";
+    export let firstDayOfWeek: number = 0; // 0 = Monday, 6 = Sunday
+    export let dateFormat: Intl.DateTimeFormatOptions = {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+    };
+    export let placeholder: string = "Select date";
+    export let disabled: boolean = false;
+    export let required: boolean = false;
+    export let inputClass: string = "";
+    export let color: Button["color"] = "primary";
+    export let inline: boolean = false;
+    export let autohide: boolean = true;
+    export let showActionButtons: boolean = false;
+    export let title: string = "";
+
+    // Internal state
+    const dispatch = createEventDispatcher();
+    let isOpen: boolean = inline;
+    let inputElement: HTMLInputElement;
+    let datepickerContainerElement: HTMLDivElement;
+    let currentMonth: Date = value || defaultDate || new Date();
+    let focusedDate: Date | null = null;
+    let calendarRef: HTMLDivElement;
+
+    $: daysInMonth = getDaysInMonth(currentMonth);
+    $: weekdays = getWeekdays();
+
+    onMount(() => {
+        if (!inline) {
+            document.addEventListener("click", handleClickOutside);
+            return () => {
+                document.removeEventListener("click", handleClickOutside);
+            };
+        }
+    });
+
+    // Color handling functions
+    function getFocusRingClass(color: Button["color"]): string {
+        switch (color) {
+            case "primary":
+                return "focus:ring-2 focus:ring-primary-400";
+            case "blue":
+                return "focus:ring-2 focus:ring-blue-400";
+            case "red":
+                return "focus:ring-2 focus:ring-red-400";
+            case "green":
+                return "focus:ring-2 focus:ring-green-400";
+            case "yellow":
+                return "focus:ring-2 focus:ring-yellow-400";
+            case "purple":
+                return "focus:ring-2 focus:ring-purple-400";
+            case "slate":
+                return "focus:ring-2 focus:ring-slate-400";
+            default:
+                return "";
+        }
+    }
+
+    function getRangeBackgroundClass(color: Button["color"]): string {
+        switch (color) {
+            case "primary":
+                return "bg-primary-900";
+            case "blue":
+                return "bg-blue-900";
+            case "red":
+                return "bg-red-900";
+            case "green":
+                return "bg-green-900";
+            case "yellow":
+                return "bg-yellow-900";
+            case "purple":
+                return "bg-purple-900";
+            case "slate":
+                return "bg-slate-900";
+            default:
+                return "";
+        }
+    }
+
+    function getDaysInMonth(date: Date): Date[] {
+        const year = date.getFullYear();
+        const month = date.getMonth();
+        const firstDay = new Date(year, month, 0);
+        const lastDay = new Date(year, month + 1, 0);
+        const daysArray: Date[] = [];
+
+        // Add days from previous month to fill the first week
+        let start = firstDay.getDay() - firstDayOfWeek;
+        if (start < 0) start += 7;
+        for (let i = 0; i < start; i++) {
+            daysArray.unshift(new Date(year, month, -i));
+        }
+
+        // Add days of the current month
+        for (let i = 1; i <= lastDay.getDate(); i++) {
+            daysArray.push(new Date(year, month, i));
+        }
+
+        // Add days from next month to fill the last week
+        const remainingDays = 7 - (daysArray.length % 7);
+        if (remainingDays < 7) {
+            for (let i = 1; i <= remainingDays; i++) {
+                daysArray.push(new Date(year, month + 1, i));
+            }
+        }
+
+        return daysArray;
+    }
+
+    function getWeekdays(): string[] {
+        const weekdays = [];
+        for (let i = 0; i < 7; i++) {
+            const day = new Date(2021, 5, i + firstDayOfWeek);
+            weekdays.push(day.toLocaleString(locale, { weekday: "short" }));
+        }
+        return weekdays;
+    }
+
+    function changeMonth(increment: number) {
+        currentMonth = new Date(
+            currentMonth.getFullYear(),
+            currentMonth.getMonth() + increment,
+            1,
+        );
+    }
+
+    function handleDaySelect(day: Date) {
+        if (range) {
+            if (!rangeFrom || (rangeFrom && rangeTo)) {
+                rangeFrom = day;
+                rangeTo = null;
+            } else if (day < rangeFrom) {
+                rangeTo = rangeFrom;
+                rangeFrom = day;
+            } else {
+                rangeTo = day;
+            }
+            dispatch("select", { from: rangeFrom, to: rangeTo });
+        } else {
+            value = day;
+            dispatch("select", value);
+            if (autohide && !inline) isOpen = false;
+        }
+    }
+
+    function handleInputChange() {
+        const date = new Date(inputElement.value);
+        if (!isNaN(date.getTime())) {
+            handleDaySelect(date);
+        }
+    }
+
+    function handleClickOutside(event: MouseEvent) {
+        if (
+            isOpen &&
+            datepickerContainerElement &&
+            !datepickerContainerElement.contains(event.target as Node)
+        ) {
+            isOpen = false;
+        }
+    }
+
+    function formatDate(date: Date | null): string {
+        if (!date) return "";
+        return date.toLocaleDateString(locale, dateFormat);
+    }
+
+    function isSameDate(date1: Date | null, date2: Date | null): boolean {
+        if (!date1 || !date2) return false;
+        return date1.toDateString() === date2.toDateString();
+    }
+
+    $: isSelected = (day: Date): boolean => {
+        if (range) {
+            return isSameDate(day, rangeFrom) || isSameDate(day, rangeTo);
+        }
+        return isSameDate(day, value);
+    };
+
+    function isInRange(day: Date): boolean {
+        if (!range || !rangeFrom || !rangeTo) return false;
+        return day > rangeFrom && day < rangeTo;
+    }
+
+    function isToday(day: Date): boolean {
+        const today = new Date();
+        return day.toDateString() === today.toDateString();
+    }
+
+    function handleCalendarKeydown(event: KeyboardEvent) {
+        if (!isOpen) return;
+
+        if (!focusedDate) {
+            focusedDate = value || new Date();
+        }
+
+        switch (event.key) {
+            case "ArrowLeft":
+                focusedDate = new Date(
+                    focusedDate.getFullYear(),
+                    focusedDate.getMonth(),
+                    focusedDate.getDate() - 1,
+                );
+                break;
+            case "ArrowRight":
+                focusedDate = new Date(
+                    focusedDate.getFullYear(),
+                    focusedDate.getMonth(),
+                    focusedDate.getDate() + 1,
+                );
+                break;
+            case "ArrowUp":
+                focusedDate = new Date(
+                    focusedDate.getFullYear(),
+                    focusedDate.getMonth(),
+                    focusedDate.getDate() - 7,
+                );
+                break;
+            case "ArrowDown":
+                focusedDate = new Date(
+                    focusedDate.getFullYear(),
+                    focusedDate.getMonth(),
+                    focusedDate.getDate() + 7,
+                );
+                break;
+            case "Enter":
+                handleDaySelect(focusedDate);
+                break;
+            case "Escape":
+                isOpen = false;
+                inputElement.focus();
+                break;
+            default:
+                return;
+        }
+
+        event.preventDefault();
+        if (focusedDate.getMonth() !== currentMonth.getMonth()) {
+            currentMonth = new Date(
+                focusedDate.getFullYear(),
+                focusedDate.getMonth(),
+                1,
+            );
+        }
+
+        // Focus the button for the focused date
+        setTimeout(() => {
+            const focusedButton = calendarRef.querySelector(
+                `button[aria-label="${focusedDate!.toLocaleDateString(locale, { weekday: "long", year: "numeric", month: "long", day: "numeric" })}"]`,
+            ) as HTMLButtonElement | null;
+            focusedButton?.focus();
+        }, 0);
+    }
+
+    function handleInputKeydown(event: KeyboardEvent) {
+        if (event.key === "Enter" || event.key === " ") {
+            event.preventDefault();
+            isOpen = !isOpen;
+        }
+    }
+
+    function handleToday() {
+        handleDaySelect(new Date());
+    }
+
+    function handleClear() {
+        value = null;
+        rangeFrom = null;
+        rangeTo = null;
+        dispatch("clear");
+    }
+
+    function handleApply() {
+        dispatch("apply", range ? { from: rangeFrom, to: rangeTo } : value);
+        if (!inline) isOpen = false;
+    }
+</script>
+
+<div
+    bind:this={datepickerContainerElement}
+    class="relative {inline ? 'inline-block' : ''}"
+>
+    {#if !inline}
+        <div class="relative">
+            <input
+                bind:this={inputElement}
+                type="text"
+                class="w-full px-4 py-3 text-sm border rounded-md focus:outline-none bg-gray-700 text-white border-gray-600 {getFocusRingClass(
+                    color,
+                )} {inputClass}"
+                {placeholder}
+                value={range
+                    ? `${formatDate(rangeFrom)} - ${formatDate(rangeTo)}`
+                    : formatDate(value)}
+                on:focus={() => (isOpen = true)}
+                on:input={handleInputChange}
+                on:keydown={handleInputKeydown}
+                {disabled}
+                {required}
+                aria-haspopup="dialog"
+            />
+            <button
+                type="button"
+                class="absolute inset-y-0 right-0 flex items-center px-3 text-gray-400 focus:outline-none"
+                on:click={() => (isOpen = !isOpen)}
+                {disabled}
+                aria-label={isOpen ? "Close date picker" : "Open date picker"}
+            >
+                <svg
+                    class="w-4 h-4 text-gray-400"
+                    aria-hidden="true"
+                    xmlns="http://www.w3.org/2000/svg"
+                    fill="currentColor"
+                    viewBox="0 0 20 20"
+                >
+                    <path
+                        d="M20 4a2 2 0 0 0-2-2h-2V1a1 1 0 0 0-2 0v1h-3V1a1 1 0 0 0-2 0v1H6V1a1 1 0 0 0-2 0v1H2a2 2 0 0 0-2 2v2h20V4ZM0 18a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V8H0v10Zm5-8h10a1 1 0 0 1 0 2H5a1 1 0 0 1 0-2Z"
+                    ></path>
+                </svg>
+            </button>
+        </div>
+    {/if}
+
+    {#if isOpen || inline}
+        <div
+            bind:this={calendarRef}
+            id="datepicker-dropdown"
+            class="
+        {inline ? '' : 'absolute z-10 mt-1'}
+        bg-gray-800 rounded-md shadow-lg"
+            transition:fade={{ duration: 100 }}
+            role="dialog"
+            aria-label="Calendar"
+        >
+            <div class="p-4" role="application">
+                {#if title}
+                    <h2 class="text-lg font-semibold mb-4 text-white">
+                        {title}
+                    </h2>
+                {/if}
+                <div class="flex items-center justify-between mb-4">
+                    <Button
+                        on:click={() => changeMonth(-1)}
+                        {color}
+                        size="sm"
+                        aria-label="Previous month"
+                    >
+                        <svg
+                            class="w-3 h-3 rtl:rotate-180 text-white"
+                            aria-hidden="true"
+                            xmlns="http://www.w3.org/2000/svg"
+                            fill="none"
+                            viewBox="0 0 14 10"
+                            ><path
+                                stroke="currentColor"
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                stroke-width="2"
+                                d="M13 5H1m0 0 4 4M1 5l4-4"
+                            ></path></svg
+                        >
+                    </Button>
+                    <h3
+                        class="text-lg font-semibold text-white"
+                        aria-live="polite"
+                    >
+                        {currentMonth.toLocaleString(locale, {
+                            month: "long",
+                            year: "numeric",
+                        })}
+                    </h3>
+                    <Button
+                        on:click={() => changeMonth(1)}
+                        {color}
+                        size="sm"
+                        aria-label="Next month"
+                    >
+                        <svg
+                            class="w-3 h-3 rtl:rotate-180 text-white"
+                            aria-hidden="true"
+                            xmlns="http://www.w3.org/2000/svg"
+                            fill="none"
+                            viewBox="0 0 14 10"
+                            ><path
+                                stroke="currentColor"
+                                stroke-linecap="round"
+                                stroke-linejoin="round"
+                                stroke-width="2"
+                                d="M1 5h12m0 0L9 1m4 4L9 9"
+                            ></path></svg
+                        >
+                    </Button>
+                </div>
+                <div class="grid grid-cols-7 gap-1" role="grid">
+                    {#each weekdays as day}
+                        <div
+                            class="text-center text-sm font-medium text-gray-400"
+                            role="columnheader"
+                        >
+                            {day}
+                        </div>
+                    {/each}
+                    {#each daysInMonth as day}
+                        <Button
+                            color={isSelected(day) ? color : "alternative"}
+                            size="sm"
+                            class="w-full h-8 {day.getMonth() !==
+                            currentMonth.getMonth()
+                                ? 'text-gray-600'
+                                : ''} {isToday(day)
+                                ? 'font-bold'
+                                : ''} {isInRange(day)
+                                ? getRangeBackgroundClass(color)
+                                : ''}"
+                            on:click={() => handleDaySelect(day)}
+                            on:keydown={handleCalendarKeydown}
+                            aria-label={day.toLocaleDateString(locale, {
+                                weekday: "long",
+                                year: "numeric",
+                                month: "long",
+                                day: "numeric",
+                            })}
+                            aria-selected={isSelected(day)}
+                            role="gridcell"
+                        >
+                            {day.getDate()}
+                        </Button>
+                    {/each}
+                </div>
+                {#if showActionButtons}
+                    <div class="mt-4 flex justify-between">
+                        <Button on:click={handleToday} {color} size="sm"
+                            >Today</Button
+                        >
+                        <Button on:click={handleClear} color="red" size="sm"
+                            >Clear</Button
+                        >
+                        <Button on:click={handleApply} {color} size="sm"
+                            >Apply</Button
+                        >
+                    </div>
+                {/if}
+            </div>
+        </div>
+    {/if}
+</div>
+
+<!--
+@component
+[Go to docs](https://flowbite-svelte.com/)
+## Props
+@prop export let value: Date | null = null;
+@prop export let defaultDate: Date | null = null;
+@prop export let range: boolean = false;
+@prop export let rangeFrom: Date | null = null;
+@prop export let rangeTo: Date | null = null;
+@prop export let locale: string = 'default';
+@prop export let firstDayOfWeek: number = 0;
+@prop export let dateFormat: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' };
+@prop export let placeholder: string = 'Select date';
+@prop export let disabled: boolean = false;
+@prop export let required: boolean = false;
+@prop export let inputClass: string = '';
+@prop export let color: Button['color'] = 'primary';
+@prop export let inline: boolean = false;
+@prop export let autohide: boolean = true;
+@prop export let showActionButtons: boolean = false;
+@prop export let title: string = '';
+-->

frontend/src/helperComponents/Header.svelte

@@ -1,106 +1,102 @@
 <script lang="ts">
-    import Search from "./Search.svelte"
+    import Search from "./Search.svelte";
     import {
         aniListLoggedIn,
-        aniListUser,
         loginToAniList,
         loginToMAL,
         loginToSimkl,
         malLoggedIn,
-        malUser,
         simklLoggedIn,
-        simklUser,
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte"
-    import type {AniListUser} from "../anilist/types/AniListTypes";
-    import type {SimklUser} from "../simkl/types/simklTypes";
-    import type {MyAnimeListUser} from "../mal/types/MALTypes";
     import AvatarMenu from "./AvatarMenu.svelte";
-    import logo from "../assets/images/AniTrackLogo.svg"
+    import logo from "../assets/images/AniTrackLogo.svg";
-    import {location} from "svelte-spa-router";
+    import { link } from "svelte-spa-router";
 
-    let isAniListLoggedIn: boolean
+    let isAniListLoggedIn: boolean;
-    let isSimklLoggedIn: boolean
+    let isSimklLoggedIn: boolean;
-    let isMALLoggedIn: boolean
+    let isMALLoggedIn: boolean;
-    let currentAniListUser: AniListUser
-    let currentSimklUser: SimklUser
-    let currentMALUser: MyAnimeListUser
 
-    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));
-    aniListUser.subscribe((value) => currentAniListUser = value)
-    simklUser.subscribe((value) => currentSimklUser = value)
-    malUser.subscribe((value) => currentMALUser = value)
-
-    let currentLocation: any
-    location.subscribe(value => currentLocation = value)
 </script>
 
-<nav class="bg-white border-gray-200 dark:bg-gray-900">
+<nav class="border-gray-200 bg-gray-900">
-    <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+    <div
+        class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4"
+    >
         <div class="flex items-center space-x-3 rtl:space-x-reverse">
-                <a href="/"><img src={logo} class="h-8" alt="AniTrack Logo"/></a>
+            <a href="/" use:link
+                ><img src={logo} class="h-8" alt="AniTrack Logo" /></a
+            >
         </div>
-        <div class="flex items-center min-[950px]:order-2 space-x-3 min-[950px]:space-x-0 rtl:space-x-reverse">
+        <div
+            class="flex items-center min-[950px]:order-2 space-x-3 min-[950px]:space-x-0 rtl:space-x-reverse"
+        >
             <div class="min-[950px]:block min-[950px]:mr-4">
                 <Search />
             </div>
-            <AvatarMenu/>
+            <AvatarMenu />
-            <button on:click={() => {
+            <button
-                let menu = document.querySelector("#navbar-user")
+                on:click={() => {
-                menu.classList.toggle("hidden")
+                    let menu = document.querySelector("#navbar-user");
-            }} type="button"
+                    menu.classList.toggle("hidden");
-                    class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg min-[950px]:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
+                }}
-                    aria-controls="navbar-user" aria-expanded="false">
+                type="button"
+                class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm rounded-lg min-[950px]:hidden focus:outline-none focus:ring-2 text-gray-400 hover:bg-gray-700 focus:ring-gray-600"
+                aria-controls="navbar-user"
+                aria-expanded="false"
+            >
                 <span class="sr-only">Open main menu</span>
-                <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"
+                <svg
-                     viewBox="0 0 17 14">
+                    class="w-5 h-5"
-                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                    aria-hidden="true"
-                          d="M1 1h15M1 7h15M1 13h15"/>
+                    xmlns="http://www.w3.org/2000/svg"
+                    fill="none"
+                    viewBox="0 0 17 14"
+                >
+                    <path
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="2"
+                        d="M1 1h15M1 7h15M1 13h15"
+                    />
                 </svg>
             </button>
         </div>
-        <div class="hidden items-center justify-between w-full pb-4 min-[950px]:pb-0 min-[950px]:flex min-[950px]:w-auto min-[950px]:order-1 border border-gray-100 dark:border-gray-700 min-[950px]:border-0 bg-gray-50 dark:bg-gray-800 min-[950px]:bg-transparent min-[950px]:dark:bg-transparent rounded-lg" id="navbar-user">
+        <div
-            <ul class="flex flex-col font-medium pb-6 min-[950px]:p-0 mt-4 min-[950px]:space-x-8 rtl:space-x-reverse min-[950px]:flex-row min-[950px]:mt-0">
+            class="hidden items-center justify-between w-full pb-4 min-[950px]:pb-0 min-[950px]:flex min-[950px]:w-auto min-[950px]:order-1 border border-gray-700 min-[950px]:border-0 bg-gray-800 min-[950px]:bg-transparent rounded-lg"
+            id="navbar-user"
+        >
+            <ul
+                class="flex flex-col font-medium pb-6 min-[950px]:p-0 mt-4 min-[950px]:space-x-8 rtl:space-x-reverse min-[950px]:flex-row min-[950px]:mt-0"
+            >
                 <li>
-                    {#if isAniListLoggedIn}
+                    {#if !isAniListLoggedIn}
-                        <div class="flex justify-center py-2 px-3 rounded bg-transparent min-[950px]:p-0">
+                        <button on:click={loginToAniList}>
-                            <span class="w-48 min-[950px]:w-auto bg-green-100 text-green-800 text-sm font-medium me-2 px-3 py-2 rounded dark:bg-green-800 dark:text-green-200 cursor-default">AniList: {currentAniListUser.data.Viewer.name}</span>
+                            <!--                                class="block py-2 px-3 w-full min-[950px]:w-auto rounded text-gray-300 min-[950px]:hover:text-blue-500 hover:bg-gray-700 hover:text-white min-[950px]:hover:bg-transparent border-gray-700">-->
-                        </div>
-                    {:else}
-                        <button on:click={loginToAniList}
-                                class="block py-2 px-3 text-gray-900 w-full min-[950px]:w-auto rounded hover:bg-gray-100 min-[950px]:hover:bg-transparent min-[950px]:hover:text-blue-700 min-[950px]:p-0 dark:text-white min-[950px]:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white min-[950px]:dark:hover:bg-transparent dark:border-gray-700">
                             AniList Login
                         </button>
                     {/if}
-                </li>
+                    {#if !isMALLoggedIn}
-                <li>
+                        <button on:click={loginToMAL}>
-                    {#if isMALLoggedIn}
+                            <!--                                class="block py-2 px-3 w-full min-[950px]:w-auto rounded min-[950px]:p-0 text-gray-300 min-[950px]:hover:text-blue-500 hover:bg-gray-700 hover:text-white min-[950px]:hover:bg-transparent border-gray-700">-->
-                        <div class="flex justify-center py-2 px-3 rounded bg-transparent min-[950px]:p-0">
-                            <span class="w-48 min-[950px]:w-auto bg-blue-100 text-blue-800 text-sm font-medium me-2 px-3 py-2 rounded dark:bg-blue-800 dark:text-blue-200 cursor-default">MyAnimeList: {currentMALUser.name}</span>
-                        </div>
-                    {:else}
-                        <button on:click={loginToMAL}
-                                class="block py-2 px-3 text-gray-900 w-full min-[950px]:w-auto rounded hover:bg-gray-100 min-[950px]:hover:bg-transparent min-[950px]:hover:text-blue-700 min-[950px]:p-0 dark:text-white min-[950px]:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white min-[950px]:dark:hover:bg-transparent dark:border-gray-700">
                             MyAnimeList Login
                         </button>
                     {/if}
                 </li>
                 <li>
-                    {#if isSimklLoggedIn}
+                    {#if !isSimklLoggedIn}
-                        <div class="flex justify-center py-2 px-3 rounded bg-transparent min-[950px]:p-0">
+                        <button on:click={loginToSimkl}>
-                            <span class="w-48 min-[950px]:w-auto bg-indigo-100 text-indigo-800 text-sm font-medium me-2 px-3 py-2 rounded dark:bg-indigo-800 dark:text-indigo-200 cursor-default">Simkl: {currentSimklUser.user.name}</span>
+                            <!--                                class="block py-2 px-3 w-full min-[950px]:w-auto rounded min-[950px]:p-0 text-gray-300 min-[950px]:hover:text-blue-500 hover:bg-gray-700 hover:text-white min-[950px]:hover:bg-transparent border-gray-700">-->
-                        </div>
-                    {:else}
-                        <button on:click={loginToSimkl}
-                                class="block py-2 px-3 text-gray-900 w-full min-[950px]:w-auto rounded hover:bg-gray-100 min-[950px]:hover:bg-transparent min-[950px]:hover:text-blue-700 min-[950px]:p-0 dark:text-white min-[950px]:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white min-[950px]:dark:hover:bg-transparent dark:border-gray-700">
                             Simkl Login
                         </button>
                     {/if}
                 </li>
             </ul>
             <div class="flex justify-center min-[950px]:hidden">
-                <Search/>
+                <Search />
             </div>
         </div>
     </div>

frontend/src/helperComponents/Pagination.svelte

@@ -1,145 +1,224 @@
 <script lang="ts">
-    import {
+  import {
-        aniListLoggedIn,
+    aniListLoggedIn,
-        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";
+  import { MediaListSort } from "../anilist/types/AniListTypes";
 
-    let aniListWatchListLoaded: AniListCurrentUserWatchList
+  let aniListWatchListLoaded: AniListCurrentUserWatchList;
-    let page: number
+  let page: number;
-    let perPage: number
+  let perPage: number;
 
-    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));
 
-    const perPageOptions = [10, 20, 50]
+  const perPageOptions = [10, 20, 50];
 
-    function ChangeWatchListPage(newPage: number) {
+  function ChangeWatchListPage(newPage: number) {
-        GetAniListUserWatchingList(newPage, perPage, MediaListSort.UpdatedTimeDesc).then((result) => {
+    GetAniListUserWatchingList(
-            watchListPage.set(newPage)
+      newPage,
-            aniListWatchlist.set(result)
+      perPage,
-            aniListLoggedIn.set(true)
+      MediaListSort.UpdatedTimeDesc,
-        })
+    ).then((result) => {
-    }
+      watchListPage.set(newPage);
+      aniListWatchlist.set(result);
+      aniListLoggedIn.set(true);
+    });
+  }
 
-    function changePage(e): void {
+  function changePage(
-        if ((e.key === "Enter" || e.key === "Tab") && Number(e.target.value) !== page) ChangeWatchListPage(Number(e.target.value))
+    e: KeyboardEvent & { currentTarget: HTMLInputElement },
-    }
+  ): void {
-
+    if (
-    function changeCountPerPage(e): void {
+      (e.key === "Enter" || e.key === "Tab") &&
-        GetAniListUserWatchingList(1, Number(e.target.value), MediaListSort.UpdatedTimeDesc).then((result) => {
+      Number(e.currentTarget.value) !== page
-            animePerPage.set(Number(e.target.value))
+    )
-            watchListPage.set(1)
+      ChangeWatchListPage(Number(e.currentTarget.value));
-            aniListWatchlist.set(result)
+  }
-            aniListLoggedIn.set(true)
-        })
-    }
 
+  function changeCountPerPage(
+    e: Event & { currentTarget: HTMLSelectElement },
+  ): void {
+    GetAniListUserWatchingList(
+      1,
+      Number(e.currentTarget.value),
+      MediaListSort.UpdatedTimeDesc,
+    ).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 disabled
+            <button
-                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight text-gray-500 bg-white border border-e-0 border-gray-300 rounded-s-lg dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 cursor-default">
+              disabled
-                            Previous
+              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"
-                        </button>
+            >
-                    </li>
+              Previous
-                {:else}
+            </button>
-                    <li>
+          </li>
-                        <button on:click={() => ChangeWatchListPage(page-1)}
+        {:else}
-                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight text-gray-500 bg-white border border-e-0 border-gray-300 rounded-s-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
+          <li>
-                            Previous
+            <button
-                        </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"
-                {/if}
+            >
-                {#each {length: aniListWatchListLoaded.data.Page.pageInfo.lastPage} as _, i}
+              Previous
-                    {#if i + 1 === page}
+            </button>
-                        <li>
+          </li>
-                            <button on:click={() => ChangeWatchListPage(i+1)}
+        {/if}
-                                    class="flex items-center justify-center px-4 h-10 leading-tight border border-gray-300 bg-gray-100 dark:border-gray-700 dark:bg-gray-700 dark:text-white">{i + 1}</button>
+        {#each { length: aniListWatchListLoaded.data.Page.pageInfo.lastPage } as _, i}
-                        </li>
+          {#if i + 1 === page}
-                    {:else}
+            <li>
-                        <li>
+              <button
-                            <button on:click={() => ChangeWatchListPage(i+1)}
+                on:click={() => ChangeWatchListPage(i + 1)}
-                                    class="flex items-center justify-center px-4 h-10 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">{i + 1}</button>
+                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"
-                        </li>
+                >{i + 1}</button
-                    {/if}
+              >
-                {/each}
+            </li>
-                {#if page === aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+          {:else}
-                    <li>
+            <li>
-                        <button disabled
+              <button
-                                class="flex items-center justify-center px-4 h-10 leading-tight text-gray-500 bg-white border border-gray-300 rounded-e-lg dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 cursor-default">
+                on:click={() => ChangeWatchListPage(i + 1)}
-                            Next
+                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"
-                        </button>
+                >{i + 1}</button
-                    </li>
+              >
-                {:else}
+            </li>
-                    <li>
+          {/if}
-                        <button on:click={() => ChangeWatchListPage(page+1)}
+        {/each}
-                                class="flex items-center justify-center px-4 h-10 leading-tight text-gray-500 bg-white border border-gray-300 rounded-e-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white">
+        {#if page === aniListWatchListLoaded.data.Page.pageInfo.lastPage}
-                            Next
+          <li>
-                        </button>
+            <button
-                    </li>
+              disabled
-                {/if}
+              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"
-            </ul>
+            >
-        </nav>
+              Next
-    {/if}
+            </button>
-    <div class="flex mt-5">
+          </li>
-        <div class="w-20 mx-auto">
+        {:else}
-            <select bind:value={perPage} on:change={(e) => changeCountPerPage(e)} id="countPerPage"
+          <li>
-                    class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+            <button
-                {#each perPageOptions as option}
+              on:click={() => ChangeWatchListPage(page + 1)}
-                    <option value={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}
+            >
-                    </option>
+              Next
-                {/each}
+            </button>
-            </select>
+          </li>
-        </div>
+        {/if}
-
+      </ul>
-        <div>
+    </nav>
-            <div>Total Anime: {aniListWatchListLoaded.data.Page.pageInfo.total}</div>
+  {/if}
-            {#if aniListWatchListLoaded.data.Page.pageInfo.lastPage <= 12}
+  <div class="flex mt-5">
-                <div class="md:hidden">Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}</div>
+    <div class="w-20 mx-auto">
-            {:else}
+      <select
-                <div>Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}</div>
+        bind:value={perPage}
-            {/if}
+        on:change={(e) => changeCountPerPage(e)}
-        </div>
+        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"
-        <div class="max-w-xs mx-auto">
+      >
-            <div class="relative flex items-center max-w-[11rem]">
+        {#each perPageOptions as option}
-                <button type="button" id="decrement-button" on:click={() => ChangeWatchListPage(page-1)}
+          <option value={option}>
-                        class="bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:border-gray-600 hover:bg-gray-200 border border-gray-300 rounded-s-lg p-3 h-11 focus:ring-gray-100 dark:focus:ring-gray-700 focus:ring-2 focus:outline-none">
+            {option}
-                    <svg class="w-3 h-3 text-gray-900 dark:text-white" aria-hidden="true"
+          </option>
-                         xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 2">
+        {/each}
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+      </select>
-                              d="M1 1h16"/>
-                    </svg>
-                </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 bg-gray-50 border-x-0 border-gray-300 h-11 font-medium text-center text-gray-900 text-sm focus:ring-blue-500 focus:border-blue-500 block w-full pb-6 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark: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="bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:border-gray-600 hover:bg-gray-200 border border-gray-300 rounded-e-lg p-3 h-11 focus:ring-gray-100 dark:focus:ring-gray-700 focus:ring-2 focus:outline-none">
-                    <svg class="w-3 h-3 text-gray-900 dark: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>
+
+    <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>
+      {/if}
+    </div>
+
+    <div class="max-w-xs mx-auto">
+      <div class="relative flex items-center max-w-[11rem]">
+        <button
+          type="button"
+          id="decrement-button"
+          on:click={() => ChangeWatchListPage(page - 1)}
+          class={page <= 1
+            ? "border-gray-600 border rounded-s-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-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
+          disabled={page <= 1}
+        >
+          <svg
+            class="w-3 h-3 text-white"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 18 2"
+          >
+            <path
+              stroke="currentColor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M1 1h16"
+            />
+          </svg>
+        </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/Search.svelte

@@ -25,11 +25,11 @@
 
 <div id="searchDropdown" class="relative w-64 md:w-48">
         <div class="flex">
-            <label for="anime-search" class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Find
+            <label for="anime-search" class="mb-2 text-sm font-medium sr-only text-white">Find
                 Anime</label>
             <div class="relative w-full">
                 <input type="search" id="anime-search" bind:value={aniSearch}
-                       class="rounded-s-lg block p-2.5 w-full z-20 text-sm text-gray-900 bg-gray-50 rounded-e-lg border-s-gray-50 border-s-2 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700  dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500"
+                       class="rounded-s-lg block p-2.5 w-full z-20 text-sm rounded-e-lg bg-gray-700 border-s-gray-700  border-gray-600 placeholder-gray-400 text-white focus:border-blue-500"
                        placeholder="Search for Anime"
                        on:keypress={(e) => {
                             if (e.key === "Enter") {
@@ -39,7 +39,7 @@
                         }}
                        required/>
                 <button id="aniListSearchButton"
-                        class="absolute top-0 end-0 h-full p-2.5 text-sm font-medium text-white bg-blue-700 rounded-e-lg border border-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
+                        class="absolute top-0 end-0 h-full p-2.5 text-sm font-medium rounded-e-lg border focus:ring-4 focus:outline-none bg-blue-600 hover:bg-blue-700 focus:ring-blue-800"
                         on:click={() => {
                             searchDropdown()
                             if(aniSearch.length > 0) runAniListSearch()
@@ -60,7 +60,7 @@
                 aria-labelledby="aniListSearchButton">
                 {#each aniListSearch.data.Page.media as media}
                     <li class="w-full">
-                        <div class="flex w-full items-start p-1 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white rounded-lg">
+                        <div class="flex w-full items-start p-1 hover:bg-gray-600 hover:text-white rounded-lg">
                             <button on:click={() => {
                                 searchDropdown()
                                 push(`#/anime/${media.id}`)

frontend/src/helperComponents/WatchList.svelte

@@ -1,68 +1,99 @@
 <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;
 
-    let isAniListLoggedIn: boolean
+  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
-    let aniListWatchListLoaded: AniListCurrentUserWatchList
+  aniListWatchlist.subscribe((value) => (aniListWatchListLoaded = value));
-
-    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-    aniListWatchlist.subscribe((value) => aniListWatchListLoaded = value)
-
 </script>
 
 <div>
-    {#if isAniListLoggedIn}
+  {#if isAniListLoggedIn}
-        <div class="mx-auto max-w-2xl p-4 sm:p-6 lg:max-w-7xl lg:px-8 relative items-center">
+    <div
-            <h1 class="text-left text-xl font-bold mb-4">Your AniList WatchList</h1>
+      class="mx-auto max-w-2xl p-4 sm:p-6 lg:max-w-7xl lg:px-8 relative items-center"
+    >
+      <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 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">
+      <div
-                {#each aniListWatchListLoaded.data.Page.mediaList as media}
+        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"
-                    <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">
+      >
-                        <div class="flex flex-col items-center group">
+        {#each aniListWatchListLoaded.data.Page.mediaList as media}
-                            <button on:click={() => {
+          <div
-                                push(`#/anime/${media.media.id}`)
+            use:loader={loading}
-                                // loading.set(true)
+            class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg xl:aspect-h-8 xl:aspect-w-7"
-                                // GetAniListSingleItem(media.media.id, true).then(() => {
+          >
-                                //     loading.set(false)
+            <div class="flex flex-col items-center group">
-                                //
+              <button
-                                // })
+                on:click={() => {
-                            }}
+                  push(`#/anime/${media.media.id}`);
-                            >
+                  // loading.set(true)
-                                <img class="rounded-lg" src={media.media.coverImage.large} alt={
+                  // GetAniListSingleItem(media.media.id, true).then(() => {
-                                media.media.title.english === "" ?
+                  //     loading.set(false)
-                                    media.media.title.romaji :
+                  //
-                                    media.media.title.english
+                  // })
-                            }/>
+                }}
-                            </button>
+              >
-                            <Rating id="anime-rating" total={5} size={35} rating={media.score/2.0}/>
+                <img
-                            <button class="mt-4 text-md font-semibold text-white-700"
+                  class="rounded-lg w-[230px] h-[330px] object-cover"
-                                    on:click={() => GetAnimeSingleItem(media.media.id, true)}>
+                  src={media.media.coverImage.large}
-                                {
+                  alt={media.media.title.english === ""
-                                    media.media.title.english === "" ?
+                    ? media.media.title.romaji
-                                        media.media.title.romaji :
+                    : media.media.title.english}
-                                        media.media.title.english
+                />
-                                }
+              </button>
-                            </button>
+              <Rating
-                            <p class="mt-1 text-lg font-medium text-white-900">{media.progress}
+                id="anime-rating"
-                                / {media.media.nextAiringEpisode.episode !== 0 ?
+                total={5}
-                                    media.media.nextAiringEpisode.episode - 1 : media.media.episodes}</p>
+                size={35}
-                            {#if media.media.episodes > 0}
+                rating={media.score / 2.0}
-                                <p class="mt-1 text-lg font-medium text-white-900">Total
+              />
-                                    Episodes: {media.media.episodes}</p>
+              <button
-                            {/if}
+                class="mt-4 text-md font-semibold text-white-700"
-                        </div>
+                on:click={() => GetAnimeSingleItem(media.media.id, true)}
-                    </div>
+              >
-                {/each}
+                {media.media.title.english === ""
+                  ? 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>
-    {/if}
+        {/each}
+      </div>
+    </div>
+  {/if}
 </div>

frontend/src/helperComponents/WebsiteLink.svelte

@@ -0,0 +1,32 @@
+<script lang="ts">
+    import { BrowserOpenURL } from "../../wailsjs/runtime";
+
+    export let id: string;
+    export let url = "";
+    let isAniList = false;
+    let isMAL = false;
+    let isSimkl = false;
+    let newId = id;
+    let re = /[ams]?-?(.*)/;
+    if (id !== undefined && id.length > 0) {
+        isAniList = id.includes("a-");
+        isMAL = id.includes("m-");
+        isSimkl = id.includes("s-");
+        if (isAniList || isMAL || isSimkl) newId = id.match(re)[1];
+        else newId = id;
+    }
+
+    if (isAniList) url = `https://anilist.co/anime/${newId}`;
+    if (isMAL) url = `https://myanimelist.net/anime/${newId}`;
+    if (isSimkl) url = `https://simkl.com/anime/${newId}`;
+</script>
+
+{#if url.length > 0}
+    <button
+        type="button"
+        class="underline underline-offset-2 px-4 py-1"
+        on:click={() => BrowserOpenURL(url)}>{newId}</button
+    >
+{:else}
+    {id}
+{/if}

frontend/src/helperFunctions/convertAniListDateIn.ts

@@ -0,0 +1,37 @@
+import moment from "moment";
+
+const convertAniListDateToString = (date: {
+  year?: number;
+  month?: number;
+  day?: number;
+}): string => {
+  if (
+    date.year === undefined ||
+    (date.year === 0 && date.month === undefined) ||
+    (date.month === 0 && date.day === undefined) ||
+    date.day === 0
+  ) {
+    return "";
+  }
+  const newISODate = new Date(date.year, date.month - 1, date.day);
+  const newMoment = moment(newISODate);
+  return newMoment.format("MM-DD-YYYY");
+};
+
+const convertAniListDateToDate = (date: {
+  year?: number;
+  month?: number;
+  day?: number;
+}): Date | null => {
+  if (
+    date.year === undefined ||
+    (date.year === 0 && date.month === undefined) ||
+    (date.month === 0 && date.day === undefined) ||
+    date.day === 0
+  ) {
+    return null;
+  }
+  return new Date(date.year, date.month - 1, date.day);
+};
+
+export { convertAniListDateToString, convertAniListDateToDate };

frontend/src/helperFunctions/convertAniListDateToString.ts

@@ -1,17 +0,0 @@
-import moment from "moment";
-
-export default (date: {
-    year?: number,
-    month?: number,
-    day?: number,
-}): string => {
-    if (date.year === undefined || date.year === 0
-        && date.month === undefined || date.month === 0
-        && date.day === undefined || date.day === 0
-    ) {
-        return ""
-    }
-    const newISODate = new Date(date.year, date.month - 1, date.day)
-    const newMoment = moment(newISODate)
-    return newMoment.format('YYYY-MM-DD')
-}

frontend/src/helperFunctions/convertDateStringToAniList.ts

@@ -1,22 +0,0 @@
-type Date = {
-    year: number,
-    month: number,
-    day: number,
-}
-
-export default (date: string): Date => {
-    if (date === "") {
-        return {
-            year: 0,
-            month: 0,
-            day: 0,
-        }
-    }
-    const re = /^([0-9]{4})-([0-9]{2})-([0-9]{2})/
-    const newDate = re.exec(date)
-    return {
-        year: Number(newDate[1]),
-        month: Number(newDate[2]),
-        day: Number(newDate[3])
-    }
-}

frontend/src/helperFunctions/convertDateToAniList.ts

@@ -0,0 +1,39 @@
+type AnilistDate = {
+  year: number;
+  month: number;
+  day: number;
+};
+
+const convertDateStringToAniList = (date: string): AnilistDate => {
+  if (date === "") {
+    return {
+      year: 0,
+      month: 0,
+      day: 0,
+    };
+  }
+  const re = /^([0-9]{4})-([0-9]{2})-([0-9]{2})/;
+  const newDate = re.exec(date);
+  return {
+    year: Number(newDate[1]),
+    month: Number(newDate[2]),
+    day: Number(newDate[3]),
+  };
+};
+
+const convertDateToAniList = (date: Date | null): AnilistDate => {
+  if (date === null) {
+    return {
+      year: 0,
+      month: 0,
+      day: 0,
+    };
+  }
+  return {
+    year: Number(date.getFullYear()),
+    month: Number(date.getMonth()) + 1,
+    day: Number(date.getDate()),
+  };
+};
+
+export { convertDateStringToAniList, convertDateToAniList };

frontend/src/helperModules/GlobalVariablesAndHelperFunctions.svelte

@@ -1,162 +1,187 @@
 <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 {SimklAnime, SimklUser, SimklWatchList} from "../simkl/types/simklTypes";
+  import type {
-    import {type AniListUser, MediaListSort} from "../anilist/types/AniListTypes";
+    SimklAnime,
-    import type {MALAnime, MALWatchlist, MyAnimeListUser} from "../mal/types/MALTypes";
+    SimklUser,
-    import type {TableItems} from "../helperTypes/TableTypes";
+    SimklWatchList,
-    import {AniListGetSingleAnimeDefaultData} from "../helperDefaults/AniListGetSingleAnime";
+  } from "../simkl/types/simklTypes";
+  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 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 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));
 
-
+  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) {
-    export function loginToSimkl(): void {
+      await SimklSearch(currentAniListAnime.data.MediaList).then(
-        GetSimklLoggedInUser().then(user => {
+        (value: SimklAnime) => {
-            if (Object.keys(user).length === 0) {
+          simklAnime.set(value);
-                simklLoggedIn.set(false)
+        },
-            } else {
+      );
-                simklUser.set(user)
-                SimklGetUserWatchlist().then(result => {
-                    simklWatchList.set(result)
-                    simklLoggedIn.set(true)
-                })
-            }
-        })
     }
+    return "";
+  }
 
-    export function loginToAniList(): void {
+  export function loginToSimkl(): void {
-        GetAniListLoggedInUser().then(result => {
+    GetSimklLoggedInUser().then((user) => {
-            aniListUser.set(result)
+      if (Object.keys(user).length === 0) {
-            if (isAniListPrimary) {
+        simklLoggedIn.set(false);
-                GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((result) => {
+      } else {
-                    aniListWatchlist.set(result)
+        simklUser.set(user);
-                    aniListLoggedIn.set(true)
+        SimklGetUserWatchlist().then((result) => {
-                })
+          simklWatchList.set(result);
-            } else {
+          simklLoggedIn.set(true);
-                aniListLoggedIn.set(true)
+        });
-            }
+      }
-        })
+    });
-    }
+  }
 
-    export function loginToMAL(): void {
+  export function loginToAniList(): void {
-        GetMyAnimeListLoggedInUser().then(result => {
+    GetAniListLoggedInUser().then((result) => {
-            malUser.set(result)
+      aniListUser.set(result);
-            malLoggedIn.set(true)
+      if (isAniListPrimary) {
-        })
+        GetAniListUserWatchingList(
-    }
+          page,
+          perPage,
+          MediaListSort.UpdatedTimeDesc,
+        ).then((result) => {
+          aniListWatchlist.set(result);
+          aniListLoggedIn.set(true);
+        });
+      } else {
+        aniListLoggedIn.set(true);
+      }
+    });
+  }
 
-    export function logoutOfAniList(): void {
+  export function loginToMAL(): void {
-        LogoutAniList().then(result => {
+    GetMyAnimeListLoggedInUser().then((result) => {
-            console.log(result)
+      malUser.set(result);
-            if (Object.keys(aniWatchlist).length !== 0) {
+      malLoggedIn.set(true);
-                aniListWatchlist.set({} as AniListCurrentUserWatchList)
+    });
-            }
+  }
-            aniListUser.set({} as AniListUser)
-            aniListLoggedIn.set(false)
-        })
-    }
 
-    export function logoutOfMAL(): void {
+  export function logoutOfAniList(): void {
-        LogoutMyAnimeList().then(result => {
+    LogoutAniList().then((result) => {
-            console.log(result)
+      console.log(result);
-            malUser.set({} as MyAnimeListUser)
+      if (Object.keys(aniWatchlist).length !== 0) {
-            malLoggedIn.set(false)
+        aniListWatchlist.set({} as AniListCurrentUserWatchList);
-        })
+      }
-    }
+      aniListUser.set({} as AniListUser);
+      aniListLoggedIn.set(false);
+    });
+  }
+
+  export function logoutOfMAL(): void {
+    LogoutMyAnimeList().then((result) => {
+      console.log(result);
+      malUser.set({} as MyAnimeListUser);
+      malLoggedIn.set(false);
+    });
+  }
+
+  export function logoutOfSimkl(): void {
+    LogoutSimkl().then((result) => {
+      console.log(result);
+      simklUser.set({} as SimklUser);
+      simklLoggedIn.set(false);
+    });
+  }
+</script>
 
-    export function logoutOfSimkl(): void {
-        LogoutSimkl().then(result => {
-            console.log(result)
-            simklUser.set({} as SimklUser)
-            simklLoggedIn.set(false)
-        })
-    }
-</script>

frontend/src/helperTypes/TableTypes.ts

@@ -1,7 +1,7 @@
 export type TableItems = TableItem[]
 
 export type TableItem = {
-    id: number
+    id: string
     title: string
     service: string
     progress: number
@@ -11,4 +11,4 @@ export type TableItem = {
     score: number
     repeat: number
     notes: string
-}
+}

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/src/style.css

@@ -16,6 +16,12 @@ body {
     sans-serif;
 }
 
+.maple-font {
+    font-family: "Maple Mono NF", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+    "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+    sans-serif;
+}
+
 @font-face {
     font-family: "Nunito";
     font-style: normal;
@@ -24,6 +30,14 @@ body {
     url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2");
 }
 
+@font-face {
+    font-family: "Maple Mono NF";
+    font-style: normal;
+    font-weight: 800;
+    src: local(""),
+    url("assets/fonts/MapleMono-Bold.woff2") format("woff2");
+}
+
 #app {
     height: 100vh;
     text-align: center;

frontend/tailwind.config.js

@@ -1,3 +1,4 @@
+import flowbitePlugin from 'flowbite/plugin'
 /** @type {import('tailwindcss').Config} */
 export default {
     content: [
@@ -6,9 +7,7 @@ export default {
         "./node_modules/flowbite/**/*.{html,js,svelte,ts}",
         "./node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}",
     ],
-    plugins: [
+    plugins: [ flowbitePlugin ],
-        require('flowbite/plugin')
-    ],
 
     darkMode: 'media',
 

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

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']();
 }

frontend/wailsjs/go/models.ts

@@ -202,8 +202,7 @@ export namespace main {
 	export class MALAnime {
 	    id: id;
 	    title: title;
-	    // Go type: struct { Large string "json:\"large\" json:\"large\""; Medium string "json:\"medium\" json:\"medium\"" }
+	    main_picture: mainPicture;
-	    main_picture: any;
 	    alternative_titles: alternativeTitles;
 	    start_date: startDate;
 	    end_date: endDate;
@@ -231,6 +230,8 @@ export namespace main {
 	    background: background;
 	    related_anime: relatedAnime;
 	    recommendations: recommendations;
+	    // Go type: struct { NumListUsers int "json:\"num_list_users\" ts_type:\"numListUsers\""; Status struct { Watching string "json:\"watching\" ts_type:\"watching\""; Completed string "json:\"completed\" ts_type:\"completed\""; OnHold string "json:\"on_hold\" ts_type:\"onHold\""; Dropped string "json:\"dropped\" ts_type:\"dropped\""; PlanToWatch string "json:\"plan_to_watch\" ts_type:\"planToWatch\"" } }
+	    Statistics: any;
 	
 	    static createFrom(source: any = {}) {
 	        return new MALAnime(source);
@@ -240,7 +241,7 @@ export namespace main {
 	        if ('string' === typeof source) source = JSON.parse(source);
 	        this.id = source["id"];
 	        this.title = source["title"];
-	        this.main_picture = this.convertValues(source["main_picture"], Object);
+	        this.main_picture = source["main_picture"];
 	        this.alternative_titles = source["alternative_titles"];
 	        this.start_date = source["start_date"];
 	        this.end_date = source["end_date"];
@@ -268,6 +269,7 @@ export namespace main {
 	        this.background = source["background"];
 	        this.related_anime = source["related_anime"];
 	        this.recommendations = source["recommendations"];
+	        this.Statistics = this.convertValues(source["Statistics"], Object);
 	    }
 	
 		convertValues(a: any, classs: any, asMap: boolean = false): any {
@@ -311,7 +313,7 @@ export namespace main {
 	    }
 	}
 	export class MALWatchlist {
-	    data: struct { Node struct { Id int "json:\"id\" ts_type:\"id\""; Title string "json:\"title\" ts_type:\"title\""; MainPicture struct { Medium string "json:\"medium\" json:\"medium\""; Large string "json:\"large\" json:\"large\"" } "json:\"main_picture\" json:\"mainPicture\"" } "json:\"node\" json:\"node\""; ListStatus struct { Status string "json:\"status\" ts_type:\"status\""; Score int "json:\"score\" ts_type:\"score\""; NumEpisodesWatched int "json:\"num_episodes_watched\" ts_type:\"numEpisodesWatched\""; IsRewatching bool "json:\"is_rewatching\" ts_type:\"isRewatching\""; UpdatedAt time.Time "json:\"updated_at\" ts_type:\"updatedAt\""; StartDate string "json:\"start_date\" ts_type:\"startDate\""; FinishDate string "json:\"finish_date\" ts_type:\"finishDate\"" } "json:\"list_status\" ts_type:\"listStatus\"" }[];
+	    data: data;
 	    paging: paging;
 	
 	    static createFrom(source: any = {}) {
@@ -320,27 +322,9 @@ export namespace main {
 	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.data = this.convertValues(source["data"], struct { Node struct { Id int "json:\"id\" ts_type:\"id\""; Title string "json:\"title\" ts_type:\"title\""; MainPicture struct { Medium string "json:\"medium\" json:\"medium\""; Large string "json:\"large\" json:\"large\"" } "json:\"main_picture\" json:\"mainPicture\"" } "json:\"node\" json:\"node\""; ListStatus struct { Status string "json:\"status\" ts_type:\"status\""; Score int "json:\"score\" ts_type:\"score\""; NumEpisodesWatched int "json:\"num_episodes_watched\" ts_type:\"numEpisodesWatched\""; IsRewatching bool "json:\"is_rewatching\" ts_type:\"isRewatching\""; UpdatedAt time.Time "json:\"updated_at\" ts_type:\"updatedAt\""; StartDate string "json:\"start_date\" ts_type:\"startDate\""; FinishDate string "json:\"finish_date\" ts_type:\"finishDate\"" } "json:\"list_status\" ts_type:\"listStatus\"" });
+	        this.data = source["data"];
 	        this.paging = source["paging"];
 	    }
-	
-		convertValues(a: any, classs: any, asMap: boolean = false): any {
-		    if (!a) {
-		        return a;
-		    }
-		    if (a.slice && a.map) {
-		        return (a as any[]).map(elem => this.convertValues(elem, classs));
-		    } else if ("object" === typeof a) {
-		        if (asMap) {
-		            for (const key of Object.keys(a)) {
-		                a[key] = new classs(a[key]);
-		            }
-		            return a;
-		        }
-		        return new classs(a);
-		    }
-		    return a;
-		}
 	}
 	export class MalListStatus {
 	    status: status;
@@ -380,7 +364,7 @@ export namespace main {
 	    id: number;
 	    mediaId: number;
 	    userId: number;
-	    // Go type: struct { ID int "json:\"id\""; IDMal int "json:\"idMal\""; Title struct { Romaji string "json:\"romaji\""; English string "json:\"english\""; Native string "json:\"native\"" } "json:\"title\""; Description string "json:\"description\""; CoverImage struct { Large string "json:\"large\"" } "json:\"coverImage\""; Season string "json:\"season\""; SeasonYear int "json:\"seasonYear\""; Status string "json:\"status\""; Episodes int "json:\"episodes\""; NextAiringEpisode struct { AiringAt int "json:\"airingAt\""; TimeUntilAiring int "json:\"timeUntilAiring\""; Episode int "json:\"episode\"" } "json:\"nextAiringEpisode\""; Tags []struct { Id int "json:\"id\""; Name string "json:\"name\""; Description string "json:\"description\""; Rank int "json:\"rank\""; IsMediaSpoiler bool "json:\"isMediaSpoiler\""; IsAdult bool "json:\"isAdult\"" } "json:\"tags\""; IsAdult bool "json:\"isAdult\"" }
+	    // Go type: struct { ID int "json:\"id\""; IDMal int "json:\"idMal\""; Title struct { Romaji string "json:\"romaji\""; English string "json:\"english\""; Native string "json:\"native\"" } "json:\"title\""; Description string "json:\"description\""; CoverImage struct { Large string "json:\"large\"" } "json:\"coverImage\""; Season string "json:\"season\""; SeasonYear int "json:\"seasonYear\""; Status string "json:\"status\""; Episodes int "json:\"episodes\""; NextAiringEpisode struct { AiringAt int "json:\"airingAt\""; TimeUntilAiring int "json:\"timeUntilAiring\""; Episode int "json:\"episode\"" } "json:\"nextAiringEpisode\""; Genres []string "json:\"genres\""; Tags []struct { Id int "json:\"id\""; Name string "json:\"name\""; Description string "json:\"description\""; Rank int "json:\"rank\""; IsMediaSpoiler bool "json:\"isMediaSpoiler\""; IsAdult bool "json:\"isAdult\"" } "json:\"tags\""; IsAdult bool "json:\"isAdult\"" }
 	    media: any;
 	    status: string;
 	    // Go type: struct { Year int "json:\"year\""; Month int "json:\"month\""; Day int "json:\"day\"" }
@@ -621,11 +605,10 @@ export namespace struct { Node main {
 
 }
 
-export namespace struct { Node struct { Id int "json:\"id\" ts_type:\"id\""; Title string "json:\"title\" ts_type:\"title\""; MainPicture struct { Medium string "json:\"medium\" json:\"medium\""; Large string "json:\"large\" json:\"large\"" } "json:\"main_picture\" json:\"mainPicture\"" } "json:\"node\" json:\"node\""; ListStatus struct { Status string "json:\"status\" ts_type:\"status\""; Score int "json:\"score\" ts_type:\"score\""; NumEpisodesWatched int "json:\"num_episodes_watched\" ts_type:\"numEpisodesWatched\""; IsRewatching bool "json:\"is_rewatching\" ts_type:\"isRewatching\""; UpdatedAt time {
+export namespace struct { Node struct { Id int "json:\"id\" ts_type:\"id\""; Title string "json:\"title\" ts_type:\"title\""; MainPicture struct { Medium string "json:\"medium\" ts_type:\"medium\""; Large string "json:\"large\" ts_type:\"large\"" } "json:\"main_picture\" ts_type:\"mainPicture\"" } "json:\"node\" ts_type:\"node\""; ListStatus struct { Status string "json:\"status\" ts_type:\"status\""; Score int "json:\"score\" ts_type:\"score\""; NumEpisodesWatched int "json:\"num_episodes_watched\" ts_type:\"numEpisodesWatched\""; IsRewatching bool "json:\"is_rewatching\" ts_type:\"isRewatching\""; UpdatedAt time {
 	
 	export class  {
-	    // Go type: struct { Id int "json:\"id\" ts_type:\"id\""; Title string "json:\"title\" ts_type:\"title\""; MainPicture struct { Medium string "json:\"medium\" json:\"medium\""; Large string "json:\"large\" json:\"large\"" } "json:\"main_picture\" json:\"mainPicture\"" }
+	    node: node;
-	    node: any;
 	    list_status: listStatus;
 	
 	    static createFrom(source: any = {}) {
@@ -634,27 +617,9 @@ export namespace struct { Node struct { Id int "json:\"id\" ts_type:\"id\""; Tit
 	
 	    constructor(source: any = {}) {
 	        if ('string' === typeof source) source = JSON.parse(source);
-	        this.node = this.convertValues(source["node"], Object);
+	        this.node = source["node"];
 	        this.list_status = source["list_status"];
 	    }
-	
-		convertValues(a: any, classs: any, asMap: boolean = false): any {
-		    if (!a) {
-		        return a;
-		    }
-		    if (a.slice && a.map) {
-		        return (a as any[]).map(elem => this.convertValues(elem, classs));
-		    } else if ("object" === typeof a) {
-		        if (asMap) {
-		            for (const key of Object.keys(a)) {
-		                a[key] = new classs(a[key]);
-		            }
-		            return a;
-		        }
-		        return new classs(a);
-		    }
-		    return a;
-		}
 	}
 
 }

frontend/wailsjs/runtime/runtime.d.ts

@@ -134,7 +134,7 @@ export function WindowIsFullscreen(): Promise<boolean>;
 
 // [WindowSetSize](https://wails.io/docs/reference/runtime/window#windowsetsize)
 // Sets the width and height of the window.
-export function WindowSetSize(width: number, height: number): Promise<Size>;
+export function WindowSetSize(width: number, height: number): void;
 
 // [WindowGetSize](https://wails.io/docs/reference/runtime/window#windowgetsize)
 // Gets the width and height of the window.

go.mod

@@ -1,48 +1,49 @@
 module AniTrack
 
-go 1.21
+go 1.24.0
-
-toolchain go1.21.11
 
 require (
 	github.com/99designs/keyring v1.2.2
-	github.com/wailsapp/wails/v2 v2.9.1
+	github.com/tidwall/gjson v1.18.0
+	github.com/wailsapp/wails/v2 v2.10.1
 )
 
 require (
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/bep/debounce v1.2.1 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
-	github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
+	github.com/dvsekhvalnov/jose2go v1.8.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
-	github.com/labstack/echo/v4 v4.12.0 // indirect
+	github.com/labstack/echo/v4 v4.13.3 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
 	github.com/leaanthony/gosod v1.0.4 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
 	github.com/leaanthony/u v1.1.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/samber/lo v1.47.0 // indirect
+	github.com/samber/lo v1.49.1 // indirect
-	github.com/tkrajina/go-reflector v0.5.6 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tkrajina/go-reflector v0.5.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	github.com/wailsapp/go-webview2 v1.0.13 // indirect
+	github.com/wailsapp/go-webview2 v1.0.19 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 )
 
 // replace github.com/wailsapp/wails/v2 v2.9.1 => /home/nymusicman/go/pkg/mod

go.sum

@@ -8,8 +8,8 @@ github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ
 github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dvsekhvalnov/jose2go v1.7.0 h1:bnQc8+GMnidJZA8zc6lLEAb4xNrIqHwO+9TzqvtQZPo=
+github.com/dvsekhvalnov/jose2go v1.8.0 h1:LqkkVKAlHFfH9LOEl5fe4p/zL02OhWE7pCufMBG2jLA=
-github.com/dvsekhvalnov/jose2go v1.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
+github.com/dvsekhvalnov/jose2go v1.8.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
@@ -23,10 +23,11 @@ github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NM
 github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
 github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
+github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
 github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
 github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
@@ -42,9 +43,8 @@ github.com/leaanthony/u v1.1.1/go.mod h1:9+o6hejoRljvZ3BzdYlVL0JYCwtnAsVuN9pVTQc
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
 github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
@@ -60,43 +60,49 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
+github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
-github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
+github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
+github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
+github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/wailsapp/go-webview2 v1.0.13 h1:I17/44xQ5/SujBaAUS4KMkWJYIoWCp35YxCEFWsMLKA=
+github.com/wailsapp/go-webview2 v1.0.19 h1:7U3QcDj1PrBPaxJNCui2k1SkWml+Q5kvFUFyTImA6NU=
-github.com/wailsapp/go-webview2 v1.0.13/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
+github.com/wailsapp/go-webview2 v1.0.19/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.9.1 h1:irsXnoQrCpeKzKTYZ2SUVlRRyeMR6I0vCO9Q1cvlEdc=
+github.com/wailsapp/wails/v2 v2.10.1 h1:QWHvWMXII2nI/nXz77gpPG8P3ehl6zKe+u4su5BWIns=
-github.com/wailsapp/wails/v2 v2.9.1/go.mod h1:7maJV2h+Egl11Ak8QZN/jlGLj2wg05bsQS+ywJPT0gI=
+github.com/wailsapp/wails/v2 v2.10.1/go.mod h1:zrebnFV6MQf9kx8HI4iAv63vsR5v67oS7GTEZ7Pz1TY=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

main.go

@@ -34,9 +34,9 @@ func main() {
 			app,
 		},
 		Linux: &linux.Options{
-			Icon:                []byte("./build/appicon.png"),
+			Icon:                []byte("./build/AniTrack.png"),
 			WindowIsTranslucent: false,
-			WebviewGpuPolicy:    linux.WebviewGpuPolicyAlways,
+			WebviewGpuPolicy:    linux.WebviewGpuPolicyNever,
 			ProgramName:         "AniTrack",
 		},
 	})

wails.json

@@ -9,5 +9,9 @@
   "author": {
     "name": "John O'Keefe",
     "email": "jokeefe@fastmail.com"
+  },
+  "info": {
+    "productName": "AniTrack",
+    "productVersion": "0.6.5"
   }
 }