Merge pull request #14 from foxocorp/dev

Merge dev into main

Author: krabiworld

.github/workflows/deploy.yml

@@ -3,15 +3,13 @@ name: Deploy Frontend
 on:
   push:
     branches:
-      - main
       - dev
 
 jobs:
   build:
     runs-on: cloud
-    environment: ${{ github.ref_name == 'main' && 'production' || github.ref_name == 'dev' && 'development' || 'development' }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Run Foxogram Frontend
-        run: docker compose up foxogram-frontend${{ github.ref_name == 'dev' && '-dev' || '' }} -d --build
+        run: docker compose up foxogram-frontend-dev -d --build

.github/workflows/desktop.yml

@@ -12,13 +12,13 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ 'macos-latest', 'ubuntu-22.04', 'windows-latest' ]
+        os: [ macos-latest, ubuntu-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
       - name: Install dependencies (ubuntu only)
-        if: matrix.os == 'ubuntu-22.04' # This must match the platform value defined above.
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf

docker-compose.yml

@@ -1,19 +1,4 @@
 services:
-  foxogram-frontend:
-    container_name: foxogram-frontend
-    build:
-      context: .
-      args:
-        NODE_ENV: production
-    restart: always
-    networks:
-      - traefik
-    labels:
-      traefik.enable: true
-      traefik.http.routers.foxogram-frontend.rule: Host(`app.foxogram.su`)
-      traefik.http.routers.foxogram-frontend.tls.certresolver: letsencrypt
-      traefik.http.services.foxogram-frontend.loadbalancer.server.port: 80
-
   foxogram-frontend-dev:
     container_name: foxogram-frontend-dev
     build:

eslint.config.mjs

@@ -87,7 +87,7 @@ export default tseslint.config(
 			"no-this-before-super": 2,
 			"no-undef-init": 2,
 			"no-unneeded-ternary": 2,
-			"no-unused-vars": [2, {
+			"no-unused-vars": [1, {
 				args: "after-used",
 				ignoreRestSiblings: true,
 			}],

package.json

@@ -7,28 +7,39 @@
 		"preview": "vite preview",
 		"tauri": "tauri",
 		"dev-desktop": "tauri dev",
-		"build-desktop": "tauri build"
+		"build-desktop": "tauri build",
+		"lint": "eslint"
 	},
 	"dependencies": {
 		"@fontsource/inter": "^5.1.0",
-		"@foxogram/api": "^0.1.2",
-		"@foxogram/rest": "^0.1.0",
+		"@foxogram/api": "^0.1.5",
+		"@foxogram/api-types": "^0.1.7",
+		"@foxogram/gateway-types": "^0.1.2",
+		"@foxogram/rest": "^0.1.3",
 		"mobx": "^6.13.5",
+		"moment": "^2.30.1",
 		"preact": "^10.22.1",
 		"preact-iso": "^2.8.1",
-		"styled-components": "^6.1.13"
+		"styled-components": "^6.1.13",
+		"ws": "^8.18.0"
 	},
 	"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",
+		"@types/ws": "^8.5.13",
+		"autoprefixer": "^10.4.20",
+		"eslint": "^9.17.0",
+		"eslint-plugin-react": "^7.37.3",
+		"globals": "^15.14.0",
+		"postcss": "^8.5.1",
 		"typescript": "^5.7.2",
-		"typescript-eslint": "^8.17.0",
-		"vite": "^5.3.3"
-	}
-}
+		"typescript-eslint": "^8.19.0",
+		"vite": "^6.0.10"
+	},
+	"browserslist": [
+		">0.3%, defaults, fully supports es6-module, maintained node versions"
+	]
+}