A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
v0.1.15a Media player (#106)
Amin Nausin4a465dbf8052
diff --git a/.editorconfig b/.editorconfigindex 8f0de65c..11745be1 100755--- a/.editorconfig+++ b/.editorconfig@@ -12,7 +12,7 @@ trim_trailing_whitespace = truetrim_trailing_whitespace = false[*.{yml,yaml}]-indent_size = 2+indent_size = 4[docker-compose.yml]indent_size = 4diff --git a/.env.example b/.env.exampleindex 8cc61611..c2329324 100755--- a/.env.example+++ b/.env.example@@ -7,7 +7,7 @@ APP_ENV=localAPP_KEY=APP_DEBUG=falseAPP_TIMEZONE=UTC-APP_URL="${APP_SCHEME}://${APP_HOST}:${APP_PORT}"+APP_URL="${APP_SCHEME}://${APP_HOST}"APP_LOCALE=enAPP_FALLBACK_LOCALE=enAPP_FAKER_LOCALE=en_CA@@ -19,7 +19,7 @@ PHP_CLI_SERVER_WORKERS=4BCRYPT_ROUNDS=12-LOG_CHANNEL=stack+LOG_CHANNEL=dailyLOG_STACK=singleLOG_DEPRECATIONS_CHANNEL=nullLOG_LEVEL=debugdiff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.ymldeleted file mode 100644index b1ccaee9..00000000--- a/.github/workflows/build-beta.yml+++ /dev/null@@ -1,54 +0,0 @@-name: Docker Image CI Beta--on:- workflow_dispatch:- inputs:- tag:- description: 'Release Tag'- required: true- # push:- # branches: ['dev']--jobs:- build:- runs-on: ubuntu-latest- permissions:- contents: write-- steps:- - name: 读取仓库的内容- uses: actions/checkout@v4-- - name: Replace DOCKER_RELEASE in .env.docker- run: |- sed -i "s/DOCKER_RELEASE=.*/DOCKER_RELEASE=beta/" docker/.env.docker-- - name: 登陆 Login to Docker Hub- uses: docker/login-action@v3- with:- username: ${{ secrets.DOCKER_HUB_USERNAME }}- password: ${{ secrets.DOCKER_HUB_TOKEN }}-- - name: 构建并推送到 Push to Docker Hub- uses: docker/build-push-action@v5- with:- push: true- tags: aminnausin/mediaserver:beta-- - name: Zip Files Linux- run: |- zip -r mediaServerDockerLinuxBeta.zip ./docker/etc ./docker/.env.docker ./docker-compose.yaml ./startDocker.sh ./README.md ./data/avatars-- - name: Zip Files Windows- run: |- zip -r mediaServerDockerWindowsBeta.zip ./docker/etc ./docker/.env.docker ./docker-compose.yaml ./startDocker.bat ./README.md ./data/avatars- - name: Create Release- uses: ncipollo/release-action@v1- with:- allowUpdates: true- token: ${{ secrets.GITHUB_TOKEN }}- tag: 'beta'- name: Beta Release- draft: false- prerelease: false- artifacts: mediaServerDockerLinuxBeta.zip,mediaServerDockerWindowsBeta.zipdiff --git a/.github/workflows/build-beta.yml.bak b/.github/workflows/build-beta.yml.baknew file mode 100644index 00000000..82e7260e--- /dev/null+++ b/.github/workflows/build-beta.yml.bak@@ -0,0 +1,119 @@+name: Docker Image CI++on:+ workflow_dispatch:+ inputs:+ tag:+ description: 'Release Tag'+ required: true+ push:+ branches:+ - main+ - dev+ paths:+ - 'docker/**'+ - 'docker-compose.yaml'+ - 'DockerFile'+ - 'startDocker.*'+ - 'data/**'+ - 'README.md'++jobs:+ build:+ name: Build Docker Image+ runs-on: ubuntu-latest+ permissions:+ contents: write+ outputs:+ tag: ${{ steps.set_release_info.outputs.TAG }}+ prerelease: ${{ steps.set_release_info.outputs.PRERELEASE }}++ steps:+ - name: 读取仓库的内容+ uses: actions/checkout@v4++ - name: Set Release Tag and Prerelease Status+ id: set_release_info+ run: |+ TIMESTAMP=$(date +%Y%m%d%H%M%S)+ SHORT_SHA=$(git rev-parse --short HEAD)++ if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "${{ github.event.inputs.tag }}" ]]; then+ echo "TAG=${{ github.event.inputs.tag }}-$TIMESTAMP" >> $GITHUB_ENV+ echo "PRERELEASE=false" >> $GITHUB_ENV+ elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then+ echo "TAG=beta-$SHORT_SHA" >> $GITHUB_ENV+ echo "PRERELEASE=true" >> $GITHUB_ENV+ else+ echo "TAG=latest-$SHORT_SHA" >> $GITHUB_ENV+ echo "PRERELEASE=false" >> $GITHUB_ENV+ fi++ echo "TAG=${TAG}" >> $GITHUB_OUTPUT+ echo "PRERELEASE=${PRERELEASE}" >> $GITHUB_OUTPUT+ - name: Update .env.docker+ run: |+ sed -i "s/DOCKER_RELEASE=.*/DOCKER_RELEASE=${{ steps.set_release_info.outputs.TAG }}/" docker/.env.docker++ - name: 登陆 Login to Docker Hub+ uses: docker/login-action@v3+ with:+ username: ${{ secrets.DOCKER_HUB_USERNAME }}+ password: ${{ secrets.DOCKER_HUB_TOKEN }}++ - name: 构建并推送到 Push to Docker Hub+ uses: docker/build-push-action@v5+ with:+ push: true+ tags: aminnausin/mediaserver:${{ steps.set_release_info.outputs.TAG }}++ check_changes:+ name: Check for Docker Related File Changes+ runs-on: ubuntu-latest+ outputs:+ files_changed: ${{ steps.filter.outputs.changes != '[]' }}+ steps:+ - name: Checkout code+ uses: actions/checkout@v4++ - name: Check for file changes+ id: filter+ uses: dorny/paths-filter@v2+ with:+ filters: |+ changed:+ - 'docker/**'+ - 'docker-compose.yaml'+ - 'DockerFile'+ - 'startDocker.*'+ - 'data/**'+ - 'README.md'++ release:+ name: Create GitHub Release+ runs-on: ubuntu-latest+ needs: [build, check_changes]+ if: needs.check_changes.outputs.files_changed == 'true' || github.event_name == 'workflow_dispatch'+ permissions:+ contents: write+ steps:+ - name: Checkout Repository+ uses: actions/checkout@v4++ - name: Zip Files Linux+ run: |+ zip -r mediaServerDockerLinux.zip ./docker/etc ./docker/.env.docker ./docker-compose.yaml ./startDocker.sh ./README.md ./data/avatars++ - name: Zip Files Windows+ run: |+ zip -r mediaServerDockerWindows.zip ./docker/etc ./docker/.env.docker ./docker-compose.yaml ./startDocker.bat ./README.md ./data/avatars+ - name: Create Release+ uses: ncipollo/release-action@v1+ with:+ allowUpdates: false+ token: ${{ secrets.GITHUB_TOKEN }}+ tag: ${{ needs.build.outputs.tag }}+ name: Docker Release - ${{ needs.build.outputs.tag }}+ draft: false+ prerelease: ${{ needs.build.outputs.prerelease }}+ artifacts: mediaServerDockerLinux.zip,mediaServerDockerWindows.zipdiff --git a/.github/workflows/build.yml b/.github/workflows/build.yml.baksimilarity index 84%rename from .github/workflows/build.ymlrename to .github/workflows/build.yml.bakindex 91e887de..e186a261 100644--- a/.github/workflows/build.yml+++ b/.github/workflows/build.yml.bak@@ -8,6 +8,13 @@ on:required: truepush:branches: ['main']+ paths:+ - 'docker/**'+ - 'docker-compose.yaml'+ - 'DockerFile'+ - 'startDocker.*'+ - 'data/**'+ - 'README.md'jobs:build:@@ -45,7 +52,7 @@ jobs:allowUpdates: truetoken: ${{ secrets.GITHUB_TOKEN }}tag: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.tag) || 'latest' }}- name: Release ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.tag) || 'latest' }}+ name: Docker Release ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.tag) || 'latest' }}draft: falseprerelease: falseartifacts: mediaServerDockerLinux.zip,mediaServerDockerWindows.zipdiff --git a/.github/workflows/ci-docker-release.yml b/.github/workflows/ci-docker-release.ymlnew file mode 100644index 00000000..8d346e71--- /dev/null+++ b/.github/workflows/ci-docker-release.yml@@ -0,0 +1,258 @@+name: CI & Docker Release++on:+ push:+ branches: ['dev', 'main']+ workflow_dispatch:+ inputs:+ tag:+ description: 'Release Tag'+ required: true++jobs:+ # ==========================+ # PHP Linting (Laravel Pint)+ # ==========================+ check-php-changes:+ runs-on: ubuntu-latest+ outputs:+ php_changed: ${{ steps.filter.outputs.changes != '[]' }}+ steps:+ - name: Checkout code+ uses: actions/checkout@v4++ - name: Detect PHP file changes+ id: filter+ uses: dorny/paths-filter@v2+ with:+ filters: |+ php_changed:+ - '**/*.php'++ laravel-pint:+ needs: [check-php-changes]+ runs-on: ubuntu-latest+ if: needs.check-php-changes.outputs.php_changed == 'true'+ permissions:+ contents: write+ strategy:+ fail-fast: true+ matrix:+ php: [8.4]++ steps:+ - name: Checkout code+ uses: actions/checkout@v4++ - name: Setup PHP+ uses: shivammathur/setup-php@v2+ with:+ php-version: ${{ matrix.php }}+ extensions: json, dom, curl, libxml, mbstring+ coverage: none++ - name: Install Pint+ run: composer global require laravel/pint++ - name: Run Pint+ run: pint++ - name: Commit linted files+ uses: stefanzweifel/git-auto-commit-action@v5+ with:+ commit_message: 'Fixes coding style'++ # ==========================+ # Laravel Tests+ # ==========================+ laravel-tests:+ needs: [laravel-pint]+ runs-on: ubuntu-latest+ env:+ DB_CONNECTION: pgsql+ DB_HOST: localhost+ DB_PORT: 5432+ DB_PASSWORD: postgres+ DB_USERNAME: postgres+ DB_DATABASE: postgres++ services:+ postgres:+ image: postgres:latest+ env:+ POSTGRES_USER: postgres+ POSTGRES_PASSWORD: postgres+ POSTGRES_DB: postgres++ ports:+ - 5432:5432+ options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3++ steps:+ - name: Set up Node.js+ uses: actions/setup-node@v3++ - name: Set up PHP+ uses: shivammathur/setup-php@v2+ with:+ php-version: '8.4'+ extensions: pgsql++ - uses: actions/checkout@v4++ - name: Copy .env+ run: php -r "file_exists('.env') || copy('.env.example', '.env');"++ - name: Install Dependencies+ run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist++ - name: Install node dependencies+ run: npm ci++ - name: Generate key+ run: php artisan key:generate++ - name: Generate Reverb Keys+ run: php artisan reverb:generate++ - name: Directory Permissions+ run: chmod -R 777 storage bootstrap/cache++ - name: Run Migration+ run: php artisan migrate -v+ env:+ DB_PORT: 5432++ - name: Build+ run: npm run build++ - name: Lint+ run: npm run lint -- --fix++ - name: Execute tests (Unit and Feature tests) via PHPUnit/Pest+ run: php artisan test++ # ==========================+ # Generate Release Tags+ # ==========================+ get-release-tags:+ name: Generate Release Tags+ runs-on: ubuntu-latest+ needs: [laravel-tests]+ if: success()+ outputs:+ tag: ${{ steps.set_release_info.outputs.TAG }}+ prerelease: ${{ steps.set_release_info.outputs.PRERELEASE }}+ steps:+ - name: 读取仓库的内容+ uses: actions/checkout@v4++ - name: Set Release Tag and Prerelease Status+ id: set_release_info+ run: |+ TIMESTAMP=$(date +%Y%m%d%H%M%S)+ SHORT_SHA=$(git rev-parse --short HEAD)+ # Set the tag and prerelease based on the branch or dispatch+ if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "${{ github.event.inputs.tag }}" ]]; then+ echo "TAG=${{ github.event.inputs.tag }}-$TIMESTAMP" >> $GITHUB_OUTPUT+ echo "PRERELEASE=false" >> $GITHUB_OUTPUT+ elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then+ echo "TAG=beta-$SHORT_SHA" >> $GITHUB_OUTPUT+ echo "PRERELEASE=true" >> $GITHUB_OUTPUT+ else+ echo "TAG=latest-$SHORT_SHA" >> $GITHUB_OUTPUT+ echo "PRERELEASE=false" >> $GITHUB_OUTPUT+ fi++ echo "Current TAG value: ${TAG}"+ echo "Current TAG value: TAG=beta-$SHORT_SHA"+ echo "TAG=beta-$SHORT_SHA" >> $GITHUB_OUTPUT+ echo "PRERELEASE=true" >> $GITHUB_OUTPUT++ # ==========================+ # Publish Docker Image+ # ==========================+ build-docker:+ name: Build Docker Image+ runs-on: ubuntu-latest+ needs: [get-release-tags]+ permissions:+ contents: write+ steps:+ - name: 读取仓库的内容+ uses: actions/checkout@v4++ - name: Update .env.docker+ run: |+ sed -i "s/DOCKER_RELEASE=.*/DOCKER_RELEASE=${{ needs.get-release-tags.outputs.tag }}/" docker/.env.docker++ - name: 登陆 Login to Docker Hub+ uses: docker/login-action@v3+ with:+ username: ${{ secrets.DOCKER_HUB_USERNAME }}+ password: ${{ secrets.DOCKER_HUB_TOKEN }}++ - name: 构建并推送到 Push to Docker Hub+ uses: docker/build-push-action@v5+ with:+ push: true+ tags: aminnausin/mediaserver:${{ needs.get-release-tags.outputs.tag }}++ # ==========================+ # Check for Docker Changes+ # ==========================+ check-docker-changes:+ name: Check for Docker Related File Changes+ needs: [laravel-tests]+ if: needs.laravel-tests.result == 'success'+ runs-on: ubuntu-latest+ outputs:+ files_changed: ${{ steps.filter.outputs.changes != '[]' }}+ steps:+ - name: Checkout code+ uses: actions/checkout@v4++ - name: Check for file changes+ id: filter+ uses: dorny/paths-filter@v2+ with:+ filters: |+ changed:+ - 'docker/**'+ - 'docker-compose.yaml'+ - 'DockerFile'+ - 'startDocker.*'+ - 'data/**'+ - 'README.md'++ # ==========================+ # Release Docker Setup Pkg+ # ==========================+ release:+ name: Create GitHub Release+ runs-on: ubuntu-latest+ needs: [build-docker, check-docker-changes, get-release-tags]+ if: needs.check-docker-changes.outputs.files_changed == 'true' || github.event_name == 'workflow_dispatch'+ permissions:+ contents: write+ steps:+ - name: Checkout Repository+ uses: actions/checkout@v4++ - name: Zip Files Linux+ run: |+ zip -r mediaServerDockerLinux.zip ./docker/etc ./docker/.env.docker ./docker-compose.yaml ./startDocker.sh ./README.md ./data/*++ - name: Zip Files Windows+ run: |+ zip -r mediaServerDockerWindows.zip ./docker/etc ./docker/.env.docker ./docker-compose.yaml ./startDocker.bat ./README.md ./data/*+ - name: Create Release+ uses: ncipollo/release-action@v1+ with:+ allowUpdates: false+ token: ${{ secrets.GITHUB_TOKEN }}+ tag: ${{ needs.get-release-tags.outputs.tag }}+ name: Docker Release - ${{ needs.get-release-tags.outputs.tag }}+ draft: false+ prerelease: ${{ needs.get-release-tags.outputs.prerelease }}+ artifacts: mediaServerDockerLinux.zip,mediaServerDockerWindows.zipdiff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.ymlnew file mode 100644index 00000000..040a9635--- /dev/null+++ b/.github/workflows/ci-test.yml@@ -0,0 +1,128 @@+name: Code Test++on:+ pull_request:+ branches: ['dev', 'main']++jobs:+ # ==========================+ # PHP Linting (Laravel Pint)+ # ==========================+ check-php-changes:+ runs-on: ubuntu-latest+ outputs:+ php_changed: ${{ steps.filter.outputs.changes != '[]' }}+ steps:+ - name: Checkout code+ uses: actions/checkout@v4++ - name: Detect PHP file changes+ id: filter+ uses: dorny/paths-filter@v2+ with:+ filters: |+ php_changed:+ - '**/*.php'++ laravel-pint:+ needs: [check-php-changes]+ runs-on: ubuntu-latest+ if: needs.check-php-changes.outputs.php_changed == 'true'+ permissions:+ contents: write+ strategy:+ fail-fast: true+ matrix:+ php: [8.4]++ steps:+ - name: Checkout code+ uses: actions/checkout@v4++ - name: Setup PHP+ uses: shivammathur/setup-php@v2+ with:+ php-version: ${{ matrix.php }}+ extensions: json, dom, curl, libxml, mbstring+ coverage: none++ - name: Install Pint+ run: composer global require laravel/pint++ - name: Run Pint+ run: pint++ - name: Commit linted files+ uses: stefanzweifel/git-auto-commit-action@v5+ with:+ commit_message: 'Fixes coding style'++ # ==========================+ # Laravel Tests+ # ==========================+ laravel-tests:+ needs: [laravel-pint]+ runs-on: ubuntu-latest+ env:+ DB_CONNECTION: pgsql+ DB_HOST: localhost+ DB_PORT: 5432+ DB_PASSWORD: postgres+ DB_USERNAME: postgres+ DB_DATABASE: postgres++ services:+ postgres:+ image: postgres:latest+ env:+ POSTGRES_USER: postgres+ POSTGRES_PASSWORD: postgres+ POSTGRES_DB: postgres++ ports:+ - 5432:5432+ options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3++ steps:+ - name: Set up Node.js+ uses: actions/setup-node@v3++ - name: Set up PHP+ uses: shivammathur/setup-php@v2+ with:+ php-version: '8.4'+ extensions: pgsql++ - uses: actions/checkout@v4++ - name: Copy .env+ run: php -r "file_exists('.env') || copy('.env.example', '.env');"++ - name: Install Dependencies+ run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist++ - name: Install node dependencies+ run: npm ci++ - name: Generate key+ run: php artisan key:generate++ - name: Generate Reverb Keys+ run: php artisan reverb:generate++ - name: Directory Permissions+ run: chmod -R 777 storage bootstrap/cache++ - name: Run Migration+ run: php artisan migrate -v+ env:+ DB_PORT: 5432++ - name: Build+ run: npm run build++ - name: Lint+ run: npm run lint -- --fix++ - name: Execute tests (Unit and Feature tests) via PHPUnit/Pest+ run: php artisan testdiff --git a/.github/workflows/laravel-pint.yml b/.github/workflows/laravel-pint.yml.baksimilarity index 90%rename from .github/workflows/laravel-pint.ymlrename to .github/workflows/laravel-pint.yml.bakindex 1156528c..dd2551a0 100644--- a/.github/workflows/laravel-pint.yml+++ b/.github/workflows/laravel-pint.yml.bak@@ -3,8 +3,12 @@ name: Laravel-pinton:push:branches: ['main']+ paths:+ - '**.php'pull_request:- branches: ['dev', 'main']+ branches: ['dev']+ paths:+ - '**.php'jobs:laravel-pint:diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.ymldeleted file mode 100755index 77110e2e..00000000--- a/.github/workflows/laravel.yml+++ /dev/null@@ -1,75 +0,0 @@-name: Laravel--on:- push:- branches: ['dev', 'main']- pull_request:- branches: ['dev']--jobs:- laravel-tests:- runs-on: ubuntu-latest- env:- DB_CONNECTION: pgsql- DB_HOST: localhost- DB_PASSWORD: postgres- DB_USERNAME: postgres- DB_DATABASE: postgres-- services:- postgres:- image: postgres:latest- env:- POSTGRES_USER: postgres- POSTGRES_PASSWORD: postgres- POSTGRES_DB: postgres-- ports:- - 5432/tcp- options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3-- steps:- - name: Set up Node.js- uses: actions/setup-node@v3-- - name: Set up PHP- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e- with:- php-version: '8.4'- extensions: pgsql-- - uses: actions/checkout@v4-- - name: Copy .env- run: php -r "file_exists('.env') || copy('.env.example', '.env');"-- - name: Install Dependencies- run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist-- - name: Install node dependencies- run: npm ci-- - name: Generate key- run: php artisan key:generate-- - name: Directory Permissions- run: chmod -R 777 storage bootstrap/cache-- # - name: Clear Config- # run: php artisan config:clear-- - name: Run Migration- run: php artisan migrate -v- env:- DB_PORT: ${{ job.services.postgres.ports[5432] }}-- - name: Build- run: npm run build-- - name: Lint- run: npm run lint -- --fix-- - name: Execute tests (Unit and Feature tests) via PHPUnit/Pest- env:- DB_PORT: ${{ job.services.postgres.ports[5432] }}- run: php artisan testdiff --git a/README.md b/README.mdindex 5e94def7..1c1bc752 100755--- a/README.md+++ b/README.md@@ -48,7 +48,7 @@ Extra features include watch history, ambient mode, editable video metadata and#### Personally Hosted With-- Nixos (Server OS)+- Nixos / Oracle Cloud (Server OS)- Nginx (Server)- Caddy (Reverse Proxy and SSL)- Docker (Caddy Host)@@ -61,13 +61,27 @@ Extra features include watch history, ambient mode, editable video metadata and### Key Features- Quiet / Minimalist UI-- Ambient Video Player- - Provides ambient backlight based on video content in darkmode- - Can be disabled-- Video Playback Heatmap- - Shows up after 5 seeks to any point in a video- - Ranges from 1 to 25 at any 100th point in the video- - Can be disabled+- Custom Media Player+ - New UI+ - Music Support (with cover art)+ - Keybinds+ - k (play/pause)+ - j / LeftArrow (rewind 10s)+ - l / rightArrow (fast forward 10s)+ - SHIFT+N (play next)+ - SHIFT+P (play previous)+ - m (mute/unmute)+ - f (full screen/exit full screen)+ - Speed Controls+ - Player Statistics+ - Ambient Background+ - Provides ambient backlight based on video content in darkmode+ - Can be disabled+ - Video Playback Heatmap+ - Shows up after 5 seeks to any point in a video+ - Ranges from 1 to 25 at any 100th point in the video+ - Can be disabled+ - Watch Party UI Demo (upcoming)- Video and Folder Sharing- With video id or folder name in the URL- Customisable Video Metadata@@ -84,10 +98,10 @@ Extra features include watch history, ambient mode, editable video metadata and- Watch History Tracking- Can filter history by any video or folder attribute- View Counts+ - See how many times you have viewed a video vs everybody else- Persistent Metadata- Moved or reuploaded videos will be matched with pre-existing metadata- Dark/Light mode-- Music Player- Server Dashboard- Index process manager- Library Manager@@ -97,7 +111,6 @@ Extra features include watch history, ambient mode, editable video metadata and### Features to add-- Video player UI- Video playback statistics- Most Played in the last X days- Your favourite video / folder / category@@ -116,7 +129,18 @@ Extra features include watch history, ambient mode, editable video metadata and### Installation-To run this yourself, you require a webserver such as [Caddy](https://caddyserver.com/) or [NGINX](https://nginx.org/en/index.html), [PostgreSQL](https://www.postgresql.org/), A build of Vue and Tailwind with [Node](https://nodejs.org/en), [FFmpeg](https://www.ffmpeg.org/), [ExifTool](https://exiftool.org/) (Optional) and PHP 8. You can use [Laragon](https://laragon.org/) to run in a single application. A valid SSL certificate is required to use some metadata features.+#### Docker+You can download the zip archive for your platform from the latest or beta docker release.+- Unzip it to the location of your choice+ - Make sure that location has sufficient read/write/execute permissions for docker+- Run `./startDocker.bat` (Windows) or `sudo bash startDocker.sh` and let it create/copy the required files+- Visit `https://app.test` and follow the setup instructions there+- Place your media in `./data/media/CATEGORY/FOLDER/VIDEO.MP4`+ - Media must be grouped by a folder (category) and subfolder (folder) in order to show up on the website+ - There are certain names that you cannot use for folders or videos+ - `List coming soon...`+#### Standard+To run this yourself, you require a webserver such as [Caddy](https://caddyserver.com/) or [NGINX](https://nginx.org/en/index.html), [PostgreSQL](https://www.postgresql.org/), A build of Vue and Tailwind with [Node](https://nodejs.org/en), [FFmpeg](https://www.ffmpeg.org/), [ExifTool](https://exiftool.org/) (Optional) and PHP 8.3+. You can use [Laragon](https://laragon.org/) or the docker compose file to run in a single application. A valid SSL certificate is required to use some metadata features.```bash# Clone@@ -201,31 +225,54 @@ Below are screenshots of the current webpage on Desktop and Android.### Video Player-+<!-- + -->+### Music Player-+<!-- + -->+++### Player Options+++++### Setup Page+++### Analytics-+<!--  -->++### Library Management-+<!-- -->+### User Management-+<!--### Task Dashboard-+<!-- -->+### Android-|  |  |+<!--+++-->+|  |  || :--------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------: || Dark Mode on Android | Light Mode on Android |diff --git a/app/Http/Controllers/Api/V1/RecordController.php b/app/Http/Controllers/Api/V1/RecordController.phpindex 312dde41..f2f03212 100644--- a/app/Http/Controllers/Api/V1/RecordController.php+++ b/app/Http/Controllers/Api/V1/RecordController.php@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\V1;use App\Http\Controllers\Controller;use App\Http\Requests\RecordStoreRequest;use App\Http\Resources\RecordResource;+use App\Models\Metadata;use App\Models\Record;use App\Models\Video;use App\Traits\HttpResponses;@@ -31,6 +32,20 @@ class RecordController extends Controller {);}+ public function userViewCount(Metadata $metadata) {+ if (! Auth::user()) {+ abort(403, 'Unauthorized action.');+ }++ try {+ $viewCount = Record::where('user_id', Auth::user()->id)->where('metadata_id', $metadata->id)->count();++ return $viewCount;+ } catch (\Throwable $th) {+ return $this->error(null, 'Unable to user view count. Error: ' . $th->getMessage(), 500);+ }+ }+/*** Store a newly created resource in storage.*/diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.phpindex 68045e58..da1506fd 100644--- a/app/Http/Controllers/Api/V1/UserController.php+++ b/app/Http/Controllers/Api/V1/UserController.php@@ -50,7 +50,7 @@ class UserController extends Controller {return $user->delete() ? $this->success('', 'Success', 200) : $this->error('', 'Not found', 404);}- public function SessionCount() {+ public function sessionCount() {if (! Auth::user()) {abort(403, 'Unauthorized action.');}diff --git a/app/Http/Controllers/Api/V1/VideoController.php b/app/Http/Controllers/Api/V1/VideoController.phpindex e049e469..340f3fdd 100755--- a/app/Http/Controllers/Api/V1/VideoController.php+++ b/app/Http/Controllers/Api/V1/VideoController.php@@ -11,6 +11,7 @@ use App\Models\Video;use App\Traits\HttpResponses;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Log;class VideoController extends Controller {use HttpResponses;@@ -72,6 +73,7 @@ class VideoController extends Controller {if (isset($metadata->view_count)) {$metadata->update(['view_count' => $metadata->view_count + 1]);} else {+ Log::alert('RESETING VIEWS ON METADATA:' . $metadata->id, [$metadata]);$metadata->update(['view_count' => Record::where('video_id', $video->id)->whereNull('metadata_id')->count() + ($metadata->id ? Record::where('metadata_id', $metadata->id)->count() : 0) + 1]);}diff --git a/config/logging.php b/config/logging.phpindex d07b8de7..c865589d 100755--- a/config/logging.php+++ b/config/logging.php@@ -18,7 +18,7 @@ return [|*/- 'default' => env('LOG_CHANNEL', 'stack'),+ 'default' => env('LOG_CHANNEL', 'daily'),/*|--------------------------------------------------------------------------@@ -69,7 +69,7 @@ return ['driver' => 'daily','path' => storage_path('logs/' . env('LOG_FILENAME', 'laravel.log')),'level' => env('LOG_LEVEL', 'debug'),- 'days' => env('LOG_DAILY_DAYS', 14),+ 'days' => env('LOG_DAILY_DAYS', 64),'replace_placeholders' => true,],diff --git a/docker-compose.yaml b/docker-compose.yamlindex 12e9ede9..6ff88286 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -4,9 +4,11 @@ services:container_name: MediaServervolumes:- ./data:/var/www/html/storage/app/public- - ./logs:/var/www/html/storage/logs+ - ./logs/mediaServer:/var/www/html/storage/logs- ./docker/etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf+ - ./docker/etc/nginx/nginx.conf:/etc/nginx/nginx.conf- .env:/var/www/html/.env+ - ./logs/nginx:/var/log/nginxports:- '8086:8086'expose:@@ -30,7 +32,7 @@ services:command: ['php', '/var/www/html/artisan', 'queue:work', '--tries=3']volumes:- ./data:/var/www/html/storage/app/public- - ./logs:/var/www/html/storage/logs+ - ./logs/mediaServer:/var/www/html/storage/logsdepends_on:postgres:condition: service_healthy@@ -49,7 +51,7 @@ services:command: ['php', '/var/www/html/artisan', 'queue:work', '--queue=high', '--tries=3']volumes:- ./data:/var/www/html/storage/app/public- - ./logs:/var/www/html/storage/logs+ - ./logs/mediaServer:/var/www/html/storage/logsdepends_on:postgres:condition: service_healthy@@ -67,7 +69,7 @@ services:command: ['php', '/var/www/html/artisan', 'schedule:work']volumes:- ./data:/var/www/html/storage/app/public- - ./logs:/var/www/html/storage/logs+ - ./logs/mediaServer:/var/www/html/storage/logsdepends_on:postgres:condition: service_healthy@@ -85,7 +87,7 @@ services:command: php artisan reverb:startvolumes:- ./data:/var/www/html/storage/app/public- - ./logs:/var/www/html/storage/logs+ - ./logs/mediaServer:/var/www/html/storage/logsports:- ${REVERB_PORT:-6001}:${REVERB_PORT:-6001}expose:@@ -113,7 +115,7 @@ services:- 443:443/udpvolumes:- ./docker/etc/caddy/Caddyfile:/etc/caddy/Caddyfile- - ./logs:/var/log/caddy+ - ./logs/caddy:/var/log/caddy- /var/run/docker.sock:/var/run/docker.sockrestart: unless-stoppedenvironment:diff --git a/docker/.env.docker b/docker/.env.dockerindex 1c833df0..73cec847 100644--- a/docker/.env.docker+++ b/docker/.env.docker@@ -27,7 +27,7 @@ APP_NAME=mediaServerAPP_KEY=APP_DEBUG=falseAPP_TIMEZONE=UTC-APP_URL="${APP_SCHEME}://${APP_HOST}:${APP_PORT}"+APP_URL="${APP_SCHEME}://${APP_HOST}"APP_LOCALE=enAPP_FALLBACK_LOCALE=enAPP_FAKER_LOCALE=en_CA@@ -68,6 +68,7 @@ PULSE_SERVER_DIRECTORIES="/"REVERB_APP_ID=355744REVERB_APP_KEY=REVERB_APP_SECRET=+REVERB_HOST="${APP_HOST}"REVERB_SERVER_PORT=6001REVERB_SERVER_HOST=0.0.0.0REVERB_SCHEME="${APP_SCHEME}"diff --git a/docker/etc/nginx/nginx.conf b/docker/etc/nginx/nginx.confnew file mode 100644index 00000000..9da8e9d5--- /dev/null+++ b/docker/etc/nginx/nginx.conf@@ -0,0 +1,35 @@+worker_processes auto;++error_log /dev/stderr warn;+pid /var/run/nginx.pid;+daemon off;+++events {+ worker_connections 1024;+}+++http {+ include /etc/nginx/mime.types;+ default_type application/octet-stream;+ server_tokens off;++ # set_real_ip_from caddy;+ real_ip_header X-Forwarded-For;++ log_format custom '$http_x_real_ip - $remote_user [$time_local] "$request" '+ '$status $body_bytes_sent "$http_referer" '+ '"$http_user_agent" "$http_x_forwarded_for"';++ access_log /dev/stdout custom;++ sendfile on;+ #tcp_nopush on;++ keepalive_timeout 65;++ #gzip on;++ include /etc/nginx/conf.d/*.conf;+}diff --git a/package-lock.json b/package-lock.jsonindex 5c7e3279..ea7c7dc7 100755--- a/package-lock.json+++ b/package-lock.json@@ -24,7 +24,9 @@"@7nohe/laravel-typegen": "^0.6.1","@eslint/compat": "^1.2.0","@eslint/js": "^9.7.0",+ "@iconify-json/cil": "^1.2.2","@iconify-json/circum": "^1.1.11",+ "@iconify-json/formkit": "^1.2.2","@iconify-json/lucide": "^1.1.202","@iconify-json/majesticons": "^1.2.1","@iconify-json/material-symbols-light": "^1.1.25",@@ -32,6 +34,7 @@"@iconify-json/ph": "^1.1.13","@iconify-json/proicons": "^1.2.9","@iconify-json/svg-spinners": "^1.2.2",+ "@iconify-json/uit": "^1.2.3","@tailwindcss/aspect-ratio": "^0.4.2","@tailwindcss/forms": "^0.5.7","@tsconfig/node22": "^22.0.0",@@ -889,6 +892,16 @@"url": "https://github.com/sponsors/nzakas"}},+ "node_modules/@iconify-json/cil": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/@iconify-json/cil/-/cil-1.2.2.tgz",+ "integrity": "sha512-DiIDcsmGQhzFuxprBI5KTUm4+k3NS9qVqihpsJe5PBAbRXwEfn6fUfcHcdAcFPgU3hIQ6zgQ4cuebXPuiWxbOg==",+ "dev": true,+ "license": "CC-BY-4.0",+ "dependencies": {+ "@iconify/types": "*"+ }+ },"node_modules/@iconify-json/circum": {"version": "1.2.2","resolved": "https://registry.npmjs.org/@iconify-json/circum/-/circum-1.2.2.tgz",@@ -899,6 +912,16 @@"@iconify/types": "*"}},+ "node_modules/@iconify-json/formkit": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/@iconify-json/formkit/-/formkit-1.2.2.tgz",+ "integrity": "sha512-vrv5X44zie1F46e1AsPjN2MEi8ui+6SA1EvWETphAbkd+MaXmxyD4vra3hdTOYYNJDn5dkC7vMGf5WieCMu9zA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@iconify/types": "*"+ }+ },"node_modules/@iconify-json/lucide": {"version": "1.2.26","resolved": "https://registry.npmjs.org/@iconify-json/lucide/-/lucide-1.2.26.tgz",@@ -969,6 +992,16 @@"@iconify/types": "*"}},+ "node_modules/@iconify-json/uit": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@iconify-json/uit/-/uit-1.2.3.tgz",+ "integrity": "sha512-p7d+5/QI0UgBXUFhvgWyNvssW6mLItrMmYT9UcsdMK97QXtPqdCpczfzPNHeQ/rYaW+Id8TIK8YuW9x5CqShMA==",+ "dev": true,+ "license": "Apache-2.0",+ "dependencies": {+ "@iconify/types": "*"+ }+ },"node_modules/@iconify/types": {"version": "2.0.0","resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",diff --git a/package.json b/package.jsonindex 91c9c0f1..2951a177 100755--- a/package.json+++ b/package.json@@ -33,7 +33,9 @@"@7nohe/laravel-typegen": "^0.6.1","@eslint/compat": "^1.2.0","@eslint/js": "^9.7.0",+ "@iconify-json/cil": "^1.2.2","@iconify-json/circum": "^1.1.11",+ "@iconify-json/formkit": "^1.2.2","@iconify-json/lucide": "^1.1.202","@iconify-json/majesticons": "^1.2.1","@iconify-json/material-symbols-light": "^1.1.25",@@ -41,6 +43,7 @@"@iconify-json/ph": "^1.1.13","@iconify-json/proicons": "^1.2.9","@iconify-json/svg-spinners": "^1.2.2",+ "@iconify-json/uit": "^1.2.3","@tailwindcss/aspect-ratio": "^0.4.2","@tailwindcss/forms": "^0.5.7","@tsconfig/node22": "^22.0.0",diff --git a/resources/css/app.css b/resources/css/app.cssindex d01912ae..87feccf3 100755--- a/resources/css/app.css+++ b/resources/css/app.css@@ -80,4 +80,82 @@width: 0.35rem;}}++ .slider {+ --thumb-size: 2;+ --thumb-rounded: 9999px; /* rounded-full */+ --track-color: rgba(255, 255, 255, 0.3); /* white with 30% opacity */+ --track-rounded: 9999px; /* rounded-full */+ --progress-color: #111827; /* gray-900 */+ }++ .slider.timeline {+ --thumb-size: 1;+ }++ .slider.timeline:hover {+ --thumb-size: 2;+ }++ .slider.volume {+ --thumb-color: #ffffff;+ --progress-color: #9333eaca;+ }++ /* WebKit (Chrome, Safari) */+ .slider::-webkit-slider-thumb {+ transition: all 200ms ease-in-out;+ appearance: none;+ border: 0;+ background: var(--thumb-color);+ border-radius: var(--thumb-rounded);+ width: calc(var(--thumb-size) * 0.25rem);+ height: calc(var(--thumb-size) * 0.25rem);+ box-shadow: -995px 0 0 992px var(--progress-color);+ }++ .slider::-webkit-slider-runnable-track {+ background: var(--track-color);+ border-radius: var(--track-rounded);+ overflow: hidden;+ }++ .slider::-webkit-slider-runnable-track {+ background: var(--track-color);+ border-radius: var(--track-rounded);+ overflow: hidden;+ }++ /* Firefox */+ .slider::-moz-range-thumb {+ transition: all 200ms ease-in-out;+ appearance: none;+ border: 0;+ background: var(--thumb-color);+ border-radius: var(--thumb-rounded);+ width: calc(var(--thumb-size) * 0.25rem);+ height: calc(var(--thumb-size) * 0.25rem);+ }++ .slider::-moz-range-track {+ transition: all 200ms ease-in-out;+ background: var(--track-color);+ border-radius: var(--track-rounded);+ height: calc(var(--thumb-size) * 0.25rem);+ }++ .slider::-moz-range-progress {+ transition: all 200ms ease-in-out;+ background: var(--progress-color);+ border-radius: var(--track-rounded);+ height: calc(var(--thumb-size) * 0.25rem);+ }++ .slider.timeline:hover::-moz-range-track,+ .slider.timeline:hover::-moz-range-progress {+ border-radius: 1px;+ }+ .slider.timeline:hover::-webkit-slider-runnable-track {+ border-radius: 1px;+ }}diff --git a/resources/js/components/cards/DashboardCard.vue b/resources/js/components/cards/DashboardCard.vueindex db24f3bc..c22f24e3 100644--- a/resources/js/components/cards/DashboardCard.vue+++ b/resources/js/components/cards/DashboardCard.vue@@ -19,7 +19,7 @@ const props = withDefaults(</script><template><div- :class="`flex col-span-${cols} row-span-${rows} flex-col gap-2 p-3 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-full ${props.class ?? ''}`"+ :class="`flex col-span-${cols} row-span-${rows} flex-col gap-2 p-3 rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-full ${props.class ?? ''}`"><header class="flex flex-wrap justify-between items-center gap-4 mb-3 @md:mb-6"><div class="flex-1 basis-0 flex-grow-[10000] max-w-full">diff --git a/resources/js/components/cards/HoverCard.vue b/resources/js/components/cards/HoverCard.vueindex 18b8823f..d85613b8 100644--- a/resources/js/components/cards/HoverCard.vue+++ b/resources/js/components/cards/HoverCard.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import { ref } from 'vue';+import { ref, watch } from 'vue';import ProiconsCommentExclamation from '~icons/proicons/comment-exclamation';@@ -46,7 +46,6 @@ const hoverCardEnter = (event: MouseEvent) => {};const hoverCardLeave = () => {- if (props.content === '') return;if (hoverCardTimout.value) clearTimeout(hoverCardTimout.value);if (!hoverCardHovered.value) return;@@ -61,13 +60,20 @@ const updateTooltipPosition = (event: MouseEvent) => {const rect = (event.target as HTMLElement).getBoundingClientRect();tooltipStyles.value = { left: `${rect.left + window.scrollX + props.paddingLeft}px`, top: `${rect.bottom + props.margin + window.scrollY}px` };};++watch(+ () => props.content,+ () => {+ if (!props.content || props.content.trim() === '') hoverCardLeave();+ },+);//relative</script><template><div class="" @mouseover="hoverCardEnter" @mouseleave="hoverCardLeave"><slot name="trigger">- <a href="#_" class="hover:underline">@thedevdojo</a>+ <a href="#_" class="hover:underline"></a></slot><Teleport to="body" v-if="init"><Transition enter-from-class="opacity-0" enter-to-class="opacity-100" leave-from-class="opacity-100" leave-to-class="opacity-0">@@ -76,14 +82,14 @@ const updateTooltipPosition = (event: MouseEvent) => {@mouseleave="hoverCardLeave"v-show="hoverCardHovered"v-cloak- :class="`${positionClasses ?? ''} z-30 flex absolute overflow-auto transition-opacity ease-in-out duration-200 md:max-w-xl xl:max-w-3xl text-sm p-3 h-fit bg-white dark:odd:bg-primary-dark-600/70 dark:bg-neutral-800/70 backdrop-blur-lg border dark:border-none rounded-md shadow-md border-neutral-200/70 gap-2 items-center`"+ :class="`${positionClasses ?? ''} z-30 flex absolute overflow-auto transition-opacity ease-in-out duration-200 md:max-w-xl xl:max-w-3xl text-sm p-3 h-fit scrollbar-minimal bg-white dark:odd:bg-primary-dark-600/70 dark:bg-neutral-800/70 backdrop-blur-lg border dark:border-none rounded-md shadow-md border-neutral-200/70 gap-2 items-center`":style="tooltipStyles"><slot name="icon"><ProiconsCommentExclamation v-if="!iconHidden" class="h-5 w-5 mb-auto shrink-0" /></slot><slot name="content">- <p class="text-pretty h-fit w-full break-words whitespace-pre-wrap">+ <p class="text-pretty h-fit max-h-[50vh] w-full break-words whitespace-pre-wrap">{{ content }}</p></slot>diff --git a/resources/js/components/cards/RecordCardDetails.vue b/resources/js/components/cards/RecordCardDetails.vueindex 747d4556..29544f42 100755--- a/resources/js/components/cards/RecordCardDetails.vue+++ b/resources/js/components/cards/RecordCardDetails.vue@@ -20,15 +20,17 @@ const videoLink = computed(() => {</script><template>- <button- @click.stop.prevent="$emit('clickAction')"+ <!-- @click.stop.prevent="$emit('clickAction')" -->+ <sectionclass="text-left relative flex flex-col gap-4 sm:flex-row flex-wrap rounded-xl dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 dark:hover:bg-primary-dark-600 hover:bg-primary-800 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-neutral-400">+ <RouterLink v-if="videoLink" :to="videoLink" class="absolute w-full h-full top-0 left-0 rounded-xl" title="Watch Video" />+<section class="flex justify-between gap-4 w-full">- <h2 class="w-full truncate" :title="props.data.relationships.file_name">+ <h2 class="truncate z-10 flex items-center" :title="props.data.relationships.file_name">{{ props.data.relationships.video_name }}</h2>- <div class="flex justify-end gap-1">+ <div class="flex justify-end gap-1 cursor-auto z-10" @click.stop.prevent=""><ButtonCornerv-if="videoLink":positionClasses="'w-7 h-7'"@@ -52,7 +54,8 @@ const videoLink = computed(() => {</section><section class="flex flex-col sm:flex-row sm:justify-between w-full text-neutral-500 dark:text-neutral-400 text-sm"><h3- class="w-full text-wrap truncate sm:text-nowrap"+ class="w-full text-wrap truncate sm:text-nowrap cursor-auto z-10"+ @click.stop.prevent="":title="`Watched on ${rawDate.toLocaleDateString('en-ca', {year: 'numeric',month: '2-digit',@@ -64,7 +67,7 @@ const videoLink = computed(() => {>{{ props.data.relationships.folder?.name }} · {{ timeSpan }}</h3>- <h3 class="truncate sm:text-right w-full line-clamp-2">+ <h3 class="truncate sm:text-right w-full line-clamp-2 cursor-auto z-10" @click.stop.prevent="">{{`${rawDate.toLocaleDateString('en-ca', {year: 'numeric',@@ -77,5 +80,5 @@ const videoLink = computed(() => {}}</h3></section>- </button>+ </section></template>diff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vueindex 9c247a08..e275c28b 100644--- a/resources/js/components/cards/TaskCard.vue+++ b/resources/js/components/cards/TaskCard.vue@@ -96,7 +96,7 @@ watch(<imgclass="aspect-square h-4 my-auto rounded-t-xl xs:rounded-full object-cover":src="`https://ui-avatars.com/api/?name=${data.user[0]}&color=7F9CF5&background=random`"- alt="aminushki"+ alt="username"/><h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate line-clamp-1 capitalize" title="">{{ data.user }}diff --git a/resources/js/components/inputs/ToggleLightMode.vue b/resources/js/components/inputs/ToggleLightMode.vueindex 3bdec8f4..eec30b73 100755--- a/resources/js/components/inputs/ToggleLightMode.vue+++ b/resources/js/components/inputs/ToggleLightMode.vue@@ -16,6 +16,7 @@ const { lightMode } = storeToRefs(appStore);name="light-mode-toggle"v-model="lightMode"v-bind:checked="lightMode"+ title="Toggle Light Mode"/><span class="slider"></span></label>diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vueindex c3db6a75..c0add018 100755--- a/resources/js/components/panels/NavBar.vue+++ b/resources/js/components/panels/NavBar.vue@@ -1,4 +1,6 @@-<script setup>+<script setup lang="ts">+import type { UserResource } from '@/types/resources';+import { ref, onMounted, watch } from 'vue';import { useAuthStore } from '@/stores/AuthStore';import { useAppStore } from '@/stores/AppStore';@@ -10,27 +12,24 @@ import NavButton from '@/components/inputs/NavButton.vue';import NavLink from '@/components/inputs/NavLink.vue';import MaterialSymbolsLightHistory from '~icons/material-symbols-light/history';-import MaterialSymbolsLightMenu from '~icons/material-symbols-light/menu?width=24px&height=24px';+import MaterialSymbolsLightMenu from '~icons/material-symbols-light/menu';import CircumFolderOn from '~icons/circum/folder-on';import CircumInboxIn from '~icons/circum/inbox-in';import CircumMonitor from '~icons/circum/monitor';-import ProiconsMenu from '~icons/proicons/menu?width=24px&height=24px';-const authStore = useAuthStore();-const appStore = useAppStore();const showDropdown = ref(false);const username = ref('');-const { pageTitle, selectedSideBar } = storeToRefs(appStore);-const { cycleSideBar } = appStore;-const { userData } = storeToRefs(authStore);-const { auth } = authStore;+const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());+const { cycleSideBar } = useAppStore();+const { userData } = storeToRefs(useAuthStore());+const { auth } = useAuthStore();const toggleDropdown = () => {showDropdown.value = !showDropdown.value;};-const handleAuthEvent = (newUserData) => {+const handleAuthEvent = (newUserData: UserResource | null) => {username.value = newUserData?.name ?? '';};@@ -57,7 +56,7 @@ watch(userData, handleAuthEvent, { immediate: false });<span id="user-name-unauth" v-else class="text-right hidden sm:block">Guest</span><img- :src="userData?.value?.avatar ?? '/storage/avatars/12345.jpg'"+ :src="userData?.avatar ?? '/storage/avatars/12345.jpg'"class="h-7 w-7 rounded-full ring-2 ring-violet-600/80 object-cover aspect-square"alt="profile picture"/></buttondiff --git a/resources/js/components/pinesUI/ButtonClipboard.vue b/resources/js/components/pinesUI/ButtonClipboard.vueindex 96aa831f..18897d98 100755--- a/resources/js/components/pinesUI/ButtonClipboard.vue+++ b/resources/js/components/pinesUI/ButtonClipboard.vue@@ -68,7 +68,7 @@ const copyToClipboard = async () => {viewBox="0 0 24 24"stroke-width="1.5"stroke="currentColor"- x-cloak+ v-cloak><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" /></svg>diff --git a/resources/js/components/pinesUI/ContextMenu.vue b/resources/js/components/pinesUI/ContextMenu.vueindex 44ef587f..1ec4126f 100644--- a/resources/js/components/pinesUI/ContextMenu.vue+++ b/resources/js/components/pinesUI/ContextMenu.vue@@ -1,10 +1,11 @@<script setup lang="ts">+import type { ContextMenu } from '@/types/types';+import { nextTick, onMounted, onUnmounted, ref, Teleport, useTemplateRef } from 'vue';+import { useMouseInElement } from '@vueuse/core';import { OnClickOutside } from '@vueuse/components';import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';-import { useMouseInElement } from '@vueuse/core';-import type { ContextMenu } from '@/types/types';const props = withDefaults(defineProps<ContextMenu>(), {positionClasses: 'z-30 left-20 bottom-10',@@ -12,12 +13,12 @@ const props = withDefaults(defineProps<ContextMenu>(), {disabled: false,});-const contextMenu = useTemplateRef('contextMenu');-const { isOutside } = useMouseInElement(contextMenu);-const contextMenuOpen = ref(false);+const contextMenu = useTemplateRef('contextMenu');const menuStyles = ref<Record<string, string>>({});+const { isOutside } = useMouseInElement(contextMenu);+const contextMenuToggle = async (event: any, override: boolean = true) => {if (!override || props.disabled) {document.removeEventListener('contextmenu', closeContextMenu);@@ -41,6 +42,7 @@ const contextMenuToggle = async (event: any, override: boolean = true) => {contextMenu.value?.$el.classList.remove('opacity-0');});};+function calculateContextMenuPosition(clickEvent: MouseEvent) {if (!contextMenu.value) return;@@ -55,6 +57,7 @@ function calculateContextMenuPosition(clickEvent: MouseEvent) {contextMenu.value.$el.style.left = clickEvent.clientX + 'px';}}+async function calculateSubMenuPosition(clickEvent: MouseEvent) {await nextTick();let submenus: NodeListOf<HTMLElement> = document.querySelectorAll('[data-submenu]');diff --git a/resources/js/components/pinesUI/ContextMenuItem.vue b/resources/js/components/pinesUI/ContextMenuItem.vueindex 893582c1..ffd5adfd 100644--- a/resources/js/components/pinesUI/ContextMenuItem.vue+++ b/resources/js/components/pinesUI/ContextMenuItem.vue@@ -9,6 +9,7 @@ const props = withDefaults(defineProps<ContextMenuItem>(), {});v-if="external && url":href="url"target="_blank"+ :data-disabled="disabled":class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style ?? ''}`"><slot name="icon">@@ -58,7 +59,7 @@ const props = withDefaults(defineProps<ContextMenuItem>(), {});<buttonv-else:disabled="disabled"- :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style ?? ''}`"+ :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors disabled:pointer-events-none disabled:opacity-50 ${style ?? ''}`":onclick="() => {if (action) action();diff --git a/resources/js/components/pinesUI/DropdownMenu.vue b/resources/js/components/pinesUI/DropdownMenu.vueindex 69def996..ec3281f1 100755--- a/resources/js/components/pinesUI/DropdownMenu.vue+++ b/resources/js/components/pinesUI/DropdownMenu.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import { computed, type Component } from 'vue';+import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type Component } from 'vue';import { handleStartTask } from '@/service/taskService';import { OnClickOutside } from '@vueuse/components';@@ -24,10 +24,13 @@ import LucideLogOut from '~icons/lucide/log-out';import LucideLogIn from '~icons/lucide/log-in';import LucideUsers from '~icons/lucide/users';import LucideUser from '~icons/lucide/user';+const { userData } = storeToRefs(useAuthStore());-const defaults = { external: false, disabled: false };+const defaults = { external: false, disabled: false };const props = defineProps<{ dropdownOpen: boolean }>();+const manualPosition = ref(0);+const dropdown = useTemplateRef('dropdown');const dropDownItems = [[{ ...defaults, name: 'settings', url: '/settings', text: 'Settings', icon: LucideSettings }],@@ -36,6 +39,7 @@ const dropDownItems = [{ ...defaults, name: 'register', url: '/register', text: 'Sign up', icon: LucideUserPlus },],];+const dropDownItemsAuth = computed<{name: string;@@ -99,6 +103,36 @@ const dropDownItemsAuth = computed<[{ ...defaults, name: 'logout', url: '/logout', text: 'Log out', icon: LucideLogOut, shortcut: '⇧⌘Q' }],];});++const adjustDropdownPosition = async () => {+ if (!dropdown.value || !dropdown.value.parentElement) return;++ const parentRect = dropdown.value.parentElement.getBoundingClientRect();++ await nextTick();++ if (parentRect.right - 4 - dropdown.value.offsetWidth >= 0) {+ manualPosition.value = 0;+ return;+ }+ manualPosition.value = -parentRect.left + 20;+};++watch(+ () => props.dropdownOpen,+ (value) => {+ if (!value) return;+ adjustDropdownPosition();+ },+);++onMounted(() => {+ window.addEventListener('resize', adjustDropdownPosition);+});++onUnmounted(() => {+ window.removeEventListener('resize', adjustDropdownPosition);+});</script><template>@@ -112,7 +146,14 @@ const dropDownItemsAuth = computed<leave-from-class="-translate-y-0"leave-to-class="-translate-y-4 opacity-0">- <div v-show="props.dropdownOpen" class="absolute top-0 z-50 mt-12 -right-[0.25rem]" v-cloak id="userDropdown">+ <div+ v-show="props.dropdownOpen"+ :class="`absolute top-0 z-50 mt-12 ${manualPosition ? '' : '-right-[0.25rem]'} `"+ v-cloak+ id="userDropdown"+ :style="manualPosition ? `left: ${manualPosition}px;` : ''"+ ref="dropdown"+ ><div class="w-56 max-w-[80vw] mx-auto"><divv-if="userData"diff --git a/resources/js/components/pinesUI/HoverCard.vue b/resources/js/components/pinesUI/HoverCard.vueindex 95d2d36c..865c1d05 100644--- a/resources/js/components/pinesUI/HoverCard.vue+++ b/resources/js/components/pinesUI/HoverCard.vue@@ -56,7 +56,7 @@ const updateTooltipPosition = (event: MouseEvent) => {<divv-show="data.hoverCardHovered":style="data.tooltipStyles"- :class="`absolute w-[365px] max-w-[100vw] md:max-w-lg z-30 transition-all duration-300 ease-in-out -translate-x-1/2 translate-y-3 left-1/2 h-auto bg-white space-x-3 p-5 flex items-start rounded-md shadow-sm border border-neutral-200/70`"+ :class="`absolute w-[365px] max-w-[100vw] max-h-[50vh] overflow-y-auto scrollbar-minimal md:max-w-lg z-30 transition-all duration-300 ease-in-out -translate-x-1/2 translate-y-3 left-1/2 h-auto bg-white space-x-3 p-5 flex items-start rounded-md shadow-sm border border-neutral-200/70`"v-cloak><slot name="content">diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vueindex 2216beff..ecfe1a8f 100755--- a/resources/js/components/pinesUI/InputSelect.vue+++ b/resources/js/components/pinesUI/InputSelect.vue@@ -13,6 +13,7 @@ interface SelectItem {const props = withDefaults(defineProps<{+ name?: string;class?: string;rootClass?: string;placeholder?: string;@@ -130,6 +131,7 @@ watch(:class="`relative ${rootClass}`"><button+ :id="name ?? 'Select'"ref="selectButton"@click="select.toggleSelect()":class="`${select.selectOpen && 'hocus:ring-0'} relative h-10 flex items-center justify-between w-full py-2 pl-3 pr-10 text-left rounded-md shadow-sm cursor-pointer text-sm border-none focus:outline-none ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem] hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800 ${props.class}diff --git a/resources/js/components/pinesUI/Popover.vue b/resources/js/components/pinesUI/Popover.vueindex 49948de2..de0f63b6 100644--- a/resources/js/components/pinesUI/Popover.vue+++ b/resources/js/components/pinesUI/Popover.vue@@ -13,10 +13,13 @@ const props = withDefaults(buttonComponent?: Component;buttonAttributes?: { [key: string]: any };verticalOffsetPixels?: number;+ hideDefaultIcon?: boolean;+ forcePopoverPosition?: 'top' | 'bottom';}>(),{disabled: false,buttonComponent: ButtonText,+ hideDefaultIcon: false,},);@@ -29,7 +32,6 @@ const popoverOffset = ref(8);const popover = useTemplateRef('popover');const popoverButton = useTemplateRef<ComponentPublicInstance>('popoverButton');-const popoverInner = ref<null | HTMLElement>(null);const popoverArrowRef = useTemplateRef('popoverArrowRef');const resizeTimeout = ref<null | number>(null);@@ -43,7 +45,6 @@ async function popoverHeightCalculate() {popoverHeight.value = popover.value.$el.offsetHeight;popoverOpen.value = false;popover.value.$el.classList.remove('invisible');- popoverInner.value?.setAttribute('x-transition', '');popoverPositionCalculate();}@@ -51,7 +52,8 @@ function popoverPositionCalculate() {if (!popoverButton.value) return;popoverPosition.value =- window.innerHeight < popoverButton.value.$el.getBoundingClientRect().top + popoverButton.value.$el.offsetHeight + popoverOffset.value + popoverHeight.value+ (props.forcePopoverPosition ??+ window.innerHeight < popoverButton.value.$el.getBoundingClientRect().top + popoverButton.value.$el.offsetHeight + popoverOffset.value + popoverHeight.value)? 'top': 'bottom';}@@ -123,7 +125,7 @@ onUnmounted(() => {</template><template #icon><slot name="buttonIcon">- <svg class="w-4 h-4" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">+ <svg class="w-4 h-4" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg" v-if="!hideDefaultIcon"><pathd="M5.5 3C4.67157 3 4 3.67157 4 4.5C4 5.32843 4.67157 6 5.5 6C6.32843 6 7 5.32843 7 4.5C7 3.67157 6.32843 3 5.5 3ZM3 5C3.01671 5 3.03323 4.99918 3.04952 4.99758C3.28022 6.1399 4.28967 7 5.5 7C6.71033 7 7.71978 6.1399 7.95048 4.99758C7.96677 4.99918 7.98329 5 8 5H13.5C13.7761 5 14 4.77614 14 4.5C14 4.22386 13.7761 4 13.5 4H8C7.98329 4 7.96677 4.00082 7.95048 4.00242C7.71978 2.86009 6.71033 2 5.5 2C4.28967 2 3.28022 2.86009 3.04952 4.00242C3.03323 4.00082 3.01671 4 3 4H1.5C1.22386 4 1 4.22386 1 4.5C1 4.77614 1.22386 5 1.5 5H3ZM11.9505 10.9976C11.7198 12.1399 10.7103 13 9.5 13C8.28967 13 7.28022 12.1399 7.04952 10.9976C7.03323 10.9992 7.01671 11 7 11H1.5C1.22386 11 1 10.7761 1 10.5C1 10.2239 1.22386 10 1.5 10H7C7.01671 10 7.03323 10.0008 7.04952 10.0024C7.28022 8.8601 8.28967 8 9.5 8C10.7103 8 11.7198 8.8601 11.9505 10.0024C11.9668 10.0008 11.9833 10 12 10H13.5C13.7761 10 14 10.2239 14 10.5C14 10.7761 13.7761 11 13.5 11H12C11.9833 11 11.9668 10.9992 11.9505 10.9976ZM8 10.5C8 9.67157 8.67157 9 9.5 9C10.3284 9 11 9.67157 11 10.5C11 11.3284 10.3284 12 9.5 12C8.67157 12 8 11.3284 8 10.5Z"fill="currentColor"diff --git a/resources/js/components/pulse/PulseThemeSwitcher.vue b/resources/js/components/pulse/PulseThemeSwitcher.vueindex ab09b805..9d02ce22 100644--- a/resources/js/components/pulse/PulseThemeSwitcher.vue+++ b/resources/js/components/pulse/PulseThemeSwitcher.vue@@ -1,20 +1,21 @@<script>setDarkClass = () => {if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {- document.documentElement.classList.add('dark')+ document.documentElement.classList.add('dark');} else {- document.documentElement.classList.remove('dark')+ document.documentElement.classList.remove('dark');}-}+};-setDarkClass()+setDarkClass();-window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', setDarkClass)+window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', setDarkClass);</script>-<div- class="relative"- x-data="{+<template>+ <div+ class="relative"+ x-data="{menu: false,theme: localStorage.theme,darkMode() {@@ -33,30 +34,52 @@ window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', setsetDarkClass()},}"- @click.outside="menu = false"->- <button- x-cloak- class="block p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800"- :class="theme ? 'text-gray-700 dark:text-gray-300' : 'text-gray-400 dark:text-gray-600 hover:text-gray-500 focus:text-gray-500 dark:hover:text-gray-500 dark:focus:text-gray-500'"- @click="menu = ! menu"+ @click.outside="menu = false">- <x-pulse::icons.sun class="block dark:hidden w-5 h-5" />- <x-pulse::icons.moon class="hidden dark:block w-5 h-5" />- </button>-- <div x-show="menu" class="z-10 absolute origin-top-right right-0 bg-white dark:bg-gray-800 rounded-md ring-1 ring-gray-900/5 shadow-xl flex flex-col" style="display: none;" @click="menu = false">- <button class="flex items-center px-4 py-2 gap-3 hover:bg-gray-100 dark:hover:bg-gray-700" :class="theme === 'light' ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'" @click="lightMode()">- <x-pulse::icons.sun class="w-5 h-5" />- Light- </button>- <button class="flex items-center px-4 py-2 gap-3 hover:bg-gray-100 dark:hover:bg-gray-700" :class="theme === 'dark' ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'" @click="darkMode()">- <x-pulse::icons.moon class="w-5 h-5" />- Dark- </button>- <button class="flex items-center px-4 py-2 gap-3 hover:bg-gray-100 dark:hover:bg-gray-700" :class="theme === undefined ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'" @click="systemMode()">- <x-pulse::icons.computer-desktop class="w-5 h-5" />- System+ <button+ v-cloak+ class="block p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800"+ :class="+ theme+ ? 'text-gray-700 dark:text-gray-300'+ : 'text-gray-400 dark:text-gray-600 hover:text-gray-500 focus:text-gray-500 dark:hover:text-gray-500 dark:focus:text-gray-500'+ "+ @click="menu = !menu"+ >+ <!-- <x-pulse::icons.sun class="block dark:hidden w-5 h-5" /> -->+ <!-- <x-pulse::icons.moon class="hidden dark:block w-5 h-5" /> --></button>++ <div+ v-show="menu"+ class="z-10 absolute origin-top-right right-0 bg-white dark:bg-gray-800 rounded-md ring-1 ring-gray-900/5 shadow-xl flex flex-col"+ style="display: none"+ @click="menu = false"+ >+ <button+ class="flex items-center px-4 py-2 gap-3 hover:bg-gray-100 dark:hover:bg-gray-700"+ :class="theme === 'light' ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'"+ @click="lightMode()"+ >+ <!-- <x-pulse::icons.sun class="w-5 h-5" /> -->+ Light+ </button>+ <button+ class="flex items-center px-4 py-2 gap-3 hover:bg-gray-100 dark:hover:bg-gray-700"+ :class="theme === 'dark' ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'"+ @click="darkMode()"+ >+ <!-- <x-pulse::icons.moon class="w-5 h-5" /> -->+ Dark+ </button>+ <button+ class="flex items-center px-4 py-2 gap-3 hover:bg-gray-100 dark:hover:bg-gray-700"+ :class="theme === undefined ? 'text-gray-900 dark:text-gray-100' : 'text-gray-500 dark:text-gray-400'"+ @click="systemMode()"+ >+ <!-- <x-pulse::icons.computer-desktop class="w-5 h-5" /> -->+ System+ </button>+ </div></div>-</div>+</template>diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vueindex 23011084..1fd453be 100755--- a/resources/js/components/table/TableBase.vue+++ b/resources/js/components/table/TableBase.vue@@ -78,7 +78,15 @@ onMounted(() => {<span class="flex items-end gap-2 flex-wrap"><div class="flex gap-2 flex-col w-full sm:w-40 flex-1"><FormInputLabel :field="{ name: 'sort', text: 'Sort by:' }" />- <InputSelect :placeholder="'None'" :options="props.sortingOptions" class="w-full" title="Select Sort" @selectItem="handleSortChange" :defaultItem="0" />+ <InputSelect+ :name="'sort'"+ :placeholder="'None'"+ :options="props.sortingOptions"+ class="w-full"+ title="Select Sort"+ @selectItem="handleSortChange"+ :defaultItem="0"+ /></div><ButtonIcon@click="diff --git a/resources/js/components/video/VideoAmbientPlayer.vue b/resources/js/components/video/VideoAmbientPlayer.vueindex 498de8c7..f6d89cb5 100755--- a/resources/js/components/video/VideoAmbientPlayer.vue+++ b/resources/js/components/video/VideoAmbientPlayer.vue@@ -11,19 +11,27 @@ const { stateVideo } = storeToRefs(useContentStore());const container = ref<null | HTMLElement>(null);const player = ref<null | HTMLVideoElement>(null);-const step = ref<undefined | number>(undefined);const canvas = ref<null | HTMLCanvasElement>(null);+const step = ref<undefined | number>(undefined);const ctx = ref<null | CanvasRenderingContext2D>(null);+const adjustTimeout = ref<null | number>(null);const videoPlayer = useTemplateRef('video-player');const isAudio = ref(false);-const adjustTimeout = ref<null | number>(null);+const isDrawing = ref(false);const draw = () => {if (!ctx.value || !player.value || !canvas.value) return;ctx.value.drawImage(player.value, 0, 0, canvas.value.width, canvas.value.height);};+const drawStart = () => {+ if (isDrawing.value) return;++ isDrawing.value = true;+ drawLoop();+};+const drawLoop = () => {if (!player.value || lightMode.value || !canvas.value || !ambientMode.value) {drawPause();@@ -35,6 +43,7 @@ const drawLoop = () => {};const drawPause = () => {+ isDrawing.value = false;if (!step.value) return;window.cancelAnimationFrame(step.value);@@ -70,7 +79,10 @@ watch(() => {if (!ambientMode.value) {drawPause();+ return;}++ drawStart();},);@@ -99,11 +111,6 @@ watch(<template><section class="w-full h-fit relative" ref="container">- <!-- <span- v-show="!lightMode && ambientMode"- class="snap-y absolute -left-[1%] -top-[1%] gap-6 pt-2 flex w-[102%] h-[102%] z-10 rounded-2xl px-6 bg-rose-400 pointer-events-none"- ref="canvasContainer"- > --><canvasv-cloakv-show="!lightMode && ambientMode && !isAudio"@@ -114,14 +121,19 @@ watch(ref="canvas"></canvas>- <img v-show="isAudio" class="absolute z-[2] opacity-100 blur pointer-events-none w-full h-full" :src="videoPlayer?.audioPoster ?? ''" alt="Video Poster" />- <!-- </span> -->+ <!-- This is in place of an ambient background because audio does not have video to use for the effect -->+ <img+ v-show="isAudio && ambientMode"+ class="absolute z-[2] opacity-100 blur pointer-events-none w-full h-full object-cover"+ :src="videoPlayer?.audioPoster ?? ''"+ alt="Video Poster"+ /><VideoPlayerref="video-player"class="z-[2] w-full"@loadedData="draw"@seeked="draw"- @play="drawLoop"+ @play="drawStart"@pause="drawPause"@ended="drawPause"@loadedMetadata="adjustOverlayDiv"diff --git a/resources/js/components/video/VideoButton.vue b/resources/js/components/video/VideoButton.vuenew file mode 100644index 00000000..393cac2b--- /dev/null+++ b/resources/js/components/video/VideoButton.vue@@ -0,0 +1,71 @@+<script setup lang="ts">+import { useTemplateRef, watch, type Component } from 'vue';++import VideoTooltipBase from '@/components/video/VideoTooltipBase.vue';++import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';++const props = withDefaults(+ defineProps<{+ icon?: Component;+ title?: string;+ link?: string;+ useTooltip?: boolean;+ tooltipArrow?: boolean;+ style?: string;+ offset?: number;+ targetElement?: HTMLElement;+ controls?: boolean;+ }>(),+ {+ icon: ProiconsFullScreenMaximize,+ tooltipArrow: false,+ style: '',+ offset: 8,+ },+);++const tooltip = useTemplateRef('tooltip');++const tooltipToggle = (event: MouseEvent, state: boolean = true) => {+ if (!props.useTooltip || !tooltip.value) return;++ tooltip.value.tooltipToggle(event, state);+};++watch(+ () => props.controls,+ () => {+ if (props.controls == false) tooltipToggle(new MouseEvent('mouseleave'), false);+ },+);+</script>+<template>+ <router-link+ v-if="link?.length"+ :to="link"+ :title="title ?? 'Video Button'"+ class="transition-opacity ease-in opacity-80 hover:opacity-100 relative"+ @mouseenter="tooltipToggle"+ @mouseleave="(e: MouseEvent) => tooltipToggle(e, false)"+ >+ <VideoTooltipBase v-if="useTooltip" v-cloak :tooltip-text="title" :tooltip-arrow="tooltipArrow" :class-name="`-top-12`" ref="tooltip" :target-element="targetElement" />++ <slot name="icon">+ <component :is="icon" class="w-4 h-4" />+ </slot>+ </router-link>+ <button+ v-else+ :title="title ?? 'Video Button'"+ class="transition-opacity ease-in opacity-80 hover:opacity-100 relative"+ @mouseenter="tooltipToggle"+ @mouseleave="(e) => tooltipToggle(e, false)"+ >+ <VideoTooltipBase v-if="useTooltip" v-cloak :tooltip-text="title" :tooltip-arrow="tooltipArrow" :class-name="`-top-12`" ref="tooltip" :target-element="targetElement" />++ <slot name="icon">+ <component :is="icon" class="w-4 h-4" />+ </slot>+ </button>+</template>diff --git a/resources/js/components/video/VideoHeatmap.vue b/resources/js/components/video/VideoHeatmap.vuenew file mode 100644index 00000000..367a5071--- /dev/null+++ b/resources/js/components/video/VideoHeatmap.vue@@ -0,0 +1,113 @@+<script setup lang="ts">+import { useAppStore } from '@/stores/AppStore';+import { storeToRefs } from 'pinia';+import { computed } from 'vue';++const props = withDefaults(defineProps<{ playbackData: any[] }>(), { playbackData: () => [] });+const { playbackHeatmap } = storeToRefs(useAppStore());++// Playback Heatmap Graph SVG+const heatMap = computed(() => {+ const start = 'M 0.0,100.0 ';++ var catmullRomFitting = function (data: string | any[], alpha: number | undefined) {+ if (!data?.length || data.length < 5) return '';+ if (alpha == 0 || alpha === undefined) {+ return '';+ } else {+ var p0, p1, p2, p3, bp1, bp2, d1, d2, d3, A, B, N, M;+ var d3powA, d2powA, d3pow2A, d2pow2A, d1pow2A, d1powA;+ var d = Math.round(data[0].x) + ',' + Math.round(data[0].y) + ' ';+ var length = data.length;+ for (var i = 0; i < length - 1; i++) {+ p0 = i == 0 ? data[0] : data[i - 1];+ p1 = data[i];+ p2 = data[i + 1];+ p3 = i + 2 < length ? data[i + 2] : p2;++ d1 = Math.sqrt(Math.pow(p0.x - p1.x, 2) + Math.pow(p0.y - p1.y, 2));+ d2 = Math.sqrt(Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2));+ d3 = Math.sqrt(Math.pow(p2.x - p3.x, 2) + Math.pow(p2.y - p3.y, 2));++ // Catmull-Rom to Cubic Bezier conversion matrix++ // A = 2d1^2a + 3d1^a * d2^a + d3^2a+ // B = 2d3^2a + 3d3^a * d2^a + d2^2a++ // [ 0 1 0 0 ]+ // [ -d2^2a /N A/N d1^2a /N 0 ]+ // [ 0 d3^2a /M B/M -d2^2a /M ]+ // [ 0 0 1 0 ]++ d3powA = Math.pow(d3, alpha);+ d3pow2A = Math.pow(d3, 2 * alpha);+ d2powA = Math.pow(d2, alpha);+ d2pow2A = Math.pow(d2, 2 * alpha);+ d1powA = Math.pow(d1, alpha);+ d1pow2A = Math.pow(d1, 2 * alpha);++ A = 2 * d1pow2A + 3 * d1powA * d2powA + d2pow2A;+ B = 2 * d3pow2A + 3 * d3powA * d2powA + d2pow2A;+ N = 3 * d1powA * (d1powA + d2powA);+ if (N > 0) {+ N = 1 / N;+ }+ M = 3 * d3powA * (d3powA + d2powA);+ if (M > 0) {+ M = 1 / M;+ }++ bp1 = {+ x: (-d2pow2A * p0.x + A * p1.x + d1pow2A * p2.x) * N,+ y: (-d2pow2A * p0.y + A * p1.y + d1pow2A * p2.y) * N,+ };++ bp2 = {+ x: (d3pow2A * p1.x + B * p2.x - d2pow2A * p3.x) * M,+ y: (d3pow2A * p1.y + B * p2.y - d2pow2A * p3.y) * M,+ };++ if (bp1.x == 0 && bp1.y == 0) {+ bp1 = p1;+ }+ if (bp2.x == 0 && bp2.y == 0) {+ bp2 = p2;+ }++ d += 'C' + bp1.x + ',' + bp1.y + ' ' + bp2.x + ',' + bp2.y + ' ' + p2.x + ',' + p2.y + ' ';+ }++ return d;+ }+ };+ return (+ start ++ catmullRomFitting(+ props.playbackData+ ? [+ ...props.playbackData.map((entry: { progress: any; count: number }) => {+ return { x: entry.progress, y: 100 - Math.min(entry.count, 10) * 10 };+ }),+ { x: 1000, y: 100 },+ ]+ : [],+ 0.5,+ )+ );+});+</script>+<template>+ <svg+ class="ytp-heat-map-svg fill-indigo-200/20 w-full h-6 pointer-events-none opacity-0 peer-hover:opacity-65 transition-opacity duration-200"+ preserveAspectRatio="none"+ viewBox="0 0 1000 100"+ v-show="playbackHeatmap"+ >+ <defs>+ <clipPath id="4">+ <path class="ytp-heat-map-path" :d="heatMap"></path>+ </clipPath>+ </defs>+ <rect class="ytp-heat-map-hover" clip-path="url(#4)" fill="white" fill-opacity="0.7" height="100%" width="100%" x="0" y="0"></rect>+ </svg>+</template>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 9ebbefe6..4dbce948 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -1,11 +1,13 @@<script setup lang="ts">-import type { FolderResource, VideoResource } from '@/types/resources';+import type { FolderResource, UserResource, VideoResource } from '@/types/resources';-import { computed, useTemplateRef, watch, type Ref } from 'vue';+import { computed, ref, useTemplateRef, watch, type Ref } from 'vue';+import { getUserViewCount } from '@/service/mediaAPI';import { handleStorageURL } from '@/service/util';import { useContentStore } from '@/stores/ContentStore';import { useAuthStore } from '@/stores/AuthStore';import { storeToRefs } from 'pinia';+import { useRoute } from 'vue-router';import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';@@ -22,11 +24,13 @@ import Popover from '@/components/pinesUI/Popover.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';import CircumShare1 from '~icons/circum/share-1';+import ProiconsEye from '~icons/proicons/eye';import CircumEdit from '~icons/circum/edit';-import { useRoute } from 'vue-router';const { updateVideoData, updateFolderData } = useContentStore();-const { userData } = storeToRefs(useAuthStore());+const { userData } = storeToRefs(useAuthStore()) as unknown as {+ userData: Ref<UserResource>;+};const { stateVideo, stateFolder } = storeToRefs(useContentStore()) as unknown as {stateVideo: Ref<VideoResource>;stateFolder: Ref<FolderResource>;@@ -35,6 +39,7 @@ const { stateVideo, stateFolder } = storeToRefs(useContentStore()) as unknown asconst popover = useTemplateRef('popover');const route = useRoute();+const personalViewCount = ref(-1);const defaultDescription = `After defeating theDemon Lord, Himmel the Hero, priest Heiter, dwarf warrior Eisen, and elf mageFrieren return to the royal capital. After their procession, they view a meteor@@ -74,11 +79,26 @@ const handleSeriesUpdate = (res: any) => {watch(() => stateVideo.value,- () => {+ async () => {metaData.updateData(stateVideo.value);+ if (!userData.value?.id || !stateVideo.value.metadata) {+ personalViewCount.value = -1;+ return;+ }++ const { data } = await getUserViewCount(stateVideo.value.metadata.id);++ personalViewCount.value = isNaN(parseInt(data)) ? -1 : parseInt(data);},{ immediate: true, deep: true },);++watch(+ () => userData.value,+ () => {+ if (!userData.value?.id) personalViewCount.value = -1;+ },+);</script><template>@@ -93,7 +113,7 @@ watch(</div><div id="mp4-description" class="flex gap-4 sm:flex-1 min-w-0">- <div class="h-32 my-auto object-cover rounded-md shadow-md aspect-2/3 mb-auto relative group">+ <div class="hidden xs:block h-32 my-auto object-cover rounded-md shadow-md aspect-2/3 mb-auto relative group"><imgid="folder-thumbnail"class="h-full object-cover rounded-md aspect-2/3 ring-1 ring-gray-900/5"@@ -125,7 +145,9 @@ watch(</h2><HoverCard :content="metaData?.fields?.description ?? defaultDescription" :hover-card-delay="800" :margin="10"><template #trigger>- <div :class="`h-[3.75rem] overflow-y-auto dark:text-slate-400 text-slate-500 text-sm whitespace-pre-wrap scrollbar-minimal scrollbar-hover`">+ <div+ :class="`h-[3.75rem] overflow-y-auto overflow-x-clip dark:text-slate-400 text-slate-500 text-sm whitespace-pre-wrap scrollbar-minimal scrollbar-hover`"+ >{{ metaData?.fields?.description ?? defaultDescription }}</div></template>@@ -133,9 +155,13 @@ watch(<span class="flex flex-1 gap-2 items-end justify-between text-sm pe-1 py-1"><span class="flex items-center justify-start gap-1 truncate h-8 sm:h-[22px] dark:text-slate-400 text-slate-500">- <p class="text-nowrap text-start truncate">- {{ metaData?.fields.views }}- </p>+ <p class="text-nowrap text-start truncate">{{ metaData?.fields.views }}</p>++ <HoverCard :content="personalViewCount > 0 ? `You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}` : ''">+ <template #trigger>+ <ProiconsEye class="w-4 h-4 scale-90 hover:scale-100 transition-all hover:text-white" v-if="personalViewCount > 0" />+ </template>+ </HoverCard><p class="text-nowrap text-start truncate hidden xs:block" v-if="stateVideo?.metadata?.resolution_height">{{ ` | ${stateVideo?.metadata?.resolution_height}p` }}</p>diff --git a/resources/js/components/video/VideoPartyItem.vue b/resources/js/components/video/VideoPartyItem.vuenew file mode 100644index 00000000..c8075c8f--- /dev/null+++ b/resources/js/components/video/VideoPartyItem.vue@@ -0,0 +1,43 @@+<script setup lang="ts">+import type { UserResource } from '@/types/resources';+import type { Ref } from 'vue';++import { useAuthStore } from '@/stores/AuthStore';+import { storeToRefs } from 'pinia';++import ButtonCorner from '@/components/inputs/ButtonCorner.vue';++import ProiconsCancel from '~icons/proicons/cancel';+import CircumStar from '~icons/circum/star';++const props = withDefaults(defineProps<{ user: UserResource; leaderId: number }>(), {});++const { userData } = storeToRefs(useAuthStore()) as { userData: Ref<UserResource> };++const emits = defineEmits<{+ kickUser: [id: number];+}>();+</script>+<template>+ <section class="flex justify-between gap-2">+ <p class="w-full flex-1 truncate">{{ user.name }}</p>+ <span class="flex gap-1 justify-end">+ <CircumStar v-if="leaderId === user.id" class="w-4 h-4" title="Party Leader" />+ <ButtonCorner+ :title="'Kick from party'"+ colour-classes="hover:bg-transparent"+ text-classes="hover:text-rose-600"+ position-classes="w-4 h-4 p-0"+ v-else-if="leaderId === userData?.id"+ @click="emits('kickUser', user.id)"+ >+ <template #icon><ProiconsCancel /></template>+ </ButtonCorner>+ <img+ class="h-4 w-4 rounded-full object-cover aspect-square"+ :src="`https://ui-avatars.com/api/?name=${user.name[0] ?? 'a'}&color=7F9CF5&background=random`"+ :alt="'user profile picture'"+ />+ </span>+ </section>+</template>diff --git a/resources/js/components/video/VideoPartyPanel.vue b/resources/js/components/video/VideoPartyPanel.vuenew file mode 100644index 00000000..fa6bc115--- /dev/null+++ b/resources/js/components/video/VideoPartyPanel.vue@@ -0,0 +1,75 @@+<script setup lang="ts">+import type { UserResource } from '@/types/resources';++import { ref, type Ref } from 'vue';+import { useAuthStore } from '@/stores/AuthStore';+import { storeToRefs } from 'pinia';+import { toast } from '@/service/toaster/toastService';++import VideoPartyItem from '@/components/video/VideoPartyItem.vue';+import VideoPopover from '@/components/video/VideoPopover.vue';+import VideoButton from '@/components/video/VideoButton.vue';++import LucideLogOut from '~icons/lucide/log-out';+import ProiconsEye from '~icons/proicons/eye';+import ProiconsAdd from '~icons/proicons/add';++const props = defineProps<{ player?: HTMLVideoElement }>();++const isLeader = ref(true);++const { userData } = storeToRefs(useAuthStore()) as { userData: Ref<UserResource> };+const { auth } = useAuthStore();++const partyUsers = ref<UserResource[]>([+ {+ id: 2560,+ name: 'zutomayo',+ email: '[email protected]',+ last_active: 'today',+ created_at: '2025-03-02',+ },+ {+ id: 2561,+ name: 'purpleschala',+ email: '[email protected]',+ last_active: 'today',+ created_at: '2025-03-02',+ },+]);++const handleKickUser = (id: number) => {+ toast.info('Kicked user [username]');+ partyUsers.value = partyUsers.value.filter((user) => user.id !== id);+};+</script>++<template>+ <VideoPopover+ v-if="userData?.id"+ popoverClass="!max-w-40 rounded-lg"+ ref="popover-party"+ :margin="80"+ :player="player ?? undefined"+ :force-popover-position="'bottom'"+ button-class="hover:bg-neutral-900/30 bg-neutral-900/10 p-1 rounded-full hover:scale-100 scale-90 transition-transform ease-in-out duration-500 flex gap-1 items-center justify-center"+ title="Watch Party"+ >+ <template #buttonIcon>+ <ProiconsEye class="w-4 h-4" />+ <p>{{ 1 + partyUsers.length }}</p>+ </template>+ <template #content>+ <section class="flex flex-col text-xs h-12 xs:h-24 md:h-fit overflow-y-auto scrollbar-minimal transition-transform gap-2 p-1">+ <section class="flex justify-between">+ <h3>Party ({{ 1 + partyUsers.length }}/8)</h3>+ <span class="flex gap-1 justify-end">+ <VideoButton :icon="ProiconsAdd" title="Invite to Party" tabindex="1" @click="toast('Would open friends list.', { type: 'info' })" />+ <VideoButton :icon="LucideLogOut" title="Leave Party" tabindex="2" @click="toast('Would leave party.', { type: 'info' })" />+ </span>+ </section>+ <VideoPartyItem v-for="user in [userData, ...partyUsers]" :user="user" :key="user.id" :leader-id="1" @kick-user="handleKickUser" />+ </section>+ </template>+ </VideoPopover>+</template>diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 45ed34a7..9912d197 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -1,156 +1,235 @@<!-- eslint-disable no-unused-vars --><script setup lang="ts">-import type { FolderResource, VideoResource } from '@/types/resources';+import type { FolderResource, UserResource, VideoResource } from '@/types/resources';+import type { ContextMenuItem, PopoverItem } from '@/types/types';import type { Metadata, Series } from '@/types/model';-import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch, type Ref } from 'vue';+import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch, type ComputedRef, type Ref } from 'vue';+import { handleStorageURL, isInputLikeElement, toFormattedDate, toFormattedDuration } from '@/service/util';import { UseCreatePlayback } from '@/service/mutations';import { useVideoPlayback } from '@/service/queries';-import { handleStorageURL } from '@/service/util';import { useContentStore } from '@/stores/ContentStore';+import { useAuthStore } from '@/stores/AuthStore';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';import { getMediaUrl } from '@/service/api';+import { useRouter } from 'vue-router';+import { toast } from '@/service/toaster/toastService';-import _ from 'lodash';+import VideoPopoverSlider from '@/components/video/VideoPopoverSlider.vue';+import VideoPopoverItem from '@/components/video/VideoPopoverItem.vue';+import VideoPartyPanel from '@/components/video/VideoPartyPanel.vue';+import ButtonCorner from '@/components/inputs/ButtonCorner.vue';+import VideoHeatmap from '@/components/video/VideoHeatmap.vue';+import VideoPopover from '@/components/video/VideoPopover.vue';+import VideoTooltip from '@/components/video/VideoTooltip.vue';+import VideoButton from '@/components/video/VideoButton.vue';+import VideoSlider from '@/components/video/VideoSlider.vue';+import _, { round, throttle } from 'lodash';++import ProiconsPictureInPictureEnter from '~icons/proicons/picture-in-picture-enter';+import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';+import ProiconsFullScreenMinimize from '~icons/proicons/full-screen-minimize';+import ProiconsArrowTrending from '~icons/proicons/arrow-trending';+import ProiconsFastForward from '~icons/proicons/fast-forward';+import ProiconsVolumeMute from '~icons/proicons/volume-mute';+import ProiconsVolumeLow from '~icons/proicons/volume-low';+import ProiconsCheckmark from '~icons/proicons/checkmark';+import ProiconsSparkle2 from '~icons/proicons/sparkle-2';+import ProiconsSettings from '~icons/proicons/settings';+import ProiconsSpinner from '~icons/proicons/spinner';+import ProiconsReverse from '~icons/proicons/reverse';+import ProiconsVolume from '~icons/proicons/volume';+import ProiconsCancel from '~icons/proicons/cancel';import ProiconsPlay from '~icons/proicons/play';-import CircumPause1 from '~icons/circum/pause-1';--const playbackDataBuffer = 5;-const defaultHeatMapData = [- { x: 25, y: 60 },- { x: 154, y: 48 },- { x: 266, y: 12 },- { x: 585, y: 18 },- { x: 799, y: 16 },- { x: 1000, y: 100 },-];--const ContentStore = useContentStore();-const appStore = useAppStore();+import CircumTimer from '~icons/circum/timer';++const controlsHideTime: number = 2500;+const playbackDataBuffer: number = 5;+const playerHealthBuffer: number = 5;+const volumeDelta: number = 0.05;+const playbackDelta: number = 0.05;+const playbackMin: number = 0.1;+const playbackMax: number = 3;+const router = useRouter();++const emit = defineEmits(['loadedData', 'seeked', 'play', 'pause', 'ended', 'loadedMetadata']);++// Global State+const { playbackHeatmap, ambientMode } = storeToRefs(useAppStore());+const { createRecord, updateViewCount } = useContentStore();+const { setContextMenu } = useAppStore();+const { userData } = storeToRefs(useAuthStore()) as unknown as {+ userData: Ref<UserResource>;+};+const { stateVideo, stateFolder, nextVideoURL, previousVideoURL } = storeToRefs(useContentStore()) as unknown as {+ stateVideo: Ref<VideoResource | { id?: number; metadata?: Metadata; path?: string }>;+ stateFolder: Ref<FolderResource | { id?: number; series?: Series; path?: string }>;+ nextVideoURL: ComputedRef<string>;+ previousVideoURL: ComputedRef<string>;+};++// API Cacheconst progressCache = ref<{ metadata_id: number; progress: number }[]>([]);-const metadata_id = ref<number>(NaN);-const currentID = ref(-1);+const metadataId = ref<number>(NaN);+const currentId = ref(-1);++// API+const { data: playbackData } = useVideoPlayback(metadataId);+const createPlayback = UseCreatePlayback().mutate;++// V-models for inputs+const timeDuration = computed(() => {+ return stateVideo.value?.metadata?.duration ?? 0;+});+const timeElapsed = ref(0);+const timeSeeking = ref('');+const timeAutoSeek = ref(10);+const currentVolume = ref(0.1);+const cachedVolume = ref(0.5);+const currentSpeed = ref(1);++// Player State+const controlsHideTimeout = ref<number>();+const autoSeekTimeout = ref<number>();+const volumeChangeTimeout = ref<number>();+const controls = ref(false);+const isPictureInPicture = ref(false);+const isChangingVolume = ref(false);+const isShowingParty = ref(false);+const isShowingStats = ref(false);+const isFullScreen = ref(false);const isLoading = ref(true);+const isSeeking = ref(false);+const isLooping = ref(false);const isPaused = ref(true);-const isAudio = computed(() => {- return stateVideo.value.metadata?.mime_type?.startsWith('audio') ?? false;-});-const audioPoster = computed(() => {- return (- handleStorageURL(stateVideo.value?.metadata?.poster_url) ??- handleStorageURL(stateFolder.value.series?.thumbnail_url) ??- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'- );+const isMuted = ref(false);+const isFastForward = ref(false);+const isRewind = ref(false);++// Player Info+const endsAtTime = ref('00:00');+const bufferHealth = ref<string>('0s');+const frameHealth = ref<string>('0/0');+const playerHealthCounter = ref(0);+const timeStrings = computed(() => {+ let timeElapsedVerbose = toFormattedDuration((timeElapsed.value / 100) * timeDuration.value, false, 'verbose') ?? 'Unknown';+ let timeDurationVerbose = toFormattedDuration(timeDuration.value, false, 'verbose') ?? 'Unknown';+ return {+ timeElapsed: toFormattedDuration((timeElapsed.value / 100) * timeDuration.value, true, 'digital') ?? '00:00',+ timeDuration: toFormattedDuration(timeDuration.value, true, 'digital') ?? '00:00',+ timeVerbose: `${timeElapsedVerbose} out of ${timeDurationVerbose}`,+ timeElapsedVerbose,+ };});++// Elements+const container = useTemplateRef('video-container');+const progressBar = useTemplateRef('progress-bar');+const popover = useTemplateRef('popover');+const tooltip = useTemplateRef('tooltip');const player = useTemplateRef('player');// const url = ref('');-const { data: playbackData } = useVideoPlayback(metadata_id);+const contextMenuItems = computed(() => {+ let items: ContextMenuItem[] = [+ {+ text: 'Loop',+ icon: isLooping.value ? ProiconsCheckmark : undefined,+ action: () => {+ isLooping.value = !isLooping.value;+ },+ },+ {+ text: 'Show Stats',+ icon: isShowingStats.value ? ProiconsCheckmark : undefined,+ action: () => {+ isShowingStats.value = !isShowingStats.value;+ },+ },+ {+ text: 'Show Party Demo',+ icon: isShowingParty.value ? ProiconsCheckmark : undefined,+ disabled: !userData.value?.id,+ action: () => {+ isShowingParty.value = !isShowingParty.value;+ },+ },+ ];+ return items;+});-const { createRecord, updateViewCount } = ContentStore;-const { playbackHeatmap } = storeToRefs(appStore);-const { stateVideo, stateFolder } = storeToRefs(ContentStore) as unknown as {- stateVideo: Ref<VideoResource | { id?: number; metadata?: Metadata; path?: string }>;- stateFolder: Ref<FolderResource | { id?: number; series?: Series; path?: string }>;-};+const videoPopoverItems = computed(() => {+ let items: PopoverItem[] = [+ {+ text: 'Ambient Mode',+ title: 'Toggle Ambient Mode',+ icon: ProiconsSparkle2,+ selectedIcon: ProiconsCheckmark,+ selected: ambientMode.value ?? false,+ selectedIconStyle: 'text-purple-600',+ action: () => {+ ambientMode.value = !ambientMode.value;+ },+ },+ {+ text: 'Heatmap',+ title: 'Toggle Playback Heatmap',+ icon: ProiconsArrowTrending,+ selectedIcon: ProiconsCheckmark,+ selected: playbackHeatmap.value ?? false,+ selectedIconStyle: 'text-purple-600',+ action: () => {+ playbackHeatmap.value = !playbackHeatmap.value;+ },+ },+ {+ text: 'Miniplayer',+ title: 'Toggle Picture-in-picture',+ icon: ProiconsPictureInPictureEnter,+ selectedIcon: ProiconsCheckmark,+ selected: isPictureInPicture.value ?? false,+ selectedIconStyle: 'text-purple-600',+ disabled: !document.pictureInPictureEnabled || isAudio.value,+ action: () => {+ if (isLoading.value) return;+ isPictureInPicture.value = !isPictureInPicture.value;+ },+ },+ ];+ return items;+});-const emit = defineEmits(['loadedData', 'seeked', 'play', 'pause', 'ended']);-const createPlayback = UseCreatePlayback().mutate;+// Computed Player State-const heatMap = computed(() => {- const start = 'M 0.0,100.0 ';+const isAudio = computed(() => {+ return stateVideo.value.metadata?.mime_type?.startsWith('audio') ?? false;+});- var catmullRomFitting = function (data: string | any[], alpha: number | undefined) {- if (!data?.length || data.length < 5) return '';- if (alpha == 0 || alpha === undefined) {- return '';- } else {- var p0, p1, p2, p3, bp1, bp2, d1, d2, d3, A, B, N, M;- var d3powA, d2powA, d3pow2A, d2pow2A, d1pow2A, d1powA;- var d = Math.round(data[0].x) + ',' + Math.round(data[0].y) + ' ';- var length = data.length;- for (var i = 0; i < length - 1; i++) {- p0 = i == 0 ? data[0] : data[i - 1];- p1 = data[i];- p2 = data[i + 1];- p3 = i + 2 < length ? data[i + 2] : p2;-- d1 = Math.sqrt(Math.pow(p0.x - p1.x, 2) + Math.pow(p0.y - p1.y, 2));- d2 = Math.sqrt(Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2));- d3 = Math.sqrt(Math.pow(p2.x - p3.x, 2) + Math.pow(p2.y - p3.y, 2));-- // Catmull-Rom to Cubic Bezier conversion matrix-- // A = 2d1^2a + 3d1^a * d2^a + d3^2a- // B = 2d3^2a + 3d3^a * d2^a + d2^2a-- // [ 0 1 0 0 ]- // [ -d2^2a /N A/N d1^2a /N 0 ]- // [ 0 d3^2a /M B/M -d2^2a /M ]- // [ 0 0 1 0 ]-- d3powA = Math.pow(d3, alpha);- d3pow2A = Math.pow(d3, 2 * alpha);- d2powA = Math.pow(d2, alpha);- d2pow2A = Math.pow(d2, 2 * alpha);- d1powA = Math.pow(d1, alpha);- d1pow2A = Math.pow(d1, 2 * alpha);-- A = 2 * d1pow2A + 3 * d1powA * d2powA + d2pow2A;- B = 2 * d3pow2A + 3 * d3powA * d2powA + d2pow2A;- N = 3 * d1powA * (d1powA + d2powA);- if (N > 0) {- N = 1 / N;- }- M = 3 * d3powA * (d3powA + d2powA);- if (M > 0) {- M = 1 / M;- }-- bp1 = {- x: (-d2pow2A * p0.x + A * p1.x + d1pow2A * p2.x) * N,- y: (-d2pow2A * p0.y + A * p1.y + d1pow2A * p2.y) * N,- };-- bp2 = {- x: (d3pow2A * p1.x + B * p2.x - d2pow2A * p3.x) * M,- y: (d3pow2A * p1.y + B * p2.y - d2pow2A * p3.y) * M,- };-- if (bp1.x == 0 && bp1.y == 0) {- bp1 = p1;- }- if (bp2.x == 0 && bp2.y == 0) {- bp2 = p2;- }-- d += 'C' + bp1.x + ',' + bp1.y + ' ' + bp2.x + ',' + bp2.y + ' ' + p2.x + ',' + p2.y + ' ';- }+const isPortrait = computed(() => {+ return (+ stateVideo.value.metadata?.resolution_width &&+ stateVideo.value.metadata.resolution_height &&+ stateVideo.value.metadata.resolution_width < stateVideo.value.metadata.resolution_height+ );+});- return d;- }- };+const audioPoster = computed(() => {return (- start +- catmullRomFitting(- playbackData.value- ? [- ...playbackData.value.map((entry: { progress: any; count: number }) => {- return { x: entry.progress, y: 100 - Math.min(entry.count, 10) * 10 };- }),- { x: 1000, y: 100 },- ]- : [],- 0.5,- )+ handleStorageURL(stateVideo.value?.metadata?.poster_url) ??+ handleStorageURL(stateFolder.value.series?.thumbnail_url) ??+ 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg');});const initVideoPlayer = async () => {let root = document.getElementById('root');+ isPaused.value = true;+ isLooping.value = false;+ isPictureInPicture.value = false;+if (!root) return;root.scrollIntoView();@@ -160,24 +239,10 @@ const initVideoPlayer = async () => {progressCache.value = [];}- metadata_id.value = stateVideo.value?.metadata ? stateVideo.value?.metadata.id : NaN;+ metadataId.value = stateVideo.value?.metadata ? stateVideo.value?.metadata.id : NaN;// url.value = await getMediaUrl(stateVideo.value.path ?? '');};-const handlePlayVideo = (override = false) => {- if (!stateVideo.value.id || (currentID.value === stateVideo.value.id && !override)) return; // stop recording every time video seek- currentID.value = stateVideo.value.id;- createRecord(stateVideo.value.id);- updateViewCount(stateVideo.value.id);- handleProgress(true);-};--const handlePlayerSeeked = () => {- // add heatmap data ?-- emit('seeked');-};-//#region Player Eventsconst handleProgress = (override = false) => {@@ -195,41 +260,87 @@ const handleProgress = (override = false) => {}};-const onPlayerPlay = (event: any) => {- // player.setPlaying(true);- handlePlayVideo();- emit('play');- handleProgress();- isPaused.value = false;+/**+ * Handle On Play+ *+ * If the player is not paused, pause the player and return.+ *+ * Otherwise, play the player.+ * Generate end time.+ * Emit 'play' event.+ *+ * If this is the first time the player has played this video or if override is set...+ * Record video progress and force publish it, ignoring the buffer.+ * Create a history record.+ * Update video view count.+ *+ * Otherwise, record video progress and quit.+ * @param override force first time playback of video.+ */+const onPlayerPlay = async (override = false, recordProgress = true) => {+ if (!player.value || !stateVideo.value.id) return;+ try {+ isLoading.value = true;+ await player.value.play();+ isLoading.value = false;++ isPaused.value = false;+ getEndTime();+ emit('loadedData');+ emit('play');++ if (!recordProgress) return;++ if (currentId.value === stateVideo.value.id && !override == true) {+ handleProgress();+ return; // stop recording every time video seek+ }++ currentId.value = stateVideo.value.id;+ createRecord(stateVideo.value.id);+ updateViewCount(stateVideo.value.id);+ handleProgress(true);+ } catch (error) {+ isLoading.value = false;+ }};-const onPlayerPause = (event: any) => {- // console.log(event.type);- // player.setPlaying(false);- emit('pause');+const onPlayerPause = () => {+ if (!player.value) return;+ player.value.pause();isPaused.value = true;+ emit('pause');+ return;};-const onPlayerEnded = (event: any) => {- // console.log(event.type);- // player.setPlaying(false);+const onPlayerEnded = () => {+ currentId.value = -1;+ if (isLooping.value) {+ onPlayerPlay();+ return;+ }+emit('ended');- currentID.value = -1;- // if (player.value?.loop) handlePlayVideo(true);+ onPlayerPause();};-const onPlayerLoadStart = (event: any) => {+const onPlayerLoadStart = () => {isLoading.value = true;};-const onPlayerLoadeddata = (event: any) => {- // console.log(event.type);+const onPlayerLoadeddata = () => {emit('loadedData');- if (stateVideo.value) isLoading.value = false;+ emit('loadedMetadata');+ if (!stateVideo.value || !player.value) return;+ if (stateVideo.value.metadata && !stateVideo.value.metadata.duration && !isNaN(player.value.duration)) {+ stateVideo.value.metadata.duration = player.value.duration ?? 0;+ timeElapsed.value = 0;+ }++ isLoading.value = false;};-const onPlayerWaiting = (event: any) => {- // console.log(event.type);+const onPlayerWaiting = () => {if (player.value?.loop) {createRecord(stateVideo.value.id);updateViewCount(stateVideo.value.id);@@ -237,65 +348,294 @@ const onPlayerWaiting = (event: any) => {}};-const onPlayerPlaying = (event: any) => {- // console.log(event.type);+const cacheVolume = () => {+ if (!player.value) return;+ localStorage.setItem('videoVolume', currentVolume.value.toString());};-const onPlayerTimeupdate = (event: any) => {- // console.log({ event: event.type, time: event.target.currentTime });+//#endregion++const debouncedCacheVolume = _.debounce(cacheVolume, 300);++const handleVolumeChange = (dir: number = 0) => {+ if (!player.value) return;++ if (dir) {+ currentVolume.value = round(Math.max(Math.min(parseFloat(`${currentVolume.value}`) + volumeDelta * dir, 1), 0), 2);+ }++ player.value.volume = currentVolume.value;++ if (currentVolume.value == 0) isMuted.value = true;+ else isMuted.value = false;+ debouncedCacheVolume();+ return true;};-const onPlayerCanplay = (event: any) => {- // console.log(event.type);+const handleVolumeWheel = (event: WheelEvent) => {+ if (!player.value) return;+ event.preventDefault();+ isChangingVolume.value = false;++ if (!handleVolumeChange(event.deltaY < 0 ? 1 : -1)) return;++ if (volumeChangeTimeout.value) clearTimeout(volumeChangeTimeout.value);+ volumeChangeTimeout.value = setTimeout(() => {+ isChangingVolume.value = true;+ }, 100);};-const onPlayerCanplaythrough = (event: any) => {- // console.log(event.type);+const handleSpeedChange = (event: Event, dir: number = 0) => {+ if (!player.value) return;++ if (dir) {+ currentSpeed.value = round(Math.max(Math.min(parseFloat(`${currentSpeed.value}`) + playbackDelta * dir, playbackMax), playbackMin), 2);+ }++ player.value.playbackRate = currentSpeed.value;+ return true;};-const onPlayerSeek = (event: any) => {- // console.log(event.type);- handlePlayerSeeked();+const handleSpeedWheel = (event: WheelEvent) => {+ if (!player.value) return;+ event.preventDefault();++ if (!handleSpeedChange(new Event('SpeedChange'), event.deltaY < 0 ? 1 : -1)) return;};-const playerStateChanged = (event: any) => {- // console.log(event.type);+const handleMute = () => {+ if (!player.value) return;++ if (isMuted.value) {+ currentVolume.value = cachedVolume.value;+ player.value.volume = cachedVolume.value;+ } else if (!isMuted.value) {+ cachedVolume.value = currentVolume.value;+ currentVolume.value = 0;+ player.value.volume = 0;+ }++ isMuted.value = !isMuted.value;};-const cacheVolume = () => {- if (player.value) {- localStorage.setItem('videoVolume', player.value.volume.toString());+const handlePlayerToggle = () => {+ if (isPaused.value) {+ onPlayerPlay();+ return;}++ onPlayerPause();};-//#endregion+function handleAutoSeek(seconds: number) {+ if (!player.value) return;+ isFastForward.value = false;+ isRewind.value = false;-const debouncedCacheVolume = _.debounce(cacheVolume, 300);+ let newTimeElapsed = player.value.currentTime + seconds;-const handleVolumeChange = () => {- debouncedCacheVolume();+ newTimeElapsed = Math.max(newTimeElapsed, 0);+ newTimeElapsed = Math.min(newTimeElapsed, timeDuration.value);++ player.value.currentTime = newTimeElapsed;+ timeElapsed.value = newTimeElapsed / timeDuration.value;++ if (!isPaused.value) onPlayerPlay(false, false);++ if (autoSeekTimeout.value) clearTimeout(autoSeekTimeout.value);+ autoSeekTimeout.value = setTimeout(() => {+ timeAutoSeek.value = seconds;+ if (seconds > 0) isFastForward.value = true;+ else isRewind.value = true;+ }, 100);+}++const handleFullScreen = async () => {+ if (!container.value) return;++ try {+ if (!isFullScreen.value || document.fullscreenElement == null) {+ await container.value?.requestFullscreen();+ isFullScreen.value = true;+ document.documentElement.classList.add('fullscreen');+ } else {+ await document.exitFullscreen();+ isFullScreen.value = false;+ document.documentElement.classList.remove('fullscreen');+ }+ } catch (error) {+ document.documentElement.classList.remove('fullscreen');+ isFullScreen.value = false;+ toast.error('Unable to switch fullscreen mode...');+ console.log(error);+ }};-const handleManualPlay = () => {- if (player.value?.paused) player.value.play();- else player.value?.pause();+const handlePlayerTimeUpdate = (event: any) => {+ playerHealthCounter.value += 1;++ if (playerHealthCounter.value >= playerHealthBuffer) {+ getPlayerInfo();+ playerHealthCounter.value = 0;+ }++ if (!isSeeking.value) timeElapsed.value = (event.target.currentTime / timeDuration.value) * 100;};-watch(stateVideo, initVideoPlayer);+const handleSeek = () => {+ if (!player.value || timeElapsed.value < 0 || timeElapsed.value > 100) return;-onMounted(() => {- const savedVolume = localStorage.getItem('videoVolume');- if (savedVolume && player.value) {- player.value.volume = parseFloat(savedVolume);+ isSeeking.value = false;+ player.value.currentTime = (timeElapsed.value / 100) * timeDuration.value;++ if (!isPaused.value) onPlayerPlay();+};++const handleSeekPreview = () => {+ if (!player.value || isSeeking.value) return;+ if (!isSeeking.value) isSeeking.value = true;+};++function resetControlsTimeout() {+ controls.value = true;++ clearTimeout(controlsHideTimeout.value);+ controlsHideTimeout.value = setTimeout(() => {+ controls.value = false;+ popover.value?.handleClose();+ }, controlsHideTime);+}++const debouncedEndTime = _.debounce(getEndTime, 100);++function playerMouseActivity() {+ if (!isPaused.value) {+ resetControlsTimeout();+ return;}- // document.querySelector('video')?.addEventListener('ended', function () {- // console.count('loop restart');- // this.play();- // });+ debouncedEndTime();++ if (!controlsHideTimeout.value && controls.value == true) return;++ controls.value = true;+ clearTimeout(controlsHideTimeout.value);+}++function getEndTime() {+ if (!player.value || currentId.value == -1) return;+ endsAtTime.value = toFormattedDate(new Date(new Date().getTime() + (timeDuration.value - (timeElapsed.value / 100) * timeDuration.value) * 1000), true, {+ hour: '2-digit',+ minute: '2-digit',+ hour12: true,+ });+}++function getPlayerInfo() {+ if (!player.value) return;+ let playbackQuality = player.value.getVideoPlaybackQuality();+ bufferHealth.value = toFormattedDuration(player.value.buffered.length, false) ?? '0s';+ frameHealth.value = `${playbackQuality.droppedVideoFrames} / ${playbackQuality.totalVideoFrames}`;+}++const handleProgressTooltip = throttle((event: MouseEvent) => {+ getProgressTooltip(event);+ requestAnimationFrame(() => {+ if (!tooltip.value) return;+ tooltip.value.calculateTooltipPosition(event);+ });+}, 7);++const getProgressTooltip = (event: MouseEvent) => {+ if (!player.value || !timeDuration.value || !progressBar.value) return;+ const rect = progressBar.value.getBoundingClientRect();+ const offsetX = event.clientX - rect.left;+ const percent = offsetX / rect.width;++ const time = percent < 0 ? 0 : Math.min(timeDuration.value, percent * timeDuration.value);++ timeSeeking.value = toFormattedDuration(time, true, 'digital') ?? '00:00';+};++const handleLoadSavedVolume = () => {+ const savedVolume = parseFloat(localStorage.getItem('videoVolume') ?? '');+ if (isNaN(savedVolume) || !player.value) return;++ const normalVolume = Math.max(0, Math.min(savedVolume, 1));+ currentVolume.value = normalVolume;+ player.value.volume = normalVolume;++ if (normalVolume == 0) isMuted.value = true;+};++const handleKeyBinds = (event: KeyboardEvent) => {+ const keyBinds = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'l', 'N', 'j', 'k', 'm', ' ', 'f'];+ if (!keyBinds.includes(event.key)) return;+ if (isInputLikeElement(event.target, event.key)) return;++ switch (event.key) {+ case 'ArrowLeft':+ case 'j':+ handleAutoSeek(event.shiftKey ? -5 : -10);+ break;+ case 'ArrowRight':+ case 'l':+ handleAutoSeek(event.shiftKey ? 5 : 10);+ break;+ case 'N':+ if (!event.shiftKey || !nextVideoURL.value) return;+ router.push(nextVideoURL.value);+ case 'm':+ handleMute();+ break;+ case 'k':+ case ' ':+ event.preventDefault();+ handlePlayerToggle();+ break;+ case 'f':+ handleFullScreen();+ break;+ case 'ArrowUp':+ event.preventDefault();+ handleVolumeWheel(new WheelEvent('wheel', { deltaY: -1 }));+ break;+ case 'ArrowDown':+ event.preventDefault();+ handleVolumeWheel(new WheelEvent('wheel', { deltaY: 1 }));+ break;+ default:+ break;+ }+};++watch(isPictureInPicture, async (value) => {+ if (!player.value || isLoading.value) return;++ try {+ if (value) {+ await player.value.requestPictureInPicture().catch((error: Error) => {+ throw error;+ });+ } else if (document.pictureInPictureElement) document.exitPictureInPicture();++ popover.value?.handleClose();+ } catch (error) {+ console.error(error);+ toast.error('Unable to toggle miniplayer');+ }+});++watch(stateVideo, initVideoPlayer);++onMounted(() => {+ if (document.pictureInPictureElement) document.exitPictureInPicture();+ handleLoadSavedVolume();+ window.addEventListener('keydown', handleKeyBinds);});onUnmounted(() => {+ window.removeEventListener('keydown', handleKeyBinds);debouncedCacheVolume.cancel();});@@ -306,100 +646,396 @@ defineExpose({</script><template>- <div :class="`relative group rounded-xl overflow-clip`">+ <div+ :class="`relative rounded-xl overflow-clip video-player`"+ ref="video-container"+ @mousemove="playerMouseActivity"+ @contextmenu="+ (e: any) => {+ setContextMenu(e, { items: contextMenuItems, style: 'w-32', itemStyle: 'text-xs' });+ }+ "+ >+ <section style="z-index: 4" :class="`player-controls text-white pointer-events-none ${controls ? 'cursor-auto' : 'cursor-none'}`">+ <!-- Video Stats -->+ <section class="absolute p-1 sm:p-4 top-0 left-0 text-xs font-mono pointer-events-auto" v-show="isShowingStats" style="z-index: 6">+ <div class="flex gap-2 bg-neutral-900/80 border-slate-700/20 border rounded-md p-2 w-fit sm:min-w-52">+ <span class="[&>*]:line-clamp-1 [&>*]:break-all text-right">+ <p title="Dropped Frames vs Total Frames" v-if="!isAudio">Dropped Frames:</p>+ <p title="Video Buffer Health">Buffer Health:</p>+ <p title="Video Resolution" v-if="!isAudio">Resolution:</p>+ <p title="Video Codec" v-if="stateVideo.metadata?.codec">Codec:</p>+ </span>+ <span class="flex-1 w-full [&>*]:line-clamp-1">+ <p v-if="!isAudio">{{ frameHealth }}</p>+ <p>{{ bufferHealth }}</p>+ <p v-if="!isAudio">{{ player?.videoWidth }}x{{ player?.videoHeight }}</p>+ <p v-if="stateVideo.metadata?.codec">{{ stateVideo.metadata?.codec }}</p>+ </span>+ <ButtonCorner+ :title="'Close Stats'"+ @click="isShowingStats = false"+ colour-classes="hover:bg-transparent"+ text-classes="hover:text-rose-600"+ position-classes="w-4 h-4 p-0"+ >+ <template #icon><ProiconsCancel /></template>+ </ButtonCorner>+ </div>+ </section>++ <!-- Watch Party -->+ <section class="absolute p-1 sm:p-4 top-0 right-0 text-xs font-mono pointer-events-auto" v-show="isShowingParty" style="z-index: 6">+ <VideoPartyPanel :player="player ?? undefined" />+ </section>++ <!-- Controls Gradient -->+ <Transition+ enter-active-class="transition ease-out duration-300"+ enter-from-class="translate-y-full"+ enter-to-class="translate-y-0"+ leave-active-class="transition ease-in duration-300"+ leave-from-class="translate-y-0"+ leave-to-class="translate-y-full"+ >+ <div v-show="controls" class="absolute bottom-0 left-0 z-20 w-full h-32 opacity-20 bg-gradient-to-b from-transparent to-black" v-cloak></div>+ </Transition>++ <!-- Controls -->+ <Transition+ enter-active-class="transition ease-out duration-300"+ enter-from-class="translate-y-full"+ enter-to-class="translate-y-0"+ leave-active-class="transition ease-in duration-300"+ leave-from-class="translate-y-0"+ leave-to-class="translate-y-full"+ >+ <div+ v-cloak+ v-show="controls"+ class="absolute bottom-0 left-0 w-full h-12 flex flex-col justify-end bg-gradient-to-b from-neutral-900/0 to-neutral-900/30 !pointer-events-none"+ style="z-index: 6"+ >+ <!-- Heatmap and Timeline -->+ <section class="flex-1 w-full rounded-full flex flex-col-reverse px-2 h-8 relative">+ <VideoTooltip+ ref="tooltip"+ tooltip-position="top"+ class="-top-6 left-0"+ :tooltip-text="timeSeeking"+ :target-element="progressBar ?? undefined"+ :offset="8"+ :tooltip-arrow="false"+ />+ <input+ @input="handleSeekPreview"+ @change="handleSeek"+ @mousemove="handleProgressTooltip"+ @mouseenter="+ () => {+ if (!tooltip) return;+ tooltip?.tooltipToggle();+ }+ "+ @mouseleave="+ () => {+ if (!tooltip) return;+ tooltip?.tooltipToggle(false);+ }+ "+ ref="progress-bar"+ title="Video Progress"+ placeholder="0"+ v-model="timeElapsed"+ type="range"+ min="0"+ max="100"+ value="0"+ step="0.01"+ :class="+ `peer w-full h-2 appearance-none flex items-center cursor-pointer bg-transparent slider timeline pointer-events-auto ` + // Base Class+ `[&::-webkit-slider-thumb]:!bg-white [&::-moz-range-thumb]:!bg-white ` // Thumb Colour+ "+ :aria-valuetext="timeStrings.timeElapsedVerbose"+ />+ <VideoHeatmap :playback-data="playbackData" />+ </section>++ <!-- Controls -->+ <section class="w-full flex items-center gap-2 p-2 text-xs pointer-events-auto">+ <section class="flex gap-1 items-center">+ <VideoButton+ v-if="previousVideoURL && isAudio"+ class="hidden xs:block"+ title="Play Previous (SHIFT+P)"+ :icon="ProiconsReverse"+ :link="previousVideoURL"+ :use-tooltip="true"+ :target-element="player ?? undefined"+ :controls="controls"+ />+ <VideoButton+ @click="handlePlayerToggle"+ :title="isPaused ? 'Play (k)' : 'Pause (k)'"+ :use-tooltip="true"+ :target-element="player ?? undefined"+ :controls="controls"+ >+ <template #icon>+ <ProiconsPlay v-if="isPaused" class="w-4 h-4" />+ <svg v-else class="w-4 h-4" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M8 3C8.55228 3 9 3.44772 9 4L9 20C9 20.5523 8.55228 21 8 21C7.44772 21 7 20.5523 7 20L7 4C7 3.44772 7.44772 3 8 3ZM16 3C16.5523 3 17 3.44772 17 4V20C17 20.5523 16.5523 21 16 21C15.4477 21 15 20.5523 15 20V4C15 3.44772 15.4477 3 16 3Z"+ fill="currentColor"+ v-cloak+ ></path>+ </svg>+ </template>+ </VideoButton>++ <VideoButton+ v-if="nextVideoURL"+ class="hidden xs:block"+ title="Play Next (SHIFT+N)"+ :icon="ProiconsFastForward"+ :link="nextVideoURL"+ :use-tooltip="true"+ :target-element="player ?? undefined"+ :controls="controls"+ />+ </section>++ <section+ class="hidden sm:flex gap-1 font-mono opacity-80 hover:opacity-100 line-clamp-1"+ :title="`The ${isAudio ? 'audio' : 'video'} will finish at ${endsAtTime}`"+ v-show="endsAtTime !== '00:00' && endsAtTime !== ''"+ >+ <p class="line-clamp-1">Ends at</p>+ <time class="line-clamp-1">{{ endsAtTime }}</time>+ </section>+ <section class="line-clamp-1 overflow-clip font-mono opacity-80 hover:opacity-100 ml-auto hidden xs:flex" :title="timeStrings.timeVerbose">+ <time>{{ timeStrings.timeElapsed }}</time>+ <span> / </span>+ <time>{{ timeStrings.timeDuration }}</time>+ </section>++ <section class="flex items-center group ml-auto xs:ml-0">+ <VideoButton+ :title="`${isMuted ? 'Unmute (m)' : 'Mute (m)'}`"+ class="duration-150 ease-out opacity-80 hover:opacity-100 hover:text-white"+ @click="handleMute"+ :use-tooltip="true"+ :target-element="player ?? undefined"+ :controls="controls"+ >+ <template #icon>+ <ProiconsVolume v-if="currentVolume > 0.3" class="w-4 h-4" />+ <ProiconsVolumeLow v-else-if="currentVolume > 0" class="w-4 h-4" />+ <ProiconsVolumeMute v-else class="w-4 h-4" />+ </template>+ </VideoButton>+ <VideoSlider+ v-model="currentVolume"+ :title="`Volume: ${Math.round(currentVolume * 100)}%`"+ :text="`Volume`"+ :action="() => handleVolumeChange()"+ :wheel-action="handleVolumeWheel"+ />+ <!-- <div class="relative h-1.5 mx-0 group-hover:mx-1 rounded-full group-hover:w-12 invisible group-hover:visible w-0 ease-out duration-300">+ <input+ v-model="currentVolume"+ @input="() => handleVolumeChange()"+ @wheel="handleVolumeWheel"+ type="range"+ min="0"+ max="1"+ step="0.01"+ :class="`w-full h-full appearance-none flex items-center cursor-pointer bg-transparent slider volume`"+ :title="`Volume: ${Math.round(currentVolume * 100)}%`"+ />+ </div> -->+ </section>+ <VideoPopover+ popoverClass="!max-w-40 rounded-lg h-16 md:h-fit font-mono"+ ref="popover"+ :margin="80"+ :player="player ?? undefined"+ :button-attributes="{ 'use-tooltip': true, 'target-element': player ?? undefined }"+ >+ <template #buttonIcon>+ <ProiconsSettings class="w-4 h-4 hover:rotate-180 transition-transform ease-in-out duration-500" />+ </template>+ <template #content>+ <section class="flex flex-col text-xs h-16 md:h-fit overflow-y-auto scrollbar-minimal transition-transform">+ <VideoPopoverItem v-for="(item, index) in videoPopoverItems" :key="index" v-bind="item" />+ <VideoPopoverSlider+ :text="`Speed`"+ :shortcut="`${Math.round(currentSpeed * 100)}%`"+ v-model="currentSpeed"+ :icon="CircumTimer"+ :min="playbackMin"+ :max="playbackMax"+ :step="playbackDelta"+ :action="handleSpeedChange"+ :wheel-action="handleSpeedWheel"+ :title="'Change Playback Speed'"+ />+ </section>+ </template>+ </VideoPopover>+ <VideoButton+ @click="handleFullScreen"+ :title="!isFullScreen ? 'Full Screen (f)' : 'Exit Full Screen (f)'"+ :use-tooltip="true"+ :target-element="player ?? undefined"+ :controls="controls"+ >+ <template #icon>+ <ProiconsFullScreenMinimize v-if="isFullScreen" class="w-4 h-4" />+ <ProiconsFullScreenMaximize v-else class="w-4 h-4" />+ </template>+ </VideoButton>+ </section>+ </div>+ </Transition>++ <!-- Loading -->+ <section v-show="isLoading" class="w-fit h-fit absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2" style="z-index: 5">+ <ProiconsSpinner class="w-8 h-8 animate-spin" />+ </section>++ <!-- Play Icon -->+ <section class="w-fit h-fit absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2" style="z-index: 5">+ <Transition+ enter-active-class="transition ease-out duration-1000 bg-black text-white"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <div+ v-show="isPaused && currentId !== -1"+ class="flex items-center justify-center rounded-full bg-opacity-40 aspect-square p-3 xs:p-4 drop-shadow-lg text-transparent"+ >+ <ProiconsPlay :class="`xs:w-8 xs:h-8 [&>*]:!stroke-1`" />+ </div>+ </Transition>+ </section>++ <!-- Pause Icon -->+ <section class="w-fit h-fit absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2" style="z-index: 5">+ <Transition+ enter-active-class="transition ease-out duration-1000 bg-black text-white"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <div v-show="!isPaused" class="flex items-center justify-center rounded-full bg-opacity-40 aspect-square p-3 xs:p-4 drop-shadow-lg text-transparent">+ <svg class="w-4 h-4 xs:w-8 xs:h-8" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">+ <path+ fill-rule="evenodd"+ clip-rule="evenodd"+ d="M8 3C8.55228 3 9 3.44772 9 4L9 20C9 20.5523 8.55228 21 8 21C7.44772 21 7 20.5523 7 20L7 4C7 3.44772 7.44772 3 8 3ZM16 3C16.5523 3 17 3.44772 17 4V20C17 20.5523 16.5523 21 16 21C15.4477 21 15 20.5523 15 20V4C15 3.44772 15.4477 3 16 3Z"+ fill="currentColor"+ ></path>+ </svg>+ </div>+ </Transition>+ </section>++ <!-- Tap Controls -->+ <section :class="`absolute w-full h-full flex pointer-events-auto text-xs font-mono ${controls ? 'cursor-auto' : 'cursor-none'}`" style="z-index: 4">+ <span :class="`flex-1 flex flex-col gap-1 items-center justify-center`" aria-describedby="Skip Backward" @dblclick="() => handleAutoSeek(-10)">+ <Transition+ enter-active-class="transition ease-out duration-1000 bg-black text-white"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <div v-show="isRewind" class="flex items-center justify-center rounded-full bg-opacity-40 aspect-square p-2 drop-shadow-lg text-transparent">+ <ProiconsReverse class="w-6 h-6" />+ </div>+ </Transition>+ <Transition+ enter-active-class="transition ease-out duration-[1.2s] text-white bg-neutral-900/30"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <p v-show="isRewind" class="text-transparent pointer-events-none select-none p-1 rounded-full">{{ timeAutoSeek }}s</p>+ </Transition>+ </span>+ <span class="w-1/12 md:hidden"></span>+ <span :class="`w-full flex-1 md:flex-none md:w-2/3 flex flex-col items-center justify-start py-4`" @click="handlePlayerToggle" aria-describedby="Play/Pause">+ <Transition+ enter-active-class="transition ease-out duration-[1.4s] text-white bg-neutral-900/30"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <p v-show="isChangingVolume" class="text-transparent pointer-events-none select-none px-2 py-1 rounded-full">{{ Math.round(currentVolume * 100) }}%</p>+ </Transition>+ </span>+ <span class="w-1/12 md:hidden"></span>+ <span :class="`flex-1 flex flex-col items-center justify-center`" aria-describedby="Skip Forward" @dblclick="() => handleAutoSeek(10)">+ <Transition+ enter-active-class="transition ease-out duration-1000 bg-black text-white"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <div v-show="isFastForward" class="flex items-center justify-center rounded-full bg-opacity-40 aspect-square p-2 drop-shadow-lg text-transparent">+ <ProiconsFastForward class="w-6 h-4" />+ </div>+ </Transition>+ <Transition+ enter-active-class="transition ease-out duration-[1.2s] text-white bg-neutral-900/30"+ enter-from-class="scale-50 opacity-100 !text-white"+ enter-to-class="scale-100 opacity-0 !text-white"+ v-cloak+ >+ <p v-show="isFastForward" class="text-transparent pointer-events-none select-none p-1 rounded-full">+{{ timeAutoSeek }}s</p>+ </Transition>+ </span>+ </section>+ </section><videoid="vid-source"width="100%"- controlstype="video/mp4"ref="player"style="z-index: 3"- :src="stateVideo?.path ? `../${stateVideo?.path}` : ''":class="- `relative focus:outline-none object-contain hover:cursor-pointer` +- `${- isLoading || !stateVideo?.path- ? 'aspect-video'- : isAudio ||- (stateVideo.metadata?.resolution_width &&- stateVideo.metadata.resolution_height &&- stateVideo.metadata.resolution_width < stateVideo.metadata.resolution_height)- ? 'max-h-[60vh]'- : ''- }`+ `relative focus:outline-none object-contain h-full rounded-xl overflow-clip pointer-events-none` ++ `${!stateVideo?.path ? ' aspect-video' : (isAudio || isPortrait) && !isFullScreen ? ` max-h-[60vh]` : ''}` ++ `${isAudio ? '' : ' bg-black'}`":poster="isAudio ? audioPoster : ''"- @play="onPlayerPlay"- @pause="onPlayerPause"@ended="onPlayerEnded"@loadstart="onPlayerLoadStart"@loadeddata="onPlayerLoadeddata"@waiting="onPlayerWaiting"- @playing="onPlayerPlaying"- @timeupdate="onPlayerTimeupdate"- @canplay="onPlayerCanplay"- @canplaythrough="onPlayerCanplaythrough"- @statechanged="playerStateChanged"- @seeked="onPlayerSeek"- @volumechange="handleVolumeChange"- @click.stop="- () => {- if (isAudio) handleManualPlay();- }- "+ @timeupdate="handlePlayerTimeUpdate"controlsList="nodownload"+ :src="stateVideo?.path ? `../${stateVideo?.path}` : ''">+ <source :src="stateVideo?.path ? `../${stateVideo?.path}` : ''" :type="stateVideo.metadata?.mime_type ?? 'video/mp4'" /><track kind="captions" />+ Your browser does not support the video tag.</video>- <p>- {{ stateVideo?.metadata?.resolution_width }}- {{ stateVideo?.metadata?.resolution_height }}- {{ stateVideo.metadata?.resolution_width && stateVideo.metadata.resolution_height && stateVideo.metadata.resolution_width < stateVideo.metadata.resolution_height }}- </p><divv-if="isAudio"id="audio-poster"class="absolute top-0 left-0 w-full h-full blur cursor-pointer flex items-center justify-center"- :style="`background: transparent url('${audioPoster}') 50% 50% / cover no-repeat`"+ :style="`background: transparent url('${audioPoster}') 50% 50% / cover no-repeat;`"></div>- <section class="w-fit h-fit absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2" style="z-index: 4" v-if="isAudio">- <button- :class="`aspect-square opacity-0 group-hover:opacity-100 transition-opacity hover:text-purple-600 bg-white/70 hover:bg-white/90 dark:bg-neutral-900/70 dark:hover:bg-neutral-900/90 rounded-full p-3 xs:p-4 drop-shadow-lg`"- @click.stop="- () => {- if (isAudio) handleManualPlay();- }- "- title="Play/Pause"- type="button"- v-if="player"- >- <ProiconsPlay :class="`xs:w-8 xs:h-8 aspect-square [&>*]:!stroke-1`" v-show="isPaused" />- <CircumPause1 :class="`xs:w-8 xs:h-8 aspect-square`" v-show="!isPaused" />- </button>- </section>- <section- style="z-index: 4"- :class="`absolute ${isAudio ? 'bottom-[52px] z-20 rounded-sm overflow-clip' : 'bottom-6'} w-[94.95%] m-auto left-0 right-0 opacity-0 group-hover:opacity-65 transition-opacity duration-75 h-5 pointer-events-none`"- v-show="playbackHeatmap"- >- <svg class="ytp-heat-map-svg fill-indigo-200/20 h-full w-full" preserveAspectRatio="none" viewBox="0 0 1000 100">- <defs>- <clipPath id="4">- <path class="ytp-heat-map-path" :d="heatMap"></path>- </clipPath>- </defs>- <rect class="ytp-heat-map-graph" clip-path="url(#4)" height="100%" width="100%" x="0" y="0"></rect>- <rect class="ytp-heat-map-hover" clip-path="url(#4)" fill="white" fill-opacity="0.7" height="100%" width="100%" x="0" y="0"></rect>- <rect class="ytp-heat-map-play" clip-path="url(#4)" height="100%" x="0" y="0"></rect>- </svg>- </section></div></template><style scoped>.group:hover .show-fade {- animation: fadeOut 1s forwards; /* Adjust the time as needed */+ animation: fadeOut 1s forwards;animation-delay: 7s;}@keyframes fadeOut {@@ -410,9 +1046,4 @@ defineExpose({opacity: 0;}}--/* video {- object-fit: cover;- background: transparent url('') 50% 50% / cover no-repeat;-} */</style>diff --git a/resources/js/components/video/VideoPopover.vue b/resources/js/components/video/VideoPopover.vuenew file mode 100644index 00000000..ffc752c3--- /dev/null+++ b/resources/js/components/video/VideoPopover.vue@@ -0,0 +1,206 @@+<script setup lang="ts">+import { nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch, type Component, type ComponentPublicInstance } from 'vue';+import { OnClickOutside } from '@vueuse/components';+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';++import VideoButton from './VideoButton.vue';++const props = withDefaults(+ defineProps<{+ disabled?: boolean;+ buttonClass?: string;+ popoverClass?: string;+ buttonAttributes?: { [key: string]: any };+ verticalOffsetPixels?: number;+ verticalOffset?: number;+ forcePopoverPosition?: 'top' | 'bottom';+ player?: HTMLVideoElement;+ margin?: number;+ popoverArrow?: boolean;+ title?: string;+ }>(),+ {+ title: 'Settings',+ disabled: false,+ margin: 40,+ popoverArrow: false,+ },+);++const popoverOpen = ref(false);+const popoverPosition = ref<'top' | 'bottom'>(props.forcePopoverPosition ?? 'top');+const popoverAdjustment = ref('');+const popoverHeight = ref(0);++const popover = useTemplateRef('popover');+const popoverButton = useTemplateRef<ComponentPublicInstance>('popoverButton');+const popoverArrowRef = useTemplateRef('popoverArrowRef');++const resizeTimeout = ref<null | number>(null);++async function popoverHeightCalculate() {+ if (!popover.value) return;+ popover.value.$el.classList.add('invisible');+ popoverOpen.value = true;++ await nextTick();+ popoverHeight.value = popover.value.$el.offsetHeight;+ popoverOpen.value = false;+ popover.value.$el.classList.remove('invisible');+}++const adjustPopoverPosition = () => {+ if (!popover.value || !popoverButton.value) return;+ let adjustment = 0;++ const popoverRect = popover.value.$el.getBoundingClientRect();+ const viewportWidth = props.player?.width ?? window.innerWidth;++ if (viewportWidth > popoverRect.width + props.margin * 2 && viewportWidth - popoverRect.right - props.margin < 0) {+ adjustment = viewportWidth - popoverRect.right - props.margin;+ } else if (viewportWidth > popoverRect.width + props.margin * 2 && popoverRect.left <= props.margin) {+ adjustment = props.margin * 2;+ } else {+ return;+ }++ popover.value.$el.style = `left: ${adjustment}px;`; // margin-${popoverPosition.value === 'bottom' ? 'top' : 'bottom'}: ${props.verticalOffsetPixels ?? 32}px;+ if (popoverArrowRef.value) {+ popoverArrowRef.value.style.left = `${popoverRect.width - props.margin / 2 + popoverArrowRef.value.offsetWidth / 2}px`;+ }+};++const handleClose = () => {+ popoverOpen.value = false;+};++defineExpose({ handleClose });++watch(+ () => popoverOpen.value,+ async (value) => {+ if (value) {+ await nextTick();+ adjustPopoverPosition();+ document.getElementById('width')?.focus();+ }+ },+);++onMounted(() => {+ setTimeout(function () {+ popoverHeightCalculate();+ }, 100);+});++onUnmounted(() => {+ if (resizeTimeout.value) {+ clearTimeout(resizeTimeout.value);+ }+});+</script>+<template>+ <VideoButton+ ref="popoverButton"+ :class="buttonClass + ` ${popoverOpen ? 'text-purple-600' : ''}`"+ @click="popoverOpen = true"+ v-bind="buttonAttributes"+ :disabled="disabled"+ :title="title"+ >+ <template #icon>+ <slot name="buttonIcon">+ <svg class="w-4 h-4" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">+ <path+ d="M5.5 3C4.67157 3 4 3.67157 4 4.5C4 5.32843 4.67157 6 5.5 6C6.32843 6 7 5.32843 7 4.5C7 3.67157 6.32843 3 5.5 3ZM3 5C3.01671 5 3.03323 4.99918 3.04952 4.99758C3.28022 6.1399 4.28967 7 5.5 7C6.71033 7 7.71978 6.1399 7.95048 4.99758C7.96677 4.99918 7.98329 5 8 5H13.5C13.7761 5 14 4.77614 14 4.5C14 4.22386 13.7761 4 13.5 4H8C7.98329 4 7.96677 4.00082 7.95048 4.00242C7.71978 2.86009 6.71033 2 5.5 2C4.28967 2 3.28022 2.86009 3.04952 4.00242C3.03323 4.00082 3.01671 4 3 4H1.5C1.22386 4 1 4.22386 1 4.5C1 4.77614 1.22386 5 1.5 5H3ZM11.9505 10.9976C11.7198 12.1399 10.7103 13 9.5 13C8.28967 13 7.28022 12.1399 7.04952 10.9976C7.03323 10.9992 7.01671 11 7 11H1.5C1.22386 11 1 10.7761 1 10.5C1 10.2239 1.22386 10 1.5 10H7C7.01671 10 7.03323 10.0008 7.04952 10.0024C7.28022 8.8601 8.28967 8 9.5 8C10.7103 8 11.7198 8.8601 11.9505 10.0024C11.9668 10.0008 11.9833 10 12 10H13.5C13.7761 10 14 10.2239 14 10.5C14 10.7761 13.7761 11 13.5 11H12C11.9833 11 11.9668 10.9992 11.9505 10.9976ZM8 10.5C8 9.67157 8.67157 9 9.5 9C10.3284 9 11 9.67157 11 10.5C11 11.3284 10.3284 12 9.5 12C8.67157 12 8 11.3284 8 10.5Z"+ fill="currentColor"+ fill-rule="evenodd"+ clip-rule="evenodd"+ ></path>+ </svg>+ </slot>+ </template>+ </VideoButton>+ <Transition+ enter-active-class="ease-out duration-150"+ enter-from-class="scale-[0.8] opacity-60"+ enter-to-class="scale-100 opacity-100"+ leave-active-class="ease-in-out duration-100"+ leave-from-class="scale-100 opacity-100"+ leave-to-class="scale-[0.1] opacity-50"+ >+ <!-- -translate-x-1/2 ${popoverAdjustment ? '' : 'left-1/2'} -->+ <UseFocusTrap+ v-if="popoverOpen"+ :class="`z-50 absolute w-[300px] max-w-lg ${popoverClass} ${popoverPosition === 'bottom' ? `top-8 ${verticalOffset ? `sm:top-${verticalOffset}` : 'sm:top-12'}` : `${verticalOffset ? `bottom-${verticalOffset}` : `bottom-12`}`} right-2 overflow-clip`"+ ref="popover"+ :options="{ allowOutsideClick: true }"+ >+ <OnClickOutside+ @trigger.stop="+ (e: any) => {+ popoverOpen = false;+ }+ "+ @keydown.esc="popoverOpen = false"+ tabindex="-1"+ v-show="popoverOpen"+ v-cloak+ :class="`w-full p-1 bg-neutral-800/90 backdrop-blur-sm border border-neutral-700/10 rounded-md shadow-sm `"+ >+ <div+ v-show="popoverArrow && popoverPosition == 'bottom'"+ ref="popoverArrowRef"+ :class="`absolute inline-block w-5 overflow-hidden -translate-x-2 left-1/2 ${popoverPosition === 'bottom' ? 'top-0 mt-px -translate-y-2.5' : 'bottom-0 mb-px translate-y-2.5'}`"+ >+ <div+ :class="`w-2.5 h-2.5 transform bg-neutral-800/90 border-l border-neutral-700/10 rounded-sm ${popoverPosition === 'bottom' ? 'origin-bottom-left rotate-45 border-t' : 'origin-top-left -rotate-45 border-b'} `"+ ></div>+ </div>+ <slot name="content">+ <div class="grid gap-4">+ <div class="space-y-2">+ {{ popoverAdjustment }}+ <h4 class="font-medium leading-none">Dimensions</h4>+ <p class="text-sm text-muted-foreground">Set the dimensions for the layer.</p>+ </div>+ <div class="grid gap-2">+ <div class="grid items-center grid-cols-3 gap-4">+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="width">Width</label+ ><input+ class="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"+ id="width"+ value="100%"+ />+ </div>+ <div class="grid items-center grid-cols-3 gap-4">+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="maxWidth">Max. width</label+ ><input+ class="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"+ id="maxWidth"+ value="300px"+ />+ </div>+ <div class="grid items-center grid-cols-3 gap-4">+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="height">Height</label+ ><input+ class="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"+ id="height"+ value="25px"+ />+ </div>+ <div class="grid items-center grid-cols-3 gap-4">+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="maxHeight">Max. height</label+ ><input+ class="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"+ id="maxHeight"+ value="none"+ />+ </div>+ </div>+ </div>+ </slot>+ </OnClickOutside>+ </UseFocusTrap>+ </Transition>+</template>diff --git a/resources/js/components/video/VideoPopoverItem.vue b/resources/js/components/video/VideoPopoverItem.vuenew file mode 100644index 00000000..03f1a405--- /dev/null+++ b/resources/js/components/video/VideoPopoverItem.vue@@ -0,0 +1,37 @@+<script setup lang="ts">+import type { PopoverItem } from '@/types/types';++const props = withDefaults(defineProps<PopoverItem>(), {});+</script>+<template>+ <button+ :title="title ?? 'Popover Item'"+ :class="`${selected ? (selectedStyle ?? '') : ''}${disabled ? ' hidden' : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-xs outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style ?? ''}`"+ :onclick="+ () => {+ if (action) action();+ }+ "+ >+ <component v-if="icon" :is="icon" class="w-4 h-4 mr-2 shrink-0" />++ <span class="text-nowrap">{{ text }}</span>+ <span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>+ <slot name="selectedIcon">+ <component v-if="selectedIcon" :is="selectedIcon" :class="`w-4 h-4 shrink-0 ${selected ? selectedIconStyle : 'invisible'}`" />+ <span+ v-else+ width="24"+ height="24"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ stroke-linecap="round"+ stroke-linejoin="round"+ class="w-4 h-4 shrink-0"+ >+ </span>+ </slot>+ </button>+</template>diff --git a/resources/js/components/video/VideoPopoverSlider.vue b/resources/js/components/video/VideoPopoverSlider.vuenew file mode 100644index 00000000..a5132e36--- /dev/null+++ b/resources/js/components/video/VideoPopoverSlider.vue@@ -0,0 +1,28 @@+<script setup lang="ts">+import type { PopoverSlider } from '@/types/types';++const props = withDefaults(defineProps<PopoverSlider>(), { min: 10, max: 200, step: 5 });+const model = defineModel();+</script>+<template>+ <section+ :disabled="disabled"+ :title="title ?? 'Popover Slider'"+ :class="`relative w-full flex flex-wrap gap-y-2 hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-xs outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style ?? ''}`"+ @wheel="wheelAction"+ >+ <component v-if="icon" :is="icon" class="w-4 h-4 mr-2 shrink-0" />++ <span class="text-nowrap">{{ text }}</span>+ <span class="ml-auto text-xs tracking-wide opacity-60">{{ shortcut ?? '' }}</span>+ <input+ type="range"+ @input="action"+ :min="min"+ :max="max"+ :step="step"+ v-model="model"+ :class="`w-full h-full appearance-none flex items-center cursor-pointer bg-transparent slider volume`"+ />+ </section>+</template>diff --git a/resources/js/components/video/VideoSlider.vue b/resources/js/components/video/VideoSlider.vuenew file mode 100644index 00000000..8d654866--- /dev/null+++ b/resources/js/components/video/VideoSlider.vue@@ -0,0 +1,64 @@+<script setup lang="ts">+import { useTemplateRef, watch, type Component } from 'vue';++import VideoTooltipBase from '@/components/video/VideoTooltipBase.vue';++import ProiconsFullScreenMaximize from '~icons/proicons/full-screen-maximize';++const props = withDefaults(+ defineProps<{+ icon?: Component;+ title?: string;+ text?: string;+ useTooltip?: boolean;+ tooltipArrow?: boolean;+ style?: string;+ offset?: number;+ targetElement?: HTMLElement;+ controls?: boolean;+ action?: (...args: any[]) => void;+ wheelAction?: (event: WheelEvent) => void;+ }>(),+ {+ icon: ProiconsFullScreenMaximize,+ tooltipArrow: false,+ useTooltip: true,+ style: '',+ offset: 8,+ },+);++const tooltip = useTemplateRef('tooltip');+const model = defineModel();++const tooltipToggle = (event: MouseEvent, state: boolean = true) => {+ if (!props.useTooltip || !tooltip.value) return;++ tooltip.value.tooltipToggle(event, state);+};++watch(+ () => props.controls,+ () => {+ if (props.controls == false) tooltipToggle(new MouseEvent('mouseleave'), false);+ },+);+</script>+<template>+ <div class="relative h-1.5 mx-0 group-hover:mx-1 rounded-full group-hover:w-12 invisible group-hover:visible w-0 ease-out duration-300">+ <input+ v-model="model"+ @input="action"+ @wheel="wheelAction"+ @mouseenter="tooltipToggle"+ @mouseleave="(e) => tooltipToggle(e, false)"+ type="range"+ min="0"+ max="1"+ step="0.01"+ :class="`w-full h-full appearance-none flex items-center cursor-pointer bg-transparent slider volume${style ? ` ${style}` : ''}`"+ :title="title"+ />+ <VideoTooltipBase v-if="useTooltip" v-cloak :tooltip-text="text" :tooltip-arrow="tooltipArrow" :class-name="`-top-12`" ref="tooltip" :target-element="targetElement" />+ </div>+</template>diff --git a/resources/js/components/video/VideoTooltip.vue b/resources/js/components/video/VideoTooltip.vuenew file mode 100644index 00000000..d54c2f42--- /dev/null+++ b/resources/js/components/video/VideoTooltip.vue@@ -0,0 +1,126 @@+<script setup lang="ts">+import { nextTick, reactive, ref, useTemplateRef } from 'vue';++const props = withDefaults(+ defineProps<{+ tooltipText?: string;+ tooltipArrow?: boolean;+ tooltipPosition?: 'top' | 'bottom';+ offset?: number;+ style?: string;+ targetElement?: HTMLElement;+ }>(),+ {+ tooltipText: 'Tooltip Text',+ tooltipArrow: true,+ tooltipPosition: 'top',+ offset: 0,+ style: '',+ },+);++const data = reactive<{+ tooltipDelay: number;+ tooltipLeaveDelay: number;+ tooltipTimout: number | null;+ tooltipLeaveTimeout: number | null;+}>({+ tooltipDelay: 200,+ tooltipLeaveDelay: 100,+ tooltipTimout: null,+ tooltipLeaveTimeout: null,+});++const tooltipVisible = ref(false);+const tooltipWidth = ref(48);+const tooltip = useTemplateRef('tooltip');++const tooltipEnter = () => {+ if (data.tooltipLeaveTimeout) clearTimeout(data.tooltipLeaveTimeout);++ if (tooltipVisible.value) return;++ if (data.tooltipTimout) clearTimeout(data.tooltipTimout);++ data.tooltipTimout = setTimeout(async () => {+ tooltipVisible.value = true;+ if (!tooltip.value) return;++ await nextTick();+ tooltipWidth.value = tooltip.value.offsetWidth;+ }, data.tooltipDelay);+};++const tooltipLeave = () => {+ if (data.tooltipTimout) clearTimeout(data.tooltipTimout);+ if (!tooltipVisible.value) return;+ if (data.tooltipLeaveTimeout) clearTimeout(data.tooltipLeaveTimeout);+ data.tooltipLeaveTimeout = setTimeout(() => {+ tooltipVisible.value = false;+ }, data.tooltipLeaveDelay);+};++function calculateTooltipPosition(event: MouseEvent) {+ if (!tooltip.value) return;++ const target = props.targetElement ?? (event.target as HTMLElement);+ const rect = target.getBoundingClientRect();+ // console.log(rect.left, event.clientX, tooltipWidth.value / 2, event.clientX - rect.left, event.clientX - rect.left - tooltipWidth.value / 2);++ let left = Math.max(event.clientX - rect.left - tooltipWidth.value / 2 + props.offset, props.offset);++ if (left + tooltipWidth.value - props.offset > rect.width) {+ left = rect.width - tooltipWidth.value + props.offset;+ }++ tooltip.value.style.transform = `translateX(${left}px)`;++ // if (left + tooltipWidth.value / 2 + props.offset > rect.width) {+ // tooltip.value.style.right = `${props.offset}px`;+ // tooltip.value.style.removeProperty('left');+ // return;+ // }++ // tooltip.value.style.left = `${left}px`;+ // tooltip.value.style.removeProperty('right');+}++const tooltipToggle = (state: boolean = true) => {+ if (!state) {+ tooltipLeave();+ return;+ }++ tooltipEnter();+};++defineExpose({ calculateTooltipPosition, tooltipToggle, tooltipVisible });+</script>++<template>+ <Transition+ enter-active-class="ease-out duration-150"+ enter-from-class="scale-[0.8] opacity-60"+ enter-to-class="scale-100 opacity-100"+ leave-active-class="ease-in-out duration-100"+ leave-from-class="scale-100 opacity-100"+ leave-to-class="scale-[0.1] opacity-50"+ >+ <div ref="tooltip" v-show="tooltipVisible" :class="`absolute z-40 ${style ? ' ' + style : ''}`" v-cloak>+ <slot name="content">+ <p+ class="flex-shrink-0 text-xs whitespace-nowrap min-h-4 py-1 px-2 bg-opacity-90 bg-neutral-800 backdrop-blur-sm rounded-md shadow-sm flex items-center justify-center font-mono"+ >+ {{ tooltipText }}+ </p>+ <div+ ref="tooltipArrow"+ v-show="tooltipArrow"+ class="bottom-0 -translate-x-1/2 left-1/2 w-2.5 translate-y-full absolute inline-flex items-center justify-center overflow-hidden"+ >+ <div class="origin-top-left -rotate-45 w-1.5 h-1.5 transform bg-neutral-800 bg-opacity-90"></div>+ </div>+ </slot>+ </div>+ </Transition>+</template>diff --git a/resources/js/components/video/VideoTooltipBase.vue b/resources/js/components/video/VideoTooltipBase.vuenew file mode 100644index 00000000..ca044e23--- /dev/null+++ b/resources/js/components/video/VideoTooltipBase.vue@@ -0,0 +1,145 @@+<script setup lang="ts">+import { nextTick, reactive, ref, useTemplateRef } from 'vue';++const props = withDefaults(+ defineProps<{+ tooltipText?: string;+ tooltipArrow?: boolean;+ tooltipPosition?: 'top' | 'bottom';+ offset?: number;+ className?: string;+ style?: string;+ targetElement?: HTMLElement;+ }>(),+ {+ tooltipText: 'Tooltip Text',+ tooltipArrow: false,+ tooltipPosition: 'top',+ offset: 8,+ className: '',+ style: '',+ },+);++const data = reactive<{+ tooltipDelay: number;+ tooltipLeaveDelay: number;+ tooltipTimout: number | null;+ tooltipLeaveTimeout: number | null;+}>({+ tooltipDelay: 200,+ tooltipLeaveDelay: 100,+ tooltipTimout: null,+ tooltipLeaveTimeout: null,+});++const tooltipVisible = ref(false);+const tooltipWidth = ref(48);+const tooltip = useTemplateRef('tooltip');++const tooltipEnter = (event: MouseEvent) => {+ if (data.tooltipLeaveTimeout) clearTimeout(data.tooltipLeaveTimeout);++ if (tooltipVisible.value) return;++ if (data.tooltipTimout) clearTimeout(data.tooltipTimout);++ tooltipWidth.value = tooltip.value?.offsetWidth ?? 48;++ data.tooltipTimout = setTimeout(async () => {+ tooltipVisible.value = true;++ if (!tooltip.value) return;++ await nextTick();+ tooltipWidth.value = tooltip.value.offsetWidth;++ calculateTooltipPosition(event);+ tooltipLeave(4000);+ }, data.tooltipDelay);+};++const tooltipLeave = (timeout: number = data.tooltipLeaveDelay) => {+ if (data.tooltipTimout) clearTimeout(data.tooltipTimout);+ if (!tooltipVisible.value) return;+ if (data.tooltipLeaveTimeout) clearTimeout(data.tooltipLeaveTimeout);+ data.tooltipLeaveTimeout = setTimeout(() => {+ tooltipVisible.value = false;+ }, timeout);+};++function calculateTooltipPosition(event: MouseEvent) {+ if (!tooltip.value || !props.targetElement || !event.target) return;++ const boundingElement = event.target as HTMLElement;+ const buttonRect = boundingElement.getBoundingClientRect();+ const targetRect = props.targetElement.getBoundingClientRect();++ const buttonCenterX = buttonRect.width / 2;++ let left = buttonCenterX - tooltipWidth.value / 2;+ // console.log(buttonCenterX, `${left}px`);++ if (left + buttonRect.left < targetRect.left + props.offset) {+ // console.log('left', left + buttonRect.left, targetRect.left + props.offset);+ left = targetRect.left - buttonRect.left + props.offset;+ } else if (left + buttonRect.left + tooltipWidth.value > targetRect.right - props.offset) {+ // console.log('right', left, targetRect.right - props.offset, targetRect.right - props.offset - tooltipWidth.value - buttonRect.left);+ left = targetRect.right - props.offset - tooltipWidth.value - buttonRect.left;+ }++ // if (left + tooltipWidth.value > targetRect.width) {+ // left = targetRect.width - tooltipWidth.value;+ // }++ tooltip.value.style.left = `${left}px`;++ // if (left + tooltipWidth.value / 2 + props.offset > rect.width) {+ // tooltip.value.style.right = `${props.offset}px`;+ // tooltip.value.style.removeProperty('left');+ // return;+ // }++ // tooltip.value.style.left = `${left}px`;+ // tooltip.value.style.removeProperty('right');+}++const tooltipToggle = (event: MouseEvent, state: boolean = true) => {+ if (!state) {+ tooltipLeave();+ return;+ }++ tooltipEnter(event);+};++defineExpose({ tooltipToggle });+</script>++<template>+ <Transition+ enter-active-class="ease-out duration-150"+ enter-from-class="scale-[0.8] opacity-60"+ enter-to-class="scale-100 opacity-100"+ leave-active-class="ease-in-out duration-100"+ leave-from-class="scale-100 opacity-100"+ leave-to-class="scale-[0.1] opacity-50"+ >+ <div ref="tooltip" v-show="tooltipVisible" :class="`absolute ${className ? className : ''}`">+ <slot name="content">+ <p+ class="flex-shrink-0 text-xs whitespace-nowrap min-h-4 py-1 px-2 bg-opacity-90 bg-neutral-800 backdrop-blur-sm rounded-md shadow-sm flex items-center justify-center font-mono"+ >+ {{ tooltipText }}+ </p>+ <div+ ref="tooltipArrow"+ v-show="tooltipArrow"+ class="bottom-0 -translate-x-1/2 left-1/2 w-2.5 translate-y-full absolute inline-flex items-center justify-center overflow-hidden"+ >+ <div class="origin-top-left -rotate-45 w-1.5 h-1.5 transform bg-neutral-800 bg-opacity-90"></div>+ </div>+ </slot>+ </div>+ </Transition>+</template>diff --git a/resources/js/echo.ts b/resources/js/echo.tsindex 0fa19178..be57329e 100644--- a/resources/js/echo.ts+++ b/resources/js/echo.ts@@ -4,6 +4,8 @@ window.Pusher = Pusher;const reverbConfig = JSON.parse(document.getElementById('reverb-config')?.dataset?.reverbConfig ?? '');+document.getElementById('reverb-config')?.remove();+export let echoInstance = null;export const EchoConfig: {diff --git a/resources/js/router/index.js b/resources/js/router/index.jsindex 057b479b..e9efd28a 100755--- a/resources/js/router/index.js+++ b/resources/js/router/index.js@@ -1,6 +1,9 @@import { createRouter, createWebHistory } from 'vue-router';+import { useContentStore } from '@/stores/ContentStore';+import { getCategories } from '@/service/mediaAPI';import { useAuthStore } from '@/stores/AuthStore';import { toTitleCase } from '@/service/util';+import { storeToRefs } from 'pinia';import { logout } from '@/service/authAPI';import { toast } from '@/service/toaster/toastService';@@ -12,6 +15,7 @@ import ProfileView from '@/views/ProfileView.vue';import LoginView from '@/views/LoginView.vue';import VideoView from '@/views/VideoView.vue';import ErrorView from '@/views/ErrorView.vue';+import SetupView from '@/views/SetupView.vue';const router = createRouter({history: createWebHistory(),@@ -19,7 +23,32 @@ const router = createRouter({{path: '/',name: 'root',- redirect: '/anime',+ component: {+ async beforeRouteEnter(to, from, next) {+ const { stateDirectory } = storeToRefs(useContentStore());++ if (stateDirectory.value.name) {+ let nextPath = `/${stateDirectory.value.name}`;+ next(nextPath);+ return;+ }++ const { data: response } = await getCategories();++ if (response?.data[0]?.name) {+ let nextPath = `/${response?.data[0]?.name}`;+ next(nextPath);+ return;+ }++ next('/setup');+ },+ },+ },+ {+ path: '/setup',+ name: 'setup',+ component: SetupView,},{path: '/login',@@ -37,8 +66,7 @@ const router = createRouter({component: {async beforeRouteEnter(to, from, next) {try {- const authStore = useAuthStore();- const { clearAuthState } = authStore;+ const { clearAuthState } = useAuthStore();let nextPath = from.fullPath;let nextTitle = from.meta?.title ?? toTitleCase(from.name);await logout();diff --git a/resources/js/service/mediaAPI.ts b/resources/js/service/mediaAPI.tsindex a2d4d651..4a739f38 100644--- a/resources/js/service/mediaAPI.ts+++ b/resources/js/service/mediaAPI.ts@@ -60,3 +60,7 @@ export function getFolders(category_id: number) {export function updateCategory(id: number, data: { default_folder_id: number }) {return API.patch(`/categories/${id}`, data);}++export function getUserViewCount(id: number) {+ return API.get(`/user-view-count/${id}`);+}diff --git a/resources/js/service/util.ts b/resources/js/service/util.tsindex 30ffbde9..dd22fe5d 100644--- a/resources/js/service/util.ts+++ b/resources/js/service/util.ts@@ -60,15 +60,21 @@ export function toFormattedDate(return toUpperCase ? result.toLocaleUpperCase() : result;}-export function toFormattedDuration(rawSeconds: number = 0, leadingZero: boolean = true) {+export function toFormattedDuration(rawSeconds: number = 0, leadingZero: boolean = true, format: 'digital' | 'analog' | 'verbose' = 'analog') {if (isNaN(parseInt(rawSeconds?.toString() ?? '0'))) return null;++ const hoursText = format === 'verbose' ? ' hours' : 'h';+ const minutesText = format === 'verbose' ? ' minutes' : 'm';+ const secondsText = format === 'verbose' ? ' seconds' : 's';+const hours = Math.floor(rawSeconds / 3600);const minutes = Math.floor((rawSeconds % 3600) / 60);const seconds = Math.floor(rawSeconds % 60);- const duration = `${hours > 0 ? `${hours}h ` : ''}${minutes > 0 ? `${minutes}m ` : ''}${`${leadingZero ? formatInteger(seconds) : `${seconds}`}s`}`;-- return duration;+ if (format === 'digital') {+ return `${hours > 0 ? `${formatInteger(hours)}:` : ''}${formatInteger(minutes)}:${formatInteger(seconds)}`;+ }+ return `${hours > 0 ? `${hours}${hoursText} ` : ''}${minutes > 0 ? `${minutes}${minutesText} ` : ''}${`${leadingZero ? formatInteger(seconds) : `${seconds}`}${secondsText}`}`;}export function formatInteger(integer: number, minimumDigits = 2) {@@ -81,6 +87,12 @@ export function toCalendarFormattedDate(date: string) {return rawDate.toLocaleDateString('en-CA', { month: 'long', day: '2-digit', year: 'numeric' }).replaceAll('.', '');}+/**+ * LARAVEL PULSE FUNCTION:+ *+ * @param value+ * @returns+ */export function pulseFormatDate(value: string = '') {if (value.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/) === null) {throw new Error(`Unknown date format [${value}].`);@@ -102,15 +114,32 @@ export function pulseFormatDate(value: string = '') {});}+/**+ * LARAVEL PULSE FUNCTION:+ *+ * @param period+ * @returns+ */export function periodForHumans(period: string) {if (period === '1_hour') return 'hour';return period.replace('_', ' ');}+/**+ * LARAVEL PULSE FUNCTION:+ * @param value+ * @returns+ */export function format_number(value: any) {return Intl.NumberFormat().format(value);}+/**+ * Get the current screen size in tailwind notation.+ *+ * Example: If the current screen width is greater than 1024px, return 'lg'.+ * @returns {'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'default'} the Tailwind CSS compatible screen size identifier.+ */export function getScreenSize(): 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'default' {const width = window.innerWidth;@@ -122,7 +151,15 @@ export function getScreenSize(): 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'default' {return 'default';}-export function formatFileSize(size: number, space = true) {+/**+ * Converts a numerical file size in bytes to a human readable format in the largest applicable unit.+ *+ * Example: "2566" returns 2.51 KB.+ * @param size Size of file in bytes.+ * @param space Include a space between the numberical value and the unit ? Example: 126MB vs 126 MB.+ * @returns {string} `${formattedSize} ${unit}`.+ */+export function formatFileSize(size: number, space = true): string {if (isNaN(size) || size < 0) {return 'Invalid size';}@@ -140,7 +177,12 @@ export function formatFileSize(size: number, space = true) {return `${formattedSize}${space ? ' ' : ''}${units[unitIndex]}`;}-export function within24Hrs(date: string) {+/**+ * Checks if a date string is within 24 hours of the current time.+ *+ * @param date Raw date string.+ */+export function within24Hrs(date: string): boolean {const now = new Date();const then = new Date(date);const diffInHours = (now.getTime() - then.getTime()) / (1000 * 60 * 60);@@ -148,7 +190,14 @@ export function within24Hrs(date: string) {return diffInHours < 24;}-export function handleStorageURL(url: string | undefined) {+/**+ * Converts storage URLs to the correct protocol based on the current URL.+ *+ * Example: "http://website.ca/storage/file.mp4" when the current URL is "https://website.ca" returns "https://website.ca/storage/file.mp4".+ * @param url The storage URL string.+ * @returns The storage URL string with the correct protocol.+ */+export function handleStorageURL(url: string | undefined): string | null {if (!url) return null;if (window.location.protocol === 'http:' && url.startsWith(`https://${window.location.host}`)) return url.replace('https:', 'http:');@@ -156,3 +205,13 @@ export function handleStorageURL(url: string | undefined) {if (window.location.protocol === 'https:' && url.startsWith(`http://${window.location.host}`)) return url.replace('http:', 'https:');return url;}++export function isInputLikeElement(element: EventTarget | null, key: string): boolean {+ if (!element) return false;++ let inputLikeTags = ['INPUT', 'TEXTAREA', 'SELECT'];++ if (key === ' ' || key === 'Enter') inputLikeTags = [...inputLikeTags, 'BUTTON'];++ return inputLikeTags.includes((element as HTMLElement).tagName);+}diff --git a/resources/js/service/wsService.ts b/resources/js/service/wsService.tsindex 89bed0ac..cd0e1d3f 100644--- a/resources/js/service/wsService.ts+++ b/resources/js/service/wsService.ts@@ -53,7 +53,8 @@ export function subscribeToDaskboardTasks() {function unsubscribeFromChannel(channel: string, closeOnEmpty: boolean = false) {if (!window.Echo || window.Echo?.connector?.pusher?.connection?.state !== 'connected') return;- window.Echo.leave(channel);+ // Not manually leaving anymore because the websocket is closed by the time it tries to leave+ // window.Echo.leave(channel);if (closeOnEmpty && Object.keys(window.Echo.connector?.channels).length === 0) {const { disconnectEcho } = useAppStore();@@ -93,7 +94,4 @@ function unsubscribeFromChannel(channel: string, closeOnEmpty: boolean = false)* I guess event runs when library edited instead of loading data again and when index files creates files or folders** Auth is done through user permissions in backend (id == 1)- *- *- **/diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex 28acee80..be884499 100755--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -71,6 +71,26 @@ export const useContentStore = defineStore('Content', () => {return sortedList;}); // use a computed ref?+ const nextVideoURL = computed(() => {+ if (!stateFilteredPlaylist.value || !stateDirectory.value.name || !stateFolder.value.name || !stateVideo.value) return '';++ const currentIndex = stateFilteredPlaylist.value.findIndex((video) => video.id === stateVideo.value.id);++ if (currentIndex === -1 || currentIndex === stateFilteredPlaylist.value.length - 1) return '';++ return encodeURI(`/${stateDirectory.value.name}/${stateFolder.value.name}?video=${stateFilteredPlaylist.value[currentIndex + 1].id}`);+ });++ const previousVideoURL = computed(() => {+ if (!stateFilteredPlaylist.value || !stateDirectory.value.name || !stateFolder.value.name || !stateVideo.value) return '';++ const currentIndex = stateFilteredPlaylist.value.findIndex((video) => video.id === stateVideo.value.id);++ if (currentIndex <= 0) return '';++ return encodeURI(`/${stateDirectory.value.name}/${stateFolder.value.name}?video=${stateFilteredPlaylist.value[currentIndex - 1].id}`);+ });+const { pageTitle } = storeToRefs(AppStore);const { userData } = storeToRefs(AuthStore);@@ -285,6 +305,8 @@ export const useContentStore = defineStore('Content', () => {searchQuery,stateFilteredPlaylist,videoSort,+ nextVideoURL,+ previousVideoURL,getRecords,createRecord,deleteRecord,diff --git a/resources/js/types/resources.ts b/resources/js/types/resources.tsindex f9a4a39f..2c6c65c5 100644--- a/resources/js/types/resources.ts+++ b/resources/js/types/resources.ts@@ -7,6 +7,7 @@ export interface UserResource {email: string;last_active: string;created_at: string;+ avatar?: string;}export interface CategoryResource {diff --git a/resources/js/types/types.ts b/resources/js/types/types.tsindex c0b403a8..b3adf651 100644--- a/resources/js/types/types.ts+++ b/resources/js/types/types.ts@@ -176,6 +176,34 @@ export interface ContextMenu {items?: ContextMenuItem[];}+export interface PopoverItem {+ text?: string;+ title?: string;+ shortcut?: string;+ action?: () => void;+ style?: string;+ selectedStyle?: string;+ selectedIconStyle?: string;+ selected?: boolean;+ disabled?: boolean;+ icon?: Component;+ selectedIcon?: Component;+}++export interface PopoverSlider {+ text?: string;+ title?: string;+ shortcut?: string;+ action?: (...args: any[]) => void;+ wheelAction?: (event: WheelEvent) => void;+ style?: string;+ disabled?: boolean;+ icon?: Component;+ min?: number;+ max?: number;+ step?: number;+}+export declare type Broadcaster = {reverb: {connector: PusherConnector;diff --git a/resources/js/views/SetupView.vue b/resources/js/views/SetupView.vuenew file mode 100644index 00000000..5874c7c9--- /dev/null+++ b/resources/js/views/SetupView.vue@@ -0,0 +1,103 @@+<script setup lang="ts">+import { useAuthStore } from '@/stores/AuthStore';+import { useAppStore } from '@/stores/AppStore';+import { storeToRefs } from 'pinia';+import { onMounted } from 'vue';++import LayoutBase from '@/layouts/LayoutBase.vue';++import LucideFolder from '~icons/lucide/folder';++const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());+const { auth } = useAuthStore();++onMounted(() => {+ pageTitle.value = 'MediaServer Setup';+ selectedSideBar.value = '';+});+</script>++<template>+ <LayoutBase>+ <template v-slot:content>+ <section id="content-settings" class="flex flex-col gap-4 [&>*]:space-y-1 space-y-2 min-h-[80vh]">+ <h2>Before you can start watching your media, you must complete these setup steps</h2>+ <ul class="text-sm flex flex-col gap-2">+ <li class="flex flex-wrap gap-1 items-center">+ <p class="mr-auto">+ 1. <RouterLink to="/register" :class="`text-purple-500 underline decoration-1`">Register</RouterLink> for an account. This will be your administrator+ account.+ </p>+ <p v-show="auth" class="text-xs text-green-700">Done!</p>+ </li>+ <li>+ <span class="flex gap-1 items-start">+ <p>2. Put your files in the data/media folder. You must follow this folder structure. An example url would be /category1/folder2</p>+ <p v-show="false" class="text-xs text-green-700">Done!</p>+ </span>+ <div class="p-2 font-mono w-full">+ <ul>+ <li class="font-bold">data</li>+ <ul class="ml-4">+ <li class="font-bold">media</li>+ <ul class="ml-4">+ <li class="font-bold flex gap-1 items-center">+ category1+ <p class="font-normal text-xs">- Each category will show all of it's folders on the same page</p>+ </li>+ <ul class="ml-4">+ <li class="font-bold">folder1</li>+ <ul class="ml-4">+ <li class="flex gap-1 items-center">+ video1.mp4+ <p class="text-xs">- Each video will have it's own link by category/folder/?video=id</p>+ </li>+ <li>video2.mp4</li>+ </ul>+ <li class="font-bold">folder2</li>+ <ul class="ml-4">+ <li>video1.mp4</li>+ <li>video2.mp4</li>+ </ul>+ </ul>+ <li class="font-bold flex gap-1">category2</li>+ <ul class="ml-4">+ <li class="font-bold">folder1</li>+ <ul class="ml-4">+ <li>video1.mp4</li>+ <li>video2.mp4</li>+ </ul>+ <li class="font-bold">folder2</li>+ <ul class="ml-4">+ <li>video1.mp4</li>+ <li>video2.mp4</li>+ </ul>+ </ul>+ </ul>+ </ul>+ </ul>+ </div>+ </li>+ <li class="flex flex-wrap gap-1 items-center">+ <p>+ 3. <RouterLink :class="`text-purple-500 underline decoration-1`" to="/dashboard/tasks">Start an "Index Files Task"</RouterLink> to discover all the+ videos you have organised.+ </p>+ <p v-show="false" class="text-xs text-green-700">Done!</p>+ </li>+ <li class="flex flex-wrap gap-1 items-center">+ <p>+ 4. <RouterLink :class="`text-purple-500 underline decoration-1`" to="/dashboard/tasks">Start a "Verify Files Task"</RouterLink> to generate metadata for+ all of your videos.+ </p>+ <p v-show="false" class="text-xs text-green-700">Done!</p>+ </li>+ <li>5. <RouterLink to="/">Enjoy</RouterLink> your media library!</li>+ </ul>+ </section>+ </template>+ <template v-slot:sidebar>+ <!-- <Settings /> -->+ </template>+ </LayoutBase>+</template>diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.phpindex 68e44b95..b7df3552 100755--- a/resources/views/layouts/app.blade.php+++ b/resources/views/layouts/app.blade.php@@ -14,6 +14,10 @@html {scrollbar-gutter: stable;}++ html.fullscreen {+ scrollbar-gutter: auto;+ }</style></head>diff --git a/routes/api.php b/routes/api.phpindex 71703058..5b123033 100755--- a/routes/api.php+++ b/routes/api.php@@ -29,7 +29,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {Route::get('/auth', [AuthController::class, 'authenticate']); // NewRoute::delete('/logout', [AuthController::class, 'destroy']); // New- Route::get('/active-sessions', [UserController::class, 'SessionCount']);+ Route::get('/active-sessions', [UserController::class, 'sessionCount']);+ Route::get('/user-view-count/{metadata}', [RecordController::class, 'userViewCount']);Route::resource('/records', RecordController::class)->only(['index', 'store', 'destroy']);Route::resource('/profile', ProfileController::class)->only(['show', 'store', 'update']);diff --git a/routes/web.php b/routes/web.phpindex e47bda92..064ee7e1 100755--- a/routes/web.php+++ b/routes/web.php@@ -3,25 +3,30 @@use App\Events\TaskEnded;use App\Http\Controllers\DirectoryController;use App\Http\Controllers\MediaController;+use App\Models\Category;use App\Models\Task;use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\Gate;use Illuminate\Support\Facades\Route;use Illuminate\Support\Facades\URL;-// Route::get('/test-headers', function () {-// return response()->json(request()->header());-// });+if (env('APP_DEBUG')) {+ Route::get('/test-headers', function () {+ return response()->json(request()->header());+ });-// Route::get('/debug-scheme', function () {-// return response()->json([-// 'scheme' => request()->getScheme(),-// 'headers' => request()->header(),-// 'isSecure' => request()->isSecure(),-// 'trustedProxies' => request()->getTrustedProxies(),-// 'trustedHeaders' => request()->getTrustedHeaderSet(),-// ]);-// });+ Route::get('/debug-scheme', function () {+ return response()->json([+ 'scheme' => request()->getScheme(),+ 'headers' => request()->header(),+ 'isSecure' => request()->isSecure(),+ 'trustedProxies' => request()->getTrustedProxies(),+ 'trustedHeaders' => request()->getTrustedHeaderSet(),+ 'realIP' => request()->header('X-Real-IP'),+ 'for' => request()->header('X-Forwarded-For'),+ ]);+ });+}// private@@ -67,6 +72,22 @@ Route::get('/welcome', function () {return view('welcome');});+Route::get('/', function () {+ if (Auth::user()) {+ $category = Category::oldest('id')->first();+ } else {+ $category = Category::where('is_private', false)->oldest('id')->first();+ }++ // If no category is found, redirect to /setup+ if (! $category) {+ return redirect('/setup');+ }++ // Otherwise, redirect to the category's name route+ return redirect("/{$category->name}");+});+Route::get('/{dir?}/{folderName?}', function () {return view('home');})->name('root');diff --git a/startDocker.bat b/startDocker.batindex 1ffaf2aa..e440ebcb 100644--- a/startDocker.bat+++ b/startDocker.bat@@ -1,73 +1,219 @@@echo off-docker compose down-docker volume prune -f-docker compose pull-echo Checking required files and folders...+echo.+echo ============================================+echo mediaServer Docker Setup+echo ============================================+echo.++call :ColorText "[STEP 1/5] " Yellow+echo Verifying required files and folders...+echo.-:: Ensure .docker-compose.yaml exists -> Holds app setup+:: Check for docker-compose.yamlif not exist docker-compose.yaml (- echo ERROR: Missing docker compose file- echo Please download this file before running Docker.+ call :ColorText "[ERROR]" Red+ echo Missing 'docker-compose.yaml' file.+ echo Please ensure this file is present in the root directory.pause- exit /b 1+ goto :end+) else (+ call :ColorText "[FOUND]" Green+ echo 'docker-compose.yaml' file.)+echo.-:: Ensure app.conf exists -> Holds nginx config+:: Check for nginx configurationif not exist "docker/etc/nginx/conf.d/default.conf" (- echo ERROR: Missing docker/etc/nginx/conf.d/default.conf- echo Please download this file before running Docker.+ call :ColorText "[ERROR]" Red+ echo Missing 'docker/etc/nginx/conf.d/default.conf' file.+ echo Please ensure this file is present in the correct directory.pause- exit /b 1+ goto :end) else (- echo Found nginx config+ call :ColorText "[FOUND]" Green+ echo 'nginx' configuration file.)+echo.-:: Ensure caddyfile exists+:: Check for Caddyfileif not exist "docker/etc/caddy/Caddyfile" (- echo ERROR: Missing /docker/etc/caddy/Caddyfile- echo Please download this file before running Docker.+ call :ColorText "[ERROR]" Red+ echo Missing 'docker/etc/caddy/Caddyfile' file.+ echo Please ensure this file is present in the correct directory.pause- exit 1+ goto :end) else (- echo Found caddy config- echo Make sure to replace 'app.test' with your website URL in '/docker/etc/caddy/Caddyfile' and in .env if you have one+ call :ColorText "[FOUND]" Green+ echo 'Caddyfile' configuration file.+ echo NOTE: Make sure to replace 'app.test' with your website URL in:+ echo - '/docker/etc/caddy/Caddyfile'+ echo - '.env')+echo.-:: Ensure .env.docker exists -> Holds default environment variables+:: Check for .env.dockerif not exist "docker/.env.docker" (- echo ERROR: Missing ./docker/.env.docker- echo Please download this file before running Docker.+ call :ColorText "[ERROR]" Red+ echo Missing 'docker/.env.docker' file.+ echo Please ensure this file is present in the correct directory.pause- exit /b 1-) else (- echo Found environment variables+ goto :end)-:: Ensure .env exists+:: Create .env if it doesn't existif not exist .env (- echo .env file not found! Creating from .env.docker...+ call :ColorText "[INFO]" Blue+ echo '.env' file not found. Creating from '.env.docker'...copy ".\docker\.env.docker" ".env"- echo .env file created.+ if errorlevel 1 (+ call :ColorText "[ERROR]" Red+ echo Failed to create '.env' file.+ pause+ goto :end+ )+ call :ColorText "[SUCCESS]" Green+ echo '.env' file created.+) else (+ call :ColorText "[FOUND]" Green+ echo '.env' file.)+echo.-:: Ensure the ./data directory exists -> Holds user media-if not exist "data" (- echo Missing ./data directory...- mkdir data- echo ./data directory created.+:: Ensure data directory exists+if not exist "data/media" (+ call :ColorText "[INFO]" Blue+ echo Missing 'data/media' directory. Creating it...+ echo.+ mkdir "data"+ mkdir "data/media"+ mkdir "data/avatars"+ mkdir "data/thumbnails"+ if errorlevel 1 (+ call :ColorText "[ERROR]" Red+ echo Failed to create 'data' directory.+ pause+ goto :end+ )+ call :ColorText "[SUCCESS]" Green+ echo 'data' directory created.) else (- echo Found ./data directory+ call :ColorText "[FOUND]" Green+ echo 'data' directory.)+echo.-:: Ensure the ./logs directory exists+:: Ensure logs directory existsif not exist "logs" (- echo Missing ./logs directory! Creating it...- mkdir -p ./logs- echo ./logs directory created.+ call :ColorText "[INFO]" Blue+ echo Missing 'logs' directory. Creating it...+ echo.+ mkdir "logs"+ mkdir "logs/mediaServer"+ mkdir "logs/nginx"+ mkdir "logs/caddy"+ if errorlevel 1 (+ call :ColorText "[ERROR]" Red+ echo Failed to create 'logs' directory.+ pause+ goto :end+ )+ call :ColorText "[SUCCESS]" Green+ echo 'logs' directory created.) else (- echo Found ./logs directory+ call :ColorText "[FOUND]" Green+ echo 'logs' directory.+)+echo.++call :ColorText "[STEP 2/5] " Yellow+echo Stopping and cleaning up Existing mediaServer Docker containers...+docker compose down+if errorlevel 1 (+ echo.+ call :ColorText "[ERROR]" Red+ echo Failed to bring down Docker containers.+ echo Please check your Docker setup and try again.+ pause+ goto :end+)+echo.+call :ColorText "[SUCCESS]" Green+echo Docker containers stopped and cleaned up.+echo.++call :ColorText "[STEP 3/5] " Yellow+echo Pruning Docker volumes...+echo.+docker volume prune -f+if errorlevel 1 (+ echo.+ call :ColorText "[ERROR]" Red+ echo Failed to prune Docker volumes.+ echo Please check your Docker setup and try again.+ pause+ goto :end)+echo.+call :ColorText "[SUCCESS]" Green+echo Docker volumes pruned.+echo.-echo Setup complete+call :ColorText "[STEP 4/5] " Yellow+echo Pulling latest Docker images...+echo.+docker compose pull+if errorlevel 1 (+ echo.+ call :ColorText "[ERROR]" Red+ echo Failed to pull Docker images.+ echo Please check your internet connection and Docker setup.+ pause+ goto :end+) else (+ echo.+ call :ColorText "[SUCCESS]" Green+ echo Docker images pulled successfully.+ echo.+)++call :ColorText "[STEP 5/5] " Yellow+echo Building docker compose...+echo.docker compose up -d++if errorlevel 1 (+ echo.+ call :ColorText "[ERROR]" Red+ echo Failed to build docker compose.+ echo Please check your configuration.+ pause+ goto :end+)+echo ============================================+echo SETUP COMPLETED SUCCESSFULLY!+echo ============================================+echo.+echo Your mediaServer will be available at https://app.test OR https://YOUR.URL+echo.+echo To add audio or video to your server, put the files in ./data/media organised by /CATEGORY/FOLDER/VIDEO.mp4++:end++set arg0=%0+if [%arg0:~2,1%]==[:] pause+exit /b++:: Function to print colored text+:ColorText+setlocal+set "text=%~1"+set "color=%~2"++if "%color%"=="" (+ call :ColorText "[ERROR]" Red+ goto :end+)++powershell -NoProfile -Command "Write-Host '%text%' -ForegroundColor %color%"+exit /b 1diff --git a/startDocker.sh b/startDocker.shindex a043d085..0b13cff2 100644--- a/startDocker.sh+++ b/startDocker.sh@@ -1,82 +1,163 @@#!/bin/bash-docker compose down-docker volume prune -f-docker compose pull-# Ensure the script is executed in the project root-cd "$(dirname "$0")"+# Define color variables+RED='\033[31m'+GREEN='\033[32m'+YELLOW='\033[33m'+BLUE='\033[34m'+RESET='\033[0m' # Reset color-echo "🔹 Checking required files and folders..."+echo+echo "============================================"+echo " mediaServer Docker Setup "+echo "============================================"+echo-# Ensure .docker-compose.yaml exists -> Holds app setup+echo -e "${YELLOW}[STEP 1/5]${RESET} Verifying required files and folders..."+echo++# Check for docker-compose.yamlif [ ! -f "docker-compose.yaml" ]; then- echo "ERROR: Missing docker compose file"- echo "Please download this file before running Docker."- pause+ echo -e "${RED}[ERROR]${RESET} Missing 'docker-compose.yaml' file."+ echo "Please ensure this file is present in the root directory."exit 1+else+ echo -e "${GREEN}[FOUND]${RESET} 'docker-compose.yaml' file."fi+echo-# Ensure default.conf exists-if [ ! -f "./docker/etc/nginx/conf.d/default.conf" ]; then- echo "ERROR: Missing docker/etc/nginx/conf.d/default.conf"- echo "Please download this file before running Docker."- pause+# Check for nginx configuration+if [ ! -f "docker/etc/nginx/conf.d/default.conf" ]; then+ echo -e "${RED}[ERROR]${RESET} Missing 'docker/etc/nginx/conf.d/default.conf' file."+ echo "Please ensure this file is present in the correct directory."exit 1else- echo "Found nginx config"+ echo -e "${GREEN}[FOUND]${RESET} 'nginx' configuration file."fi+echo-# Ensure caddyfile exists-if [ ! -f "./docker/etc/caddy/Caddyfile" ]; then- echo "ERROR: Missing /docker/etc/caddy/Caddyfile"- echo "Please download this file before running Docker."- pause+# Check for Caddyfile+if [ ! -f "docker/etc/caddy/Caddyfile" ]; then+ echo -e "${RED}[ERROR]${RESET} Missing 'docker/etc/caddy/Caddyfile' file."+ echo "Please ensure this file is present in the correct directory."exit 1else- echo "Found caddy config"- echo "Make sure to replace 'app.test' with your website URL in '/docker/etc/caddy/Caddyfile' and in .env if you have one"+ echo -e "${GREEN}[FOUND]${RESET} 'Caddyfile' configuration file."+ echo "NOTE: Make sure to replace 'app.test' with your website URL in:"+ echo " - '/docker/etc/caddy/Caddyfile'"+ echo " - '.env'"fi+echo-# Ensure docker env exists-if [ ! -f "./docker/.env.docker" ]; then- echo "ERROR: Missing docker/.env.docker"- echo "Please download this file before running Docker."- pause+# Check for .env.docker+if [ ! -f "docker/.env.docker" ]; then+ echo -e "${RED}[ERROR]${RESET} Missing 'docker/.env.docker' file."+ echo "Please ensure this file is present in the correct directory."exit 1-else- echo "Found environment variables"fi-# Check if .env exists, otherwise create it from .env.example+# Create .env if it doesn't existif [ ! -f ".env" ]; then- echo ".env file not found! Creating from .env.docker..."- cp ./docker/.env.docker .env- chmod 755 /var/www/html/.env- chown www-data:www-data /var/www/html/.env- echo ".env file created."+ echo -e "${BLUE}[INFO]${RESET} '.env' file not found. Creating from '.env.docker'..."+ cp "docker/.env.docker" ".env"+ if [ $? -ne 0 ]; then+ echo -e "${RED}[ERROR]${RESET} Failed to create '.env' file."+ exit 1+ fi+ echo -e "${GREEN}[SUCCESS]${RESET} '.env' file created."+else+ echo -e "${GREEN}[FOUND]${RESET} '.env' file."+fi+echo++# Ensure data directory exists+if [ ! -d "data/media" ]; then+ echo -e "${BLUE}[INFO]${RESET} Missing 'data/media' directory. Creating it..."+ echo+ mkdir -p "data/media"+ mkdir -p "data/avatars"+ mkdir -p "data/thumbnails"+ if [ $? -ne 0 ]; then+ echo -e "${RED}[ERROR]${RESET} Failed to create 'data' directory."+ exit 1+ fi+ echo -e "${GREEN}[SUCCESS]${RESET} 'data' directory created."+else+ echo -e "${GREEN}[FOUND]${RESET} 'data' directory."fi+echo-# Ensure the ./data directory exists-if [ ! -d "./data/media" ]; then- echo "Missing ./data directory! Creating it..."- mkdir -p ./data- mkdir -p ./data/media- mkdir -p ./data/avatars- mkdir -p ./data/thumbnails- echo "./data directory created."+# Ensure logs directory exists+if [ ! -d "logs" ]; then+ echo -e "${BLUE}[INFO]${RESET} Missing 'logs' directory. Creating it..."+ echo+ mkdir -p "logs/mediaServer"+ mkdir -p "logs/nginx"+ mkdir -p "logs/caddy"+ if [ $? -ne 0 ]; then+ echo -e "${RED}[ERROR]${RESET} Failed to create 'logs' directory."+ exit 1+ fi+ echo -e "${GREEN}[SUCCESS]${RESET} 'logs' directory created."else- echo "Found ./data directory"+ echo -e "${GREEN}[FOUND]${RESET} 'logs' directory."+fi+echo++echo -e "${YELLOW}[STEP 2/5]${RESET} Stopping and cleaning up Existing mediaServer Docker containers..."+docker compose down+if [ $? -ne 0 ]; then+ echo+ echo -e "${RED}[ERROR]${RESET} Failed to bring down Docker containers."+ echo "Please check your Docker setup and try again."+ exit 1+fi+echo+echo -e "${GREEN}[SUCCESS]${RESET} Docker containers stopped and cleaned up."+echo++echo -e "${YELLOW}[STEP 3/5]${RESET} Pruning Docker volumes..."+echo+docker volume prune -f+if [ $? -ne 0 ]; then+ echo+ echo -e "${RED}[ERROR]${RESET} Failed to prune Docker volumes."+ echo "Please check your Docker setup and try again."+ exit 1fi+echo+echo -e "${GREEN}[SUCCESS]${RESET} Docker volumes pruned."+echo-# Ensure the ./logs directory exists-if [ ! -d "./logs" ]; then- echo "Missing ./logs directory! Creating it..."- mkdir -p ./logs- chmod 755 ./logs- echo "./logs directory created."+echo -e "${YELLOW}[STEP 4/5]${RESET} Pulling latest Docker images..."+echo+docker compose pull+if [ $? -ne 0 ]; then+ echo+ echo -e "${RED}[ERROR]${RESET} Failed to pull Docker images."+ echo "Please check your internet connection and Docker setup."+ exit 1else- echo "Found ./logs directory"+ echo+ echo -e "${GREEN}[SUCCESS]${RESET} Docker images pulled successfully."+ echofi-echo "Setup complete"+echo -e "${YELLOW}[STEP 5/5]${RESET} Building docker compose..."+echodocker compose up -d++if [ $? -ne 0 ]; then+ echo+ echo -e "${RED}[ERROR]${RESET} Failed to build docker compose."+ echo "Please check your configuration."+ exit 1+fi++echo "============================================"+echo -e "${GREEN} SETUP COMPLETED SUCCESSFULLY!${RESET}"+echo "============================================"+echo+echo "Your mediaServer will be available at https://app.test OR https://YOUR.URL"+echo+echo "To add audio or video to your server, put the files in ./data/media organised by /CATEGORY/FOLDER/VIDEO.mp4"diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.phpindex 3ca96505..11219c6b 100755--- a/tests/Feature/ExampleTest.php+++ b/tests/Feature/ExampleTest.php@@ -12,6 +12,6 @@ class ExampleTest extends TestCase {public function test_the_application_returns_a_successful_response(): void {$response = $this->get('/');- $response->assertStatus(200);+ $response->assertStatus(302);}}