diff --git a/.github/workflows/vps-deploy.yml b/.github/workflows/vps-deploy.yml new file mode 100644 index 0000000..462989a --- /dev/null +++ b/.github/workflows/vps-deploy.yml @@ -0,0 +1,23 @@ +name: Build & Deploy to VPS + +on: + push: + branches: + - main + +env: + PROJECT_NAME: generator-td2 + +jobs: + build_and_deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build the app + run: yarn && yarn build + - name: Setup SSH key for connection with the server + run: | + mkdir -p ~/.ssh + echo "${{ secrets.VPS_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + - 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 diff --git a/index.html b/index.html index 992ea78..b1e6d77 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -24,9 +24,71 @@ + + + + + + + + GeneraTOR - + + + + + + + + + + + + + + + + + + +
diff --git a/package.json b/package.json index cd6fbe6..9bc5fc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "genera-tor", - "version": "1.6.0", + "version": "1.7.0", "private": true, "type": "module", "scripts": { @@ -13,7 +13,7 @@ }, "dependencies": { "axios": "^1.6.2", - "lucide-vue-next": "^0.525.0", + "lucide-vue-next": "^0.562.0", "pinia": "^2.1.7", "showdown": "^2.1.0", "vue": "^3.3.11", diff --git a/public/fonts/LibreFranklin-Bold.woff2 b/public/fonts/LibreFranklin-Bold.woff2 deleted file mode 100644 index 80b50c1..0000000 Binary files a/public/fonts/LibreFranklin-Bold.woff2 and /dev/null differ diff --git a/public/fonts/LibreFranklin-Regular.woff2 b/public/fonts/LibreFranklin-Regular.woff2 deleted file mode 100644 index e382c58..0000000 Binary files a/public/fonts/LibreFranklin-Regular.woff2 and /dev/null differ diff --git a/public/fonts/LibreFranklin-SemiBold.woff2 b/public/fonts/LibreFranklin-SemiBold.woff2 deleted file mode 100644 index 05e7880..0000000 Binary files a/public/fonts/LibreFranklin-SemiBold.woff2 and /dev/null differ diff --git a/public/fonts/libre-franklin-500.woff2 b/public/fonts/libre-franklin-500.woff2 new file mode 100644 index 0000000..c0f23e2 Binary files /dev/null and b/public/fonts/libre-franklin-500.woff2 differ diff --git a/public/fonts/libre-franklin-700.woff2 b/public/fonts/libre-franklin-700.woff2 new file mode 100644 index 0000000..ad5cca2 Binary files /dev/null and b/public/fonts/libre-franklin-700.woff2 differ diff --git a/public/fonts/libre-franklin-800.woff2 b/public/fonts/libre-franklin-800.woff2 new file mode 100644 index 0000000..6784af0 Binary files /dev/null and b/public/fonts/libre-franklin-800.woff2 differ diff --git a/public/fonts/libre-franklin-regular.woff2 b/public/fonts/libre-franklin-regular.woff2 new file mode 100644 index 0000000..d8fd680 Binary files /dev/null and b/public/fonts/libre-franklin-regular.woff2 differ diff --git a/src/App.vue b/src/App.vue index 8a83456..99c0105 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,47 +1,41 @@ + + diff --git a/src/components/OrderHelper.vue b/src/components/Global/OrderHelper.vue similarity index 89% rename from src/components/OrderHelper.vue rename to src/components/Global/OrderHelper.vue index 900d81c..1fbbbd3 100644 --- a/src/components/OrderHelper.vue +++ b/src/components/Global/OrderHelper.vue @@ -29,18 +29,17 @@ diff --git a/src/components/Order.vue b/src/components/Orders/Order.vue similarity index 76% rename from src/components/Order.vue rename to src/components/Orders/Order.vue index d271d8e..c3ad35d 100644 --- a/src/components/Order.vue +++ b/src/components/Orders/Order.vue @@ -1,28 +1,33 @@