upped version for automation

Merge branch 'main' of ssh://git.linuxhg.com:2222/john-okeefe/anitrack

.gitignore

@@ -29,4 +29,7 @@ package.json.md5
 package-lock.json
 .idea
 .env
-environment.go
+environment.go
+
+# REST (http files)
+http-client.private.env.json

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)
-	if reserr != nil {
+	res, resErr := client.Do(response)
+	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, ""
+	return returnedBody, res.Status
 }
 
 func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
-	var user = a.GetAniListLoggedInUser()
+	user := a.GetAniListLoggedInUser()
 
 	var neededVariables interface{}
 
@@ -138,14 +141,44 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 		Variables: neededVariables,
 	}
 
-	returnedBody, _ := AniListQuery(body, login)
-
+	returnedBody, status := AniListQuery(body, login)
 	var post AniListGetSingleAnime
+
+	if status == "404 Not Found" && !login {
+		return post
+	}
+
+	if status == "404 Not Found" {
+		post = a.GetAniListItem(aniId, false)
+	}
+
 	err := json.Unmarshal(returnedBody, &post)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
+	if !login {
+		post.Data.MediaList.UserID = user.Data.Viewer.ID
+		post.Data.MediaList.Status = ""
+		post.Data.MediaList.StartedAt.Year = 0
+		post.Data.MediaList.StartedAt.Month = 0
+		post.Data.MediaList.StartedAt.Day = 0
+		post.Data.MediaList.CompletedAt.Year = 0
+		post.Data.MediaList.CompletedAt.Month = 0
+		post.Data.MediaList.CompletedAt.Day = 0
+		post.Data.MediaList.Notes = ""
+		post.Data.MediaList.Progress = 0
+		post.Data.MediaList.Score = 0
+		post.Data.MediaList.Repeat = 0
+		post.Data.MediaList.User.ID = user.Data.Viewer.ID
+		post.Data.MediaList.User.Name = user.Data.Viewer.Name
+		post.Data.MediaList.User.Avatar.Large = user.Data.Viewer.Avatar.Large
+		post.Data.MediaList.User.Avatar.Medium = user.Data.Viewer.Avatar.Medium
+		post.Data.MediaList.User.Statistics.Anime.Count = 0
+		// This provides an empty array and frees up the memory from the garbage collector
+		post.Data.MediaList.User.Statistics.Anime.Statuses = nil
+	}
+
 	return post
 }
 
@@ -169,7 +202,7 @@ func (a *App) AniListSearch(query string) any {
 					  perPage
 					}
 					media (search: $search, type: $listType) {
-						id						
+						id
 						idMal
 						title {
 						  romaji
@@ -219,7 +252,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"`
@@ -330,27 +363,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 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
+	if status == "200 OK" {
+		err := json.Unmarshal(returnedBody, &post)
+		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
+			}
+		}
+
+		lastPage := total / perPage
+
+		post.Data.Page.PageInfo.Total = total
+		post.Data.Page.PageInfo.LastPage = lastPage
 	}
 
-	lastPage := total / perPage
-
-	post.Data.Page.PageInfo.Total = total
-	post.Data.Page.PageInfo.LastPage = lastPage
+	if status == "403 Forbidden" {
+		err := json.Unmarshal(returnedBody, &badPost)
+		if err != nil {
+			log.Printf("Failed at unmarshal, %s\n", err)
+		}
+		log.Fatal(badPost.Errors[0].Message)
+	}
 
 	return post
 }
@@ -362,8 +415,8 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
 	}{
 		Query: `
 			mutation(
-			  $mediaId:Int, 
-			  $progress:Int, 
+			  $mediaId:Int,
+			  $progress:Int,
 			  $status:MediaListStatus,
 			  $score:Float,
 			  $repeat:Int,
@@ -372,15 +425,15 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
 			  $completedAt:FuzzyDateInput,
 			){
 			  SaveMediaListEntry(
-				mediaId:$mediaId, 
-				progress:$progress, 
+				mediaId:$mediaId,
+				progress:$progress,
 				status:$status,
 				score:$score,
 				repeat:$repeat,
 				notes:$notes,
 				startedAt:$startedAt
 				completedAt:$completedAt
-			  ){   
+			  ){
 				id
 				mediaId
 				userId
@@ -459,3 +512,39 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
 
 	return post
 }
+
+func (a *App) AniListDeleteEntry(mediaListId int) DeleteAniListReturn {
+	type Variables = struct {
+		Id int `json:"id"`
+	}
+
+	body := struct {
+		Query     string    `json:"query"`
+		Variables Variables `json:"variables"`
+	}{
+		Query: `
+			mutation(
+			  $id:Int,
+			){
+			  DeleteMediaListEntry(
+				id:$id,
+			  ){
+				deleted
+				}
+			}
+		`,
+		Variables: Variables{
+			Id: mediaListId,
+		},
+	}
+
+	returnedBody, _ := AniListQuery(body, true)
+
+	var post DeleteAniListReturn
+	err := json.Unmarshal(returnedBody, &post)
+	if err != nil {
+		log.Printf("Failed at unmarshal, %s\n", err)
+	}
+
+	return post
+}

AniListTypes.go

@@ -139,6 +139,14 @@ type AniListUpdateVariables struct {
 	CompletedAt CompletedAt `json:"completedAt"`
 }
 
+type DeleteAniListReturn struct {
+	Data struct {
+		DeleteMediaListEntry struct {
+			Deleted bool `json:"deleted"`
+		} `json:"DeleteMediaListEntry"`
+	} `json:"data"`
+}
+
 //var MediaListSort = struct {
 //	MediaId               string
 //	MediaIdDesc           string

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")
-		expiresIn, err := aniRing.Get("anilistTokenExpiresIn")
-		accessToken, err := aniRing.Get("anilistAccessToken")
-		refreshToken, err := aniRing.Get("anilistRefreshToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		tokenType, tokenErr := aniRing.Get("anilistTokenType")
+		expiresIn, expiresInErr := aniRing.Get("anilistTokenExpiresIn")
+		refreshToken, refreshTokenErr := aniRing.Get("anilistRefreshToken")
+		accessToken, accessTokenErr := aniRing.Get("anilistAccessToken")
+		if (tokenErr != nil || expiresInErr != nil || refreshTokenErr != nil || accessTokenErr != nil) || len(accessToken.Data) == 0 {
 			return false
 		} else {
 			aniListJwt.TokenType = string(tokenType.Data)
@@ -46,13 +51,13 @@ func (a *App) CheckIfAniListLoggedIn() bool {
 
 func (a *App) AniListLogin() {
 	if (AniListJWT{} == aniListJwt) {
-		tokenType, err := aniRing.Get("anilistTokenType")
-		expiresIn, err := aniRing.Get("anilistTokenExpiresIn")
-		accessToken, err := aniRing.Get("anilistAccessToken")
-		refreshToken, err := aniRing.Get("anilistRefreshToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		tokenType, tokenErr := aniRing.Get("anilistTokenType")
+		expiresIn, expiresInErr := aniRing.Get("anilistTokenExpiresIn")
+		refreshToken, refreshTokenErr := aniRing.Get("anilistRefreshToken")
+		accessToken, accessTokenErr := aniRing.Get("anilistAccessToken")
+		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(a.ctx, getAniListCodeUrl)
+			runtime.BrowserOpenURL(*wailsContext, getAniListCodeUrl)
 
 			serverDone := &sync.WaitGroup{}
 			serverDone.Add(1)
@@ -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{
@@ -97,7 +101,7 @@ func (a *App) handleAniListCallback(wg *sync.WaitGroup) {
 				Key:  "anilistRefreshToken",
 				Data: []byte(aniListJwt.RefreshToken),
 			})
-			_, err := runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			_, err := runtime.MessageDialog(*wailsContext, runtime.MessageDialogOptions{
 				Title:   "AniList Authorization",
 				Message: "It is now safe to close your browser tab",
 			})
@@ -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/json")
+	response.Header.Add("Content-type", "application/x-www-form-urlencoded")
 	response.Header.Add("Accept", "application/json")
 
 	client := &http.Client{}
-	res, reserr := client.Do(response)
-	if reserr != nil {
+	res, resErr := client.Do(response)
+	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")
-		err = aniRing.Remove("anilistTokenExpiresIn")
-		err = aniRing.Remove("anilistAccessToken")
-		err = aniRing.Remove("anilistRefreshToken")
-
-		if err != nil {
-			fmt.Println("AniList Logout Failed", err)
+		typeErr := aniRing.Remove("anilistTokenType")
+		expiresInErr := aniRing.Remove("anilistTokenExpiresIn")
+		accessTokenErr := aniRing.Remove("anilistAccessToken")
+		refreshTokenErr := aniRing.Remove("anilistRefreshToken")
+		if typeErr != nil || expiresInErr != nil || accessTokenErr != nil || refreshTokenErr != nil {
+			fmt.Println("AniList Logout Failed")
 		}
 		aniListJwt = AniListJWT{}
 	}

MALFunctions.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 )
 
-func MALHelper(method string, malUrl string, body url.Values) json.RawMessage {
+func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage, string) {
 	client := &http.Client{}
 
 	req, _ := http.NewRequest(method, malUrl, strings.NewReader(body.Encode()))
@@ -29,13 +29,18 @@ func MALHelper(method string, malUrl string, body url.Values) json.RawMessage {
 			Message: "Errored when sending request to the server" + err.Error(),
 		})
 
-		return message
+		return message, resp.Status
 	}
 
 	defer resp.Body.Close()
 	respBody, _ := io.ReadAll(resp.Body)
 
-	return respBody
+	if resp.Status == "401 Unauthorized" {
+		refreshMyAnimeListAuthorizationToken()
+		MALHelper(method, malUrl, body)
+	}
+
+	return respBody, resp.Status
 }
 
 func (a *App) GetMyAnimeList(count int) MALWatchlist {
@@ -45,11 +50,13 @@ func (a *App) GetMyAnimeList(count int) MALWatchlist {
 
 	var malList MALWatchlist
 
-	respBody := MALHelper("GET", malUrl, nil)
+	respBody, resStatus := MALHelper("GET", malUrl, nil)
 
-	err := json.Unmarshal(respBody, &malList)
-	if err != nil {
-		log.Printf("Failed to unmarshal json response, %s\n", err)
+	if resStatus == "200 OK" {
+		err := json.Unmarshal(respBody, &malList)
+		if err != nil {
+			log.Printf("Failed to unmarshal json response, %s\n", err)
+		}
 	}
 
 	return malList
@@ -71,10 +78,13 @@ func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) MalListS
 
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(anime.Id) + "/my_list_status"
 	var status MalListStatus
-	respBody := MALHelper("PATCH", malUrl, body)
-	err := json.Unmarshal(respBody, &status)
-	if err != nil {
-		log.Printf("Failed to unmarshal json response, %s\n", err)
+	respBody, respStatus := MALHelper("PATCH", malUrl, body)
+
+	if respStatus == "200 OK" {
+		err := json.Unmarshal(respBody, &status)
+		if err != nil {
+			log.Printf("Failed to unmarshal json response, %s\n", err)
+		}
 	}
 
 	return status
@@ -82,12 +92,25 @@ func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) MalListS
 
 func (a *App) GetMyAnimeListAnime(id int) MALAnime {
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(id) + "?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics"
-	respBody := MALHelper("GET", malUrl, nil)
+	respBody, respStatus := MALHelper("GET", malUrl, nil)
 	var malAnime MALAnime
-	err := json.Unmarshal(respBody, &malAnime)
-	if err != nil {
-		log.Printf("Failed to unmarshal json response, %s\n", err)
+
+	if respStatus == "200 OK" {
+		err := json.Unmarshal(respBody, &malAnime)
+		if err != nil {
+			log.Printf("Failed to unmarshal json response, %s\n", err)
+		}
 	}
 
 	return malAnime
 }
+
+func (a *App) DeleteMyAnimeListEntry(id int) bool {
+	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(id) + "/my_list_status"
+	_, respStatus := MALHelper("DELETE", malUrl, nil)
+	if respStatus == "200 OK" {
+		return true
+	} else {
+		return false
+	}
+}

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"`
-				Large  string `json:"large" json:"large"`
-			} `json:"main_picture" json:"mainPicture"`
-		} `json:"node" json:"node"`
+				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"`
@@ -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"`
-		Medium string `json:"medium" json:"medium"`
-	} `json:"main_picture" json:"mainPicture"`
+		Large  string `json:"large" ts_type:"large"`
+		Medium string `json:"medium" ts_type:"medium"`
+	} `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")
-		expiresIn, err := myAnimeListRing.Get("MyAnimeListExpiresIn")
-		accessToken, err := myAnimeListRing.Get("MyAnimeListAccessToken")
-		refreshToken, err := myAnimeListRing.Get("MyAnimeListRefreshToken")
-		if err != nil || len(accessToken.Data) == 0 {
+		tokenType, tokenErr := myAnimeListRing.Get("MyAnimeListTokenType")
+		expiresIn, expiresInErr := myAnimeListRing.Get("MyAnimeListExpiresIn")
+		refreshToken, refreshTokenErr := myAnimeListRing.Get("MyAnimeListAccessToken")
+		accessToken, accessTokenErr := myAnimeListRing.Get("MyAnimeListRefreshToken")
+		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))
-			if err != nil {
+			myAnimeListJwt.ExpiresIn, expiresInConvertErr = strconv.Atoi(string(expiresIn.Data))
+			if expiresInConvertErr != nil {
 				fmt.Println("unable to convert string to int")
 			}
 			myAnimeListJwt.AccessToken = string(accessToken.Data)
@@ -89,23 +95,25 @@ func (a *App) CheckIfMyAnimeListLoggedIn() bool {
 }
 
 func (a *App) MyAnimeListLogin() {
-	if a.CheckIfMyAnimeListLoggedIn() == false {
-		tokenType, err := myAnimeListRing.Get("MyAnimeListTokenType")
-		expiresIn, err := myAnimeListRing.Get("MyAnimeListExpiresIn")
-		accessToken, err := myAnimeListRing.Get("MyAnimeListAccessToken")
-		refreshToken, err := myAnimeListRing.Get("MyAnimeListRefreshToken")
-		if err != nil || len(accessToken.Data) == 0 {
+	if !a.CheckIfMyAnimeListLoggedIn() {
+		fmt.Println("check logged in function failed")
+		tokenType, tokenErr := myAnimeListRing.Get("MyAnimeListTokenType")
+		expiresIn, expiresInErr := myAnimeListRing.Get("MyAnimeListExpiresIn")
+		refreshToken, refreshTokenErr := myAnimeListRing.Get("MyAnimeListAccessToken")
+		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(a.ctx, getMyAnimeListCodeUrl)
+			runtime.BrowserOpenURL(*wailsContext, getMyAnimeListCodeUrl)
 			serverDone := &sync.WaitGroup{}
 			serverDone.Add(1)
 			a.handleMyAnimeListCallback(serverDone, verifier)
 			serverDone.Wait()
 		} else {
+			var expiresInConvertErr error
 			myAnimeListJwt.TokenType = string(tokenType.Data)
-			myAnimeListJwt.ExpiresIn, err = strconv.Atoi(string(expiresIn.Data))
-			if err != nil {
+			myAnimeListJwt.ExpiresIn, expiresInConvertErr = strconv.Atoi(string(expiresIn.Data))
+			if expiresInConvertErr != nil {
 				fmt.Println("unable to convert string to int in Login function")
 			}
 			myAnimeListJwt.AccessToken = string(accessToken.Data)
@@ -144,7 +152,7 @@ func (a *App) handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifi
 				Key:  "MyAnimeListRefreshToken",
 				Data: []byte(myAnimeListJwt.RefreshToken),
 			})
-			_, err := runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			_, err := runtime.MessageDialog(*wailsContext, runtime.MessageDialogOptions{
 				Title:   "MyAnimeList Authorization",
 				Message: "It is now safe to close your browser tab",
 			})
@@ -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)
-	if reserr != nil {
+	res, resErr := client.Do(response)
+	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)
@@ -224,6 +235,77 @@ func getMyAnimeListAuthorizationToken(content string, verifier *CodeVerifier) My
 	return post
 }
 
+func refreshMyAnimeListAuthorizationToken() {
+	dataForURLs := struct {
+		GrantType    string `json:"grant_type"`
+		RefreshToken string `json:"refresh_token"`
+		ClientID     string `json:"client_id"`
+		ClientSecret string `json:"client_secret"`
+		RedirectURI  string `json:"redirect_uri"`
+	}{
+		GrantType:    "refresh_token",
+		RefreshToken: myAnimeListJwt.RefreshToken,
+		ClientID:     Environment.MAL_CLIENT_ID,
+		ClientSecret: Environment.MAL_CLIENT_SECRET,
+		RedirectURI:  Environment.MAL_CALLBACK_URI,
+	}
+
+	data := url.Values{}
+	data.Set("grant_type", dataForURLs.GrantType)
+	data.Set("refresh_token", dataForURLs.RefreshToken)
+	data.Set("client_id", dataForURLs.ClientID)
+	data.Set("client_secret", dataForURLs.ClientSecret)
+	data.Set("redirect_uri", dataForURLs.RedirectURI)
+
+	response, err := http.NewRequest("POST", "https://myanimelist.net/v1/oauth2/token", strings.NewReader(data.Encode()))
+	if err != nil {
+		log.Printf("Failed at response, %s\n", err)
+	}
+	response.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	client := &http.Client{}
+	res, resErr := client.Do(response)
+	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 {
+		log.Printf("Failed at unmarshal, %s\n", err)
+	}
+
+	_ = myAnimeListRing.Set(keyring.Item{
+		Key:  "MyAnimeListTokenType",
+		Data: []byte(myAnimeListJwt.TokenType),
+	})
+	_ = myAnimeListRing.Set(keyring.Item{
+		Key:  "MyAnimeListExpiresIn",
+		Data: []byte(strconv.Itoa(myAnimeListJwt.ExpiresIn)),
+	})
+	_ = myAnimeListRing.Set(keyring.Item{
+		Key:  "MyAnimeListAccessToken",
+		Data: []byte(myAnimeListJwt.AccessToken),
+	})
+	_ = myAnimeListRing.Set(keyring.Item{
+		Key:  "MyAnimeListRefreshToken",
+		Data: []byte(myAnimeListJwt.RefreshToken),
+	})
+	_, err = runtime.MessageDialog(*wailsContext, runtime.MessageDialogOptions{
+		Title:   "MyAnimeList Authorization",
+		Message: "It is now safe to close your browser tab",
+	})
+	if err != nil {
+		fmt.Println(err)
+	}
+}
+
 func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 	a.MyAnimeListLogin()
 
@@ -236,7 +318,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{}
@@ -258,13 +339,12 @@ func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 
 func (a *App) LogoutMyAnimeList() string {
 	if (MyAnimeListJWT{} != myAnimeListJwt) {
-		err := myAnimeListRing.Remove("MyAnimeListTokenType")
-		err = myAnimeListRing.Remove("MyAnimeListExpiresIn")
-		err = myAnimeListRing.Remove("MyAnimeListAccessToken")
-		err = myAnimeListRing.Remove("MyAnimeListRefreshToken")
-
-		if err != nil {
-			fmt.Println("MAL Logout Failed", err)
+		typeErr := myAnimeListRing.Remove("MyAnimeListTokenType")
+		expiresInErr := myAnimeListRing.Remove("MyAnimeListExpiresIn")
+		accessTokenErr := myAnimeListRing.Remove("MyAnimeListAccessToken")
+		refreshTokenErr := myAnimeListRing.Remove("MyAnimeListRefreshToken")
+		if typeErr != nil || expiresInErr != nil || accessTokenErr != nil || refreshTokenErr != nil {
+			fmt.Println("MAL Logout Failed")
 		}
 		myAnimeListJwt = MyAnimeListJWT{}
 	}

README.md

@@ -2,10 +2,35 @@
 
 ## About
 
-Track anime shows by syncing with various services. Anilist, MyAnimeList, Kitsu, Simkl...
+Track the anime you are watching by syncing with various services. Anilist, MyAnimeList, Simkl...
 
 This has been built with the official Wails Svelte-TS template.
 
+To run as is, please feel free to download a binary from the releases page.
+
+If you are getting too many errors due to api usage, please build from source.
+
+## Build from Source
+
+### Get API Keys
+First you will need your own API keys for the various services the app connects to.
+AniList: [AniList Developer App](https://anilist.co/settings/developer)
+MyAnimeList: [MyAnimeList Developer App](https://myanimelist.net/apiconfig/create)
+Simkl: [Simkl Developer](https://simkl.com/settings/developer/)
+
+  - Name: AniTrack
+  - Redirect URL: http://localhost:6734/callback
+  - App Type: web
+  - Homepage URL: http://localhost or the Github URL
+  - Company Name: AniTrack
+  - Commercial/Non-Commercial: non-commercial
+  - Purpose of Use: hobbyist
+
+Once you have the IDs, Keys, and Secrets create an environment.go file based on the environment.go.example and fill in the fields.
+
+### Install Wails and Dependencies
+Please follow the instructions [here](https://wails.io/docs/gettingstarted/installation) to get Wails up and running and follow the instructions below.
+
 ## Live Development
 
 To run in live development mode, run `wails dev` in the project directory. This will run a Vite development
@@ -15,4 +40,4 @@ to this in your browser, and you can call your Go code from devtools.
 
 ## Building
 
-To build a redistributable, production mode package, use `wails build`.
+To build a redistributable, production mode package, use `wails build --clean`.

SimklFunctions.go

@@ -8,10 +8,11 @@ import (
 	"log"
 	"net/http"
 	"reflect"
+	"slices"
 	"strconv"
 )
 
-var WatchList SimklWatchList
+var SimklWatchList SimklWatchListType
 
 func SimklHelper(method string, url string, body interface{}) json.RawMessage {
 	reader, _ := json.Marshal(body)
@@ -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() SimklWatchList {
+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,30 +60,28 @@ func (a *App) SimklGetUserWatchlist() SimklWatchList {
 	}
 
 	err := json.Unmarshal(respBody, &errCheck)
-
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
 	if errCheck.Error != "" {
 		a.LogoutSimkl()
-		return SimklWatchList{}
+		return SimklWatchListType{}
 	}
 
-	var watchlist SimklWatchList
+	var watchlist SimklWatchListType
 
 	err = json.Unmarshal(respBody, &watchlist)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
-	WatchList = watchlist
+	SimklWatchList = watchlist
 
 	return watchlist
 }
 
 func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {
-
 	var episodes []Episode
 	var url string
 	var shows []SimklPostShow
@@ -124,20 +121,22 @@ func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
-	for i, simklAnime := range WatchList.Anime {
+	for i, simklAnime := range SimklWatchList.Anime {
 		if anime.Show.Ids.Simkl == simklAnime.Show.Ids.Simkl {
-			WatchList.Anime[i].WatchedEpisodesCount = progress
+			SimklWatchList.Anime[i].WatchedEpisodesCount = progress
 		}
 	}
 
 	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,
@@ -179,20 +178,22 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
-	for i, simklAnime := range WatchList.Anime {
+	for i, simklAnime := range SimklWatchList.Anime {
 		if anime.Show.Ids.Simkl == simklAnime.Show.Ids.Simkl {
-			WatchList.Anime[i].UserRating = rating
+			SimklWatchList.Anime[i].UserRating = rating
 		}
 	}
 
 	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,
@@ -219,47 +220,67 @@ func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {
 		log.Printf("Failed at unmarshal, %s\n", err)
 	}
 
-	for i, simklAnime := range WatchList.Anime {
+	for i, simklAnime := range SimklWatchList.Anime {
 		if anime.Show.Ids.Simkl == simklAnime.Show.Ids.Simkl {
-			WatchList.Anime[i].Status = status
+			SimklWatchList.Anime[i].Status = status
 		}
 	}
 
 	anime.Status = status
 
+	WatchListUpdate(anime)
+
 	return anime
 }
 
-func (a *App) SimklSearch(aniId int) SimklAnime {
+func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
 	var result SimklAnime
 
-	if reflect.DeepEqual(WatchList, SimklWatchList{}) {
+	if reflect.DeepEqual(SimklWatchList, SimklWatchListType{}) {
 		fmt.Println("Watchlist empty. Calling...")
-		WatchList = a.SimklGetUserWatchlist()
+		SimklWatchList = a.SimklGetUserWatchlist()
 	}
 
-	for _, anime := range WatchList.Anime {
+	for _, anime := range SimklWatchList.Anime {
 		id, err := strconv.Atoi(anime.Show.Ids.AniList)
 		if err != nil {
 			fmt.Println("AniList ID does not exist on " + anime.Show.Title)
 		}
-		if id == aniId {
+		if id == aniListAnime.Media.ID {
 			result = anime
 		}
 	}
 
 	if reflect.DeepEqual(result, SimklAnime{}) {
 		var anime SimklSearchType
-		url := "https://api.simkl.com/search/id?anilist=" + strconv.Itoa(aniId)
+		url := "https://api.simkl.com/search/id?anilist=" + strconv.Itoa(aniListAnime.Media.ID)
 
 		respBody := SimklHelper("GET", url, nil)
 
 		err := json.Unmarshal(respBody, &anime)
+
+		if len(anime) == 0 {
+			url = "https://api.simkl.com/search/id?mal=" + strconv.Itoa(aniListAnime.Media.IDMal)
+			respBody = SimklHelper("GET", url, nil)
+			err = json.Unmarshal(respBody, &anime)
+		}
+
 		if err != nil {
 			log.Printf("Failed at unmarshal, %s\n", err)
 		}
 
-		if len(anime) > 0 {
+		if len(anime) == 0 {
+			return result
+		}
+
+		for _, watchListAnime := range SimklWatchList.Anime {
+			id := watchListAnime.Show.Ids.Simkl
+			if id == anime[0].Ids.Simkl {
+				result = watchListAnime
+			}
+		}
+
+		if reflect.DeepEqual(result, SimklAnime{}) && len(anime) > 0 {
 			result.Show.Title = anime[0].Title
 			result.Show.Poster = anime[0].Poster
 			result.Show.Ids.Simkl = anime[0].Ids.Simkl
@@ -269,3 +290,58 @@ func (a *App) SimklSearch(aniId int) SimklAnime {
 
 	return result
 }
+
+func (a *App) SimklSyncRemove(anime SimklAnime) bool {
+	url := "https://api.simkl.com/sync/history/remove"
+	var showArray []SimklShowStatus
+
+	singleShow := SimklShowStatus{
+		Title: anime.Show.Title,
+		Ids: Ids{
+			Simkl:   anime.Show.Ids.Simkl,
+			Mal:     anime.Show.Ids.Mal,
+			Anilist: anime.Show.Ids.AniList,
+		},
+	}
+
+	showArray = append(showArray, singleShow)
+
+	show := struct {
+		Shows []SimklShowStatus `json:"shows"`
+	}{
+		Shows: showArray,
+	}
+
+	respBody := SimklHelper("POST", url, show)
+
+	var success SimklDeleteType
+
+	err := json.Unmarshal(respBody, &success)
+	if err != nil {
+		log.Printf("Failed at unmarshal, %s\n", err)
+	}
+
+	if success.Deleted.Shows >= 1 {
+		for i, simklAnime := range SimklWatchList.Anime {
+			if simklAnime.Show.Ids.Simkl == anime.Show.Ids.Simkl {
+				SimklWatchList.Anime = slices.Delete(SimklWatchList.Anime, i, i+1)
+			}
+		}
+		return true
+	} 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)
+	}
+}

SimklTypes.go

@@ -26,7 +26,7 @@ type SimklUser struct {
 	} `json:"connections" ts_type:"connections"`
 }
 
-type SimklWatchList struct {
+type SimklWatchListType struct {
 	Anime []SimklAnime `json:"anime" ts_type:"anime"`
 }
 
@@ -119,3 +119,15 @@ type SimklSearchType []struct {
 	TotalEpisodes int    `json:"total_episodes"`
 	AnimeType     string `json:"anime_type"`
 }
+
+type SimklDeleteType struct {
+	Deleted struct {
+		Movies   int `json:"movies"`
+		Shows    int `json:"shows"`
+		Episodes int `json:"episodes"`
+	} `json:"deleted"`
+	NotFound struct {
+		Movies []interface{} `json:"movies"`
+		Shows  []interface{} `json:"shows"`
+	} `json:"not_found"`
+}

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")
-		accessToken, err := simklRing.Get("SimklAccessToken")
-		scope, err := simklRing.Get("SimklScope")
-		if err != nil || len(accessToken.Data) == 0 {
+		tokenType, tokenTypeErr := simklRing.Get("SimklTokenType")
+		accessToken, accessTokenErr := simklRing.Get("SimklAccessToken")
+		scope, scopeErr := simklRing.Get("SimklScope")
+		if (tokenTypeErr != nil || accessTokenErr != nil || scopeErr != nil) || len(accessToken.Data) == 0 {
 			return false
 		} else {
 			simklJwt.TokenType = string(tokenType.Data)
@@ -41,13 +46,13 @@ func (a *App) CheckIfSimklLoggedIn() bool {
 }
 
 func (a *App) SimklLogin() {
-	if a.CheckIfSimklLoggedIn() == false {
-		tokenType, err := simklRing.Get("SimklTokenType")
-		accessToken, err := simklRing.Get("SimklAccessToken")
-		scope, err := simklRing.Get("SimklScope")
-		if err != nil || len(accessToken.Data) == 0 {
+	if !a.CheckIfSimklLoggedIn() {
+		tokenType, tokenTypeErr := simklRing.Get("SimklTokenType")
+		accessToken, accessTokenErr := simklRing.Get("SimklAccessToken")
+		scope, scopeErr := simklRing.Get("SimklScope")
+		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(a.ctx, getSimklCodeUrl)
+			runtime.BrowserOpenURL(*wailsContext, getSimklCodeUrl)
 
 			serverDone := &sync.WaitGroup{}
 			serverDone.Add(1)
@@ -87,7 +92,7 @@ func (a *App) handleSimklCallback(wg *sync.WaitGroup) {
 				Key:  "SimklScope",
 				Data: []byte(simklJwt.Scope),
 			})
-			_, err := runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			_, err := runtime.MessageDialog(*wailsContext, runtime.MessageDialogOptions{
 				Title:   "Simkl Authorization",
 				Message: "It is now safe to close your browser tab",
 			})
@@ -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)
-	if reserr != nil {
+	res, resErr := client.Do(response)
+	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")
-		err = simklRing.Remove("SimklAccessToken")
-		err = simklRing.Remove("SimklScope")
+		tokenTypeErr := simklRing.Remove("SimklTokenType")
+		accessTokenErr := simklRing.Remove("SimklAccessToken")
+		scopeErr := simklRing.Remove("SimklScope")
 
-		if err != nil {
-			fmt.Println("Simkl Logout Failed", err)
+		if tokenTypeErr != nil || accessTokenErr != nil || scopeErr != nil {
+			fmt.Println("Simkl Logout Failed")
 		}
 		simklJwt = SimklJWT{}
 	}

app.go

@@ -2,8 +2,19 @@ package main
 
 import (
 	"context"
+	_ "embed"
+	"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
 type App struct {
 	ctx context.Context
@@ -17,6 +28,18 @@ 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) {
-	a.ctx = ctx
+	version := gjson.Get(wailsJSON, "info.productVersion")
+	wailsContext = &ctx
+	runtime.WindowSetTitle(ctx, "AniTrack "+version.String())
 	//runtime.WindowMaximise(ctx)
 }
+
+func (a *App) onSecondInstanceLaunch(secondInstanceData options.SecondInstanceData) {
+	var secondInstanceArgs = secondInstanceData.Args
+
+	println("user opened second instance", strings.Join(secondInstanceData.Args, ","))
+	println("user opened second from", secondInstanceData.WorkingDirectory)
+	runtime.WindowUnminimise(*wailsContext)
+	runtime.Show(*wailsContext)
+	go runtime.EventsEmit(*wailsContext, "launchArgs", secondInstanceArgs)
+}

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
@@ -93,7 +94,7 @@ body:graphql {
 body:graphql:vars {
   {
     "userId": 413504,
-    "mediaId": 1,
+    "mediaId": 170998,
     "listType": "ANIME"
   }
 }

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

@@ -53,7 +53,7 @@ body:graphql {
 
 body:graphql:vars {
   {
-    "search": "frieren",
+    "search": "dan-da-dan",
     "listType": "ANIME"
   }
 }

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/AniList/Set Items/Delete Media.bru

@@ -0,0 +1,31 @@
+meta {
+  name: Delete Media
+  type: graphql
+  seq: 4
+}
+
+post {
+  url: https://graphql.anilist.co
+  body: graphql
+  auth: none
+}
+
+headers {
+  Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
+  Content-Type: application/json
+  Accept: application/json
+}
+
+body:graphql {
+  mutation($id:Int){
+    DeleteMediaListEntry(id:$id){
+      deleted
+    }
+  }
+}
+
+body:graphql:vars {
+  {
+    "id":430978266
+  }
+}

bruno/AniTrack/MAL/Get Single Anime.bru

@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: https://api.myanimelist.net/v2/anime/53580?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics
+  url: https://api.myanimelist.net/v2/anime/57380?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics
   body: none
   auth: bearer
 }

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

@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: https://api.simkl.com/anime/862523?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/Simkl/Post Items/Delete Entry.bru

@@ -0,0 +1,29 @@
+meta {
+  name: Delete Entry
+  type: http
+  seq: 2
+}
+
+post {
+  url: https://api.simkl.com/sync/history/remove
+  body: json
+  auth: none
+}
+
+headers {
+  Authorization: Bearer {{SIMKL_AUTH_TOKEN}}
+  Content-Type: application/json
+  simkl-api-key: {{SIMKL_CLIENT_ID}}
+}
+
+body:json {
+  {
+    "shows": [
+      {
+        "ids": {
+          "simkl": 909121
+        }
+      }
+    ]
+  }
+}

bruno/AniTrack/environments/Dev.bru

@@ -8,11 +8,11 @@ vars {
   MAL_CALLBACK_URI: {{process.env.MAL_CALLBACK_URI}}
 }
 vars:secret [
-  code,
-  SIMKL_AUTH_TOKEN,
   ANILIST_ACCESS_TOKEN,
+  ANILIST_CODE,
+  SIMKL_AUTH_TOKEN,
   MAL_CODE,
   MAL_VERIFIER,
   MAL_USER,
-  MAL_ACCESS_TOKEN
+  ~MAL_ACCESS_TOKEN
 ]

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>

frontend/index.html

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

frontend/package.json

@@ -16,19 +16,19 @@
     "postcss": "^8.4.45",
     "svelte": "^4.0.0",
     "svelte-check": "^3.4.3",
+    "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",
-    "@tanstack/svelte-table": "^8.20.5",
     "flowbite": "^2.5.1",
     "flowbite-svelte": "^0.46.16",
     "moment": "^2.30.1"
   }
-}
+}

frontend/src/App.svelte

@@ -1,108 +1,24 @@
 <script lang="ts">
     import {
-        aniListLoggedIn,
-        aniListPrimary,
-        aniListUser,
-        aniListWatchlist,
-        animePerPage,
-        malLoggedIn,
-        malPrimary,
-        malUser,
-        malWatchList,
-        simklLoggedIn,
-        simklUser,
-        simklWatchList,
-        watchListPage,
-        simklPrimary,
         aniListAnime,
-        GetAniListSingleItem,
-    } from "./helperComponents/GlobalVariablesAndHelperFunctions.svelte";
-    import {
-        CheckIfAniListLoggedIn,
-        CheckIfMyAnimeListLoggedIn,
-        CheckIfSimklLoggedIn,
-        GetAniListLoggedInUser,
-        GetAniListUserWatchingList,
-        GetMyAnimeList,
-        GetMyAnimeListLoggedInUser,
-        GetSimklLoggedInUser,
-        SimklGetUserWatchlist,
-    } from "../wailsjs/go/main/App";
-    import {MediaListSort} from "./anilist/types/AniListTypes";
+        GetAnimeSingleItem,
+    } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
     import {onMount} from "svelte";
     import Router from "svelte-spa-router"
     import Home from "./routes/Home.svelte";
     import {wrap} from "svelte-spa-router/wrap";
     import Spinner from "./helperComponents/Spinner.svelte";
     import Header from "./helperComponents/Header.svelte";
-
-
-    let isAniListPrimary: boolean
-    let isMalPrimary: boolean
-    let isSimklPrimary: boolean
-
-    aniListPrimary.subscribe((value) => isAniListPrimary = value)
-    malPrimary.subscribe((value) => isMalPrimary = value)
-    simklPrimary.subscribe(value => isSimklPrimary = value)
-
-
-    let page: number
-    let perPage: number
-    watchListPage.subscribe(value => page = value)
-    animePerPage.subscribe(value => perPage = value)
+    import {CheckIfAniListLoggedInAndLoadWatchList} from "./helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
+    import { CheckIfMALLoggedInAndSetUser } from "./helperModules/CheckIfMyAnimeListLoggedIn.svelte";
+    import {CheckIfSimklLoggedInAndSetUser} from "./helperModules/CheckIsSimklLoggedIn.svelte"
+    import {CheckIfAniListLoggedIn} from "../wailsjs/go/main/App";
+    import {AniListGetSingleAnimeDefaultData} from "./helperDefaults/AniListGetSingleAnime";
 
     onMount(async () => {
-        await CheckIfAniListLoggedIn().then(loggedIn => {
-            if (loggedIn) {
-                GetAniListLoggedInUser().then(user => {
-                    aniListUser.set(user)
-                    if (isAniListPrimary) {
-                        GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((watchList) => {
-                            aniListWatchlist.set(watchList)
-                            aniListLoggedIn.set(loggedIn)
-                        })
-                    } else {
-                        aniListLoggedIn.set(loggedIn)
-                    }
-                })
-            }
-        })
-
-        await CheckIfMyAnimeListLoggedIn().then(loggedIn => {
-            if (loggedIn) {
-                GetMyAnimeListLoggedInUser().then(user => {
-                    malUser.set(user)
-                    if (isMalPrimary) {
-                        GetMyAnimeList(1000).then(watchList => {
-                            malWatchList.set(watchList)
-                            malLoggedIn.set(loggedIn)
-                        })
-                    } else {
-                        malLoggedIn.set(loggedIn)
-                    }
-                })
-            }
-        })
-
-        await CheckIfSimklLoggedIn().then(loggedIn => {
-            if (loggedIn) {
-                GetSimklLoggedInUser().then(user => {
-                    if (Object.keys(user).length === 0) {
-                        simklLoggedIn.set(false)
-                    } else {
-                        simklUser.set(user)
-                        if(isSimklPrimary) {
-                            SimklGetUserWatchlist().then(result => {
-                                simklWatchList.set(result)
-                                simklLoggedIn.set(loggedIn)
-                            })
-                        } else {
-                            simklLoggedIn.set(loggedIn)
-                        }
-                    }
-                })
-            }
-        })
+        await CheckIfAniListLoggedInAndLoadWatchList()
+        await CheckIfMALLoggedInAndSetUser()
+        await CheckIfSimklLoggedInAndSetUser()
     })
 </script>
 
@@ -110,11 +26,15 @@
 <Router routes={{
     '/': Home,
     '/anime/:id': wrap({
-        asyncComponent: () => import('./routes/Anime.svelte'),
+        asyncComponent: () => import('./routes/AnimeRoutePage.svelte'),
         conditions: [
-            () => $aniListLoggedIn,
+            async () => await CheckIfAniListLoggedIn(),
             async (detail) => {
-                await GetAniListSingleItem(Number(detail.params.id), true)
+                aniListAnime.update(value => {
+                    value = AniListGetSingleAnimeDefaultData
+                    return value
+                })
+                await GetAnimeSingleItem(Number(detail.params.id), true)
                 return Object.keys($aniListAnime).length!==0
             },
         ],

frontend/src/helperComponents/Anime.svelte

@@ -0,0 +1,823 @@
+<script lang="ts">
+    import {
+        aniListAnime,
+        aniListLoggedIn,
+        malAnime,
+        malLoggedIn,
+        simklAnime,
+        simklLoggedIn,
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    import { push } from "svelte-spa-router";
+    import { Button } from "flowbite-svelte";
+    import type { AniListGetSingleAnime } from "../anilist/types/AniListCurrentUserWatchListType";
+    import Rating from "./Rating.svelte";
+    import {
+        convertAniListDateToString,
+        convertAniListDateToDate,
+    } from "../helperFunctions/convertAniListDateIn";
+    import AnimeTable from "./AnimeTable.svelte";
+    import type {
+        MALAnime,
+        MalListStatus,
+        MALUploadStatus,
+    } from "../mal/types/MALTypes";
+    import type { SimklAnime } from "../simkl/types/simklTypes";
+    import { writable } from "svelte/store";
+    import type {
+        StatusOption,
+        StatusOptions,
+    } from "../helperTypes/StatusTypes";
+    import type { AniListUpdateVariables } from "../anilist/types/AniListTypes";
+    import { convertDateToAniList } from "../helperFunctions/convertDateToAniList";
+    import {
+        AniListDeleteEntry,
+        AniListUpdateEntry,
+        DeleteMyAnimeListEntry,
+        MyAnimeListUpdate,
+        SimklSyncEpisodes,
+        SimklSyncRating,
+        SimklSyncRemove,
+        SimklSyncStatus,
+    } from "../../wailsjs/go/main/App";
+    import { AddAnimeServiceToTable } from "../helperModules/AddAnimeServiceToTable.svelte";
+    import { CheckIfAniListLoggedInAndLoadWatchList } from "../helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
+    import Datepicker from "./Datepicker.svelte";
+    const re = /^([0-9]{4})-([0-9]{2})-([0-9]{2})/;
+
+    let isAniListLoggedIn: boolean;
+    let isMalLoggedIn: boolean;
+    let isSimklLoggedIn: boolean;
+    let currentAniListAnime: AniListGetSingleAnime;
+    let currentMalAnime: MALAnime;
+    let currentSimklAnime: SimklAnime;
+    let submitting = writable(false);
+    let isSubmitting: boolean;
+    let submitSuccess = writable(false);
+
+    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    malLoggedIn.subscribe((value) => (isMalLoggedIn = value));
+    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+    aniListAnime.subscribe((value) => (currentAniListAnime = value));
+    malAnime.subscribe((value) => (currentMalAnime = value));
+    simklAnime.subscribe((value) => (currentSimklAnime = value));
+    submitting.subscribe((value) => (isSubmitting = value));
+
+    const title =
+        currentAniListAnime.data.MediaList.media.title.english !== ""
+            ? currentAniListAnime.data.MediaList.media.title.english
+            : currentAniListAnime.data.MediaList.media.title.romaji;
+    const statusOptions: StatusOptions = [
+        { id: 0, aniList: "CURRENT", mal: "watching", simkl: "watching" },
+        {
+            id: 1,
+            aniList: "PLANNING",
+            mal: "plan_to_watch",
+            simkl: "plantowatch",
+        },
+        { id: 2, aniList: "COMPLETED", mal: "completed", simkl: "completed" },
+        { id: 3, aniList: "DROPPED", mal: "dropped", simkl: "dropped" },
+        { id: 4, aniList: "PAUSED", mal: "on_hold", simkl: "hold" },
+        { id: 5, aniList: "REPEATING", mal: "rewatching", simkl: "watching" },
+    ];
+    let startingAnilistStatusOption: StatusOption = statusOptions.filter(
+        (option) =>
+            currentAniListAnime.data.MediaList.status === option.aniList,
+    )[0];
+    let startedAtDate: Date | null = convertAniListDateToDate(
+        currentAniListAnime.data.MediaList.startedAt,
+    );
+    let completedAtDate: Date | null = convertAniListDateToDate(
+        currentAniListAnime.data.MediaList.completedAt,
+    );
+
+    if (isAniListLoggedIn)
+        AddAnimeServiceToTable({
+            id: `a-${currentAniListAnime.data.MediaList.mediaId}`,
+            title,
+            service: "AniList",
+            progress: currentAniListAnime.data.MediaList.progress,
+            status: currentAniListAnime.data.MediaList.status,
+            startedAt: convertAniListDateToString(
+                currentAniListAnime.data.MediaList.startedAt,
+            ),
+            completedAt: convertAniListDateToString(
+                currentAniListAnime.data.MediaList.completedAt,
+            ),
+            score: currentAniListAnime.data.MediaList.score,
+            repeat: currentAniListAnime.data.MediaList.repeat,
+            notes: currentAniListAnime.data.MediaList.notes,
+        });
+
+    if (isMalLoggedIn) {
+        let startDate = "";
+        let finishDate = "";
+        if (currentMalAnime.my_list_status.start_date !== "") {
+            const startArray = re.exec(
+                currentMalAnime.my_list_status.start_date,
+            );
+            startDate = `${startArray[2]}-${startArray[3]}-${startArray[1]}`;
+        }
+        if (currentMalAnime.my_list_status.finish_date !== "") {
+            const finishArray = re.exec(
+                currentMalAnime.my_list_status.finish_date,
+            );
+            finishDate = `${finishArray[2]}-${finishArray[3]}-${finishArray[1]}`;
+        }
+        AddAnimeServiceToTable({
+            id: `m-${currentMalAnime.id}`,
+            title: currentMalAnime.title,
+            service: "MyAnimeList",
+            progress: currentMalAnime.my_list_status.num_episodes_watched,
+            status: currentMalAnime.my_list_status.status,
+            startedAt: startDate,
+            completedAt: finishDate,
+            score: currentMalAnime.my_list_status.score,
+            repeat: currentMalAnime.my_list_status.num_times_rewatched,
+            notes: currentMalAnime.my_list_status.comments,
+        });
+    }
+
+    if (isSimklLoggedIn && Object.keys(currentSimklAnime).length > 0)
+        AddAnimeServiceToTable({
+            id: `s-${currentSimklAnime.show.ids.simkl}`,
+            title: currentSimklAnime.show.title,
+            service: "Simkl",
+            progress: currentSimklAnime.watched_episodes_count,
+            status: currentSimklAnime.status,
+            startedAt: "",
+            completedAt: "",
+            score: currentSimklAnime.user_rating,
+            repeat: 0,
+            notes: "",
+        });
+
+    const handleSubmit = async (e: any) => {
+        submitting.set(true);
+        let submitData: {
+            rating: number;
+            episodes: number;
+            status: StatusOption;
+            startedAt: Date | null;
+            completedAt: Date | null;
+            repeat: number;
+            notes: string;
+        } = {
+            rating: 0,
+            episodes: 0,
+            status: {
+                id: 0,
+                aniList: "",
+                mal: "",
+                simkl: "",
+            },
+            startedAt: null,
+            completedAt: null,
+            repeat: 0,
+            notes: "",
+        };
+        const formData = new FormData(e.target);
+        for (let field of formData) {
+            const [key, value] = field;
+            if (key === "rating") {
+                submitData.rating = Number(value) * 2;
+                continue;
+            }
+            if (key === "episodes") {
+                submitData.episodes = Number(value);
+                continue;
+            }
+            if (key === "repeat") {
+                submitData.repeat = Number(value);
+                continue;
+            }
+            if (key === "status") {
+                submitData.status = startingAnilistStatusOption;
+                continue;
+            }
+            submitData[key] = value;
+        }
+
+        if (
+            isAniListLoggedIn &&
+            currentAniListAnime.data.MediaList.mediaId !== 0
+        ) {
+            let body: AniListUpdateVariables = {
+                mediaId: currentAniListAnime.data.MediaList.mediaId,
+                progress: submitData.episodes,
+                status: submitData.status.aniList,
+                score: submitData.rating,
+                repeat: submitData.repeat,
+                notes: submitData.notes,
+                startedAt: convertDateToAniList(startedAtDate),
+                completedAt: convertDateToAniList(completedAtDate),
+            };
+            await AniListUpdateEntry(body).then(
+                (value: AniListGetSingleAnime) => {
+                    /* TODO in future when you inevitably add tags to typescript, until Anilist fixes the api bug
+                    where tags break the SaveMediaListEntry return, you'll want to use this delete line
+                    delete value.data.MediaList.media.tags */
+                    aniListAnime.update((newValue) => {
+                        newValue = value;
+                        return newValue;
+                    });
+                    AddAnimeServiceToTable({
+                        id: `a-${currentAniListAnime.data.MediaList.mediaId}`,
+                        title,
+                        service: "AniList",
+                        progress: currentAniListAnime.data.MediaList.progress,
+                        status: currentAniListAnime.data.MediaList.status,
+                        startedAt: convertAniListDateToString(
+                            currentAniListAnime.data.MediaList.startedAt,
+                        ),
+                        completedAt: convertAniListDateToString(
+                            currentAniListAnime.data.MediaList.completedAt,
+                        ),
+                        score: currentAniListAnime.data.MediaList.score,
+                        repeat: currentAniListAnime.data.MediaList.repeat,
+                        notes: currentAniListAnime.data.MediaList.notes,
+                    });
+                },
+            );
+        }
+
+        if (malLoggedIn && currentMalAnime.id !== 0) {
+            let body: MALUploadStatus = {
+                status: submitData.status.mal,
+                is_rewatching: submitData.repeat > 0,
+                score: submitData.rating,
+                num_watched_episodes: submitData.episodes,
+                num_times_rewatched: submitData.repeat,
+                comments: submitData.notes,
+            };
+
+            await MyAnimeListUpdate(currentMalAnime, body).then(
+                (malAnimeReturn: MalListStatus) => {
+                    malAnime.update((value) => {
+                        value.my_list_status.status = malAnimeReturn.status;
+                        value.my_list_status.is_rewatching =
+                            malAnimeReturn.is_rewatching;
+                        value.my_list_status.score = malAnimeReturn.score;
+                        value.my_list_status.num_episodes_watched =
+                            malAnimeReturn.num_episodes_watched;
+                        value.my_list_status.num_times_rewatched =
+                            malAnimeReturn.num_times_rewatched;
+                        value.my_list_status.comments = malAnimeReturn.comments;
+                        return value;
+                    });
+                    let startDate = "";
+                    let finishDate = "";
+                    if (currentMalAnime.my_list_status.start_date !== "") {
+                        const startArray = re.exec(
+                            currentMalAnime.my_list_status.start_date,
+                        );
+                        startDate = `${startArray[2]}-${startArray[3]}-${startArray[1]}`;
+                    }
+                    if (currentMalAnime.my_list_status.finish_date !== "") {
+                        const finishArray = re.exec(
+                            currentMalAnime.my_list_status.finish_date,
+                        );
+                        finishDate = `${finishArray[2]}-${finishArray[3]}-${finishArray[1]}`;
+                    }
+                    AddAnimeServiceToTable({
+                        id: `m-${currentMalAnime.id}`,
+                        title: currentMalAnime.title,
+                        service: "MyAnimeList",
+                        progress:
+                            currentMalAnime.my_list_status.num_episodes_watched,
+                        status: currentMalAnime.my_list_status.status,
+                        startedAt: startDate,
+                        completedAt: finishDate,
+                        score: currentMalAnime.my_list_status.score,
+                        repeat: currentMalAnime.my_list_status
+                            .num_times_rewatched,
+                        notes: currentMalAnime.my_list_status.comments,
+                    });
+                },
+            );
+        }
+
+        if (simklLoggedIn && currentSimklAnime.show.ids.simkl !== 0) {
+            if (
+                currentSimklAnime.watched_episodes_count !== submitData.episodes
+            ) {
+                await SimklSyncEpisodes(
+                    currentSimklAnime,
+                    submitData.episodes,
+                ).then((value: SimklAnime) => {
+                    AddAnimeServiceToTable({
+                        id: `s-${value.show.ids.simkl}`,
+                        title: value.show.title,
+                        service: "Simkl",
+                        progress: value.watched_episodes_count,
+                        status: value.status,
+                        startedAt: "",
+                        completedAt: "",
+                        score: value.user_rating,
+                        repeat: 0,
+                        notes: "",
+                    });
+                    simklAnime.update((newValue) => {
+                        newValue = value;
+                        return newValue;
+                    });
+                });
+            }
+
+            if (currentSimklAnime.user_rating !== submitData.rating) {
+                await SimklSyncRating(
+                    currentSimklAnime,
+                    submitData.rating,
+                ).then((value) => {
+                    AddAnimeServiceToTable({
+                        id: `s-${value.show.ids.simkl}`,
+                        title: value.show.title,
+                        service: "Simkl",
+                        progress: value.watched_episodes_count,
+                        status: value.status,
+                        startedAt: "",
+                        completedAt: "",
+                        score: value.user_rating,
+                        repeat: 0,
+                        notes: "",
+                    });
+                    simklAnime.update((newValue) => {
+                        newValue = value;
+                        return newValue;
+                    });
+                });
+            }
+
+            if (currentSimklAnime.status !== submitData.status.simkl) {
+                await SimklSyncStatus(
+                    currentSimklAnime,
+                    submitData.status.simkl,
+                ).then((value) => {
+                    AddAnimeServiceToTable({
+                        id: `s-${value.show.ids.simkl}`,
+                        title: value.show.title,
+                        service: "Simkl",
+                        progress: value.watched_episodes_count,
+                        status: value.status,
+                        startedAt: "",
+                        completedAt: "",
+                        score: value.user_rating,
+                        repeat: 0,
+                        notes: "",
+                    });
+                    simklAnime.update((newValue) => {
+                        newValue = value;
+                        return newValue;
+                    });
+                });
+            }
+        }
+
+        submitting.set(false);
+        submitSuccess.set(true);
+        setTimeout(() => submitSuccess.set(false), 2000);
+    };
+
+    const deleteEntries = async () => {
+        submitting.set(true);
+        if (
+            isAniListLoggedIn &&
+            currentAniListAnime.data.MediaList.mediaId !== 0
+        ) {
+            await AniListDeleteEntry(currentAniListAnime.data.MediaList.id);
+            AddAnimeServiceToTable({
+                id: `a-${currentAniListAnime.data.MediaList.mediaId}`,
+                title,
+                service: "AniList",
+                progress: 0,
+                status: "",
+                startedAt: "",
+                completedAt: "",
+                score: 0,
+                repeat: 0,
+                notes: "",
+            });
+        }
+        if (malLoggedIn && currentMalAnime.id !== 0) {
+            await DeleteMyAnimeListEntry(currentMalAnime.id);
+            AddAnimeServiceToTable({
+                id: `m-${currentMalAnime.id}`,
+                title: currentMalAnime.title,
+                service: "MyAnimeList",
+                progress: 0,
+                status: "",
+                startedAt: "",
+                completedAt: "",
+                score: 0,
+                repeat: 0,
+                notes: "",
+            });
+        }
+        if (simklLoggedIn && currentSimklAnime.show.ids.simkl !== 0) {
+            await SimklSyncRemove(currentSimklAnime);
+            AddAnimeServiceToTable({
+                id: `s-${currentSimklAnime.show.ids.simkl}`,
+                title: currentSimklAnime.show.title,
+                service: "Simkl",
+                progress: 0,
+                status: "",
+                startedAt: "",
+                completedAt: "",
+                score: 0,
+                repeat: 0,
+                notes: "",
+            });
+        }
+        submitting.set(false);
+        submitSuccess.set(true);
+        setTimeout(() => submitSuccess.set(false), 2000);
+    };
+
+    let max = 999;
+
+    if (currentAniListAnime.data.MediaList.media.episodes !== 0) {
+        max = currentAniListAnime.data.MediaList.media.episodes;
+    }
+    if (
+        currentAniListAnime.data.MediaList.media.episodes === 0 &&
+        currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode !== 0
+    ) {
+        max =
+            currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode -
+            1;
+    }
+</script>
+
+<form on:submit|preventDefault={handleSubmit} class="container pt-3 pb-10">
+    {console.log(startingAnilistStatusOption)}
+    <h1 class="text-white font-bold text-left text-xl pb-3">
+        {title}
+    </h1>
+    <div class="grid grid-cols-1 md:grid-cols-10 grid-flow-col gap-4">
+        <div class="md:col-span-2 space-y-3">
+            <img
+                class="rounded-lg"
+                src={currentAniListAnime.data.MediaList.media.coverImage.large}
+                alt="{title} Cover Image"
+            />
+            <Rating bind:score={currentAniListAnime.data.MediaList.score} />
+        </div>
+
+        <div class="md:col-span-8">
+            <div
+                class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center md:gap-x-24 lg:gap-x-56"
+            >
+                <div>
+                    <label
+                        for="episodes"
+                        class="text-left block mb-2 text-sm font-medium text-white"
+                        >Episode Progress</label
+                    >
+                    <div class="relative flex items-center max-w-[8rem]">
+                        <button
+                            type="button"
+                            id="decrement-button"
+                            data-input-counter-decrement="quantity-input"
+                            on:click={() => {
+                                currentAniListAnime.data.MediaList.progress -= 1;
+                                if (
+                                    currentAniListAnime.data.MediaList
+                                        .progress <
+                                    currentAniListAnime.data.MediaList.media
+                                        .episodes
+                                ) {
+                                    startingAnilistStatusOption =
+                                        statusOptions[0];
+                                    if (
+                                        currentAniListAnime.data.MediaList
+                                            .repeat === 0
+                                    )
+                                        completedAtDate = null;
+                                }
+                            }}
+                            class="bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+                        >
+                            <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"
+                            name="episodes"
+                            min="0"
+                            {max}
+                            id="episodes"
+                            class="border border-x-0 p-2.5 h-11 text-center text-sm block w-full placeholder-gray-400 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none
+                            {currentAniListAnime.data.MediaList.progress < 0 ||
+                            (currentAniListAnime.data.MediaList.media.episodes >
+                                0 &&
+                                currentAniListAnime.data.MediaList.progress >
+                                    currentAniListAnime.data.MediaList.media
+                                        .episodes) ||
+                            (currentAniListAnime.data.MediaList.media
+                                .nextAiringEpisode.episode > 0 &&
+                                currentAniListAnime.data.MediaList.progress >
+                                    currentAniListAnime.data.MediaList.media
+                                        .nextAiringEpisode.episode -
+                                        1)
+                                ? 'border-red-500 border-[2px] text-rose-300 focus:ring-red-500 focus:border-red-500'
+                                : 'bg-gray-700 hover:bg-gray-600 border-gray-600 text-white focus:ring-blue-500 focus:border-blue-500'} w-24"
+                            bind:value={
+                                currentAniListAnime.data.MediaList.progress
+                            }
+                            required
+                        />
+                        <button
+                            type="button"
+                            id="increment-button"
+                            data-input-counter-increment="quantity-input"
+                            on:click={() => {
+                                currentAniListAnime.data.MediaList.progress += 1;
+                                if (
+                                    currentAniListAnime.data.MediaList.media
+                                        .episodes ===
+                                    currentAniListAnime.data.MediaList.progress
+                                ) {
+                                    startingAnilistStatusOption =
+                                        statusOptions[2];
+                                    completedAtDate = new Date();
+                                }
+                            }}
+                            class="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"
+                        >
+                            <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>
+                        / {currentAniListAnime.data.MediaList.media
+                            .nextAiringEpisode.episode !== 0
+                            ? currentAniListAnime.data.MediaList.media
+                                  .nextAiringEpisode.episode - 1
+                            : currentAniListAnime.data.MediaList.media.episodes}
+                    </div>
+                    {#if currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode !== 0}
+                        <div>
+                            of {currentAniListAnime.data.MediaList.media
+                                .episodes}
+                        </div>
+                    {/if}
+                </div>
+                <div>
+                    <label
+                        for="status"
+                        class="text-left block mb-2 text-sm font-medium text-white"
+                        >Status</label
+                    >
+                    <select
+                        id="status"
+                        name="status"
+                        class="border text-sm rounded-lg
+                            block p-2.5 bg-gray-700 border-gray-600 placeholder-gray-400
+                            text-white focus:ring-blue-500 focus:border-blue-500"
+                        bind:value={startingAnilistStatusOption}
+                    >
+                        {#each statusOptions as option}
+                            <option value={option}>{option.aniList}</option>
+                        {/each}
+                    </select>
+                </div>
+            </div>
+            <div
+                class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center md:gap-x-16 lg:gap-x-36"
+            >
+                <div>
+                    <label
+                        for="startedAt"
+                        class="text-left block mb-2 text-sm font-medium text-white"
+                        >Date Started</label
+                    >
+                    <Datepicker
+                        bind:value={startedAtDate}
+                        color="slate"
+                        dateFormat={{
+                            year: "numeric",
+                            month: "2-digit",
+                            day: "2-digit",
+                        }}
+                        showActionButtons
+                    />
+                </div>
+                <div>
+                    <label
+                        for="completedAt"
+                        class="text-left block mb-2 text-sm font-medium text-white"
+                        >Date Completed</label
+                    >
+                    <Datepicker
+                        bind:value={completedAtDate}
+                        color="slate"
+                        dateFormat={{
+                            year: "numeric",
+                            month: "2-digit",
+                            day: "2-digit",
+                        }}
+                        showActionButtons
+                    />
+                </div>
+                <div>
+                    <label
+                        for="repeat"
+                        class="text-left block mb-2 text-sm font-medium text-white"
+                        >Rewatched</label
+                    >
+                    <input
+                        type="number"
+                        name="repeat"
+                        min="0"
+                        id="repeat"
+                        class="border {currentAniListAnime.data.MediaList
+                            .repeat < 0
+                            ? 'border-red-500 border-[2px] text-rose-300 focus:ring-red-500 focus:border-red-500'
+                            : 'border-gray-500 text-white focus:ring-blue-500 focus:border-blue-500'} text-sm rounded-lg block w-24 p-2.5 bg-gray-600 placeholder-gray-400 text-white"
+                        bind:value={currentAniListAnime.data.MediaList.repeat}
+                        required
+                    />
+                </div>
+            </div>
+            <div
+                class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center"
+            >
+                <div class="w-full">
+                    <label
+                        for="notes"
+                        class="text-left block mb-2 text-sm font-medium text-white"
+                        >Your notes</label
+                    >
+                    <textarea
+                        id="notes"
+                        rows="3"
+                        name="notes"
+                        class="block p-2.5 w-full text-sm rounded-lg border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
+                        placeholder="Write your thoughts here..."
+                        bind:value={currentAniListAnime.data.MediaList.notes}
+                    ></textarea>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="flex mb-4 rounded-lg shadow max-w-4-4 bg-gray-800">
+        <div
+            class="w-full mx-auto max-w-screen-xl p-4 md:flex md:items-center md:justify-end"
+        >
+            <button
+                disabled={isSubmitting}
+                id="sync-button"
+                class="text-white {$submitSuccess
+                    ? 'bg-green-600 hover:bg-green-700 focus:ring-4 focus:ring-green-800'
+                    : 'bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:ring-blue-800'} font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 focus:outline-none"
+                type="submit"
+            >
+                <svg
+                    id="submit-loader"
+                    aria-hidden="true"
+                    role="status"
+                    class="{isSubmitting
+                        ? 'inline'
+                        : 'hidden'} w-4 h-4 me-3 text-white animate-spin"
+                    viewBox="0 0 100 101"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                >
+                    <path
+                        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                        fill="#E5E7EB"
+                    />
+                    <path
+                        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                        fill="currentColor"
+                    />
+                </svg>
+                Sync Changes
+            </button>
+            <button
+                class="text-white bg-gray-800 border border-gray-600 focus:outline-none hover:bg-gray-700 focus:ring-4
+                    focus:ring-gray-700 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2
+                    hover:border-gray-600"
+                on:click={async () => {
+                    await CheckIfAniListLoggedInAndLoadWatchList();
+                    return push("/");
+                }}
+            >
+                Go Home
+            </button>
+        </div>
+    </div>
+    <AnimeTable />
+
+    <div class="flex rounded-lg shadow max-w-4-4 bg-gray-800">
+        <div
+            class="w-full mx-auto max-w-screen-xl p-4 md:flex md:items-center md:justify-start"
+        >
+            <button
+                disabled={isSubmitting}
+                id="delete-button"
+                class="text-white {$submitSuccess
+                    ? 'bg-green-600 hover:bg-green-700 focus:ring-4 focus:ring-green-800'
+                    : 'bg-red-600 hover:bg-red-700 focus:ring-4 focus:ring-red-800'} font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 focus:outline-none"
+                on:click={deleteEntries}
+            >
+                <svg
+                    id="submit-loader"
+                    aria-hidden="true"
+                    role="status"
+                    class="{isSubmitting
+                        ? 'inline'
+                        : 'hidden'} w-4 h-4 me-3 text-white animate-spin"
+                    viewBox="0 0 100 101"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                >
+                    <path
+                        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                        fill="#E5E7EB"
+                    />
+                    <path
+                        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                        fill="currentColor"
+                    />
+                </svg>
+                Delete Entries
+            </button>
+        </div>
+        <div
+            class="w-full mx-auto max-w-screen-xl p-4 md:flex md:items-center md:justify-end"
+        >
+            <button
+                disabled={isSubmitting}
+                id="sync-button"
+                class="text-white {$submitSuccess
+                    ? 'bg-green-600 hover:bg-green-700 focus:ring-4 focus:ring-green-800'
+                    : 'bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:ring-blue-800'} font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 focus:outline-none"
+                type="submit"
+            >
+                <svg
+                    id="submit-loader"
+                    aria-hidden="true"
+                    role="status"
+                    class="{isSubmitting
+                        ? 'inline'
+                        : 'hidden'} w-4 h-4 me-3 text-white animate-spin"
+                    viewBox="0 0 100 101"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                >
+                    <path
+                        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                        fill="#E5E7EB"
+                    />
+                    <path
+                        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                        fill="currentColor"
+                    />
+                </svg>
+                Sync Changes
+            </button>
+            <button
+                class="text-white bg-gray-800 border border-gray-600 focus:outline-none hover:bg-gray-700 focus:ring-4
+                    focus:ring-gray-700 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2
+                    hover:border-gray-600"
+                on:click={async () => {
+                    await CheckIfAniListLoggedInAndLoadWatchList();
+                    return push("/");
+                }}
+            >
+                Go Home
+            </button>
+        </div>
+    </div>
+
+    <div>
+        <h3 class="text-2xl">Summary</h3>
+        <p>{@html currentAniListAnime.data.MediaList.media.description}</p>
+    </div>
+</form>

frontend/src/helperComponents/AnimeTable.svelte

@@ -1,151 +1,119 @@
 <script lang="ts">
-    import {writable} from 'svelte/store'
-    import type {ColumnDef, TableOptions} from '@tanstack/svelte-table'
     import {
-        createSvelteTable,
-        flexRender,
-        getCoreRowModel,
-        getSortedRowModel,
-        type OnChangeFn,
-        type SortingState,
-    } from '@tanstack/svelte-table'
-    import {tableItems} from "./GlobalVariablesAndHelperFunctions.svelte"
-    import type {TableItem, TableItems} from "../helperTypes/TableTypes";
+        createRender,
+        createTable,
+        Render,
+        Subscribe,
+    } from "svelte-headless-table";
+    // @ts-ignore
+    import { addSortBy } from "svelte-headless-table/plugins";
+    import { tableItems } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+    import WebsiteLink from "./WebsiteLink.svelte";
 
-    let tableItemsView: TableItems
-    tableItems.subscribe(value => tableItemsView = value)
+    //when adding sort here is code { sort: addSortBy() }
+    const table = createTable(tableItems, { sort: addSortBy() });
 
-    const defaultColumns: ColumnDef<TableItem>[] = [
-        {
-            accessorKey: 'id',
-            header: () => "Service Id",
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'service',
-            header: () => 'Service',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'progress',
-            header: () => 'Episode Progress',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'status',
-            header: () => 'Status',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'startedAt',
-            header: () => 'Started At',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'completedAt',
-            header: () => 'Completed At',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'score',
-            header: () => 'Rating',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'repeat',
-            header: () => 'Repeat',
-            cell: info => info.getValue(),
-        },
-        {
-            accessorKey: 'notes',
-            header: () => 'Notes',
-            cell: info => info.getValue(),
-        },
-    ]
+    const columns = table.createColumns([
+        table.column({
+            header: "Service Id",
+            cell: ({ value }) => createRender(WebsiteLink, { id: value }),
+            accessor: "id",
+        }),
+        table.column({
+            header: "Anime Title",
+            accessor: "title",
+        }),
+        table.column({
+            header: "Service",
+            accessor: "service",
+        }),
+        table.column({
+            header: "Episode Progress",
+            accessor: "progress",
+        }),
+        table.column({
+            header: "Status",
+            accessor: "status",
+        }),
+        table.column({
+            header: "Started At",
+            accessor: "startedAt",
+        }),
+        table.column({
+            header: "Completed At",
+            accessor: "completedAt",
+        }),
+        table.column({
+            header: "Rating",
+            accessor: "score",
+        }),
+        table.column({
+            header: "Repeat",
+            accessor: "repeat",
+        }),
+        table.column({
+            header: "Notes",
+            accessor: "notes",
+        }),
+    ]);
 
-    let sorting: SortingState = []
-
-    const setSorting: OnChangeFn<SortingState> = updater => {
-        if (updater instanceof Function) {
-            sorting = updater(sorting)
-        } else {
-            sorting = updater
-        }
-        options.update(old => ({
-            ...old,
-            state: {
-                ...old.state,
-                sorting,
-            },
-        }))
-    }
-
-    const options = writable<TableOptions<TableItem>>({
-        data: tableItemsView,
-        columns: defaultColumns,
-        state: {
-            sorting,
-        },
-        onSortingChange: setSorting,
-        getCoreRowModel: getCoreRowModel(),
-        getSortedRowModel: getSortedRowModel(),
-    })
-
-    const rerender = () => {
-        console.log(tableItemsView)
-        options.update(options => ({
-            ...options,
-            data: tableItemsView,
-        }))
-    }
-
-    const table = createSvelteTable(options)
+    //add pluginStates when add sort back
+    const { headerRows, 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">
-        <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
-        {#each $table.getHeaderGroups() as headerGroup}
-            <tr>
-                {#each headerGroup.headers as header}
-                    <th class="px-6 py-3">
-                        {#if !header.isPlaceholder}
-                            <button
-                                class:cursor-pointer={header.column.getCanSort()}
-                                class:select-none={header.column.getCanSort()}
-                                on:click={header.column.getToggleSortingHandler()}
+    <table
+        class="w-full text-sm text-left rtl:text-right text-gray-400"
+        {...$tableAttrs}
+    >
+        <thead class="text-xs uppercase bg-gray-700 text-gray-400">
+            {#each $headerRows as headerRow (headerRow.id)}
+                <Subscribe attrs={headerRow.attrs()} let:attrs>
+                    <tr {...attrs}>
+                        {#each headerRow.cells as cell (cell.id)}
+                            <Subscribe
+                                attrs={cell.attrs()}
+                                let:attrs
+                                props={cell.props()}
+                                let:props
                             >
-                                <svelte:component
-                                        this={flexRender(
-                                            header.column.columnDef.header,
-                                            header.getContext()
-                                        )}
-                                />
-                                {#if header.column.getIsSorted().toString() === 'asc'}
-                                    🔼
-                                {:else if header.column.getIsSorted().toString() === 'desc'}
-                                    🔽
-                                {/if}
-                            </button>
-                        {/if}
-                    </th>
-                {/each}
-            </tr>
-        {/each}
+                                <th
+                                    {...attrs}
+                                    on:click={props.sort.toggle}
+                                    class:sorted={props.sort.order !==
+                                        undefined}
+                                    class="px-6 py-3"
+                                >
+                                    <div>
+                                        <Render of={cell.render()} />
+                                        {#if props.sort.order === "asc"}
+                                            ⬇️
+                                        {:else if props.sort.order === "desc"}
+                                            ⬆️
+                                        {/if}
+                                    </div>
+                                </th>
+                            </Subscribe>
+                        {/each}
+                    </tr>
+                </Subscribe>
+            {/each}
         </thead>
-        <tbody>
-        {#each $table.getRowModel().rows as row}
-            <tr class="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
-                {#each row.getVisibleCells() as cell}
-                    <td class="px-6 py-4">
-                        <svelte:component
-                                this={flexRender(cell.column.columnDef.cell, cell.getContext())}
-                        />
-                    </td>
-                {/each}
-            </tr>
-        {/each}
+        <tbody {...$tableBodyAttrs}>
+            {#each $rows as row (row.id)}
+                <Subscribe attrs={row.attrs()} let:attrs>
+                    <tr {...attrs} class="bg-gray-800 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()} />
+                                </td>
+                            </Subscribe>
+                        {/each}
+                    </tr>
+                </Subscribe>
+            {/each}
         </tbody>
     </table>
-    <button on:click={() => rerender()} class="border p-2 mb-3"> Rerender</button>
 </div>

frontend/src/helperComponents/AvatarMenu.svelte

@@ -1,74 +1,128 @@
 <script lang="ts">
-
-    import {Avatar} from "flowbite-svelte";
-    import type {AniListUser} from "../anilist/types/AniListTypes";
-    import {aniListLoggedIn, aniListUser, malLoggedIn, simklLoggedIn, logoutOfAniList, logoutOfMAL, logoutOfSimkl} from "./GlobalVariablesAndHelperFunctions.svelte"
+    import { Avatar } from "flowbite-svelte";
+    import type { AniListUser } from "../anilist/types/AniListTypes";
+    import {
+        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";
 
-    let currentAniListUser: AniListUser
-    let isAniListLoggedIn: boolean
-    let isSimklLoggedIn: boolean
-    let isMALLoggedIn: boolean
+    let currentAniListUser: AniListUser;
+    let currentMALUser: MyAnimeListUser;
+    let currentSimklUser: SimklUser;
+    let isAniListLoggedIn: boolean;
+    let isSimklLoggedIn: boolean;
+    let isMALLoggedIn: boolean;
 
-    aniListUser.subscribe((value) => currentAniListUser = value)
-    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-    simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
-    malLoggedIn.subscribe((value) => isMALLoggedIn = value)
+    aniListUser.subscribe((value) => (currentAniListUser = value));
+    malUser.subscribe((value) => (currentMALUser = value))
+    simklUser.subscribe(value => currentSimklUser = 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")
+        let dropdown = document.querySelector("#userDropdown");
+        dropdown.classList.toggle("hidden");
     }
 </script>
 
 <div class="relative">
     <button id="userDropdownButton" on:click={dropdownUser}>
         {#if isAniListLoggedIn}
-            <Avatar src="{currentAniListUser.data.Viewer.avatar.medium}" class="cursor-pointer"
-                    dot={{ color: 'green' }}/>
+            <Avatar
+                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"
-         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">
-        <div class="px-4 py-3 text-sm text-gray-900 dark:text-white">
+    <div
+        id="userDropdown"
+        class="absolute hidden right-0 2xl:left-1/2 2xl:-translate-x-1/2 z-10 divide-y rounded-lg shadow w-44 bg-gray-700 divide-gray-600"
+    >
+        <div class="px-4 py-3 text-sm text-white">
             {#if isAniListLoggedIn}
                 <div>{currentAniListUser.data.Viewer.name}</div>
             {:else}
                 <div>You are not logged into AniList</div>
             {/if}
         </div>
-        <ul class="py-2 text-sm text-gray-700 dark:text-gray-200"
-            aria-labelledby="dropdownUserAvatarButton">
+        <ul
+            class="py-2 text-sm text-gray-200"
+            aria-labelledby="dropdownUserAvatarButton"
+        >
             {#if isAniListLoggedIn}
                 <li>
-                    <button on:click={logoutOfAniList}
-                            class="block px-4 py-2 w-full hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
-                        Logout Anilist
+                    <button
+                        on:click={logoutOfAniList}
+                        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={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}
-                            class="block px-4 py-2 w-full hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
-                        Logout MAL
+                    <button
+                        on:click={logoutOfMAL}
+                        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={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}
-                            class="block px-4 py-2 w-full hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">
-                        Logout Simkl
+                    <button
+                        on:click={logoutOfSimkl}
+                        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={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()}
-                    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">
+            <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

@@ -2,48 +2,28 @@
     import Search from "./Search.svelte"
     import {
         aniListLoggedIn,
-        aniListUser,
         loginToAniList,
         loginToMAL,
         loginToSimkl,
         malLoggedIn,
-        malUser,
         simklLoggedIn,
-        simklUser,
-    } from "./GlobalVariablesAndHelperFunctions.svelte"
-    import type {AniListUser} from "../anilist/types/AniListTypes";
-    import type {SimklUser} from "../simkl/types/simklTypes";
-    import type {MyAnimeListUser} from "../mal/types/MALTypes";
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte"
     import AvatarMenu from "./AvatarMenu.svelte";
     import logo from "../assets/images/AniTrackLogo.svg"
-    import {location, pop} from "svelte-spa-router";
 
     let isAniListLoggedIn: boolean
     let isSimklLoggedIn: boolean
     let isMALLoggedIn: boolean
-    let currentAniListUser: AniListUser
-    let currentSimklUser: SimklUser
-    let currentMALUser: MyAnimeListUser
 
     aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
     simklLoggedIn.subscribe((value) => isSimklLoggedIn = 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="flex items-center space-x-3 rtl:space-x-reverse">
-            {#if currentLocation === "/"}
                 <a href="/"><img src={logo} class="h-8" alt="AniTrack Logo"/></a>
-            {:else}
-                <button on:click={() => pop()}><img src={logo} class="h-8" alt="AniTrack Logo"/></button>
-            {/if}
         </div>
         <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">
@@ -54,7 +34,7 @@
                 let menu = document.querySelector("#navbar-user")
                 menu.classList.toggle("hidden")
             }} type="button"
-                    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"
+                    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"
@@ -64,40 +44,26 @@
                 </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 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}
-                        <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-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>
-                        </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">
+                    {#if !isAniListLoggedIn}
+                        <button on:click={loginToAniList}>
+<!--                                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">-->
                             AniList Login
                         </button>
                     {/if}
-                </li>
-                <li>
-                    {#if isMALLoggedIn}
-                        <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">
+                    {#if !isMALLoggedIn}
+                        <button on:click={loginToMAL}>
+<!--                                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">-->
                             MyAnimeList Login
                         </button>
                     {/if}
                 </li>
                 <li>
-                    {#if isSimklLoggedIn}
-                        <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-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>
-                        </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">
+                    {#if !isSimklLoggedIn}
+                        <button on:click={loginToSimkl}>
+<!--                                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">-->
                             Simkl Login
                         </button>
                     {/if}

frontend/src/helperComponents/Pagination.svelte

@@ -4,7 +4,7 @@
         aniListWatchlist,
         animePerPage,
         watchListPage,
-    } from "./GlobalVariablesAndHelperFunctions.svelte";
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
 
     import type {AniListCurrentUserWatchList} from "../anilist/types/AniListCurrentUserWatchListType"
     import {GetAniListUserWatchingList} from "../../wailsjs/go/main/App";
@@ -50,14 +50,14 @@
                 {#if page === 1}
                     <li>
                         <button disabled
-                                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">
+                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 cursor-default">
                             Previous
                         </button>
                     </li>
                 {:else}
                     <li>
                         <button on:click={() => ChangeWatchListPage(page-1)}
-                                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">
+                                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">
                             Previous
                         </button>
                     </li>
@@ -66,26 +66,26 @@
                     {#if i + 1 === page}
                         <li>
                             <button on:click={() => ChangeWatchListPage(i+1)}
-                                    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>
+                                    class="flex items-center justify-center px-4 h-10 leading-tight border bg-gray-100 border-gray-700 bg-gray-700 text-white">{i + 1}</button>
                         </li>
                     {:else}
                         <li>
                             <button 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 dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">{i + 1}</button>
                         </li>
                     {/if}
                 {/each}
                 {#if page === aniListWatchListLoaded.data.Page.pageInfo.lastPage}
                     <li>
                         <button disabled
-                                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">
+                                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">
                             Next
                         </button>
                     </li>
                 {:else}
                     <li>
                         <button on:click={() => ChangeWatchListPage(page+1)}
-                                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">
+                                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">
                             Next
                         </button>
                     </li>
@@ -96,7 +96,7 @@
     <div class="flex mt-5">
         <div class="w-20 mx-auto">
             <select bind:value={perPage} on:change={(e) => changeCountPerPage(e)} id="countPerPage"
-                    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">
+                    class="border text-sm rounded-lg block w-full p-2.5 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500">
                 {#each perPageOptions as option}
                     <option value={option}>
                         {option}
@@ -117,8 +117,8 @@
         <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="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">
-                    <svg class="w-3 h-3 text-gray-900 dark:text-white" aria-hidden="true"
+                        class="bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none">
+                    <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"/>
@@ -126,14 +126,14 @@
                 </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"
+                       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="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"
+                        class="hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none">
+                    <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"/>

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

@@ -2,9 +2,9 @@
     import {
         aniListLoggedIn,
         aniListWatchlist,
-        GetAniListSingleItem,
+        GetAnimeSingleItem,
         loading,
-    } from "./GlobalVariablesAndHelperFunctions.svelte";
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
     import {push} from "svelte-spa-router";
     import type {AniListCurrentUserWatchList} from "../anilist/types/AniListCurrentUserWatchListType"
     import {Rating} from "flowbite-svelte";
@@ -45,7 +45,7 @@
                             </button>
                             <Rating id="anime-rating" total={5} size={35} rating={media.score/2.0}/>
                             <button class="mt-4 text-md font-semibold text-white-700"
-                                    on:click={() => GetAniListSingleItem(media.media.id, true)}>
+                                    on:click={() => GetAnimeSingleItem(media.media.id, true)}>
                                 {
                                     media.media.title.english === "" ?
                                         media.media.title.romaji :

frontend/src/helperComponents/WebsiteLink.svelte

@@ -0,0 +1,28 @@
+<script lang="ts">
+  import {BrowserOpenURL} from "../../wailsjs/runtime"
+
+  export let id: string
+  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-")
+    newId = id.match(re)[1]
+  }
+
+
+  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 class="underline underline-offset-2 px-4 py-1" on:click={() => BrowserOpenURL(url)}>{newId}</button>
+{:else}
+  {id}
+{/if}

frontend/src/helperDefaults/AniListGetSingleAnime.ts

@@ -0,0 +1,65 @@
+import type {AniListGetSingleAnime} from "../anilist/types/AniListCurrentUserWatchListType";
+
+export const AniListGetSingleAnimeDefaultData: AniListGetSingleAnime =  {
+    data: {
+        MediaList: {
+            id: 0,
+            mediaId: 0,
+            userId: 0,
+            media: {
+                id: 0,
+                idMal: 0,
+                title: {
+                    romaji: "",
+                    english: "",
+                    native: "",
+                },
+                description: "",
+                coverImage: {
+                    large: "",
+                },
+                season: "",
+                seasonYear: 0,
+                status: "",
+                episodes: 0,
+                nextAiringEpisode: {
+                    airingAt: 0,
+                    timeUntilAiring: 0,
+                    episode: 0,
+                }
+            },
+            status: "",
+            startedAt: {
+                year: 0,
+                month: 0,
+                day: 0,
+            },
+            completedAt: {
+                year: 0,
+                month: 0,
+                day: 0,
+            },
+            notes: "",
+            progress: 0,
+            score: 0,
+            repeat: 0,
+            user: {
+                id: 0,
+                name: "",
+                avatar: {
+                    large: "",
+                    medium: "",
+                },
+                statistics: {
+                    anime: {
+                        count: 0,
+                        statuses: [{
+                            status: "",
+                            count: 0,
+                        }]
+                    }
+                }
+            }
+        }
+    }
+}

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/CheckIfAniListLoggedInAndLoadWatchList.svelte

@@ -0,0 +1,34 @@
+<script lang="ts" context="module">
+    import {CheckIfAniListLoggedIn, GetAniListLoggedInUser, GetAniListUserWatchingList} from "../../wailsjs/go/main/App";
+    import {MediaListSort} from "../anilist/types/AniListTypes";
+    import { aniListUser, watchListPage, animePerPage, aniListPrimary, aniListLoggedIn, aniListWatchlist } from "./GlobalVariablesAndHelperFunctions.svelte"
+
+    let isAniListPrimary: boolean
+    let page: number
+    let perPage: number
+
+    aniListPrimary.subscribe(value => isAniListPrimary = value)
+    watchListPage.subscribe(value => page = value)
+    animePerPage.subscribe(value => perPage = value)
+
+    export const LoadAniListUser = async () => {
+        await GetAniListLoggedInUser().then(user => {
+            aniListUser.set(user)
+        })
+    }
+
+    export const LoadAniListWatchList = async () => {
+        await GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((watchList) => {
+            aniListWatchlist.set(watchList)
+        })
+    }
+
+    export const CheckIfAniListLoggedInAndLoadWatchList = async () => {
+        const loggedIn = await CheckIfAniListLoggedIn()
+        if (loggedIn) {
+            await LoadAniListUser()
+            if (isAniListPrimary) await LoadAniListWatchList()
+        }
+        aniListLoggedIn.set(loggedIn)
+    }
+</script>

frontend/src/helperModules/CheckIfMyAnimeListLoggedIn.svelte

@@ -0,0 +1,25 @@
+<script lang="ts" context="module">
+    import {CheckIfMyAnimeListLoggedIn, GetMyAnimeList, GetMyAnimeListLoggedInUser} from "../../wailsjs/go/main/App";
+    import {malUser, malPrimary, malWatchList, malLoggedIn} from "./GlobalVariablesAndHelperFunctions.svelte"
+
+    let isMalPrimary: boolean
+    malPrimary.subscribe(value => isMalPrimary = value)
+
+    export const CheckIfMALLoggedInAndSetUser = async () => {
+        await CheckIfMyAnimeListLoggedIn().then(loggedIn => {
+            if (loggedIn) {
+                GetMyAnimeListLoggedInUser().then(user => {
+                    malUser.set(user)
+                    if (isMalPrimary) {
+                        GetMyAnimeList(1000).then(watchList => {
+                            malWatchList.set(watchList)
+                            malLoggedIn.set(loggedIn)
+                        })
+                    } else {
+                        malLoggedIn.set(loggedIn)
+                    }
+                })
+            }
+        })
+    }
+</script>

frontend/src/helperModules/CheckIsSimklLoggedIn.svelte

@@ -0,0 +1,29 @@
+<script lang="ts" context="module">
+    import {CheckIfSimklLoggedIn, GetSimklLoggedInUser, SimklGetUserWatchlist} from "../../wailsjs/go/main/App";
+    import { simklLoggedIn, simklUser, simklPrimary, simklWatchList } from "./GlobalVariablesAndHelperFunctions.svelte";
+
+    let isSimklPrimary: boolean
+    simklPrimary.subscribe(value => isSimklPrimary = value)
+
+    export const CheckIfSimklLoggedInAndSetUser = async () => {
+        await CheckIfSimklLoggedIn().then(loggedIn => {
+            if (loggedIn) {
+                GetSimklLoggedInUser().then(user => {
+                    if (Object.keys(user).length === 0) {
+                        simklLoggedIn.set(false)
+                    } else {
+                        simklUser.set(user)
+                        if (isSimklPrimary) {
+                            SimklGetUserWatchlist().then(result => {
+                                simklWatchList.set(result)
+                                simklLoggedIn.set(loggedIn)
+                            })
+                        } else {
+                            simklLoggedIn.set(loggedIn)
+                        }
+                    }
+                })
+            }
+        })
+    }
+</script>

frontend/src/helperModules/GlobalVariablesAndHelperFunctions.svelte

@@ -21,8 +21,9 @@
     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({} as AniListGetSingleAnime)
+    export let aniListAnime = writable(AniListGetSingleAnimeDefaultData)
     export let title = writable("")
     export let aniListLoggedIn = writable(false)
     export let simklLoggedIn = writable(false)
@@ -62,7 +63,7 @@
     aniListAnime.subscribe(value => currentAniListAnime = value)
 
 
-    export async function GetAniListSingleItem(aniId: number, login: boolean): Promise<""> {
+    export async function GetAnimeSingleItem(aniId: number, login: boolean): Promise<""> {
         await GetAniListItem(aniId, login).then(aniListResult => {
             let finalResult: AniListGetSingleAnime
             finalResult = aniListResult
@@ -90,7 +91,7 @@
             })
         }
         if (isSimklLoggedIn) {
-            await SimklSearch(currentAniListAnime.data.MediaList.media.id).then((value: SimklAnime) => {
+            await SimklSearch(currentAniListAnime.data.MediaList).then((value: SimklAnime) => {
                 simklAnime.set(value)
             })
         }

frontend/src/helperTypes/TableTypes.ts

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

frontend/src/routes/Anime.svelte

@@ -1,449 +0,0 @@
-<script lang="ts">
-    import {
-        aniListAnime,
-        aniListLoggedIn,
-        malAnime,
-        malLoggedIn,
-        simklAnime,
-        simklLoggedIn,
-    } from "../helperComponents/GlobalVariablesAndHelperFunctions.svelte";
-    import {pop} from "svelte-spa-router";
-    import {Button} from "flowbite-svelte";
-    import type {AniListGetSingleAnime} from "../anilist/types/AniListCurrentUserWatchListType";
-    import Rating from "../helperComponents/Rating.svelte";
-    import convertAniListDateToString from "../helperFunctions/convertAniListDateToString";
-    import AnimeTable from "../helperComponents/AnimeTable.svelte";
-    import type {MALAnime, MalListStatus, MALUploadStatus} from "../mal/types/MALTypes";
-    import type {SimklAnime} from "../simkl/types/simklTypes";
-    import {writable} from "svelte/store";
-    import type {StatusOption, StatusOptions} from "../helperTypes/StatusTypes";
-    import type {AniListUpdateVariables} from "../anilist/types/AniListTypes";
-    import convertDateStringToAniList from "../helperFunctions/convertDateStringToAniList";
-    import {
-        AniListUpdateEntry,
-        MyAnimeListUpdate,
-        SimklSyncEpisodes,
-        SimklSyncRating,
-        SimklSyncStatus
-    } from "../../wailsjs/go/main/App";
-    import {AddAnimeServiceToTable} from "../helperComponents/AddAnimeServiceToTable.svelte";
-
-    let isAniListLoggedIn: boolean
-    let isMalLoggedIn: boolean
-    let isSimklLoggedIn: boolean
-    let currentAniListAnime: AniListGetSingleAnime
-    let currentMalAnime: MALAnime
-    let currentSimklAnime: SimklAnime
-    let submitting = writable(false)
-    let isSubmitting: boolean
-    let submitSuccess = writable(false)
-
-    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-    malLoggedIn.subscribe((value) => isMalLoggedIn = value)
-    simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
-    aniListAnime.subscribe((value) => currentAniListAnime = value)
-    malAnime.subscribe((value) => currentMalAnime = value)
-    simklAnime.subscribe((value) => currentSimklAnime = value)
-    submitting.subscribe((value) => isSubmitting = value)
-
-    const title = currentAniListAnime.data.MediaList.media.title.english !== "" ?
-        currentAniListAnime.data.MediaList.media.title.english :
-        currentAniListAnime.data.MediaList.media.title.romaji
-    const statusOptions: StatusOptions = [
-        {id: 0, aniList: "CURRENT", mal: "watching", simkl: "watching"},
-        {id: 1, aniList: "PLANNING", mal: "plan_to_watch", simkl: "plantowatch"},
-        {id: 2, aniList: "COMPLETED", mal: "completed", simkl: "completed"},
-        {id: 3, aniList: "DROPPED", mal: "dropped", simkl: "dropped"},
-        {id: 4, aniList: "PAUSED", mal: "on_hold", simkl: "hold"},
-        {id: 5, aniList: "REPEATING", mal: "rewatching", simkl: "watching"}
-    ]
-    let startingAnilistStatusOption: StatusOption = statusOptions.filter(option => currentAniListAnime.data.MediaList.status === option.aniList)[0]
-    const startedAtDate = convertAniListDateToString(currentAniListAnime.data.MediaList.startedAt)
-    const completedAtDate = convertAniListDateToString(currentAniListAnime.data.MediaList.completedAt)
-
-    if (isAniListLoggedIn) AddAnimeServiceToTable({
-        id: currentAniListAnime.data.MediaList.id,
-        service: "AniList",
-        progress: currentAniListAnime.data.MediaList.progress,
-        status: currentAniListAnime.data.MediaList.status,
-        startedAt: convertAniListDateToString(currentAniListAnime.data.MediaList.startedAt),
-        completedAt: convertAniListDateToString(currentAniListAnime.data.MediaList.completedAt),
-        score: currentAniListAnime.data.MediaList.score,
-        repeat: currentAniListAnime.data.MediaList.repeat,
-        notes: currentAniListAnime.data.MediaList.notes
-    })
-
-
-    if (isMalLoggedIn) AddAnimeServiceToTable({
-        id: currentMalAnime.id,
-        service: "MyAnimeList",
-        progress: currentMalAnime.my_list_status.num_episodes_watched,
-        status: currentMalAnime.my_list_status.status,
-        startedAt: currentMalAnime.my_list_status.start_date,
-        completedAt: currentMalAnime.my_list_status.finish_date,
-        score: currentMalAnime.my_list_status.score,
-        repeat: currentMalAnime.my_list_status.num_times_rewatched,
-        notes: currentMalAnime.my_list_status.comments
-    })
-
-    if (isSimklLoggedIn && Object.keys(currentSimklAnime).length > 0) AddAnimeServiceToTable({
-        id: currentSimklAnime.show.ids.simkl,
-        service: "Simkl",
-        progress: currentSimklAnime.watched_episodes_count,
-        status: currentSimklAnime.status,
-        startedAt: "",
-        completedAt: "",
-        score: currentSimklAnime.user_rating,
-        repeat: 0,
-        notes: ""
-    })
-
-    const handleSubmit = async (e: any) => {
-        submitting.set(true)
-        let submitData: {
-            rating: number,
-            episodes: number,
-            status: StatusOption,
-            startedAt: string,
-            completedAt: string,
-            repeat: number,
-            notes: string,
-        } = {
-            rating: 0,
-            episodes: 0,
-            status: {
-                id: 0,
-                aniList: "",
-                mal: "",
-                simkl: "",
-            },
-            startedAt: "",
-            completedAt: "",
-            repeat: 0,
-            notes: "",
-        }
-        const formData = new FormData(e.target)
-        for (let field of formData) {
-            const [key, value] = field
-            if (key === "rating") {
-                submitData.rating = (Number(value) * 2)
-                continue
-            }
-            if (key === "episodes") {
-                submitData.episodes = Number(value)
-                continue
-            }
-            if (key === "repeat") {
-                submitData.repeat = Number(value)
-                continue
-            }
-            if (key === "status") {
-                submitData.status = startingAnilistStatusOption
-                continue
-            }
-            submitData[key] = value
-        }
-
-        if (isAniListLoggedIn) {
-            let body: AniListUpdateVariables = {
-                mediaId: currentAniListAnime.data.MediaList.mediaId,
-                progress: submitData.episodes,
-                status: submitData.status.aniList,
-                score: submitData.rating,
-                repeat: submitData.repeat,
-                notes: submitData.notes,
-                startedAt: convertDateStringToAniList(submitData.startedAt),
-                completedAt: convertDateStringToAniList(submitData.completedAt)
-            }
-            await AniListUpdateEntry(body).then((value: AniListGetSingleAnime) => {
-                // in future when you inevitably add tags to typescript, until Anilist fixes the api bug
-                // where tags break the SaveMediaListEntry return, you'll want to use this delete line
-                // delete value.data.MediaList.media.tags
-                aniListAnime.update(newValue => {
-                    newValue = value
-                    return newValue
-                })
-                AddAnimeServiceToTable({
-                    id: currentAniListAnime.data.MediaList.id,
-                    service: "AniList",
-                    progress: currentAniListAnime.data.MediaList.progress,
-                    status: currentAniListAnime.data.MediaList.status,
-                    startedAt: convertAniListDateToString(currentAniListAnime.data.MediaList.startedAt),
-                    completedAt: convertAniListDateToString(currentAniListAnime.data.MediaList.completedAt),
-                    score: currentAniListAnime.data.MediaList.score,
-                    repeat: currentAniListAnime.data.MediaList.repeat,
-                    notes: currentAniListAnime.data.MediaList.notes,
-                })
-            })
-        }
-
-        if (malLoggedIn) {
-            let body: MALUploadStatus = {
-                status: submitData.status.mal,
-                is_rewatching: submitData.repeat > 0,
-                score: submitData.rating,
-                num_watched_episodes: submitData.episodes,
-                num_times_rewatched: submitData.repeat,
-                comments: submitData.notes
-            }
-
-            await MyAnimeListUpdate(currentMalAnime, body).then((malAnimeReturn: MalListStatus) => {
-                malAnime.update(value => {
-                    value.my_list_status.status = malAnimeReturn.status
-                    value.my_list_status.is_rewatching = malAnimeReturn.is_rewatching
-                    value.my_list_status.score = malAnimeReturn.score
-                    value.my_list_status.num_episodes_watched = malAnimeReturn.num_episodes_watched
-                    value.my_list_status.num_times_rewatched = malAnimeReturn.num_times_rewatched
-                    value.my_list_status.comments = malAnimeReturn.comments
-                    return value
-                })
-                AddAnimeServiceToTable({
-                    id: currentMalAnime.id,
-                    service: "MyAnimeList",
-                    progress: currentMalAnime.my_list_status.num_episodes_watched,
-                    status: currentMalAnime.my_list_status.status,
-                    startedAt: currentMalAnime.my_list_status.start_date,
-                    completedAt: currentMalAnime.my_list_status.finish_date,
-                    score: currentMalAnime.my_list_status.score,
-                    repeat: currentMalAnime.my_list_status.num_times_rewatched,
-                    notes: currentMalAnime.my_list_status.comments,
-                })
-            })
-        }
-
-        if (simklLoggedIn) {
-            if (currentSimklAnime.watched_episodes_count !== submitData.episodes) {
-                await SimklSyncEpisodes(currentSimklAnime, submitData.episodes).then((value: SimklAnime) => {
-                    AddAnimeServiceToTable({
-                        id: value.show.ids.simkl,
-                        service: "Simkl",
-                        progress: value.watched_episodes_count,
-                        status: value.status,
-                        startedAt: "",
-                        completedAt: "",
-                        score: value.user_rating,
-                        repeat: 0,
-                        notes: ""
-                    })
-                    simklAnime.update(newValue => {
-                        newValue = value
-                        return newValue
-                    })
-                })
-            }
-
-            if (currentSimklAnime.user_rating !== submitData.rating) {
-                await SimklSyncRating(currentSimklAnime, submitData.rating).then(value => {
-                    AddAnimeServiceToTable({
-                        id: value.show.ids.simkl,
-                        service: "Simkl",
-                        progress: value.watched_episodes_count,
-                        status: value.status,
-                        startedAt: "",
-                        completedAt: "",
-                        score: value.user_rating,
-                        repeat: 0,
-                        notes: ""
-                    })
-                    simklAnime.update(newValue => {
-                        newValue = value
-                        return newValue
-                    })
-                })
-            }
-
-            if (currentSimklAnime.status !== submitData.status.simkl) {
-                await SimklSyncStatus(currentSimklAnime, submitData.status.simkl).then(value => {
-                    AddAnimeServiceToTable({
-                        id: value.show.ids.simkl,
-                        service: "Simkl",
-                        progress: value.watched_episodes_count,
-                        status: value.status,
-                        startedAt: "",
-                        completedAt: "",
-                        score: value.user_rating,
-                        repeat: 0,
-                        notes: ""
-                    })
-                    simklAnime.update(newValue => {
-                        newValue = value
-                        return newValue
-                    })
-                })
-            }
-        }
-
-        submitting.set(false)
-        submitSuccess.set(true)
-        setTimeout(() => submitSuccess.set(false), 2000)
-    }
-</script>
-<form on:submit|preventDefault={handleSubmit} class="container py-10">
-    <div class="grid grid-cols-1 md:grid-cols-10 grid-flow-col gap-4">
-        <div class="md:col-span-2 space-y-3">
-            <img class="rounded-lg" src={currentAniListAnime.data.MediaList.media.coverImage.large}
-                 alt="{title} Cover Image">
-            <Rating bind:score={currentAniListAnime.data.MediaList.score}/>
-        </div>
-
-        <div class="md:col-span-8 ">
-            <div class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center md:gap-x-24 lg:gap-x-56">
-                <div>
-                    <label for="episodes"
-                           class="text-left block mb-2 text-sm font-medium text-gray-900 dark:text-white">Episode
-                        Progress</label>
-                    <input
-                            type="number"
-                            name="episodes"
-                            min="0"
-                            max="{currentAniListAnime.data.MediaList.media.episodes}"
-                            id="episodes"
-                            class="bg-gray-50 border {currentAniListAnime.data.MediaList.progress < 0 || currentAniListAnime.data.MediaList.progress > currentAniListAnime.data.MediaList.media.episodes ?
-                            'border-red-300 dark:border-red-500 border-[2px] text-rose-500 dark:text-rose-300 focus:ring-red-500 focus:border-red-500 dark:focus:ring-red-500 dark:focus:border-red-500' :
-                            'border-gray-300 dark:border-gray-500 text-gray-900 dark:text-white focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-500 dark:focus:border-blue-500'
-                            } text-sm rounded-lg block w-24 p-2.5 dark:bg-gray-600 dark:placeholder-gray-400"
-                            bind:value={currentAniListAnime.data.MediaList.progress}
-                            required>
-                    <div>of {currentAniListAnime.data.MediaList.media.episodes}</div>
-                </div>
-
-
-                <div>
-                    <label for="status"
-                           class="text-left block mb-2 text-sm font-medium text-gray-900 dark:text-white">Status</label>
-                    <select id="status" name="status"
-                            class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500
-                            focus:border-blue-500 block 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"
-                            bind:value={startingAnilistStatusOption}
-                    >
-                        {#each statusOptions as option}
-                            <option value={option}>{option.aniList}</option>
-                        {/each}
-                    </select>
-                </div>
-            </div>
-            <div class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center md:gap-x-16 lg:gap-x-36">
-
-                <div>
-
-                    <label for="startedAt"
-                           class="text-left block mb-2 text-sm font-medium text-gray-900 dark:text-white">Date
-                        Started</label>
-                    <div class="relative max-w-sm">
-                        <div class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none">
-                            <svg class="w-4 h-4 text-gray-500 dark: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"/>
-                            </svg>
-                        </div>
-                        <input
-                                id="startedAt"
-                                type="date"
-                                name="startedAt"
-                                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500
-                            focus:border-blue-500 dark:focus:ring-blue-500 dark:focus:border-blue-500 block w-full ps-10 p-2.5 dark:bg-gray-700 dark:border-gray-600
-                            dark:placeholder-gray-400 dark:text-white"
-                                value={startedAtDate}
-                                placeholder="Date Started"
-                        >
-                    </div>
-                </div>
-                <div>
-
-                    <label for="completedAt"
-                           class="text-left block mb-2 text-sm font-medium text-gray-900 dark:text-white">Date
-                        Completed</label>
-                    <div class="relative max-w-sm">
-                        <div class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none">
-                            <svg class="w-4 h-4 text-gray-500 dark: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"/>
-                            </svg>
-                        </div>
-                        <input
-                                id="completedAt"
-                                type="date"
-                                name="completedAt"
-                                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 ps-10 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"
-                                value={completedAtDate}
-                                placeholder="Date Completed"
-                        >
-                    </div>
-                </div>
-                <div>
-                    <label for="repeat"
-                           class="text-left block mb-2 text-sm font-medium text-gray-900 dark:text-white">Rewatched</label>
-                    <input
-                            type="number"
-                            name="repeat"
-                            min="0"
-                            id="repeat"
-                            class="bg-gray-50 border {currentAniListAnime.data.MediaList.repeat < 0 ?
-                            'border-red-300 dark:border-red-500 border-[2px] text-rose-500 dark:text-rose-300 focus:ring-red-500 focus:border-red-500 dark:focus:ring-red-500 dark:focus:border-red-500' :
-                            'border-gray-300 dark:border-gray-500 text-gray-900 dark:text-white focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-500 dark:focus:border-blue-500'
-                            } text-sm rounded-lg block w-24 p-2.5 dark:bg-gray-600 dark:placeholder-gray-400 dark:text-white"
-                            bind:value={currentAniListAnime.data.MediaList.repeat}
-                            required>
-                </div>
-            </div>
-            <div class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center">
-                <div class="w-full">
-                    <label for="notes" class="text-left block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your
-                        notes</label>
-                    <textarea id="notes" rows="3" name="notes"
-                              class="block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 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"
-                              placeholder="Write your thoughts here..."
-                              bind:value={currentAniListAnime.data.MediaList.notes}></textarea>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div id="external-data">
-        <div id="anilist-data"
-             class="flex flex-col md:flex-row md:pl-10 md:pr-10 pt-5 pb-5 justify-center md:gap-x-16 lg:gap-x-36 group">
-            <h2 class="text-left mb-1 text-base font-semibold text-gray-900 dark:text-white">AniList</h2>
-        </div>
-    </div>
-
-    <AnimeTable/>
-
-    <div class="bg-white rounded-lg shadow max-w-4-4 dark:bg-gray-800">
-        <div class="w-full mx-auto max-w-screen-xl p-4 md:flex md:items-center md:justify-end">
-            <Button disabled={isSubmitting}
-                    id="sync-button"
-                    class="text-white bg-blue-700 {$submitSuccess ?
-                    'dark:bg-green-600 hover:bg-green-800 dark:hover:bg-green-700 focus:ring-4 focus:ring-green-300 dark:focus:ring-green-800' :
-                    'dark:bg-blue-600 hover:bg-blue-800 dark:hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-800'
-                    } font-medium
-                    rounded-lg text-sm px-5 py-2.5 me-2 mb-2 focus:outline-none"
-                    type="submit">
-                <svg id="submit-loader" aria-hidden="true" role="status"
-                     class="{isSubmitting ? 'inline': 'hidden'} w-4 h-4 me-3 text-white animate-spin"
-                     viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-                          fill="#E5E7EB"/>
-                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-                          fill="currentColor"/>
-                </svg>
-                Sync Changes
-            </Button>
-            <Button
-                    class="text-gray-900 bg-white border border-gray-300 focus:outline-none hover:bg-gray-100 focus:ring-4
-                    focus:ring-gray-100 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2 dark:bg-gray-800 dark:text-white
-                    dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-600 dark:focus:ring-gray-700"
-                    on:click={() => pop()}>
-                Back
-            </Button>
-        </div>
-    </div>
-
-    <div>
-        <h3 class="text-2xl">
-            Summary
-        </h3>
-        <p>{@html currentAniListAnime.data.MediaList.media.description}</p>
-    </div>
-</form>

frontend/src/routes/AnimeRoutePage.svelte

@@ -0,0 +1,9 @@
+<script lang="ts">
+    import Anime from "../helperComponents/Anime.svelte"
+
+    export let params: Record<string, string>
+</script>
+
+{#key params.id}
+    <Anime />
+{/key}

frontend/src/routes/Home.svelte

@@ -5,7 +5,7 @@ import {
     aniListLoggedIn,
     aniListPrimary,
     loading,
-} from "../helperComponents/GlobalVariablesAndHelperFunctions.svelte";
+} from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
 import loader from '../helperFunctions/loader'
 
 let isAniListPrimary: boolean

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: [
-        require('flowbite/plugin')
-    ],
+    plugins: [ flowbitePlugin ],
 
     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

@@ -2,6 +2,8 @@
 // This file is automatically generated. DO NOT EDIT
 import {main} from '../models';
 
+export function AniListDeleteEntry(arg1:number):Promise<main.DeleteAniListReturn>;
+
 export function AniListLogin():Promise<void>;
 
 export function AniListSearch(arg1:string):Promise<any>;
@@ -14,6 +16,8 @@ export function CheckIfMyAnimeListLoggedIn():Promise<boolean>;
 
 export function CheckIfSimklLoggedIn():Promise<boolean>;
 
+export function DeleteMyAnimeListEntry(arg1:number):Promise<boolean>;
+
 export function GetAniListItem(arg1:number,arg2:boolean):Promise<main.AniListGetSingleAnime>;
 
 export function GetAniListLoggedInUser():Promise<main.AniListUser>;
@@ -38,14 +42,16 @@ export function MyAnimeListLogin():Promise<void>;
 
 export function MyAnimeListUpdate(arg1:main.MALAnime,arg2:main.MALUploadStatus):Promise<main.MalListStatus>;
 
-export function SimklGetUserWatchlist():Promise<main.SimklWatchList>;
+export function SimklGetUserWatchlist():Promise<main.SimklWatchListType>;
 
 export function SimklLogin():Promise<void>;
 
-export function SimklSearch(arg1:number):Promise<main.SimklAnime>;
+export function SimklSearch(arg1:main.MediaList):Promise<main.SimklAnime>;
 
 export function SimklSyncEpisodes(arg1:main.SimklAnime,arg2:number):Promise<main.SimklAnime>;
 
 export function SimklSyncRating(arg1:main.SimklAnime,arg2:number):Promise<main.SimklAnime>;
 
+export function SimklSyncRemove(arg1:main.SimklAnime):Promise<boolean>;
+
 export function SimklSyncStatus(arg1:main.SimklAnime,arg2:string):Promise<main.SimklAnime>;

frontend/wailsjs/go/main/App.js

@@ -2,6 +2,10 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+export function AniListDeleteEntry(arg1) {
+  return window['go']['main']['App']['AniListDeleteEntry'](arg1);
+}
+
 export function AniListLogin() {
   return window['go']['main']['App']['AniListLogin']();
 }
@@ -26,6 +30,10 @@ export function CheckIfSimklLoggedIn() {
   return window['go']['main']['App']['CheckIfSimklLoggedIn']();
 }
 
+export function DeleteMyAnimeListEntry(arg1) {
+  return window['go']['main']['App']['DeleteMyAnimeListEntry'](arg1);
+}
+
 export function GetAniListItem(arg1, arg2) {
   return window['go']['main']['App']['GetAniListItem'](arg1, arg2);
 }
@@ -94,6 +102,10 @@ export function SimklSyncRating(arg1, arg2) {
   return window['go']['main']['App']['SimklSyncRating'](arg1, arg2);
 }
 
+export function SimklSyncRemove(arg1) {
+  return window['go']['main']['App']['SimklSyncRemove'](arg1);
+}
+
 export function SimklSyncStatus(arg1, arg2) {
   return window['go']['main']['App']['SimklSyncStatus'](arg1, arg2);
 }

frontend/wailsjs/go/models.ts

@@ -168,11 +168,41 @@ export namespace main {
 		}
 	}
 	
+	export class DeleteAniListReturn {
+	    // Go type: struct { DeleteMediaListEntry struct { Deleted bool "json:\"deleted\"" } "json:\"DeleteMediaListEntry\"" }
+	    data: any;
+	
+	    static createFrom(source: any = {}) {
+	        return new DeleteAniListReturn(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.data = this.convertValues(source["data"], Object);
+	    }
+	
+		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 MALAnime {
 	    id: id;
 	    title: title;
-	    // Go type: struct { Large string "json:\"large\" json:\"large\""; Medium string "json:\"medium\" json:\"medium\"" }
-	    main_picture: any;
+	    main_picture: mainPicture;
 	    alternative_titles: alternativeTitles;
 	    start_date: startDate;
 	    end_date: endDate;
@@ -200,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);
@@ -209,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"];
@@ -237,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 {
@@ -280,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 = {}) {
@@ -289,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;
@@ -505,11 +520,11 @@ export namespace main {
 	        this.connections = source["connections"];
 	    }
 	}
-	export class SimklWatchList {
+	export class SimklWatchListType {
 	    anime: anime;
 	
 	    static createFrom(source: any = {}) {
-	        return new SimklWatchList(source);
+	        return new SimklWatchListType(source);
 	    }
 	
 	    constructor(source: any = {}) {
@@ -590,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: any;
+	    node: node;
 	    list_status: listStatus;
 	
 	    static createFrom(source: any = {}) {
@@ -603,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
-
-toolchain go1.21.11
+go 1.24.0
 
 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/tkrajina/go-reflector v0.5.6 // indirect
+	github.com/samber/lo v1.49.1 // 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/net v0.28.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/term v0.29.0 // indirect
+	golang.org/x/text v0.22.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.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
+github.com/dvsekhvalnov/jose2go v1.8.0 h1:LqkkVKAlHFfH9LOEl5fe4p/zL02OhWE7pCufMBG2jLA=
+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/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+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.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 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.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
+github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
+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.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE=
-github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
+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.13/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
+github.com/wailsapp/go-webview2 v1.0.19 h1:7U3QcDj1PrBPaxJNCui2k1SkWml+Q5kvFUFyTImA6NU=
+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.9.1/go.mod h1:7maJV2h+Egl11Ak8QZN/jlGLj2wg05bsQS+ywJPT0gI=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+github.com/wailsapp/wails/v2 v2.10.1 h1:QWHvWMXII2nI/nXz77gpPG8P3ehl6zKe+u4su5BWIns=
+github.com/wailsapp/wails/v2 v2.10.1/go.mod h1:zrebnFV6MQf9kx8HI4iAv63vsR5v67oS7GTEZ7Pz1TY=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 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.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 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.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 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.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 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

@@ -26,13 +26,17 @@ func main() {
 		},
 		BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1},
 		OnStartup:        app.startup,
+		SingleInstanceLock: &options.SingleInstanceLock{
+			UniqueId:               "49c93b6d-663d-4b7a-9cb0-8a469ea9182b",
+			OnSecondInstanceLaunch: app.onSecondInstanceLaunch,
+		},
 		Bind: []interface{}{
 			app,
 		},
 		Linux: &linux.Options{
-			Icon:                []byte("./build/appicon.png"),
+			Icon:                []byte("./build/AniTrack.png"),
 			WindowIsTranslucent: false,
-			WebviewGpuPolicy:    linux.WebviewGpuPolicyAlways,
+			WebviewGpuPolicy:    linux.WebviewGpuPolicyNever,
 			ProgramName:         "AniTrack",
 		},
 	})

rest/AniTrack/Get Items/AniChart.http

@@ -0,0 +1,79 @@
+# @name AniChart
+
+POST https://graphql.anilist.co
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+
+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
+      }
+    }
+  }
+}
+
+{
+  "page": 50,
+  "perPage": 20,
+  "airingAt_greater": 1730260800
+}

rest/AniTrack/Get Items/AniList Item.http

@@ -0,0 +1,83 @@
+# @name AniList Item
+
+POST https://graphql.anilist.co
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
+
+query ($userId: Int, $mediaId: Int, $listType: MediaType) {
+  MediaList(mediaId: $mediaId, userId: $userId, type: $listType) {
+    id
+    mediaId
+    userId
+    media {
+      id
+      idMal
+      tags {
+        id
+        name
+        description
+        rank
+        isMediaSpoiler
+        isAdult
+      }
+      title {
+        romaji
+        english
+        native
+      }
+      description
+      coverImage {
+        large
+      }
+      season
+      seasonYear
+      status
+      episodes
+      nextAiringEpisode {
+        airingAt
+        timeUntilAiring
+        episode
+      }
+      isAdult
+    }
+    status
+    startedAt {
+      year
+      month
+      day
+    }
+    completedAt {
+      year
+      month
+      day
+    }
+    notes
+    progress
+    score
+    repeat
+    user {
+      id
+      name
+      avatar {
+        large
+        medium
+      }
+      statistics {
+        anime {
+          count
+          statuses {
+            status
+            count
+          }
+        }
+      }
+    }
+  }
+}
+
+{
+  "userId": 413504,
+  "mediaId": 170998,
+  "listType": "ANIME"
+}

rest/AniTrack/Get Items/AniList MediaList User Query.http

@@ -0,0 +1,70 @@
+# @name AniList MediaList User Query
+
+POST https://graphql.anilist.co
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+
+query(
+  $page: Int
+  $perPage: Int
+  $userId: Int
+  $listType: MediaType
+  $status: MediaListStatus
+) {
+  Page(page: $page, perPage: $perPage) {
+    pageInfo {
+      total
+      perPage
+      currentPage
+      lastPage
+      hasNextPage
+    }
+    mediaList(userId: $userId, type: $listType, status: $status) {
+      id
+      mediaId
+      userId
+      media {
+        id
+        idMal
+        title {
+          romaji
+          english
+          native
+        }
+        description
+        coverImage {
+          large
+        }
+        season
+        seasonYear
+        episodes
+      }
+      status
+      notes
+      progress
+      score
+      repeat
+      user {
+        id
+        statistics {
+          anime {
+            count
+            statuses {
+              status
+              count
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+
+{
+  "page": 1,
+  "perPage": 20,
+  "userId": 413504,
+  "listType": "ANIME",
+  "status": "CURRENT"
+}

rest/AniTrack/Get Items/AniList Search.http

@@ -0,0 +1,44 @@
+# @name AniList Search
+
+POST https://graphql.anilist.co
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+
+query ($search: String!, $listType: MediaType) {
+				 Page (page: 1, perPage: 100) {
+					pageInfo {
+					  total
+					  currentPage
+					  lastPage
+					  hasNextPage
+					  perPage
+					}
+					media (search: $search, type: $listType) {
+						id						
+						idMal
+						title {
+						  romaji
+						  english
+						  native
+						}
+						description
+						coverImage {
+						  large
+						}
+						season
+						seasonYear
+						status
+						episodes
+						nextAiringEpisode{
+						  airingAt
+						  timeUntilAiring
+						  episode
+						}
+					}
+				}
+			}
+
+{
+  "search": "dan-da-dan",
+  "listType": "ANIME"
+}

rest/AniTrack/Get Items/GetAniListUserWatchingList.http

@@ -0,0 +1,93 @@
+# @name GetAniListUserWatchList
+
+POST https://graphql.anilist.co
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+
+query (
+  $page: Int
+  $perPage: Int
+  $userId: Int
+  $listType: MediaType
+  $status: MediaListStatus
+  $sort: [MediaListSort]
+) {
+  Page(page: $page, perPage: $perPage) {
+    pageInfo {
+      total
+      perPage
+      currentPage
+      lastPage
+      hasNextPage
+    }
+    mediaList(userId: $userId, type: $listType, status: $status, sort: $sort) {
+      id
+      mediaId
+      userId
+      media {
+        id
+        idMal
+        title {
+          romaji
+          english
+          native
+        }
+        description
+        coverImage {
+          large
+        }
+        season
+        seasonYear
+        status
+        episodes
+        nextAiringEpisode {
+          airingAt
+          timeUntilAiring
+          episode
+        }
+      }
+      status
+      startedAt {
+        year
+        month
+        day
+      }
+      completedAt {
+        year
+        month
+        day
+      }
+      notes
+      progress
+      score
+      repeat
+      user {
+        id
+        name
+        avatar {
+          large
+          medium
+        }
+        statistics {
+          anime {
+            count
+            statuses {
+              status
+              count
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+
+{
+  "page": 1,
+  "perPage": 20,
+  "userId": 413504,
+  "listType": "ANIME",
+  "status": "CURRENT",
+  "sort": "UPDATED_TIME_DESC"
+}

rest/AniTrack/GetAuthorizationToken.http

@@ -0,0 +1,3 @@
+# @name GetAuthorizationToken
+
+GET https://anilist.co/api/v2/oauth/authorize?client_id={{ANILIST_APP_ID}}&redirect_uri=http://localhost:6734/callback&response_type=code

rest/AniTrack/Load AniList Oauth Page.http

@@ -0,0 +1,11 @@
+# @name Load AniList Oauth Token
+
+POST https://anilist.co/api/v2/oauth/token
+Content-Type: application/x-www-form-urlencoded
+Accept: application/json
+
+grant_type=authorization_code
+client_id={{ANILIST_APP_ID}}
+client_secret={{ANILIST_SECRET_ID}}
+redirect_uri=http://localhost:6734/callback
+code={{ANILIST_CODE}}

rest/AniTrack/Set Items/AniList Change Episode Watched.http

@@ -0,0 +1,76 @@
+# @name AniList Change Episode Watched
+
+POST https://graphql.anilist.co
+Content-Type: applicaton/json
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
+
+mutation($mediaId:Int, $progress:Int, $status:MediaListStatus){
+  SaveMediaListEntry(mediaId:$mediaId, progress:$progress, status:$status){   
+    id
+    mediaId
+    userId
+    media {
+      id
+      idMal
+      title {
+        romaji
+        english
+        native
+      }
+      description
+      coverImage {
+        large
+      }
+      season
+      seasonYear
+      status
+      episodes
+      nextAiringEpisode {
+        airingAt
+        timeUntilAiring
+        episode
+      }
+      isAdult
+    }
+    status
+    startedAt{
+      year
+      month
+      day
+    }
+    completedAt{
+      year
+      month
+      day
+    }
+    notes
+    progress
+    score
+    repeat
+    user {
+      id
+      name
+      avatar{
+        large
+        medium
+      }
+      statistics{
+        anime{
+          count
+          statuses{
+            status
+            count
+          }
+        }
+      }
+    }
+  }
+}
+
+{
+  "mediaId": 169417,
+  "progress": 12,
+  "status":"COMPLETED"
+}

rest/AniTrack/Set Items/AniList Change Status.http

@@ -0,0 +1,19 @@
+# @name AniList Change Status
+
+POST https://graphql.anilist.co
+Content-Type: applicaton/json
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
+
+mutation($mediaId:Int, $status:MediaListStatus){
+  SaveMediaListEntry(mediaId:$mediaId, status:$status){
+    id
+    status
+  }
+}
+
+{
+  "mediaId": 1,
+  "status": "CURRENT"
+}

rest/AniTrack/Set Items/Change Episode Count.http

@@ -0,0 +1,65 @@
+# @name AniList Change Count
+
+POST https://graphql.anilist.co
+Content-Type: applicaton/json
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
+
+mutation (
+  $mediaId: Int
+  $progress: Int
+  $status: MediaListStatus
+  $score: Float
+  $repeat: Int
+  $notes: String
+  $startedAt: FuzzyDateInput
+  $completedAt: FuzzyDateInput
+) {
+  SaveMediaListEntry(
+    mediaId: $mediaId
+    progress: $progress
+    status: $status
+    score: $score
+    repeat: $repeat
+    notes: $notes
+    startedAt: $startedAt
+    completedAt: $completedAt
+  ) {
+    mediaId
+    progress
+    status
+    score
+    repeat
+    notes
+    startedAt {
+      year
+      month
+      day
+    }
+    completedAt {
+      year
+      month
+      day
+    }
+  }
+}
+
+{
+  "mediaId": 170998,
+  "progress": 5,
+  "status": "CURRENT",
+  "score": 9.0,
+  "repeat": 0,
+  "notes": ",malSync::eyJ1IjoiaHR0cHM6Ly93d3cuY3J1bmNoeXJvbGwuY29tL3Nlcmllcy9HVkRIWDg1Wk4vI3NlYXNvbj1HNjNWQzJHUUsiLCJwIjoiIn0=::",
+  "startedAt": {
+    "year": 2024,
+    "month": 7,
+    "day": 10
+  },
+  "completedAt": {
+    "year": 0,
+    "month": 0,
+    "day": 0
+  }
+}

rest/AniTrack/Set Items/Delete Media.http

@@ -0,0 +1,17 @@
+# @name AniList Delete Media
+
+POST https://graphql.anilist.co
+Content-Type: applicaton/json
+Accept: applicaton/json
+X-REQUEST-TYPE: Graphql
+Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
+
+mutation ($id: Int) {
+  DeleteMediaListEntry(id: $id) {
+    deleted
+  }
+}
+
+{
+  "id": 430978266
+}

rest/MAL/Get AnimeList.http

@@ -0,0 +1,6 @@
+# @name Get AnimeList
+
+GET https://api.myanimelist.net/v2/users/{{MAL_USER}}/animelist?fields=list_status&status=watching&limit=1000
+Content-Type application/x-www-form-urlencoded
+Accept: application/json
+Authorization: Bearer {{MAL_ACCESS_TOKEN}}

rest/MAL/Get Authorization.http

@@ -0,0 +1,12 @@
+# @name Get Authorization
+
+POST https://myanimelist.net/v1/oauth2/token
+Content-Type: application/x-www-form-urlencoded
+Accept: application/json
+
+grant_type=authorization_code&
+client_id={{MAL_CLIENT_ID}}&
+client_secret={{MAL_CLIENT_SECRET}}&
+redirect_uri=http://localhost:6734/callback&
+code={{MAL_CODE}}&
+code_verifier={{MAL_VERIFIER}}

rest/MAL/Get Single Anime.http

@@ -0,0 +1,5 @@
+# @name Get Single Anime
+
+GET https://api.myanimelist.net/v2/anime/57380?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics
+Accept: application/json
+Authorization: Bearer {{MAL_ACCESS_TOKEN}}

rest/MAL/MAL Oauth Page.http

@@ -0,0 +1,5 @@
+# @name MAL Oauth Page
+
+GET https://myanimelist.net/v1/oauth2/authorize?response_type=code&client_id={{MAL_CLIENT_ID}}&redirect_uri={{MAL_CALLBACK_URI}}
+cookie MALSESSIONID=5ad688aafb78239bfd84752752ce193f; MALHLOGSESSID=632f67c3955267b4e57fc3d74b373ebb
+Accept: application/json

rest/MAL/Update Anime Status.http

@@ -0,0 +1,8 @@
+# @name Update Anime Status
+
+PATCH https://api.myanimelist.net/v2/anime/50205/my_list_status
+Content-Type: application/x-www-form-urlencoded
+Accept: application/json
+Authorization: Bearer {{MAL_ACCESS_TOKEN}}
+
+num_watched_episodes=3

rest/Simkl/Get Code.http

@@ -0,0 +1,3 @@
+# @name Get Code
+
+GET https://simkl.com/oauth/authorize?response_type=code&client_id={{SIMKL_CLIENT_ID}}&redirect_uri=http://localhost:6734/callback

rest/Simkl/Get Items/Get Anime Full Info.http

@@ -0,0 +1,5 @@
+# @name Get Anime Full Info
+
+GET https://api.simkl.com/anime/40084?extended=full
+Accept application/json
+simkl-api-key {{SIMKL_CLIENT_ID}}

rest/Simkl/Get Items/GetUser WatchList.http

@@ -0,0 +1,7 @@
+# @name GetUser WatchList
+
+GET https://api.simkl.com/sync/all-items/anime/
+Content-Type application/json
+Accept application/json
+simkl-api-key {{SIMKL_CLIENT_ID}}
+Authorization Bearer {{SIMKL_AUTH_TOKEN}}

rest/Simkl/Get Items/Search By MALID to Get Simkl ID.http

@@ -0,0 +1,5 @@
+# @name Search By MALID to Get Simkl ID
+
+GET https://api.simkl.com/search/id?anilist=174576
+Accept application/json
+simkl-api-key {{SIMKL_CLIENT_ID}}

rest/Simkl/Post Items/Delete Entry.http

@@ -0,0 +1,17 @@
+# @name Delete Entry
+
+GET https://api.simkl.com/sync/history/remove
+Content-Type application/json
+Accept application/json
+simkl-api-key {{SIMKL_CLIENT_ID}}
+Authorization Bearer {{SIMKL_AUTH_TOKEN}}
+
+{
+  "shows": [
+    {
+      "ids": {
+        "simkl": 909121
+      }
+    }
+  ]
+}

rest/Simkl/Post Items/Update Episode.http

@@ -0,0 +1,40 @@
+# @name Update Episode
+
+GET https://api.simkl.com/sync/history
+Content-Type application/json
+Accept application/json
+simkl-api-key {{SIMKL_CLIENT_ID}}
+Authorization Bearer {{SIMKL_AUTH_TOKEN}}
+
+{
+  "shows": [
+    {
+      "title": "Ramen Aka Neko",
+      "ids": {
+        "simkl": 2307708,
+        "mal": "57325",
+        "anilist": "170998"
+      },
+      "episodes": [
+        {
+          "number": 1
+        },
+        {
+          "number": 2
+        },
+        {
+          "number": 3
+        },
+        {
+          "number": 4
+        },
+        {
+          "number": 5
+        },
+        {
+          "number": 6
+        }
+      ]
+    }
+  ]
+}

rest/Simkl/SimklGetAuthorizationToken.http

@@ -0,0 +1,12 @@
+# @name SimklGetAuthorizationToken
+
+POST https://api.simkl.com/oauth/token
+Content-Type application/json
+
+{
+  "grant_type": "authorization_code",
+  "client_id": "{{SIMKL_CLIENT_ID}}",
+  "client_secret": "{{SIMKL_CLIENT_SECRET}}",
+  "redirect_uri": "http://localhost:6734/callback",
+  "code": {{SIMKL_CODE}}
+}

rest/http-client.env.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://raw.githubusercontent.com/mistweaverco/kulala.nvim/main/schemas/http-client.env.schema.json",
+  "dev": {
+    "ANILIST_ACCESS_TOKEN": "",
+    "ANILIST_APP_ID": "",
+    "ANILIST_SECRET": "",
+    "ANILSIT_CODE": "",
+    "MAL_ACCESS_TOKEN": "",
+    "MAL_CLIENT_ID": "",
+    "MAL_CLIENT_SECRET": "",
+    "MAL_CODE": "",
+    "MAL_USER": "",
+    "MAL_VERIFIER": "",
+    "SIMKL_AUTH_TOKEN": "",
+    "SIMKL_CODE": "",
+    "SIMKL_CLIENT_ID": "",
+    "SIMKL_CLIENT_SECRET": ""
+  }
+}

wails.json

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