diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0b492f3..ef62bca 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,8 +1,13 @@
name: Build & Deploy to VPS
-'on':
+
+on:
push:
branches:
- - master
+ - main
+
+env:
+ PROJECT_NAME: pojazdownik-td2
+
jobs:
build_and_deploy:
runs-on: ubuntu-latest
@@ -14,9 +19,5 @@ jobs:
run: |
mkdir -p ~/.ssh
echo "${{ secrets.VPS_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
- - name: Remove old assets
- run: |
- ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} -p 2022 "rm -rf /var/www/pojazdownik/assets"
- - name: Send the build files to web server
- run: |
- scp -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa -P 2022 -r ./dist/* ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }}:/var/www/pojazdownik
\ No newline at end of file
+ - name: Send new files
+ run: rsync -avP -e "ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa -p 2022" ./dist/ ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }}:/var/www/$PROJECT_NAME --delete
\ No newline at end of file
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index 52a8253..f36e7d9 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -5,7 +5,7 @@ name: Deploy to Firebase Hosting on merge
'on':
push:
branches:
- - main
+ - main-old
jobs:
build_and_deploy:
runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index bcc1daa..19b46e6 100644
--- a/package.json
+++ b/package.json
@@ -13,22 +13,22 @@
},
"dependencies": {
"axios": "^1.4.0",
- "lucide-vue-next": "^0.552.0",
+ "lucide-vue-next": "^0.576.0",
"pinia": "^3.0.3",
"prettier": "^3.0.3",
"vue": "^3.2.37",
- "vue-i18n": "11.1.12",
- "vue-router": "4"
+ "vue-i18n": "11.2.8",
+ "vue-router": "5.0.3"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.3.3",
- "@types/node": "^24.10.0",
+ "@types/node": "^25.3.3",
"@vite-pwa/assets-generator": "^1.0.2",
"@vitejs/plugin-vue": "^6.0.1",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.6.0",
- "@vue/tsconfig": "^0.8.1",
- "eslint": "^9.39.1",
+ "@vue/tsconfig": "^0.9.0",
+ "eslint": "^10.0.2",
"eslint-plugin-vue": "^10.5.1",
"sass": "^1.59.3",
"typescript": "^5.0.2",
diff --git a/src/App.vue b/src/App.vue
index 194e7ea..138a586 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,82 +2,88 @@
+
+
+
+
-
diff --git a/src/components/app/MainContainer.vue b/src/components/app/MainContainer.vue
index bbd73e5..3a924e1 100644
--- a/src/components/app/MainContainer.vue
+++ b/src/components/app/MainContainer.vue
@@ -20,6 +20,8 @@ export default defineComponent({
diff --git a/src/components/cards/RealStockCard.vue b/src/components/cards/RealStockCard.vue
index 8a86aa9..dcda4af 100644
--- a/src/components/cards/RealStockCard.vue
+++ b/src/components/cards/RealStockCard.vue
@@ -220,6 +220,8 @@ export default defineComponent({