diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 1735f73..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: "[BUG]" -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. Arch Linux, Windows] - - App Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml deleted file mode 100644 index 0db08a0..0000000 --- a/.github/workflows/clippy.yml +++ /dev/null @@ -1,23 +0,0 @@ -on: push -name: Clippy check -jobs: - clippy_check: - runs-on: ubuntu-24.04 - permissions: - checks: write - steps: - - uses: actions/checkout@v1 - - name: install dependencies (ubuntu only) - run: | - sudo apt-get update - sudo apt-get install -y libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev - - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - components: clippy - override: true - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --manifest-path ./src-tauri/Cargo.toml \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 34d41f8..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,104 +0,0 @@ -name: 'publish' - -on: - workflow_dispatch: {} - release: - types: [published] - # This can be used to automatically publish nightlies at UTC nighttime -# schedule: -# - cron: "0 2 * * *" # run at 2 AM UTC - -# This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release. - -jobs: - publish-tauri: - permissions: - contents: write - strategy: - fail-fast: false - matrix: - include: - - platform: 'macos-latest' # for Arm based macs (M1 and above). - args: '--target aarch64-apple-darwin' - - platform: 'macos-latest' # for Intel based macs. - args: '--target x86_64-apple-darwin' - - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04. - args: '' - - platform: 'ubuntu-22.04-arm' - args: '--target aarch64-unknown-linux-gnu' - - platform: 'windows-latest' - args: '' - - runs-on: ${{ matrix.platform }} - steps: - - uses: actions/checkout@v4 - with: - submodules: true - token: ${{ secrets.GITHUB_TOKEN }} - - - name: setup node - uses: actions/setup-node@v4 - with: - node-version: lts/* - - - name: install Rust nightly - uses: dtolnay/rust-toolchain@nightly - with: - # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. - targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - - - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above. - run: | - sudo apt-get update - sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils - # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2. - - - - name: Import Apple Developer Certificate - if: matrix.platform == 'macos-latest' - env: - APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: | - echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12 - security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain - security set-keychain-settings -t 3600 -u build.keychain - - curl https://droposs.org/drop.crt --output drop.pem - sudo security authorizationdb write com.apple.trust-settings.user allow - security add-trusted-cert -r trustRoot -k build.keychain -p codeSign -u -1 drop.pem - sudo security authorizationdb remove com.apple.trust-settings.user - - security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain - security find-identity -v -p codesigning build.keychain - - - name: Verify Certificate - if: matrix.platform == 'macos-latest' - run: | - CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Drop OSS") - CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}') - echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV - echo "Certificate imported. Using identity: $CERT_ID" - - - name: install frontend dependencies - run: yarn install # change this to npm, pnpm or bun depending on which one you use. - - - uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }} - NO_STRIP: true - with: - tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version. - releaseName: 'Auto-release v__VERSION__' - releaseBody: 'See the assets to download this version and install. This release was created automatically.' - releaseDraft: false - prerelease: true - args: ${{ matrix.args }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index c60be72..5767a3f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,4 @@ dist-ssr .output src-tauri/flamegraph.svg -src-tauri/perf* - -/*.AppImage -/squashfs-root \ No newline at end of file +src-tauri/perf* \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fc3abe..7d0ff2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: build-linux: stage: build - image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/rustlang/rust:nightly + image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/rust:1.81.0-bookworm script: - apt-get update -y - apt-get install yarnpkg libsoup-3.0-0 libsoup-3.0-dev libatk-adaptor libgtk-3-dev libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev -y @@ -13,10 +13,9 @@ build-linux: - yarnpkg tauri build - cp src-tauri/target/release/bundle/deb/*.deb . - cp src-tauri/target/release/bundle/rpm/*.rpm . - - cp src-tauri/target/release/bundle/appimage/*.AppImage . artifacts: paths: - - "*.{deb,rpm,AppImage}" + - "*.{deb,rpm}" build-windows: stage: build diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index df4511d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "src-tauri/tailscale/libtailscale"] - path = src-tauri/tailscale/libtailscale - url = https://github.com/tailscale/libtailscale.git -[submodule "libs/drop-base"] - path = libs/drop-base - url = https://github.com/drop-oss/drop-base.git diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index 4099407..0000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -23 diff --git a/README.md b/README.md index f66cea8..b0df333 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,6 @@ Drop app is the companion app for [Drop](https://github.com/Drop-OSS/drop). It uses a Tauri base with Nuxt 3 + TailwindCSS on top of it, so we can re-use components from the web UI. -## Running -Before setting up the drop app, be sure that you have a server set up. -The instructions for this can be found on the [Drop Docs](https://docs.droposs.org/docs/guides/quickstart) - -## Current features -Currently supported are the following features: -- Signin (with custom server) -- Database registering & recovery -- Dynamic library fetching from server -- Installing & uninstalling games -- Download progress monitoring -- Launching / playing games - ## Development Install dependencies with `yarn` @@ -23,7 +10,7 @@ Run the app in development with `yarn tauri dev`. NVIDIA users on Linux, use she To manually specify the logging level, add the environment variable `RUST_LOG=[debug, info, warn, error]` to `yarn tauri dev`: -e.g. `RUST_LOG=debug yarn tauri dev` +e.g. `RUST_LOG=debug yarn taudi dev` ## Contributing Check the original [Drop repo](https://github.com/Drop-OSS/drop/blob/main/CONTRIBUTING.md) for contributing guidelines. \ No newline at end of file diff --git a/main/app.vue b/app.vue similarity index 53% rename from main/app.vue rename to app.vue index 7d4165f..9c11de6 100644 --- a/main/app.vue +++ b/app.vue @@ -1,15 +1,18 @@ diff --git a/main/components/Header.vue b/components/Header.vue similarity index 85% rename from main/components/Header.vue rename to components/Header.vue index 160b9ae..75537eb 100644 --- a/main/components/Header.vue +++ b/components/Header.vue @@ -11,7 +11,7 @@ v-for="(nav, navIdx) in navigation" :class="[ 'transition uppercase font-display font-semibold text-md', - navIdx === currentNavigation + navIdx === currentPageIndex ? 'text-zinc-100' : 'text-zinc-400 hover:text-zinc-200', ]" @@ -28,7 +28,9 @@ />
    - +
  1. -
- + diff --git a/main/components/HeaderWidget.vue b/components/HeaderWidget.vue similarity index 100% rename from main/components/HeaderWidget.vue rename to components/HeaderWidget.vue diff --git a/main/components/InitiateAuthModule.vue b/components/InitiateAuthModule.vue similarity index 63% rename from main/components/InitiateAuthModule.vue rename to components/InitiateAuthModule.vue index 4a1e290..5f7158c 100644 --- a/main/components/InitiateAuthModule.vue +++ b/components/InitiateAuthModule.vue @@ -13,7 +13,11 @@
-
+ - - Use a code → - + + Sign in with your browser -
- -
-

Having trouble?

-

- You can manually enter the token from your web browser. -

-
- - - Submit - -
-
+
@@ -126,46 +96,20 @@ diff --git a/main/components/Logo.vue b/components/Logo.vue similarity index 100% rename from main/components/Logo.vue rename to components/Logo.vue diff --git a/main/components/MiniHeader.vue b/components/MiniHeader.vue similarity index 84% rename from main/components/MiniHeader.vue rename to components/MiniHeader.vue index 3a129c8..2f6bf01 100644 --- a/main/components/MiniHeader.vue +++ b/components/MiniHeader.vue @@ -1,6 +1,6 @@