From f8695bf9a6d16f8f073381c6ab0750b770c0de1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Marseault?=
 <22910497+Larsluph@users.noreply.github.com>
Date: Sat, 18 May 2024 10:26:02 +0200
Subject: [PATCH] feat(pages): Deploy mocked demo version (#1690)

---
 .github/workflows/build-release.yml     | 57 +++++++++++++++++--------
 .github/workflows/test.yml              |  4 +-
 .github/workflows/translations.yml      |  4 +-
 .gitignore                              |  1 +
 README.md                               | 30 +++++++------
 package.json                            |  2 +
 src/components/Settings/Advanced.vue    |  2 +-
 src/services/index.ts                   | 20 ---------
 src/services/{ => qbit}/IProvider.ts    |  0
 src/services/{ => qbit}/MockProvider.ts |  6 +--
 src/services/{ => qbit}/QbitProvider.ts | 10 ++++-
 src/services/qbit/index.ts              |  8 ++++
 src/stores/app.ts                       |  2 +-
 src/stores/auth.ts                      |  2 +-
 src/stores/content.ts                   |  2 +-
 src/stores/logs.ts                      |  2 +-
 src/stores/maindata.ts                  |  2 +-
 src/stores/preferences.ts               |  2 +-
 src/stores/rss.ts                       |  2 +-
 src/stores/searchEngine.ts              |  2 +-
 src/stores/torrentDetail.ts             |  2 +-
 src/stores/torrents.ts                  |  2 +-
 src/types/qbit/models/FeedRule.ts       |  2 +-
 vite.config.ts                          |  2 +-
 24 files changed, 98 insertions(+), 70 deletions(-)
 delete mode 100644 src/services/index.ts
 rename src/services/{ => qbit}/IProvider.ts (100%)
 rename src/services/{ => qbit}/MockProvider.ts (99%)
 rename src/services/{ => qbit}/QbitProvider.ts (98%)
 create mode 100644 src/services/qbit/index.ts

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index c8f5c5db..8303018f 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -14,24 +14,28 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-      actions: write
-
     steps:
       - name: Run release please
-        uses: google-github-actions/release-please-action@v4
+        uses: googleapis/release-please-action@v4
         id: release
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
           config-file: release-please-config.json
           manifest-file: .release-please-manifest.json
 
   build-release:
     name: Build VueTorrent
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      actions: write
+    strategy:
+      matrix:
+        npm-step: [ 'build', 'build-demo' ]
+        include:
+          - npm-step: build
+            artifact-name: vuetorrent-build
+            artifact-path: ./vuetorrent
+          - npm-step: build-demo
+            artifact-name: vuetorrent-demo
+            artifact-path: ./vuetorrent-demo
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -45,7 +49,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          key: "${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}"
           restore-keys: ${{ runner.os }}-node-
 
       - name: Install dependencies
@@ -63,13 +67,13 @@ jobs:
           tolgee_secret: ${{ secrets.TOLGEE_TOKEN }}
 
       - name: Build VueTorrent
-        run: npm run build
+        run: npm run ${{ matrix.npm-step }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: vuetorrent-build
-          path: ./vuetorrent
+          name: ${{ matrix.artifact-name }}
+          path: ${{ matrix.artifact-path }}
           retention-days: 1
 
   push-nightly:
@@ -94,9 +98,29 @@ jobs:
           branch: nightly-release
           folder: ./vuetorrent
 
+  push-demo:
+    name: Push to demo repo
+    runs-on: ubuntu-latest
+    needs: build-release
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: vuetorrent-demo
+          path: ./vuetorrent-demo
+
+      - name: Push to demo repo
+        uses: JamesIves/github-pages-deploy-action@v4.6.0
+        with:
+          folder: './vuetorrent-demo'
+          repository-name: 'VueTorrent/demo'
+          token: ${{ secrets.GH_PAT }}
+
   upload-release:
     name: Upload release to GitHub
-    needs: [setup-release, build-release]
+    needs: [ setup-release, build-release ]
     if: needs.setup-release.outputs.release_created
     runs-on: ubuntu-latest
     steps:
@@ -120,7 +144,7 @@ jobs:
 
   push-release:
     name: Push to latest branch
-    needs: [setup-release, build-release]
+    needs: [ setup-release, build-release ]
     if: needs.setup-release.outputs.release_created
     runs-on: ubuntu-latest
     steps:
@@ -135,6 +159,5 @@ jobs:
       - name: Push to latest-release
         uses: JamesIves/github-pages-deploy-action@v4.6.0
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: latest-release
-          FOLDER: ./vuetorrent
+          branch: latest-release
+          folder: ./vuetorrent
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fd2482a1..ea848c98 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,8 +25,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: ${{ runner.os }}-node-
+          key: "${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}"
+          restore-keys: "${{ runner.os }}-node-"
 
       - name: Install dependencies
         run: npm ci
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index c45286ca..31d3d460 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -26,8 +26,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: ${{ runner.os }}-node
+          key: "${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}"
+          restore-keys: "${{ runner.os }}-node"
 
       - name: Install dependencies
         run: npm ci
diff --git a/.gitignore b/.gitignore
index 78223223..7390c413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ coverage
 
 # Custom
 vuetorrent/**
+vuetorrent-demo/**
 docker/**
 coverage/
 config/
diff --git a/README.md b/README.md
index 3b2e9bad..dc187459 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,15 @@ The sleekest looking WebUI for qBittorrent made with Vue.js!
   <img src="readme_assets/screenshot-mobile-navbar-dark-mode.png" width="400" alt="Screenshot Mobile Dashboard (Light Mode)" /> 
 </p>
 
+## Demo
+
+A live demo **with mocked data** is available here: https://vuetorrent.github.io/demo
+
+> [!NOTE]
+> This version isn't connected to a qBittorrent instance.
+> 
+> Don't try to download torrents or change preferences, it won't work 😉
+
 ## Installation
 
 Checkout the [wiki](https://github.com/VueTorrent/VueTorrent/wiki/Installation)!
@@ -50,9 +59,9 @@ Checkout the [wiki](https://github.com/VueTorrent/VueTorrent/wiki/Installation)!
 - `docker-compose up -d` (starts a qbittorrent docker, optional)
 - Open the WebUI on localhost with the default credentials
   - Default username is always `admin`
-  - Default password is `adminadmin` **on 4.6.0 and below**, and is generated on 4.6.1 and above
-- Make sure "CSRF protection" and "Host header verification" is disabled on the target server!
-- Edit `env.development` to tweak your dev environment (e.g. fake torrents)
+  - Default password is `adminadmin` **on 4.6.0 and below**, and is generated in logs on 4.6.1 and above
+- Make sure "CSRF protection" and "Host header verification" is disabled in the qBittorrent preferences
+- Edit `env.development` to tweak your dev environment (e.g. mocked data)
 
 ## Features
 
@@ -89,7 +98,7 @@ Checkout the [wiki](https://github.com/VueTorrent/VueTorrent/wiki/Installation)!
 
 VueTorrent is a **WebUI** (think of it as a "visual skin") that uses qBittorrent's API, enabling compatibility with automation solutions like the Servarr stack.
 
-Everything that is compatible with qBittorrent will work regardless of the WebUI you chose to use.
+Everything that is compatible with the classic qBittorrent WebUI will work regardless of the WebUI you chose to use, whether its VueTorrent or another one.
 
 ## Contributing
 
@@ -101,16 +110,13 @@ See the [Contributing Guidelines](https://github.com/VueTorrent/VueTorrent/blob/
 
 ## Support
 
-[![Discord](https://img.shields.io/discord/1170618192956243998?logo=discord)](https://discord.gg/KDQP7fR467)
-[![Wiki](https://img.shields.io/badge/Wiki-blue)](https://github.com/VueTorrent/VueTorrent/wiki)
-[![FAQ](https://img.shields.io/badge/FAQ-orange)](https://github.com/VueTorrent/VueTorrent/wiki/FAQ)
+- [![Discord](https://img.shields.io/discord/1170618192956243998?logo=discord)](https://discord.gg/KDQP7fR467)
+- [![Wiki](https://img.shields.io/badge/Wiki-blue)](https://github.com/VueTorrent/VueTorrent/wiki)
+- [![FAQ](https://img.shields.io/badge/FAQ-orange)](https://github.com/VueTorrent/VueTorrent/wiki/FAQ)
 
-Open up an issue 😛
+If any of the above didn't help, feel free to open an issue!
 
-but before you do that:
-
-- confirm you're on the latest version of VueTorrent
-- confirm there is no other issue mentioning the same problem
+See the [Contributing Guidelines](https://github.com/VueTorrent/VueTorrent/blob/master/.github/CONTRIBUTING.md) for more information.
 
 ## Funding
 
diff --git a/package.json b/package.json
index f066de64..bc6cd1ee 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,10 @@
     "dev": "vite",
     "build": "vue-tsc && vite build",
     "postbuild": "node write-version.cjs",
+    "build-demo": "vue-tsc && vite build -m demo",
     "check-build": "vue-tsc",
     "preview": "vite preview",
+    "preview-demo": "vite preview -m demo",
     "lint": "eslint --fix && prettier . -w -u",
     "test": "vitest run",
     "coverage": "vitest run --coverage"
diff --git a/src/components/Settings/Advanced.vue b/src/components/Settings/Advanced.vue
index fe15ccf3..66f98997 100644
--- a/src/components/Settings/Advanced.vue
+++ b/src/components/Settings/Advanced.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { DiskIOMode, DiskIOType, ResumeDataStorageType, UploadChokingAlgorithm, UploadSlotsBehavior, UtpTcpMixedMode } from '@/constants/qbit/AppPreferences'
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { usePreferenceStore } from '@/stores'
 import { computed, onBeforeMount, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
diff --git a/src/services/index.ts b/src/services/index.ts
deleted file mode 100644
index 2f76cd31..00000000
--- a/src/services/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import IProvider from './IProvider'
-import QBitProvider from './QbitProvider'
-
-async function getProvider(): Promise<IProvider> {
-  if (import.meta.env.DEV && import.meta.env.VITE_USE_MOCK_PROVIDER === 'true') {
-    try {
-      const { default: MockProvider } = await import('./MockProvider')
-      return MockProvider.getInstance()
-    } catch (error) {
-      console.error('Failed to load MockProvider:', error)
-      return new QBitProvider()
-    }
-  } else {
-    return new Promise(resolve => resolve(new QBitProvider()))
-  }
-}
-
-const qbit = await getProvider()
-
-export { qbit }
diff --git a/src/services/IProvider.ts b/src/services/qbit/IProvider.ts
similarity index 100%
rename from src/services/IProvider.ts
rename to src/services/qbit/IProvider.ts
diff --git a/src/services/MockProvider.ts b/src/services/qbit/MockProvider.ts
similarity index 99%
rename from src/services/MockProvider.ts
rename to src/services/qbit/MockProvider.ts
index 75a693c3..c282a13d 100644
--- a/src/services/MockProvider.ts
+++ b/src/services/qbit/MockProvider.ts
@@ -24,7 +24,7 @@ import IProvider from './IProvider'
 
 export default class MockProvider implements IProvider {
   private static instance: MockProvider
-  private static hashes: string[] = Array(parseInt(import.meta.env.VITE_FAKE_TORRENTS_COUNT))
+  private static hashes: string[] = Array(parseInt(import.meta.env.VITE_FAKE_TORRENTS_COUNT || 15))
     .fill('')
     .map((_, i) => (i + 1).toString(16).padStart(40, '0'))
 
@@ -666,7 +666,7 @@ export default class MockProvider implements IProvider {
 
   async getTorrents(_?: GetTorrentPayload): Promise<Torrent[]> {
     const result = MockProvider.hashes.map(hash => {
-      const added_on = faker.date.past().getTime()
+      const added_on = faker.date.past().getTime() / 1000
       const name = faker.system.fileName()
       const num_complete = faker.number.int({ min: 0, max: 250 })
       const num_incomplete = faker.number.int({ min: 0, max: 250 })
@@ -682,7 +682,7 @@ export default class MockProvider implements IProvider {
         availability: faker.number.float({ min: 0, max: 100, multipleOf: 0.01 }),
         category: faker.helpers.arrayElement(['ISO', 'Other', 'Movie', 'Music', 'TV']),
         completed,
-        completion_on: faker.date.between({ from: added_on, to: Date.now() }).getTime(),
+        completion_on: faker.date.between({ from: added_on, to: Date.now() }).getTime() / 1000,
         content_path: faker.system.filePath(),
         dl_limit: faker.number.float({ min: 0, max: 1, multipleOf: 0.01 }),
         dlspeed: faker.number.int({ min: 0, max: 5_000_000 }), // [0; 5 Mo/s]
diff --git a/src/services/QbitProvider.ts b/src/services/qbit/QbitProvider.ts
similarity index 98%
rename from src/services/QbitProvider.ts
rename to src/services/qbit/QbitProvider.ts
index a4b76c2b..a80ce6bf 100644
--- a/src/services/QbitProvider.ts
+++ b/src/services/qbit/QbitProvider.ts
@@ -25,9 +25,10 @@ import type IProvider from './IProvider'
 type Parameters = Record<string, any>
 
 export default class QBitProvider implements IProvider {
+  private static _instance: QBitProvider
   private axios: AxiosInstance
 
-  constructor() {
+  private constructor() {
     this.axios = axios.create({
       baseURL: 'api/v2'
     })
@@ -35,6 +36,13 @@ export default class QBitProvider implements IProvider {
     this.axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
   }
 
+  public static getInstance() {
+    if (!this._instance) {
+      this._instance = new QBitProvider()
+    }
+    return this._instance
+  }
+
   /// Misc ///
 
   /**
diff --git a/src/services/qbit/index.ts b/src/services/qbit/index.ts
new file mode 100644
index 00000000..38a70c9e
--- /dev/null
+++ b/src/services/qbit/index.ts
@@ -0,0 +1,8 @@
+import IProvider from './IProvider'
+import MockProvider from './MockProvider'
+import QBitProvider from './QbitProvider'
+
+const qbit: IProvider =
+  import.meta.env.MODE === 'demo' || (import.meta.env.DEV && import.meta.env.VITE_USE_MOCK_PROVIDER === 'true') ? MockProvider.getInstance() : QBitProvider.getInstance()
+
+export default qbit
diff --git a/src/stores/app.ts b/src/stores/app.ts
index c8a54581..cbe3b649 100644
--- a/src/stores/app.ts
+++ b/src/stores/app.ts
@@ -1,4 +1,4 @@
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index 8af457fc..3e944849 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -1,6 +1,6 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 
 export const useAuthStore = defineStore('auth', () => {
   const isAuthenticated = ref(false)
diff --git a/src/stores/content.ts b/src/stores/content.ts
index c323a3ee..ad75095c 100644
--- a/src/stores/content.ts
+++ b/src/stores/content.ts
@@ -1,6 +1,6 @@
 import { useSearchQuery, useTreeBuilder } from '@/composables'
 import { FilePriority } from '@/constants/qbit'
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { useDialogStore } from '@/stores/dialog'
 import { useMaindataStore } from '@/stores/maindata'
 import { useVueTorrentStore } from '@/stores/vuetorrent'
diff --git a/src/stores/logs.ts b/src/stores/logs.ts
index 4427e66c..5a251112 100644
--- a/src/stores/logs.ts
+++ b/src/stores/logs.ts
@@ -1,4 +1,4 @@
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { Log } from '@/types/qbit/models'
 import { defineStore } from 'pinia'
 import { ref, watch } from 'vue'
diff --git a/src/stores/maindata.ts b/src/stores/maindata.ts
index 1f518b94..a59097bc 100644
--- a/src/stores/maindata.ts
+++ b/src/stores/maindata.ts
@@ -1,7 +1,7 @@
 import { useTorrentBuilder } from '@/composables'
 import { SortOptions } from '@/constants/qbit'
 import { extractHostname } from '@/helpers'
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { Category, ServerState } from '@/types/qbit/models'
 import { defineStore, storeToRefs } from 'pinia'
 import { MaybeRefOrGetter, ref, toValue } from 'vue'
diff --git a/src/stores/preferences.ts b/src/stores/preferences.ts
index 72990f47..53b6b396 100644
--- a/src/stores/preferences.ts
+++ b/src/stores/preferences.ts
@@ -1,7 +1,7 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
 import AppPreferences from '@/types/qbit/models/AppPreferences'
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 
 export const usePreferenceStore = defineStore(
   'preferences',
diff --git a/src/stores/rss.ts b/src/stores/rss.ts
index 26fc2f4c..eb69f1a1 100644
--- a/src/stores/rss.ts
+++ b/src/stores/rss.ts
@@ -1,4 +1,4 @@
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { Feed, FeedRule } from '@/types/qbit/models'
 import { RssArticle } from '@/types/vuetorrent'
 import { AxiosError } from 'axios'
diff --git a/src/stores/searchEngine.ts b/src/stores/searchEngine.ts
index ffd2ad11..14ba831a 100644
--- a/src/stores/searchEngine.ts
+++ b/src/stores/searchEngine.ts
@@ -1,4 +1,4 @@
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { SearchPlugin } from '@/types/qbit/models'
 import { SearchData } from '@/types/vuetorrent'
 import { defineStore } from 'pinia'
diff --git a/src/stores/torrentDetail.ts b/src/stores/torrentDetail.ts
index bddc3ad6..1963c4a2 100644
--- a/src/stores/torrentDetail.ts
+++ b/src/stores/torrentDetail.ts
@@ -1,4 +1,4 @@
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { TorrentProperties } from '@/types/qbit/models'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
diff --git a/src/stores/torrents.ts b/src/stores/torrents.ts
index f0db3f4f..4f6ee17e 100644
--- a/src/stores/torrents.ts
+++ b/src/stores/torrents.ts
@@ -1,7 +1,7 @@
 import { useSearchQuery } from '@/composables'
 import { SortOptions, TorrentState } from '@/constants/qbit'
 import { extractHostname } from '@/helpers'
-import { qbit } from '@/services'
+import qbit from '@/services/qbit'
 import { AddTorrentPayload, GetTorrentPayload } from '@/types/qbit/payloads'
 import { Torrent } from '@/types/vuetorrent'
 import { defineStore } from 'pinia'
diff --git a/src/types/qbit/models/FeedRule.ts b/src/types/qbit/models/FeedRule.ts
index 17275a10..a243217e 100644
--- a/src/types/qbit/models/FeedRule.ts
+++ b/src/types/qbit/models/FeedRule.ts
@@ -1,4 +1,4 @@
-import { ContentLayout } from '@/constants/qbit/AppPreferences.ts'
+import { ContentLayout } from '@/constants/qbit/AppPreferences'
 import { AddTorrentParams } from '@/types/qbit/models'
 
 export interface LegacyFeedRule {
diff --git a/vite.config.ts b/vite.config.ts
index 373524b8..d92f66cd 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -16,7 +16,7 @@ export default defineConfig(({ mode }) => {
     base: './',
     build: {
       target: 'esnext',
-      outDir: './vuetorrent/public',
+      outDir: mode === 'demo' ? './vuetorrent-demo' : './vuetorrent/public',
       rollupOptions: {
         output: {
           manualChunks: {