Merge pull request #9 from foxocorp/dev

Merge changes

Author: krabiworld

.github/workflows/deploy.yml

@@ -1,9 +1,10 @@
----
-name: Deploy Foxogram frontend
+name: Deploy Frontend
 
 on:
   push:
-    branches: ["main", "dev"]
+    branches:
+      - main
+      - dev
 
 jobs:
   build:

.github/workflows/desktop.yml

@@ -1,7 +1,9 @@
-name: 'Build Foxogram Desktop'
+name: Build Desktop
 
 on:
-  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   publish-tauri:
@@ -52,7 +54,7 @@ jobs:
         # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
         run: npm install # change this to npm or pnpm depending on which one you use.
 
-      - uses: tauri-apps/tauri-action@v0
+      - uses: tauri-apps/tauri-action@v0.5.16
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.gitignore

@@ -24,4 +24,4 @@ dist-ssr
 *.sln
 *.sw?
 
-package-lock.json
+package-lock.json

eslint.config.mjs

@@ -1,9 +1,22 @@
+// @ts-nocheck
 import globals from "globals";
 import eslint from "@eslint/js";
 import tseslint from "typescript-eslint";
 import pluginReact from "eslint-plugin-react";
 
 export default tseslint.config(
+	{
+		ignores: [
+			"node_modules/",
+			"dist/",
+			".github/",
+			".idea/",
+			".vscode/",
+			"src-tauri/",
+			"vite.config.ts",
+			"eslint.config.mjs",
+		],
+	},
 	eslint.configs.recommended,
 	tseslint.configs.strictTypeChecked,
 	tseslint.configs.stylisticTypeChecked,
@@ -14,6 +27,7 @@ export default tseslint.config(
 			"no-multi-spaces": 2,
 			"comma-dangle": [2, "always-multiline"],
 			"@typescript-eslint/ban-ts-comment": 2,
+			"@typescript-eslint/restrict-template-expressions": 0,
 
 			/**
 			 * Preact / JSX rules

package.json

@@ -5,29 +5,31 @@
 		"dev": "vite",
 		"build": "vite build",
 		"preview": "vite preview",
+		"lint": "eslint .",
 		"tauri": "tauri",
 		"dev-desktop": "tauri dev",
 		"build-desktop": "tauri build"
 	},
 	"dependencies": {
-		"@fontsource/inter": "^5.1.0",
-		"@foxogram/api-types": "^0.1.0",
+		"@fontsource/inter": "^5.1.1",
+		"@foxogram/api": "^0.1.2",
+		"@foxogram/rest": "^0.1.0",
 		"mobx": "^6.13.5",
-		"preact": "^10.22.1",
+		"preact": "^10.25.4",
 		"preact-iso": "^2.8.1",
 		"styled-components": "^6.1.13"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.16.0",
-		"@preact/preset-vite": "^2.9.0",
+		"@eslint/js": "^9.17.0",
+		"@preact/preset-vite": "^2.9.3",
 		"@tauri-apps/cli": "^2.1.0",
 		"@tsconfig/strictest": "^2.0.5",
 		"@tsconfig/vite-react": "^3.4.0",
-		"eslint": "^8.57.1",
-		"eslint-plugin-react": "^7.37.2",
-		"globals": "^15.13.0",
+		"eslint": "^9.17.0",
+		"eslint-plugin-react": "^7.37.3",
+		"globals": "^15.14.0",
 		"typescript": "^5.7.2",
-		"typescript-eslint": "^8.17.0",
-		"vite": "^5.3.3"
+		"typescript-eslint": "^8.19.0",
+		"vite": "^6.0.6"
 	}
 }

src-tauri/Cargo.lock

@@ -1,12 +1,12 @@
 [package]
-name = "app"
+name = "foxogram"
 version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
+description = "Foxogram Desktop"
+authors = ["FoxoCorp"]
+license = "MIT"
+repository = "https://github.com/foxocorp/foxogram-frontend"
 edition = "2021"
-rust-version = "1.77.2"
+rust-version = "1.83.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -15,11 +15,11 @@ name = "app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.2", features = [] }
+tauri-build = { version = "2.0.3", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.1.0", features = [] }
-tauri-plugin-log = "2.0.0-rc"
+tauri = { version = "2.1.1", features = [] }
+tauri-plugin-log = "2.2.0"