Accent colors, preparing for launch

Author: MegaSa1nt

README-EN.md

@@ -0,0 +1,22 @@
+[Русский](https://github.com/MegaSa1nt/GCS-Client/blob/new/README.md) | English
+
+# GCS-Client
+### Launcher for your GDPS with updating via patches
+[Launcher backend](https://github.com/MegaSa1nt/GCS-Client-backend) is required for launcher to work
+### Stack
+Front:
+`SvelteKit`
+`Vite`
+
+Desktop:
+`Tauri`
+
+For running dev-build:
+1. `npm i`, this command will install everything required
+2. `npm run tauri dev`, this command will start launcher, first run will be very long
+
+For building:
+`npm run tauri build`
+
+Setup tutorial:
+*later*

README.md

@@ -1,3 +1,5 @@
+Русский | [English](https://github.com/MegaSa1nt/GCS-Client/blob/new/README-EN.md)
+
 # GCS-Client
 ### Лаунчер для вашей приватки с системой обновлений посредством патчей файлов
 Для работы обновлений необходим [бэкэнд лаунчера](https://github.com/MegaSa1nt/GCS-Client-backend)
@@ -13,7 +15,8 @@
 1. `npm i`, эта команда установит всё необходимое
 2. `npm run tauri dev`, эта команда запустит лаунчер, первый раз будет очень долгим
 
-- [x] [Переписать бэкэнд загрузки на Bun + Elysia](https://github.com/MegaSa1nt/GCS-Client-backend)
-- [x] Доделать лаунчер технически
-- [ ] Доделать верстку
-- [ ] Выпуск первой релизной версии
+Для сборки:
+`npm run tauri build`
+
+Туториал по настройке:
+*позже*

src/components/ProfilePost/profilePost.svelte

@@ -41,7 +41,7 @@
 		postReplies[postID] = false;
 		document.getElementById("profilePostSpinner" + postID).classList.add(style.show);
 		return new Promise(async function(r) {
-			const settings = library.getSettings();
+			const settings = await library.getSettings();
 			fetch(settings.dashboard_api_url + "replies.php", {
 				method: "POST",
 				body: "commentID=" + postID,

src/components/ProfilePostReply/profilePostReply.svelte

@@ -30,7 +30,7 @@
 	
 	async function checkReplies(postID) {
 		return new Promise(async function(r) {
-			const settings = library.getSettings();
+			const settings = await library.getSettings();
 			fetch(settings.dashboard_api_url + "replies.php", {
 				method: "POST",
 				body: "commentID=" + postID,

src/components/ProfilePostSecond/profilePostSecond.svelte

@@ -41,7 +41,7 @@
 		postReplies[postID] = false;
 		document.getElementById("profilePostSpinner" + postID).classList.add(style.show);
 		return new Promise(async function(r) {
-			const settings = library.getSettings();
+			const settings = await library.getSettings();
 			fetch(settings.dashboard_api_url + "replies.php", {
 				method: "POST",
 				body: "commentID=" + postID,

src/components/Select/select.svelte

@@ -14,8 +14,8 @@
 	--item-is-active-color="black"
 	--item-hover-color="black"
 	--list-background="#242424"
-	--item-hover-bg="#3ee667"
-	--item-is-active-bg="#3ee667"
+	--item-hover-bg="var(--accent-color)"
+	--item-is-active-bg="var(--accent-color)"
 	--list-border-radius="10px"
 	--multi-item-border-radius="10px"
 	--font-size="15px"

src/components/SettingsSidebar/settingsSidebar.svelte

@@ -4,7 +4,7 @@
     import { page } from '$app/stores';
 
     const colors = {
-        "active": '#3EE667',
+        "active": 'var(--accent-color)',
         "none": '#C7C6CA'
     };
 

src/components/Sidebar/sidebar.svelte

@@ -7,7 +7,7 @@
 	library.initializeVariables();
 
     const colors = {
-        "active": '#3EE667',
+        "active": 'var(--accent-color)',
         "none": '#C7C6CA'
     };
 

src/components/Toggle/toggle.svelte

@@ -10,7 +10,7 @@
 	export let off = undefined;
 	export let switchColor = "#000";
 	export let untoggledSwitchColor = "#eee";
-	export let toggledColor = "#3EE667";
+	export let toggledColor = "var(--accent-color)";
 	export let untoggledColor = "#5b5b5b";
 
 	import { createEventDispatcher } from "svelte";

src/libs/library.js

@@ -79,7 +79,7 @@ library.initializeEvents = async function() {
 }
 
 const gameCheckInterval = setInterval(async function() {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	library.checkProcess(settings.game_exe);
 },	500);
 
@@ -96,22 +96,24 @@ library.initializeVariables = function() {
 
 library.getSettings = function() {
 	library.initializeVariables();
-	const resourcePath = await resourceDir();
-	return {
-		updates_api_url: "https://updates.example.com/",
-		dashboard_api_url: "https://example.com/dashboard/api/",
-		gdps_name: "GDPS",
-		game_exe: "GDPS.exe",
-		
-		update_time: localStorage.update_time,
-		resource_path: resourcePath
-	}
+	return new Promise(async function(r) {
+		const resourcePath = await resourceDir();
+		r({
+			updates_api_url: "https://updates.gcs.icu/",
+			dashboard_api_url: "https://api.gcs.icu/",
+			gdps_name: "GreenCatsServer",
+			game_exe: "GreenCatsServer.exe",
+			
+			update_time: localStorage.update_time,
+			resource_path: resourcePath
+		});
+	});
 }
 
 library.checkUpdates = async function() {
 	if(window.isCheckingUpdate) return;
 	await library.changeIsCheckingUpdateState(true);
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	if(settings.update_time == 0) {
 		console.log('You should install game ;)');
 		await library.changeIsCheckingUpdateState(false);
@@ -124,7 +126,7 @@ library.checkUpdates = async function() {
 				library.changePendingUpdateState(false);
 				return true;
 			} else {
-				library.sendNotification(settings.foundUpdate.title, settings.foundUpdate.description);
+				library.sendNotification(strings.foundUpdate.title, strings.foundUpdate.description);
 				console.log("Updates were found!");
 				window.new_updates = response;
 				library.changeIsCheckingUpdateState(false);
@@ -142,7 +144,7 @@ library.installGame = async function() {
 	if(window.isUpdatingGame) return;
 	library.changeUpdatingGameState(true);
 	library.changePendingUpdateState(false);
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	const lastUpdateTimestamp = await library.getLatestUpdateTimestamp();
 	const configPath = await resolve(await appCacheDir() + "/temp.7z");
 	console.log('Starting downloading game...');
@@ -153,7 +155,7 @@ library.installGame = async function() {
 				if(stdout === null) {
 					console.log('Adding all files to SQL... (that means it also calculates MD5 checksum for all files)');
 					await library.addFolderToSQL(settings.resource_path);
-					library.sendNotification(settings.gameInstalled.title, settings.gameInstalled.description);
+					library.sendNotification(strings.gameInstalled.title, strings.gameInstalled.description);
 					console.log('Game successfully downloaded!');
 					library.changeUpdatingGameState(false);
 					library.cleanTemporaryFiles();
@@ -181,7 +183,7 @@ library.installGame = async function() {
 }
 
 library.cleanTemporaryFiles = async function(patchTimestamp = 0) {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	const configPath = await appCacheDir();
 	await remove(configPath + "/temp.7z").catch(err => {console.log("Temporary game archive was not found. Nothing to delete!");});
 	if(patchTimestamp != 0) {
@@ -224,7 +226,7 @@ library.openOrInstallGame = async function() {
 	if(isGameRunning) return;
 	if(isPendingUpdate) return library.updateGame();
 	clearInterval(gameCheckInterval);
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	await library.changeIsGameStartingState(true);
 	await open(await join(settings.resource_path, settings.game_exe)).then(res => {
 		library.changeIsGameStartingState(false);
@@ -240,7 +242,7 @@ library.openOrInstallGame = async function() {
 
 library.updateGame = async function() {
 	if(window.isUpdatingGame) return;
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	if(settings.update_time == 0) return library.installGame();
 	library.changePendingUpdateState(false);
 	library.changeUpdatingGameState(true);
@@ -249,15 +251,15 @@ library.updateGame = async function() {
 		await library.patchGame(new_updates[i]);
 	}
 	const lastUpdateTimestamp = new_updates[new_updates.length - 1];
-	library.sendNotification(settings.gameUpdated.title, settings.gameUpdated.description);
+	library.sendNotification(strings.gameUpdated.title, strings.gameUpdated.description);
 	console.log('Game successfully updated!');
 	library.changeUpdatingGameState(false);
 	library.cleanTemporaryFiles();
 	localStorage.update_time = lastUpdateTimestamp;
 }
 
 library.getLatestUpdateTimestamp = async function() {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	return new Promise(r => {
 		fetch(settings.updates_api_url + "lastUpdate").then(res => res.json()).then(response => {
 			r(response.timestamp);
@@ -269,7 +271,7 @@ library.getLatestUpdateTimestamp = async function() {
 }
 
 library.patchGame = async function(patchTimestamp) {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	const patchArchivePath = await resolve(await appCacheDir() + "/patch_" + patchTimestamp + ".7z");
 	const patchFolderPath = await resolve(await appCacheDir() + "/patch_" + patchTimestamp);
 	console.log('Downloading patch ' + patchTimestamp + '...');
@@ -368,7 +370,7 @@ library.addFolderToSQL = async function(folder) {
 }
 
 library.addFilesToSQL = async function(allFiles) {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	var i = 0;
 	for(i = 0; i < allFiles.length; i++) {
 		const fileRelativePath = allFiles[i];
@@ -378,7 +380,7 @@ library.addFilesToSQL = async function(allFiles) {
 }
 
 library.addGameFoldersToSQL = async function(allFolders) {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	var i = 0;
 	for(i = 0; i < allFolders.length; i++) {
 		const folderRelativePath = allFolders[i];
@@ -393,7 +395,7 @@ library.removeFilesFromSQL = async function(allFiles) {
 
 library.uninstallGame = async function() {
 	if(window.isUpdatingGame) return;
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	console.log('Deleting game...');
 	library.changeUpdatingGameState(true);
 	const gameFiles = await db.select("SELECT file FROM files");
@@ -409,15 +411,15 @@ library.uninstallGame = async function() {
 	await db.execute("DELETE FROM files");
 	await db.execute("DELETE FROM folders");
 	localStorage.update_time = 0;
-	library.sendNotification(settings.gameDeleted.title, settings.gameDeleted.description);
+	library.sendNotification(strings.gameDeleted.title, strings.gameDeleted.description);
 	console.log('Game was successfully deleted! ...');
 	library.changePendingUpdateState(true);
 	library.changeUpdatingGameState(false);
 	library.checkUpdates();
 }
 
 library.removeEmptyFolders = async function() {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	var i = game_folders.length - 1;
 	for(i = game_folders.length - 1; i >= 0; i--) {
 		const folderPath = game_folders[i];
@@ -440,7 +442,7 @@ library.checkProcess = async function(process) {
 
 library.verifyGameFilesIntegrity = async function() {
 	if(window.isUpdatingGame) return;
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	console.log("Verifying game files integrity...");
 	library.changeUpdatingGameState(true);
 	const gameFiles = await db.select("SELECT * FROM files");
@@ -468,7 +470,7 @@ library.verifyGameFilesIntegrity = async function() {
 
 library.downloadSpecificFiles = async function(downloadFiles) {
 	return new Promise(async function(r) {
-		const settings = library.getSettings();
+		const settings = await library.getSettings();
 		console.log("Downloading some specific files...");
 		const downloadArchivePath = await resolve(await appCacheDir() + "/download.7z");
 		invoke('download_archive', { url: settings.updates_api_url + "files", tempPath: downloadArchivePath, files: JSON.stringify({ files: downloadFiles })}).then(stdout => {
@@ -494,15 +496,15 @@ library.downloadSpecificFiles = async function(downloadFiles) {
 
 library.getProfile = function(accountID) {
 	return new Promise(async function(r) {
-		const settings = library.getSettings();
+		const settings = await library.getSettings();
 		fetch(settings.dashboard_api_url + "profile.php?accountID=" + accountID).then(res => res.json()).then(response => {
 			r(response);
 		});
 	});
 }
 
 library.openGameFolder = async function() {
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	open(settings.resource_path);
 }
 
@@ -511,9 +513,9 @@ library.sendNotification = async function(title, body) {
 	sendNotification({title: title.toString(), body: body.toString()});
 }
 
-library.checkIfPlayerIsLoggedIn = function() {
+library.checkIfPlayerIsLoggedIn = async function() {
 	if(!localStorage.auth.length) return false;
-	const settings = library.getSettings();
+	const settings = await library.getSettings();
 	fetch(settings.dashboard_api_url + "login.php?auth=" + localStorage.auth).then(r => r.json()).then(response => {
 		if(!response.success) {
 			library.logout();