add tanstack table, add clients table

.env.ci

@@ -1,58 +1,57 @@
-# Application
 APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_FORCE_HTTPS=false
-APP_ENABLE_REGISTRATION=true
+SESSION_SECURE_COOKIE=false
 
-# Logging
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
-# Database
 DB_CONNECTION=pgsql_test
+
 DB_TEST_HOST=127.0.0.1
 DB_TEST_PORT=5432
 DB_TEST_DATABASE=laravel
 DB_TEST_USERNAME=root
 DB_TEST_PASSWORD=root
 
-# Broadcasting
-BROADCAST_DRIVER=null
-
-# Cache
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-
-# Queue
+FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
-
-# Session
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-# Mail
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 MAIL_MAILER=log
-MAIL_FROM_ADDRESS="no-reply@solidtime.test"
-MAIL_FROM_NAME="solidtime"
-MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
-MAIL_REPLY_TO_NAME="solidtime"
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
 
-# Filesystems
-FILESYSTEM_DISK=local
-PUBLIC_FILESYSTEM_DISK=public
+S3_ACCESS_KEY_ID=
+S3_SECRET_ACCESS_KEY=
+S3_REGION=us-east-1
+S3_BUCKET=
+S3_USE_PATH_STYLE_ENDPOINT=false
 
-# Passport
-PASSPORT_PERSONAL_ACCESS_CLIENT_ID="9e27f54d-5dfb-4dde-99d7-834518236c92"
-PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET="EL5mXp3aF8ITjcwoOXRpbSK7zGrWhW4zTDpQXTkf"
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
 
-# Auditing
-AUDITING_ENABLED=true
-
-# Telescope
-TELESCOPE_ENABLED=false
-
-# Services
-GOTENBERG_URL=http://0.0.0.0:3000
+VITE_APP_NAME="${APP_NAME}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.env.example

@@ -1,21 +1,18 @@
-# Application
 APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
-APP_FORCE_HTTPS=false
-APP_ENABLE_REGISTRATION=true
-SUPER_ADMINS=admin@example.com
-PAGINATION_PER_PAGE_DEFAULT=500
+AUDITING_ENABLED=true
+
+SUPER_ADMINS=admin@example.com
 
-# Logging
 LOG_CHANNEL=single
 LOG_DEPRECATIONS_CHANNEL=deprecation
 LOG_LEVEL=debug
 
-# Database
 DB_CONNECTION=pgsql
+
 DB_HOST=pgsql
 DB_PORT=5432
 DB_DATABASE=laravel
@@ -28,20 +25,18 @@ DB_TEST_DATABASE=laravel
 DB_TEST_USERNAME=root
 DB_TEST_PASSWORD=root
 
-# Broadcasting
-BROADCAST_DRIVER=null
-
-# Cache
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-
-# Queue
 QUEUE_CONNECTION=sync
-
-# Session
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-# Mail
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 MAIL_MAILER=smtp
 MAIL_HOST=mailpit
 MAIL_PORT=1025
@@ -49,11 +44,17 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="no-reply@solidtime.test"
-MAIL_FROM_NAME="solidtime"
-MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
-MAIL_REPLY_TO_NAME="solidtime"
+MAIL_FROM_NAME="${APP_NAME}"
 
-# Filesystems
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+# Storage
 FILESYSTEM_DISK=s3
 PUBLIC_FILESYSTEM_DISK=s3
 S3_ACCESS_KEY_ID=sail
@@ -64,24 +65,18 @@ S3_URL=http://storage.solidtime.test/local
 S3_ENDPOINT=http://storage.solidtime.test
 S3_USE_PATH_STYLE_ENDPOINT=true
 
-# Passport
-PASSPORT_PERSONAL_ACCESS_CLIENT_ID="9e27f54d-5dfb-4dde-99d7-834518236c92"
-PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET="EL5mXp3aF8ITjcwoOXRpbSK7zGrWhW4zTDpQXTkf"
-
-# Auditing
-AUDITING_ENABLED=true
-
-# Telescope
-TELESCOPE_ENABLED=false
-
-# Services
-GOTENBERG_URL=http://gotenberg:3000
-
-# Local setup
-NGINX_HOST_NAME=solidtime.test
-NETWORK_NAME=reverse-proxy-docker-traefik_routing
-FORWARD_DB_PORT=5432
-FORWARD_WEB_PORT=8083
 VITE_HOST_NAME=vite.solidtime.test
 VITE_APP_NAME="${APP_NAME}"
-#SAIL_XDEBUG_MODE=develop,debug,coverage
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+NGINX_HOST_NAME=solidtime.test
+NETWORK_NAME=reverse-proxy-docker-traefik_routing
+
+FORWARD_DB_PORT=5432
+FORWARD_WEB_PORT=8083
+
+PAGINATION_PER_PAGE_DEFAULT=500

.env.production

@@ -1,10 +1,9 @@
 APP_NAME=solidtime
-APP_VERSION=0.0.0
-APP_BUILD=0
 VITE_APP_NAME=solidtime
 APP_ENV=production
 APP_DEBUG=false
 APP_FORCE_HTTPS=true
+SESSION_SECURE_COOKIE=true
 OCTANE_SERVER=frankenphp
 PAGINATION_PER_PAGE_DEFAULT=500
 

.eslintrc.cjs

@@ -0,0 +1,13 @@
+/* eslint-env node */
+require("@rushstack/eslint-patch/modern-module-resolution")
+
+module.exports = {
+    extends: ['plugin:vue/vue3-essential', '@vue/eslint-config-typescript/recommended', '@vue/eslint-config-prettier'],
+    rules: {
+        'vue/multi-word-component-names': 'off',
+        "@typescript-eslint/no-unused-vars": "off",
+        "unused-imports/no-unused-imports": "error",
+        "unused-imports/no-unused-vars": "error",
+    },
+    plugins: ['unused-imports'],
+}

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: solidtime-io

.github/ISSUE_TEMPLATE/1_bug_report.yml

@@ -1,47 +0,0 @@
-name: Bug Report
-description: "Report a bug"
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before creating a new bug report, please check that there isn't already a similar issue.
-
-  - type: textarea
-    attributes:
-      label: Description
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: "Steps To Reproduce"
-      description: How do you trigger this bug? Please walk us through it step by step.
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: false
-
-  - type: dropdown
-    attributes:
-      label: "Self-hosted or Cloud?"
-      options:
-        - Self-Hosted
-        - solidtime Cloud
-        - Both
-
-  - type: input
-    attributes:
-      label: "Version of solidtime: (for self-hosted)"
-    validations:
-      required: false
-
-  - type: input
-    attributes:
-      label: "solidtime self-hosting guide: (for self-hosted)"
-      description: "Did you use the official guide to self-host solidtime? If yes, which one?"
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 🚀 Feature Request
-    url: https://github.com/solidtime-io/solidtime/discussions/new?category=feature-requests
-    about: Share ideas for new features
-  - name: ❓ Ask a Question
-    url: https://github.com/solidtime-io/solidtime/discussions/new?category=general
-    about: Ask the community for help

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +0,0 @@
-<!--
-This project is early stage. The structure and APIs are still subject to change and not stable.
-Therefore, we do not currently accept any contributions, unless you are a member of the team.
-
-As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
-
-We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
--->

.github/workflows/build-private.yml

@@ -20,55 +20,15 @@ jobs:
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
-
-      - name: "Get build"
-        id: build
-        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: "Get Previous tag (normal push)"
-        id: previoustag
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          prefix: "v"
-
-      - name: "Get version"
-        id: version
-        run: |
-          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
-            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
-              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
-              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-            else
-              echo "ERROR: No previous tag found";
-              exit 1;
-            fi
-          else
-            version=$(echo "${{ github.ref }}" | cut -c 12-)
-            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: "Copy .env template for production"
-        run: |
-          cp .env.production .env
-          rm .env.production .env.ci .env.example
-
-      - name: "Add version to .env"
-        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.version.outputs.app_version }}/g' .env
-
-      - name: "Add build to .env"
-        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.build.outputs.build }}/g' .env
-
-      - name: "Output .env"
-        run: cat .env
 
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
+      - name: "Copy .env template for production"
+        run: cp .env.production .env && cat .env
+
       - name: "Checkout billing extension"
         uses: actions/checkout@v4
         with:
@@ -107,24 +67,6 @@ jobs:
       - name: "Install npm dependencies in services extension"
         run: cd extensions/Services && npm ci
 
-      - name: "Checkout invoicing extension"
-        uses: actions/checkout@v4
-        with:
-          repository: solidtime-io/extension-invoicing
-          path: extensions/Invoicing
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
-
-      - name: "Install composer dependencies in invoicing extension"
-        uses: php-actions/composer@v6
-        with:
-          working_dir: "extensions/Invoicing"
-          command: install
-          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
-          php_version: 8.3
-
-      - name: "Install npm dependencies in invoicing extension"
-        run: cd extensions/Invoicing && npm ci
-
       - name: "Setup PHP with PECL extension"
         uses: shivammathur/setup-php@v2
         with:
@@ -145,9 +87,6 @@ jobs:
       - name: "Activate services extension"
         run: php artisan module:enable Services
 
-      - name: "Activate invoicing extension"
-        run: php artisan module:enable Invoicing
-
       - name: "Install npm dependencies"
         run: npm ci
 

.github/workflows/build-public-release.yml

@@ -0,0 +1,90 @@
+on:
+  push:
+    tags:
+      - '*'
+  pull_request:
+    paths:
+      - '.github/workflows/build-public.yml'
+      - 'docker/prod/**'
+  workflow_dispatch:
+
+name: Build - Public (Release)
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    timeout-minutes: 90
+
+    steps:
+      - name: "Check out code"
+        uses: actions/checkout@v4
+
+      - name: "Copy .env template for production"
+        run: cp .env.production .env
+
+      - name: "Install dependencies"
+        uses: php-actions/composer@v6
+        if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
+        with:
+          command: install
+          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+          php_version: 8.3
+
+      - name: "Use Node.js"
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - name: "Install npm dependencies"
+        run: npm ci
+
+      - name: "Build"
+        run: npm run build
+
+      - name: "Login to GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: "Login to GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Docker meta"
+        id: "meta"
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            solidtime/solidtime
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v3
+
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Build and push"
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/prod/Dockerfile
+          build-args: |
+            DOCKER_FILES_BASE_PATH=docker/prod/
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/build-public.yml

@@ -3,29 +3,16 @@ on:
     branches:
       - main
       - develop
-    tags:
-      - '*'
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
       - 'docker/prod/**'
   workflow_dispatch:
 
-env:
-  DOCKERHUB_REPO: solidtime/solidtime
-  GHCR_REPO: ghcr.io/solidtime-io/solidtime
-
 name: Build - Public
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-          - runs-on: "ubuntu-24.04-arm"
-            platform: "linux/arm64"
-          - runs-on: "ubuntu-24.04"
-            platform: "linux/amd64"
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read
@@ -36,59 +23,17 @@ jobs:
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
-
-      - name: "Get build"
-        id: release-build
-        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
-
-      - name: "Get Previous tag (normal push)"
-        id: previoustag
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
-        with:
-          prefix: "v"
-
-      - name: "Get version"
-        id: release-version
-        run: |
-          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
-            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
-              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
-              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-            else
-              echo "ERROR: No previous tag found";
-              exit 1;
-            fi
-          else
-            version=$(echo "${{ github.ref }}" | cut -c 12-)
-            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
-          fi
 
       - name: "Copy .env template for production"
-        run: |
-          cp .env.production .env
-          rm .env.production .env.ci .env.example
-
-      - name: "Add version to .env"
-        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.release-version.outputs.app_version }}/g' .env
-
-      - name: "Add build to .env"
-        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.release-build.outputs.build }}/g' .env
-
-      - name: "Output .env"
-        run: cat .env
-
-      - name: "Setup PHP with PECL extension"
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: mbstring, dom, fileinfo, pgsql
+        run: cp .env.production .env
 
       - name: "Install dependencies"
-        run: composer install --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+        uses: php-actions/composer@v6
         if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
+        with:
+          command: install
+          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+          php_version: 8.3
 
       - name: "Use Node.js"
         uses: actions/setup-node@v4
@@ -101,31 +46,29 @@ jobs:
       - name: "Build"
         run: npm run build
 
-      - name: "Prepare"
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: "Docker meta"
-        id: "meta"
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKERHUB_REPO }}
-            ${{ env.GHCR_REPO }}
-
-      - name: "Login to Docker Hub Container Registry"
+      - name: "Login to GitHub Container Registry"
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: "Login to GitHub Container Registry"
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Docker meta"
+        id: "meta"
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            solidtime/solidtime
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
 
       - name: "Set up QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,90 +76,16 @@ jobs:
       - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v3
 
-      - name: "Build and push by digest"
-        id: build
+      - name: "Build and push"
         uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/prod/Dockerfile
           build-args: |
             DOCKER_FILES_BASE_PATH=docker/prod/
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
-      - name: "Export digest"
-        run: |
-          mkdir -p ${{ runner.temp }}/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: "Upload digest"
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    timeout-minutes: 90
-    needs:
-      - build
-    steps:
-      - name: "Download digests"
-        uses: actions/download-artifact@v4
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: "Login to Docker Hub"
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: "Login to GHCR"
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
-
-      - name: "Docker meta"
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKERHUB_REPO }}
-            ${{ env.GHCR_REPO }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: "Create manifest list and push"
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
-
-      - name: "Inspect image"
-        run: |
-          docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}
-          docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }}

.github/workflows/npm-publish-api.yml

@@ -8,8 +8,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci

.github/workflows/npm-publish-ui.yml

@@ -8,8 +8,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v4
         with:

.github/workflows/phpunit.yml

@@ -20,15 +20,7 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-      gotenberg:
-        image: gotenberg/gotenberg:8
-        ports:
-          - 3000:3000
-        options: >-
-          --health-cmd "curl --silent --fail http://localhost:3000/health"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v4
@@ -63,7 +55,7 @@ jobs:
         run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.4.2
+        uses: codecov/codecov-action@v4.5.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -10,6 +10,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Check code style"
-        uses: aglipanci/laravel-pint-action@2.5
+        uses: aglipanci/laravel-pint-action@2.4
         with:
           configPath: "pint.json"

.github/workflows/playwright.yml

@@ -27,47 +27,45 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v4
 
-      - name: "Setup node"
-        uses: actions/setup-node@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
-      - name: "Setup PHP"
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.3'
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
           coverage: none
 
-      - name: "Run composer install"
+      - name: Run composer install
         run: composer install -n --prefer-dist
 
-      - name: "Prepare Laravel Application"
+      - name: Prepare Laravel Application
         run: |
           cp .env.ci .env
           php artisan key:generate
-          php artisan passport:keys
           php artisan migrate --seed
+          php artisan passport:keys
 
-      - name: "Install dependencies"
+      - name: Install dependencies
         run: npm ci
 
-      - name: "Build Frontend"
+      - name: Build Frontend
         run: npm run build
 
-      - name: "Run Laravel Server"
+      - name: Run Laravel Server
         run: php artisan serve > /dev/null 2>&1 &
 
-      - name: "Install Playwright Browsers"
+      - name: Install Playwright Browsers
         run: npx playwright install --with-deps
 
-      - name: "Run Playwright tests"
+      - name: Run Playwright tests
         run: npx playwright test
         env:
           PLAYWRIGHT_BASE_URL: 'http://127.0.0.1:8000'
 
-      - name: "Upload test results"
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-results

README.md

@@ -13,7 +13,7 @@ solidtime is a modern open-source time tracking application for Freelancers and
 
  - Time tracking: Track your time with a modern and easy-to-use interface
  - Projects: Create and manage projects and assign project members
- - Tasks: Create and manage tasks and assign tasks to projects
+ - Tasks: Create and manage tasks and assign tasks to project members
  - Clients: Create and manage clients and assign clients to projects
  - Billable rates: Set billable rates for projects, project members, organization members and organizations 
  - Multiple organizations: Create and manage multiple organizations with one account
@@ -28,11 +28,6 @@ We also have an examples repository [here](https://github.com/solidtime-io/self-
 
 If you do not want to self-host solidtime or try it out you can sign up for [solidtime cloud](https://www.solidtime.io/)
 
-## Issues & Feature Requests
-
-If you find any **bugs in solidtime**, please feel free to [**open an issue**](https://github.com/solidtime-io/solidtime/issues/new) in this repository, with instructions on how to reproduce the bug. 
-If you have a **feature request**, please [**create a discussion**](https://github.com/solidtime-io/solidtime/discussions/new?category=feature-requests) in this repository.
-
 ## Contributing
 
 This project is in a very early stage. The structure and APIs are still subject to change and not stable. 
@@ -40,8 +35,6 @@ Therefore, we do not currently accept any contributions, unless you are a member
 
 As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
 
-We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
-
 ## Security
 
 Looking to report a vulnerability? Please refer our [SECURITY.md](./SECURITY.md) file.

app/Actions/Fortify/CreateNewUser.php

@@ -4,14 +4,16 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
+use App\Enums\Role;
 use App\Enums\Weekday;
 use App\Events\NewsletterRegistered;
+use App\Models\Organization;
 use App\Models\User;
 use App\Service\IpLookup\IpLookupServiceContract;
 use App\Service\TimezoneService;
-use App\Service\UserService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
@@ -32,12 +34,6 @@ class CreateNewUser implements CreatesNewUsers
      */
     public function create(array $input): User
     {
-        if (! config('app.enable_registration')) {
-            throw ValidationException::withMessages([
-                'email' => [__('Registration is disabled.')],
-            ]);
-        }
-
         Validator::make($input, [
             'name' => [
                 'required',
@@ -47,9 +43,9 @@ class CreateNewUser implements CreatesNewUsers
             'email' => [
                 'required',
                 'string',
-                'email:rfc,strict',
+                'email',
                 'max:255',
-                UniqueEloquent::make(User::class, 'email', function (Builder $builder): Builder {
+                new UniqueEloquent(User::class, 'email', function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
                 }),
@@ -76,11 +72,6 @@ class CreateNewUser implements CreatesNewUsers
         $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
 
         $startOfWeek = Weekday::Monday;
-        $numberFormat = null;
-        $currencyFormat = null;
-        $dateFormat = null;
-        $intervalFormat = null;
-        $timeFormat = null;
         $currency = null;
         if ($ipLookupResponse !== null) {
             $startOfWeek = $ipLookupResponse->startOfWeek ?? Weekday::Monday;
@@ -90,21 +81,30 @@ class CreateNewUser implements CreatesNewUsers
             $currency = $ipLookupResponse->currency;
         }
         $user = null;
-        DB::transaction(function () use (&$user, $input, $timezone, $startOfWeek, $currency, $numberFormat, $currencyFormat, $dateFormat, $intervalFormat, $timeFormat): void {
-            $userService = app(UserService::class);
-            $user = $userService->createUser(
-                $input['name'],
-                $input['email'],
-                $input['password'],
-                $timezone ?? 'UTC',
-                $startOfWeek,
-                $currency,
-                $numberFormat,
-                $currencyFormat,
-                $dateFormat,
-                $intervalFormat,
-                $timeFormat
+        $organization = null;
+        DB::transaction(function () use (&$user, &$organization, $input, $timezone, $startOfWeek, $currency) {
+            $user = User::create([
+                'name' => $input['name'],
+                'email' => $input['email'],
+                'password' => Hash::make($input['password']),
+                'timezone' => $timezone ?? 'UTC',
+                'week_start' => $startOfWeek,
+            ]);
+
+            $organization = new Organization;
+            $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
+            $organization->personal_team = true;
+            $organization->currency = $currency ?? 'EUR';
+            $organization->owner()->associate($user);
+            $organization->save();
+
+            $organization->users()->attach(
+                $user, [
+                    'role' => Role::Owner->value,
+                ]
             );
+
+            $user->ownedTeams()->save($organization);
         });
 
         $newsletterConsent = isset($input['newsletter_consent']) && (bool) $input['newsletter_consent'];

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -35,7 +35,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
                 'required',
                 'email',
                 'max:255',
-                UniqueEloquent::make(User::class, 'email')->ignore($user->id)->query(function (Builder $query) {
+                (new UniqueEloquent(User::class, 'email'))->ignore($user->id)->query(function (Builder $query) {
                     /** @var Builder<User> $query */
                     return $query->where('is_placeholder', '=', false);
                 }),

app/Actions/Jetstream/AddOrganizationMember.php

@@ -7,16 +7,18 @@ namespace App\Actions\Jetstream;
 use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\MemberService;
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\In;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 use Laravel\Jetstream\Contracts\AddsTeamMembers;
+use Laravel\Jetstream\Events\AddingTeamMember;
+use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class AddOrganizationMember implements AddsTeamMembers
 {
@@ -34,7 +36,15 @@ class AddOrganizationMember implements AddsTeamMembers
             ->where('is_placeholder', '=', false)
             ->firstOrFail();
 
-        app(MemberService::class)->addMember($newOrganizationMember, $organization, Role::from($role));
+        AddingTeamMember::dispatch($organization, $newOrganizationMember);
+
+        DB::transaction(function () use ($organization, $newOrganizationMember, $role) {
+            $organization->users()->attach(
+                $newOrganizationMember, ['role' => $role]
+            );
+        });
+
+        TeamMemberAdded::dispatch($organization, $newOrganizationMember);
     }
 
     /**
@@ -61,10 +71,10 @@ class AddOrganizationMember implements AddsTeamMembers
             'email' => [
                 'required',
                 'email',
-                ExistsEloquent::make(User::class, 'email', function (Builder $builder) {
+                (new ExistsEloquent(User::class, 'email', function (Builder $builder) {
                     /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
-                })->withMessage(__('We were unable to find a registered user with this email address.')),
+                }))->withMessage(__('We were unable to find a registered user with this email address.')),
             ],
             'role' => [
                 'required',
@@ -83,7 +93,7 @@ class AddOrganizationMember implements AddsTeamMembers
      */
     protected function ensureUserIsNotAlreadyOnTeam(Organization $team, string $email): Closure
     {
-        return function ($validator) use ($team, $email): void {
+        return function ($validator) use ($team, $email) {
             $validator->errors()->addIf(
                 $team->hasRealUserWithEmail($email),
                 'email',

app/Actions/Jetstream/CreateOrganization.php

@@ -4,11 +4,10 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
+use App\Enums\Role;
 use App\Events\AfterCreateOrganization;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\IpLookup\IpLookupServiceContract;
-use App\Service\OrganizationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
@@ -34,18 +33,16 @@ class CreateOrganization implements CreatesTeams
             'name' => ['required', 'string', 'max:255'],
         ])->validateWithBag('createTeam');
 
-        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
+        $organization = new Organization;
+        $organization->name = $input['name'];
+        $organization->personal_team = false;
+        $organization->owner()->associate($user);
+        $organization->save();
 
-        $currency = null;
-        if ($ipLookupResponse !== null) {
-            $currency = $ipLookupResponse->currency;
-        }
-
-        $organization = app(OrganizationService::class)->createOrganization(
-            $input['name'],
-            $user,
-            false,
-            $currency
+        $organization->users()->attach(
+            $user, [
+                'role' => Role::Owner->value,
+            ]
         );
 
         $user->switchTeam($organization);

app/Console/Commands/Admin/UserCreateCommand.php

@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\Admin;
-
-use App\Enums\Weekday;
-use App\Models\Organization;
-use App\Models\User;
-use App\Service\UserService;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use LogicException;
-
-class UserCreateCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'admin:user:create
-                { name : The name of the user }
-                { email : The email of the user }
-                { --ask-for-password : Ask for the password, otherwise the command will generate a random one }
-                { --verify-email : Verify the email address of the user }';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create a new user';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $name = $this->argument('name');
-        $email = $this->argument('email');
-        $askForPassword = (bool) $this->option('ask-for-password');
-        $verifyEmail = (bool) $this->option('verify-email');
-
-        if (User::query()->where('email', $email)->where('is_placeholder', '=', false)->exists()) {
-            $this->error('User with email "'.$email.'" already exists.');
-
-            return self::FAILURE;
-        }
-
-        if ($askForPassword) {
-            $outputPassword = false;
-            $password = $this->secret('Enter the password');
-        } else {
-            $outputPassword = true;
-            $password = bin2hex(random_bytes(16));
-        }
-
-        $user = null;
-        DB::transaction(function () use (&$user, $name, $email, $password, $verifyEmail): void {
-            $user = app(UserService::class)->createUser(
-                $name,
-                $email,
-                $password,
-                'UTC',
-                Weekday::Monday,
-                null,
-                verifyEmail: $verifyEmail
-            );
-        });
-        /** @var Organization|null $organization */
-        $organization = $user->ownedTeams->first();
-        if ($organization === null) {
-            throw new LogicException('User does not have an organization');
-        }
-
-        $this->info('Created user "'.$name.'" ("'.$email.'")');
-        $this->line('ID: '.$user->getKey());
-        $this->line('Name: '.$name);
-        $this->line('Email: '.$email);
-        if ($outputPassword) {
-            $this->line('Password: '.$password);
-        }
-        $this->line('Timezone: '.$user->timezone);
-        $this->line('Week start: '.$user->week_start->value);
-
-        // Organization
-        $this->line('Currency: '.$organization->currency);
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/Admin/UserVerifyCommand.php

@@ -35,9 +35,7 @@ class UserVerifyCommand extends Command
         $this->info('Start verifying user with email "'.$email.'"');
 
         /** @var User|null $user */
-        $user = User::query()->where('email', $email)
-            ->where('is_placeholder', '=', false)
-            ->first();
+        $user = User::where('email', $email)->first();
 
         if ($user === null) {
             $this->error('User with email "'.$email.'" not found.');

app/Console/Commands/Correction/CorrectionPlaceholderMembersCommand.php

@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\Correction;
-
-use App\Enums\Role;
-use App\Models\Member;
-use App\Models\User;
-use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Builder;
-
-class CorrectionPlaceholderMembersCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'correction:placeholder-members '.
-        ' { --dry-run : Do not actually save anything to the database, just output what would happen }';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Sets all members who belong to a placeholder user to role placeholder';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $this->comment('Sets all members who belong to a placeholder user to role placeholder...');
-        $dryRun = (bool) $this->option('dry-run');
-        if ($dryRun) {
-            $this->comment('Running in dry-run mode. Nothing will be saved to the database.');
-        }
-
-        $members = Member::query()
-            ->where('role', '!=', Role::Placeholder->value)
-            ->whereHas('user', function (Builder $builder): void {
-                /** @var Builder<User> $builder */
-                $builder->where('is_placeholder', '=', true);
-            })
-            ->get();
-        foreach ($members as $member) {
-            /** @var Member $member */
-            $member->role = Role::Placeholder->value;
-            if (! $dryRun) {
-                $member->save();
-            }
-            $this->line('Set role of member (id='.$member->getKey().') to placeholder');
-        }
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/Report/ReportSetExpiredToPrivateCommand.php

@@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\Report;
-
-use App\Models\Report;
-use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Carbon;
-use LogicException;
-
-class ReportSetExpiredToPrivateCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'report:set-expired-to-private '.
-        ' { --dry-run : Do not actually save anything to the database, just output what would happen }';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Makes public reports private if the public_until date has passed.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $this->comment('Makes public reports private if the public_until date has passed...');
-        $dryRun = (bool) $this->option('dry-run');
-        if ($dryRun) {
-            $this->comment('Running in dry-run mode. Nothing will be saved to the database.');
-        }
-
-        $resetReports = 0;
-        Report::query()
-            ->where('public_until', '<', Carbon::now())
-            ->orderBy('created_at', 'asc')
-            ->chunk(500, function (Collection $reports) use ($dryRun, &$resetReports): void {
-                /** @var Collection<int, Report> $reports */
-                foreach ($reports as $report) {
-                    $publicUntil = $report->public_until;
-                    if ($publicUntil === null) {
-                        throw new LogicException('public_until should not be null');
-                    }
-                    $this->info('Make report "'.$report->name.'" ('.$report->getKey().') private, expired: '.
-                        $publicUntil->toIso8601ZuluString().' ('.$publicUntil->diffForHumans().')');
-                    $resetReports++;
-                    if (! $dryRun) {
-                        $report->is_public = false;
-                        $report->share_secret = null;
-                        $report->save();
-                    }
-                }
-            });
-
-        $this->comment('Finished setting '.$resetReports.' expired reports to private...');
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/SelfHost/SelfHostCheckForUpdateCommand.php

@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\SelfHost;
-
-use App\Service\ApiService;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
-
-class SelfHostCheckForUpdateCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'self-host:check-for-update';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $apiService = app(ApiService::class);
-
-        $latestVersion = $apiService->checkForUpdate();
-        if ($latestVersion === null) {
-            $this->error('Failed to check for update, check the logs for more information.');
-
-            return self::FAILURE;
-        }
-
-        // Note: Cache for 13 hours, because the command runs twice daily (every 12 hours).
-        Cache::put('latest_version', $latestVersion, 60 * 60 * 12);
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/SelfHost/SelfHostGenerateKeysCommand.php

@@ -18,7 +18,6 @@ class SelfHostGenerateKeysCommand extends Command
      */
     protected $signature = 'self-host:generate-keys
                 { --length=4096 : The length of the passport private key }
-                { --multi-line : Whether to output the keys in multiple lines }
                 { --format=env : The format of the output (env, yaml) }';
 
     /**
@@ -35,7 +34,6 @@ class SelfHostGenerateKeysCommand extends Command
     {
         $format = $this->option('format');
         $key = RSA::createKey((int) $this->option('length'));
-        $multiLine = (bool) $this->option('multi-line');
 
         $publicKey = (string) $key->getPublicKey();
         $privateKey = (string) $key;
@@ -43,17 +41,12 @@ class SelfHostGenerateKeysCommand extends Command
 
         if ($format === 'env') {
             $this->line('APP_KEY="'.$appKey.'"');
-            if ($multiLine) {
-                $this->line('PASSPORT_PRIVATE_KEY="'.Str::replace("\r\n", "\n", $privateKey).'"');
-                $this->line('PASSPORT_PUBLIC_KEY="'.Str::replace("\r\n", "\n", $publicKey).'"');
-            } else {
-                $this->line('PASSPORT_PRIVATE_KEY="'.Str::replace("\r\n", '\n', $privateKey).'"');
-                $this->line('PASSPORT_PUBLIC_KEY="'.Str::replace("\r\n", '\n', $publicKey).'"');
-            }
+            $this->line('PASSPORT_PRIVATE_KEY="'.$privateKey.'"');
+            $this->line('PASSPORT_PUBLIC_KEY="'.$publicKey.'"');
         } elseif ($format === 'yaml') {
             $this->line('APP_KEY: "'.$appKey.'"');
-            $this->line("PASSPORT_PRIVATE_KEY: |\n  ".Str::replace("\r\n", "\n  ", $privateKey));
-            $this->line("PASSPORT_PUBLIC_KEY: |\n  ".Str::replace("\r\n", "\n  ", $publicKey));
+            $this->line("PASSPORT_PRIVATE_KEY: |\n  ".Str::replace("\n", "\n  ", $privateKey));
+            $this->line("PASSPORT_PUBLIC_KEY: |\n  ".Str::replace("\n", "\n  ", $publicKey));
         } else {
             $this->error('Invalid format');
 

app/Console/Commands/SelfHost/SelfHostTelemetryCommand.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands\SelfHost;
-
-use App\Service\ApiService;
-use Illuminate\Console\Command;
-
-class SelfHostTelemetryCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'self-host:telemetry';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        $apiService = app(ApiService::class);
-
-        $success = $apiService->telemetry();
-
-        if (! $success) {
-            $this->error('Failed to send telemetry data, check the logs for more information.');
-
-            return self::FAILURE;
-
-        }
-
-        return self::SUCCESS;
-    }
-}

app/Console/Commands/TimeEntry/TimeEntrySendStillRunningMailsCommand.php

@@ -54,7 +54,7 @@ class TimeEntrySendStillRunningMailsCommand extends Command
                 $query->where('is_placeholder', '=', false);
             })
             ->orderBy('created_at', 'asc')
-            ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails): void {
+            ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails) {
                 /** @var Collection<int, TimeEntry> $timeEntries */
                 foreach ($timeEntries as $timeEntry) {
                     $user = $timeEntry->user;

app/Console/Kernel.php

@@ -17,14 +17,6 @@ class Kernel extends ConsoleKernel
         $schedule->command('time-entry:send-still-running-mails')
             ->when(fn (): bool => config('scheduling.tasks.time_entry_send_still_running_mails'))
             ->everyTenMinutes();
-
-        $schedule->command('self-host:check-for-update')
-            ->when(fn (): bool => config('scheduling.tasks.self_hosting_check_for_update'))
-            ->twiceDaily();
-
-        $schedule->command('self-host:telemetry')
-            ->when(fn (): bool => config('scheduling.tasks.self_hosting_telemetry'))
-            ->twiceDaily();
     }
 
     /**

app/Enums/CurrencyFormat.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum CurrencyFormat: string
-{
-    use LaravelEnumHelper;
-
-    case ISOCodeBeforeWithSpace = 'iso-code-before-with-space';
-    case ISOCodeAfterWithSpace = 'iso-code-after-with-space';
-
-    case SymbolBefore = 'symbol-before';
-
-    case SymbolAfter = 'symbol-after';
-
-    case SymbolBeforeWithSpace = 'symbol-before-with-space';
-
-    case SymbolAfterWithSpace = 'symbol-after-with-space';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.currency_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/DateFormat.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum DateFormat: string
-{
-    use LaravelEnumHelper;
-
-    case PointSeparatedDMYYYY = 'point-separated-d-m-yyyy';
-    case SlashSeparatedMMDDYYYY = 'slash-separated-mm-dd-yyyy';
-
-    case SlashSeparatedDDMMYYYY = 'slash-separated-dd-mm-yyyy';
-
-    case HyphenSeparatedDDMMYYY = 'hyphen-separated-dd-mm-yyyy';
-
-    case HyphenSeparatedMMDDDYYYY = 'hyphen-separated-mm-dd-yyyy';
-
-    case HyphenSeparatedYYYYMMDD = 'hyphen-separated-yyyy-mm-dd';
-
-    public function toCarbonFormat(): string
-    {
-        return match ($this->value) {
-            self::PointSeparatedDMYYYY->value => 'j.n.Y',
-            self::SlashSeparatedMMDDYYYY->value => 'm/d/Y',
-            self::SlashSeparatedDDMMYYYY->value => 'd/m/Y',
-            self::HyphenSeparatedDDMMYYY->value => 'd-m-Y',
-            self::HyphenSeparatedMMDDDYYYY->value => 'm-d-Y',
-            self::HyphenSeparatedYYYYMMDD->value => 'Y-m-d',
-        };
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.date_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/ExportFormat.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Maatwebsite\Excel\Excel;
-
-enum ExportFormat: string
-{
-    case CSV = 'csv';
-    case PDF = 'pdf';
-    case XLSX = 'xlsx';
-    case ODS = 'ods';
-
-    public function getFileExtension(): string
-    {
-        return match ($this) {
-            self::CSV => 'csv',
-            self::PDF => 'pdf',
-            self::XLSX => 'xlsx',
-            self::ODS => 'ods',
-        };
-    }
-
-    public function getExportPackageType(): string
-    {
-        return match ($this) {
-            self::CSV => Excel::CSV,
-            self::PDF => Excel::MPDF,
-            self::XLSX => Excel::XLSX,
-            self::ODS => Excel::ODS,
-        };
-    }
-}

app/Enums/IntervalFormat.php

@@ -1,32 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum IntervalFormat: string
-{
-    use LaravelEnumHelper;
-
-    case Decimal = 'decimal';
-    case HoursMinutes = 'hours-minutes';
-
-    case HoursMinutesColonSeparated = 'hours-minutes-colon-separated';
-
-    case HoursMinutesSecondsColonSeparated = 'hours-minutes-seconds-colon-separated';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.interval_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/NumberFormat.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-/**
- * @info https://en.wikipedia.org/wiki/Decimal_separator
- */
-enum NumberFormat: string
-{
-    use LaravelEnumHelper;
-
-    case ThousandsPointDecimalComma = 'point-comma';
-
-    case ThousandsCommaDecimalPoint = 'comma-point';
-    case ThousandsSpaceDecimalComma = 'space-comma';
-
-    case ThousandsSpaceDecimalPoint = 'space-point';
-
-    case ThousandsApostropheDecimalPoint = 'apostrophe-point';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.number_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/TimeEntryAggregationType.php

@@ -4,12 +4,8 @@ declare(strict_types=1);
 
 namespace App\Enums;
 
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
 enum TimeEntryAggregationType: string
 {
-    use LaravelEnumHelper;
-
     case Day = 'day';
     case Week = 'week';
     case Month = 'month';
@@ -21,16 +17,6 @@ enum TimeEntryAggregationType: string
     case Billable = 'billable';
     case Description = 'description';
 
-    public static function fromInterval(TimeEntryAggregationTypeInterval $timeEntryAggregationTypeInterval): TimeEntryAggregationType
-    {
-        return match ($timeEntryAggregationTypeInterval) {
-            TimeEntryAggregationTypeInterval::Day => TimeEntryAggregationType::Day,
-            TimeEntryAggregationTypeInterval::Week => TimeEntryAggregationType::Week,
-            TimeEntryAggregationTypeInterval::Month => TimeEntryAggregationType::Month,
-            TimeEntryAggregationTypeInterval::Year => TimeEntryAggregationType::Year,
-        };
-    }
-
     public function toInterval(): ?TimeEntryAggregationTypeInterval
     {
         return match ($this) {

app/Enums/TimeFormat.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum TimeFormat: string
-{
-    use LaravelEnumHelper;
-
-    case TwelveHours = '12-hours';
-    case TwentyFourHours = '24-hours';
-
-    /**
-     * @return array<string, string>
-     */
-    public static function toSelectArray(): array
-    {
-        $selectArray = [];
-        foreach (self::values() as $value) {
-            $selectArray[(string) $value] = (string) __('enum.time_format.'.$value);
-        }
-
-        return $selectArray;
-    }
-}

app/Enums/Weekday.php

@@ -4,13 +4,10 @@ declare(strict_types=1);
 
 namespace App\Enums;
 
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
 use Illuminate\Support\Carbon;
 
 enum Weekday: string
 {
-    use LaravelEnumHelper;
-
     case Monday = 'monday';
     case Tuesday = 'tuesday';
     case Wednesday = 'wednesday';

app/Exceptions/Api/ChangingRoleOfPlaceholderIsNotAllowed.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class ChangingRoleOfPlaceholderIsNotAllowed extends ApiException
-{
-    public const string KEY = 'changing_role_of_placeholder_is_not_allowed';
-}

app/Exceptions/Api/FeatureIsNotAvailableInFreePlanApiException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class FeatureIsNotAvailableInFreePlanApiException extends ApiException
-{
-    public const string KEY = 'feature_is_not_available_in_free_plan';
-}

app/Exceptions/Api/OnlyPlaceholdersCanBeMergedIntoAnotherMember.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class OnlyPlaceholdersCanBeMergedIntoAnotherMember extends ApiException
-{
-    public const string KEY = 'only_placeholders_can_be_merged_into_another_member';
-}

app/Exceptions/Api/PdfRendererIsNotConfiguredException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class PdfRendererIsNotConfiguredException extends ApiException
-{
-    public const string KEY = 'pdf_renderer_is_not_configured';
-}

app/Exceptions/Api/PersonalAccessClientIsNotConfiguredException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class PersonalAccessClientIsNotConfiguredException extends ApiException
-{
-    public const string KEY = 'personal_access_client_is_not_configured';
-}

app/Exceptions/Api/ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException extends ApiException
-{
-    public const string KEY = 'this_placeholder_can_not_be_invited_use_the_merge_tool_instead_api_exception';
-}

app/Exceptions/Handler.php

@@ -27,7 +27,7 @@ class Handler extends ExceptionHandler
      */
     public function register(): void
     {
-        $this->reportable(function (Throwable $e): void {
+        $this->reportable(function (Throwable $e) {
             //
         });
     }

app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Extensions\Scramble;
 
 use App\Http\Resources\PaginatedResourceCollection;
-use App\Http\Resources\V1\TimeEntry\TimeEntryCollection;
 use Dedoc\Scramble\Extensions\TypeToSchemaExtension;
 use Dedoc\Scramble\Support\Generator\Response;
 use Dedoc\Scramble\Support\Generator\Schema;
@@ -45,49 +44,39 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
             return null;
         }
 
-        $newType = new OpenApiObjectType;
-        $newType->addProperty('data', (new ArrayType)->setItems($collectingType));
-        if ($type instanceof ObjectType && $type->isInstanceOf(TimeEntryCollection::class)) {
-            $newType->addProperty(
-                'meta',
-                (new OpenApiObjectType)
-                    ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
-                    ->setRequired(['total'])
-            );
-            $newType->setRequired(['data', 'meta']);
-        } else {
-            $newType->addProperty(
-                'links',
-                (new OpenApiObjectType)
-                    ->addProperty('first', (new StringType)->nullable(true))
-                    ->addProperty('last', (new StringType)->nullable(true))
-                    ->addProperty('prev', (new StringType)->nullable(true))
-                    ->addProperty('next', (new StringType)->nullable(true))
-                    ->setRequired(['first', 'last', 'prev', 'next'])
-            );
-            $newType->addProperty(
-                'meta',
-                (new OpenApiObjectType)
-                    ->addProperty('current_page', new IntegerType)
-                    ->addProperty('from', (new IntegerType)->nullable(true))
-                    ->addProperty('last_page', new IntegerType)
-                    ->addProperty('links', (new ArrayType)->setItems(
-                        (new OpenApiObjectType)
-                            ->addProperty('url', (new StringType)->nullable(true))
-                            ->addProperty('label', new StringType)
-                            ->addProperty('active', new BooleanType)
-                            ->setRequired(['url', 'label', 'active'])
-                    )->setDescription('Generated paginator links.'))
-                    ->addProperty('path', (new StringType)->nullable(true)->setDescription('Base path for paginator generated URLs.'))
-                    ->addProperty('per_page', (new IntegerType)->setDescription('Number of items shown per page.'))
-                    ->addProperty('to', (new IntegerType)->nullable(true)->setDescription('Number of the last item in the slice.'))
-                    ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
-                    ->setRequired(['current_page', 'from', 'last_page', 'links', 'path', 'per_page', 'to', 'total'])
-            );
-            $newType->setRequired(['data', 'links', 'meta']);
-        }
+        $type = new OpenApiObjectType;
+        $type->addProperty('data', (new ArrayType)->setItems($collectingType));
+        $type->addProperty(
+            'links',
+            (new OpenApiObjectType)
+                ->addProperty('first', (new StringType)->nullable(true))
+                ->addProperty('last', (new StringType)->nullable(true))
+                ->addProperty('prev', (new StringType)->nullable(true))
+                ->addProperty('next', (new StringType)->nullable(true))
+                ->setRequired(['first', 'last', 'prev', 'next'])
+        );
+        $type->addProperty(
+            'meta',
+            (new OpenApiObjectType)
+                ->addProperty('current_page', new IntegerType)
+                ->addProperty('from', (new IntegerType)->nullable(true))
+                ->addProperty('last_page', new IntegerType)
+                ->addProperty('links', (new ArrayType)->setItems(
+                    (new OpenApiObjectType)
+                        ->addProperty('url', (new StringType)->nullable(true))
+                        ->addProperty('label', new StringType)
+                        ->addProperty('active', new BooleanType)
+                        ->setRequired(['url', 'label', 'active'])
+                )->setDescription('Generated paginator links.'))
+                ->addProperty('path', (new StringType)->nullable(true)->setDescription('Base path for paginator generated URLs.'))
+                ->addProperty('per_page', (new IntegerType)->setDescription('Number of items shown per page.'))
+                ->addProperty('to', (new IntegerType)->nullable(true)->setDescription('Number of the last item in the slice.'))
+                ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
+                ->setRequired(['current_page', 'from', 'last_page', 'links', 'path', 'per_page', 'to', 'total'])
+        );
+        $type->setRequired(['data', 'links', 'meta']);
 
-        return $newType;
+        return $type;
     }
 
     /**

app/Filament/Resources/AuditResource.php

@@ -13,7 +13,7 @@ use Filament\Tables;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Str;
-use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
 
 class AuditResource extends Resource
 {
@@ -38,8 +38,8 @@ class AuditResource extends Resource
                     ->maxLength(255),
                 Forms\Components\TextInput::make('auditable_id')
                     ->required(),
-                PrettyJsonField::make('old_values'),
-                PrettyJsonField::make('new_values'),
+                PrettyJson::make('old_values'),
+                PrettyJson::make('new_values'),
                 Forms\Components\Textarea::make('url'),
                 Forms\Components\TextInput::make('ip_address'),
                 Forms\Components\TextInput::make('user_agent')

app/Filament/Resources/ClientResource.php

@@ -60,13 +60,8 @@ class ClientResource extends Resource
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),

app/Filament/Resources/ClientResource/Pages/EditClient.php

@@ -15,8 +15,7 @@ class EditClient extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/ClientResource/Pages/ListClients.php

@@ -15,8 +15,7 @@ class ListClients extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/FailedJobResource.php

@@ -20,7 +20,7 @@ use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
-use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
 
 /**
  * @source https://gitlab.com/amvisor/filament-failed-jobs
@@ -50,7 +50,7 @@ class FailedJobResource extends Resource
 
                 // make text a little bit smaller because often a complete Stack Trace is shown:
                 TextArea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
-                PrettyJsonField::make('payload')->disabled()->columnSpan(4),
+                PrettyJson::make('payload')->disabled()->columnSpan(4),
             ])->columns(4);
     }
 

app/Filament/Resources/OrganizationInvitationResource.php

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Enums\Role;
-use App\Filament\Resources\OrganizationInvitationResource\Pages;
-use App\Models\OrganizationInvitation;
-use App\Service\OrganizationInvitationService;
-use Filament\Forms;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Support\Collection;
-
-class OrganizationInvitationResource extends Resource
-{
-    protected static ?string $model = OrganizationInvitation::class;
-
-    protected static ?string $label = 'Invitations';
-
-    protected static ?string $navigationIcon = 'heroicon-o-user-plus';
-
-    protected static ?string $navigationGroup = 'Users';
-
-    protected static ?int $navigationSort = 9;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('email')
-                    ->label('Email')
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Select::make('role')
-                    ->options(Role::class),
-                Forms\Components\Select::make('organization_id')
-                    ->label('Organization')
-                    ->relationship(name: 'organization', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('organization.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('email')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('role'),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label('Created At')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->label('Updated At')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                //
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\BulkAction::make('resend')
-                        ->label('Resend')
-                        ->action(function (Collection $records): void {
-                            foreach ($records as $organizationInvite) {
-                                app(OrganizationInvitationService::class)->resend($organizationInvite);
-                            }
-                        }),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListOrganizationInvitations::route('/'),
-            'edit' => Pages\EditOrganizationInvitation::route('/{record}/edit'),
-            'view' => Pages\ViewOrganizationInvitation::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/OrganizationInvitationResource/Pages/EditOrganizationInvitation.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
-
-use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditOrganizationInvitation extends EditRecord
-{
-    protected static string $resource = OrganizationInvitationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
-        ];
-    }
-}

app/Filament/Resources/OrganizationInvitationResource/Pages/ListOrganizationInvitations.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
-
-use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListOrganizationInvitations extends ListRecords
-{
-    protected static string $resource = OrganizationInvitationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/OrganizationInvitationResource/Pages/ViewOrganizationInvitation.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
-
-use App\Filament\Resources\OrganizationInvitationResource;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewOrganizationInvitation extends ViewRecord
-{
-    protected static string $resource = OrganizationInvitationResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            EditAction::make('edit')
-                ->icon('heroicon-s-pencil'),
-        ];
-    }
-}

app/Filament/Resources/OrganizationResource.php

@@ -4,16 +4,9 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources;
 
-use App\Enums\CurrencyFormat;
-use App\Enums\DateFormat;
-use App\Enums\IntervalFormat;
-use App\Enums\NumberFormat;
-use App\Enums\TimeFormat;
 use App\Filament\Resources\OrganizationResource\Pages;
-use App\Filament\Resources\OrganizationResource\RelationManagers\InvitationsRelationManager;
 use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
 use App\Models\Organization;
-use App\Service\DeletionService;
 use App\Service\Export\ExportService;
 use App\Service\Import\Importers\ImporterProvider;
 use App\Service\Import\Importers\ImportException;
@@ -53,28 +46,10 @@ class OrganizationResource extends Resource
                     ->maxLength(255),
                 Forms\Components\Toggle::make('personal_team')
                     ->label('Is personal?')
-                    ->hiddenOn(['create'])
                     ->required(),
                 Forms\Components\Select::make('user_id')
-                    ->label('Owner')
                     ->relationship(name: 'owner', titleAttribute: 'email')
                     ->searchable(['name', 'email'])
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Select::make('date_format')
-                    ->options(DateFormat::toSelectArray())
-                    ->required(),
-                Select::make('currency_format')
-                    ->options(CurrencyFormat::toSelectArray())
-                    ->required(),
-                Select::make('interval_format')
-                    ->options(IntervalFormat::toSelectArray())
-                    ->required(),
-                Select::make('number_format')
-                    ->options(NumberFormat::toSelectArray())
-                    ->required(),
-                Select::make('time_format')
-                    ->options(TimeFormat::toSelectArray())
                     ->required(),
                 Forms\Components\Select::make('currency')
                     ->label('Currency')
@@ -87,7 +62,6 @@ class OrganizationResource extends Resource
 
                         return $select;
                     })
-                    ->required()
                     ->searchable(),
                 Forms\Components\TextInput::make('billable_rate')
                     ->label('Billable rate (in Cents)')
@@ -96,16 +70,13 @@ class OrganizationResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
                 Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
             ]);
     }
@@ -125,7 +96,7 @@ class OrganizationResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('currency'),
                 TextColumn::make('billable_rate')
-                    ->money(fn (Organization $resource) => $resource->currency, divideBy: 100),
+                    ->money(fn (Organization $resource) => $resource->currency ?? 'EUR', divideBy: 100),
                 Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
@@ -140,10 +111,6 @@ class OrganizationResource extends Resource
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make()
-                    ->using(function (Organization $record): void {
-                        app(DeletionService::class)->deleteOrganization($record);
-                    }),
                 Action::make('Export')
                     ->icon('heroicon-o-arrow-down-tray')
                     ->action(function (Organization $record) {
@@ -155,7 +122,7 @@ class OrganizationResource extends Resource
                                 ->persistent()
                                 ->send();
 
-                            return response()->streamDownload(function () use ($file): void {
+                            return response()->streamDownload(function () use ($file) {
                                 echo Storage::disk(config('filesystems.private'))->get($file);
                             }, 'export.zip');
                         } catch (\Exception $exception) {
@@ -170,7 +137,7 @@ class OrganizationResource extends Resource
                     }),
                 Action::make('Import')
                     ->icon('heroicon-o-inbox-arrow-down')
-                    ->action(function (Organization $record, array $data): void {
+                    ->action(function (Organization $record, array $data) {
                         try {
                             $file = Storage::disk(config('filament.default_filesystem_disk'))->get($data['file']);
                             if ($file === null) {
@@ -231,6 +198,8 @@ class OrganizationResource extends Resource
                     ]),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                ]),
             ]);
     }
 
@@ -238,7 +207,6 @@ class OrganizationResource extends Resource
     {
         return [
             UsersRelationManager::class,
-            InvitationsRelationManager::class,
         ];
     }
 

app/Filament/Resources/OrganizationResource/Actions/DeleteOrganization.php

@@ -15,6 +15,7 @@ class DeleteOrganization extends DeleteAction
     protected function setUp(): void
     {
         parent::setUp();
+        // TODO: check why setting the icon is necessary
         $this->icon('heroicon-m-trash');
         $this->action(function (): void {
             $result = $this->process(function (Organization $record): bool {

app/Filament/Resources/OrganizationResource/Pages/CreateOrganization.php

@@ -4,33 +4,10 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\OrganizationResource\Pages;
 
-use App\Enums\Role;
 use App\Filament\Resources\OrganizationResource;
-use App\Models\Organization;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateOrganization extends CreateRecord
 {
     protected static string $resource = OrganizationResource::class;
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['personal_team'] = false;
-
-        return $data;
-    }
-
-    protected function afterCreate(): void
-    {
-        /** @var Organization $organization */
-        $organization = $this->record;
-
-        $user = $organization->owner;
-
-        $organization->users()->attach(
-            $user, [
-                'role' => Role::Owner->value,
-            ]
-        );
-    }
 }

app/Filament/Resources/OrganizationResource/Pages/ListOrganizations.php

@@ -15,8 +15,7 @@ class ListOrganizations extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/OrganizationResource/RelationManagers/InvitationsRelationManager.php

@@ -1,86 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\OrganizationResource\RelationManagers;
-
-use App\Enums\Role;
-use App\Filament\Resources\OrganizationInvitationResource;
-use App\Models\Organization;
-use App\Models\OrganizationInvitation;
-use App\Service\InvitationService;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables;
-use Filament\Tables\Actions\Action;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Validation\Rule;
-
-class InvitationsRelationManager extends RelationManager
-{
-    protected static string $relationship = 'teamInvitations';
-
-    protected static ?string $title = 'Invitations';
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                TextInput::make('email')
-                    ->label('Email')
-                    ->disabledOn(['edit'])
-                    ->required(),
-                Select::make('role')
-                    ->options(Role::class)
-                    ->label('Role')
-                    ->rules([
-                        'required',
-                        'string',
-                        Rule::enum(Role::class)
-                            ->except([Role::Owner, Role::Placeholder]),
-                    ])
-                    ->required(),
-            ]);
-    }
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordTitleAttribute('email')
-            ->modelLabel('Invitation')
-            ->pluralModelLabel('Invitations')
-            ->columns([
-                Tables\Columns\TextColumn::make('email'),
-                Tables\Columns\TextColumn::make('role'),
-            ])
-            ->headerActions([
-                Tables\Actions\CreateAction::make()
-                    ->icon('heroicon-s-plus')
-                    ->using(function (array $data, string $model): Model {
-                        /** @var Organization $ownerRecord */
-                        $ownerRecord = $this->getOwnerRecord();
-
-                        return app(InvitationService::class)
-                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']));
-                    }),
-            ])
-            ->actions([
-                Action::make('view')
-                    ->icon('heroicon-o-eye')
-                    ->color('gray')
-                    ->url(fn (OrganizationInvitation $record): string => OrganizationInvitationResource::getUrl('view', [
-                        'record' => $record->getKey(),
-                    ])),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DetachBulkAction::make(),
-                ]),
-            ]);
-    }
-}

app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php

@@ -5,24 +5,17 @@ declare(strict_types=1);
 namespace App\Filament\Resources\OrganizationResource\RelationManagers;
 
 use App\Enums\Role;
-use App\Exceptions\Api\ApiException;
 use App\Filament\Resources\UserResource;
-use App\Models\Member;
-use App\Models\Organization;
 use App\Models\User;
-use App\Service\BillableRateService;
-use App\Service\MemberService;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\AttachAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Validation\Rule;
 
 class UsersRelationManager extends RelationManager
 {
@@ -43,40 +36,20 @@ class UsersRelationManager extends RelationManager
 
     public function table(Table $table): Table
     {
-        /** @var Organization $organization */
-        $organization = $this->getOwnerRecord();
-
         return $table
             ->recordTitleAttribute('name')
             ->columns([
                 Tables\Columns\TextColumn::make('name'),
                 Tables\Columns\TextColumn::make('role'),
                 TextColumn::make('billable_rate')
-                    ->money($organization->currency, divideBy: 100),
+                    ->money($this->getOwnerRecord()->currency ?? 'EUR', divideBy: 100),
             ])
             ->headerActions([
-                Tables\Actions\AttachAction::make()
-                    ->recordTitle(fn (User $record): string => "{$record->name} ({$record->email})")
-                    ->form(fn (AttachAction $action): array => [
-                        $action->getRecordSelect(),
-                        Select::make('role')
-                            ->required()
-                            ->options(Role::class)
-                            ->rule([
-                                'required',
-                                'string',
-                                Rule::enum(Role::class)
-                                    ->except([Role::Owner, Role::Placeholder]),
-                            ]),
-                    ])
-                    ->label('Add user')
-                    ->modalHeading('Add user')
-                    ->icon('heroicon-s-plus')
-                    ->using(function (User $record, array $data): void {
-                        /** @var Organization $organization */
-                        $organization = $this->getOwnerRecord();
-                        app(MemberService::class)->addMember($record, $organization, Role::from($data['role']), true);
-                    }),
+                Tables\Actions\AttachAction::make()->form(fn (AttachAction $action): array => [
+                    $action->getRecordSelect(),
+                    Select::make('role')
+                        ->options(Role::class),
+                ]),
             ])
             ->actions([
                 Action::make('view')
@@ -85,55 +58,13 @@ class UsersRelationManager extends RelationManager
                     ->url(fn (User $record): string => UserResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                Tables\Actions\EditAction::make()
-                    ->using(function (User $record, array $data): User {
-                        /** @var Organization $organization */
-                        $organization = $this->getOwnerRecord();
-                        /** @var Member $member */
-                        $member = $record->getRelation('membership');
-
-                        if ($data['billable_rate'] !== $member->billable_rate) {
-                            $member->billable_rate = $data['billable_rate'];
-                            app(BillableRateService::class)->updateTimeEntriesBillableRateForMember($member);
-                        }
-
-                        if ($data['role'] !== $member->role) {
-                            try {
-                                app(MemberService::class)->changeRole($member, $organization, Role::from($data['role']), true);
-                            } catch (ApiException $exception) {
-                                Notification::make()
-                                    ->danger()
-                                    ->title('Update failed')
-                                    ->body($exception->getTranslatedMessage())
-                                    ->persistent()
-                                    ->send();
-                            }
-                        }
-                        $member->save();
-
-                        return $record;
-                    }),
-                Tables\Actions\DetachAction::make()
-                    ->using(function (User $record): void {
-                        /** @var Organization $organization */
-                        $organization = $this->getOwnerRecord();
-                        $member = Member::query()
-                            ->whereBelongsTo($record, 'user')
-                            ->whereBelongsTo($organization, 'organization')
-                            ->firstOrFail();
-                        try {
-                            app(MemberService::class)->removeMember($member, $organization);
-                        } catch (ApiException $exception) {
-                            Notification::make()
-                                ->danger()
-                                ->title('Delete failed')
-                                ->body($exception->getTranslatedMessage())
-                                ->persistent()
-                                ->send();
-                        }
-                    }),
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DetachAction::make(),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DetachBulkAction::make(),
+                ]),
             ]);
     }
 }

app/Filament/Resources/ProjectMemberResource.php

@@ -29,7 +29,6 @@ class ProjectMemberResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\Select::make('user_id')

app/Filament/Resources/ProjectMemberResource/Pages/EditProjectMember.php

@@ -15,8 +15,7 @@ class EditProjectMember extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/ProjectMemberResource/Pages/ListProjectMembers.php

@@ -15,8 +15,7 @@ class ListProjectMembers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/ProjectResource.php

@@ -45,7 +45,6 @@ class ProjectResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\Select::make('organization_id')
@@ -72,13 +71,8 @@ class ProjectResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([

app/Filament/Resources/ProjectResource/Pages/EditProject.php

@@ -15,8 +15,7 @@ class EditProject extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/ProjectResource/Pages/ListProjects.php

@@ -15,8 +15,7 @@ class ListProjects extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/ReportResource.php

@@ -1,141 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\ReportResource\Pages;
-use App\Models\Report;
-use App\Service\Dto\ReportPropertiesDto;
-use Filament\Forms;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Toggle;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Actions\Action;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Columns\ToggleColumn;
-use Filament\Tables\Filters\SelectFilter;
-use Filament\Tables\Table;
-use Novadaemon\FilamentPrettyJson\Form\PrettyJsonField;
-
-class ReportResource extends Resource
-{
-    protected static ?string $model = Report::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-document-chart-bar';
-
-    protected static ?string $navigationGroup = 'Timetracking';
-
-    protected static ?int $navigationSort = 7;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('name')
-                    ->label('Name')
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\TextInput::make('description')
-                    ->label('Description')
-                    ->nullable()
-                    ->maxLength(255),
-                Toggle::make('is_public')
-                    ->label('Is public?')
-                    ->required(),
-                DateTimePicker::make('public_until')
-                    ->label('Public until')
-                    ->nullable(),
-                Forms\Components\Select::make('organization_id')
-                    ->label('Organization')
-                    ->relationship(name: 'organization', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabled()
-                    ->required(),
-                Forms\Components\TextInput::make('share_secret')
-                    ->label('Share Secret')
-                    ->nullable(),
-                PrettyJsonField::make('properties')
-                    ->formatStateUsing(function (ReportPropertiesDto $state, Report $record): string {
-                        return $record->getRawOriginal('properties');
-                    })
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->hiddenOn(['create'])
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('description')
-                    ->searchable()
-                    ->sortable(),
-                ToggleColumn::make('is_public')
-                    ->label('Is public?')
-                    ->sortable(),
-                TextColumn::make('organization.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                SelectFilter::make('organization')
-                    ->label('Organization')
-                    ->relationship('organization', 'name')
-                    ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
-            ])
-            ->actions([
-                Action::make('public-view')
-                    ->label('Public')
-                    ->icon('heroicon-o-eye')
-                    ->color('gray')
-                    ->hidden(fn (Report $record): bool => $record->getShareableLink() === null)
-                    ->url(fn (Report $record): string => $record->getShareableLink(), true),
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListReports::route('/'),
-            'edit' => Pages\EditReport::route('/{record}/edit'),
-            'view' => Pages\ViewReport::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/ReportResource/Pages/EditReport.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\ReportResource\Pages;
-
-use App\Filament\Resources\ReportResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditReport extends EditRecord
-{
-    protected static string $resource = ReportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
-        ];
-    }
-}

app/Filament/Resources/ReportResource/Pages/ListReports.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\ReportResource\Pages;
-
-use App\Filament\Resources\ReportResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListReports extends ListRecords
-{
-    protected static string $resource = ReportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/ReportResource/Pages/ViewReport.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\ReportResource\Pages;
-
-use App\Filament\Resources\ReportResource;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewReport extends ViewRecord
-{
-    protected static string $resource = ReportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            EditAction::make('edit')
-                ->icon('heroicon-s-pencil'),
-        ];
-    }
-}

app/Filament/Resources/TagResource.php

@@ -60,13 +60,8 @@ class TagResource extends Resource
             ->defaultSort('created_at', 'desc')
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),

app/Filament/Resources/TagResource/Pages/EditTag.php

@@ -15,8 +15,7 @@ class EditTag extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/TagResource/Pages/ListTags.php

@@ -15,8 +15,7 @@ class ListTags extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TaskResource.php

@@ -61,13 +61,8 @@ class TaskResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([

app/Filament/Resources/TaskResource/Pages/EditTask.php

@@ -15,8 +15,7 @@ class EditTask extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/TaskResource/Pages/ListTasks.php

@@ -15,8 +15,7 @@ class ListTasks extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TimeEntryResource.php

@@ -92,13 +92,8 @@ class TimeEntryResource extends Resource
             ])
             ->filters([
                 SelectFilter::make('organization')
-                    ->label('Organization')
                     ->relationship('organization', 'name')
                     ->searchable(),
-                SelectFilter::make('organization_id')
-                    ->label('Organization ID')
-                    ->relationship('organization', 'id')
-                    ->searchable(),
             ])
             ->defaultSort('created_at', 'desc')
             ->actions([

app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php

@@ -15,8 +15,7 @@ class EditTimeEntry extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->icon('heroicon-m-trash'),
+            Actions\DeleteAction::make(),
         ];
     }
 }

app/Filament/Resources/TimeEntryResource/Pages/ListTimeEntries.php

@@ -15,8 +15,7 @@ class ListTimeEntries extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TokenResource.php

@@ -1,148 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\TokenResource\Pages;
-use App\Models\Passport\Client;
-use App\Models\Passport\Token;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Filters\TernaryFilter;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-
-class TokenResource extends Resource
-{
-    protected static ?string $model = Token::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-key';
-
-    protected static ?string $navigationGroup = 'Auth';
-
-    protected static ?int $navigationSort = 6;
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->columns(1)
-            ->schema([
-                Forms\Components\TextInput::make('id')
-                    ->label('ID')
-                    ->disabled()
-                    ->visibleOn(['update', 'show'])
-                    ->readOnly()
-                    ->maxLength(255),
-                Forms\Components\TextInput::make('name')
-                    ->label('Name')
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\Select::make('user_id')
-                    ->label('User')
-                    ->relationship(name: 'user', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->disabled()
-                    ->required(),
-                Forms\Components\Select::make('client_id')
-                    ->label('Client')
-                    ->relationship(name: 'client', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->required(),
-                Forms\Components\Toggle::make('revoked')
-                    ->label('Revoked')
-                    ->required(),
-                Forms\Components\DateTimePicker::make('expires_at')
-                    ->label('Expires At')
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('created_at')
-                    ->label('Created At')
-                    ->disabled(),
-                Forms\Components\DateTimePicker::make('updated_at')
-                    ->label('Updated At')
-                    ->disabled(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('user.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('client.name')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('client.personal_access_client')
-                    ->boolean()
-                    ->label('API token?')
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('revoked')
-                    ->boolean()
-                    ->label('Revoked?')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('expires_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->defaultSort('created_at', 'desc')
-            ->filters([
-                TernaryFilter::make('is_personal_access_client')
-                    ->queries(
-                        true: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', true);
-                            });
-                        },
-                        false: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query->whereHas('client', function (Builder $query) {
-                                /** @var Builder<Client> $query */
-                                return $query->where('personal_access_client', false);
-                            });
-                        },
-                        blank: function (Builder $query) {
-                            /** @var Builder<Token> $query */
-                            return $query;
-                        },
-                    )
-                    ->label('API token?'),
-                TernaryFilter::make('revoked')
-                    ->label('Revoked?'),
-            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-            ])
-            ->bulkActions([
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListTokens::route('/'),
-            'view' => Pages\ViewToken::route('/{record}'),
-        ];
-    }
-}

app/Filament/Resources/TokenResource/Pages/ListTokens.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\TokenResource\Pages;
-
-use App\Filament\Resources\TokenResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListTokens extends ListRecords
-{
-    protected static string $resource = TokenResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/TokenResource/Pages/ViewToken.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Resources\TokenResource\Pages;
-
-use App\Filament\Resources\TokenResource;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewToken extends ViewRecord
-{
-    protected static string $resource = TokenResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-        ];
-    }
-}

app/Filament/Resources/UserResource.php

@@ -5,27 +5,21 @@ declare(strict_types=1);
 namespace App\Filament\Resources;
 
 use App\Enums\Weekday;
-use App\Exceptions\Api\ApiException;
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers\OrganizationsRelationManager;
 use App\Filament\Resources\UserResource\RelationManagers\OwnedOrganizationsRelationManager;
 use App\Models\User;
-use App\Service\DeletionService;
 use App\Service\TimezoneService;
-use Brick\Money\ISOCurrencyProvider;
 use Exception;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Filters\TernaryFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
 class UserResource extends Resource
@@ -40,9 +34,6 @@ class UserResource extends Resource
 
     public static function form(Form $form): Form
     {
-        /** @var User|null $record */
-        $record = $form->getRecord();
-
         return $form
             ->columns(1)
             ->schema([
@@ -59,25 +50,12 @@ class UserResource extends Resource
                 Forms\Components\TextInput::make('email')
                     ->label('Email')
                     ->required()
-                    ->rules($record?->is_placeholder ? [] : [
-                        UniqueEloquent::make(User::class, 'email')
-                            ->ignore($record?->getKey()),
-                    ])
-                    ->rule([
-                        'email',
-                    ])
                     ->maxLength(255),
                 Forms\Components\Toggle::make('is_placeholder')
-                    ->label('Is Placeholder?')
-                    ->hiddenOn(['create'])
-                    ->disabledOn(['edit']),
+                    ->label('Is Placeholder'),
                 Forms\Components\DateTimePicker::make('email_verified_at')
                     ->label('Email Verified At')
-                    ->hiddenOn(['create'])
                     ->nullable(),
-                Forms\Components\Toggle::make('is_email_verified')
-                    ->label('Email Verified?')
-                    ->visibleOn(['create']),
                 Forms\Components\Select::make('timezone')
                     ->label('Timezone')
                     ->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
@@ -89,39 +67,15 @@ class UserResource extends Resource
                     ->required(),
                 TextInput::make('password')
                     ->password()
-                    ->label('Password')
                     ->dehydrateStateUsing(fn ($state) => Hash::make($state))
                     ->dehydrated(fn ($state) => filled($state))
-                    ->hiddenOn(['create'])
                     ->required(fn (string $context): bool => $context === 'create')
                     ->maxLength(255),
-                TextInput::make('password_create')
-                    ->password()
-                    ->label('Password')
-                    ->visibleOn(['create'])
-                    ->required(fn (string $context): bool => $context === 'create')
-                    ->maxLength(255),
-                Forms\Components\Select::make('currency')
-                    ->label('Currency (Personal Organization)')
-                    ->options(function (): array {
-                        $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
-                        $select = [];
-                        foreach ($currencies as $currency) {
-                            $select[$currency->getCurrencyCode()] = $currency->getName().' ('.$currency->getCurrencyCode().')';
-                        }
-
-                        return $select;
-                    })
-                    ->required()
-                    ->visibleOn(['create'])
-                    ->searchable(),
                 Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
                 Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
-                    ->hiddenOn(['create'])
                     ->disabled(),
             ]);
     }
@@ -191,22 +145,11 @@ class UserResource extends Resource
                     }
                 }),
                 Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make()
-                    ->hidden(fn (User $record) => $record->is(Auth::user()))
-                    ->using(function (User $record): void {
-                        try {
-                            app(DeletionService::class)->deleteUser($record);
-                        } catch (ApiException $exception) {
-                            Notification::make()
-                                ->danger()
-                                ->title('Delete failed')
-                                ->body($exception->getTranslatedMessage())
-                                ->persistent()
-                                ->send();
-                        }
-                    }),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
             ]);
     }
 

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -4,29 +4,24 @@ declare(strict_types=1);
 
 namespace App\Filament\Resources\UserResource\Pages;
 
-use App\Enums\Weekday;
 use App\Filament\Resources\UserResource;
+use App\Models\Organization;
 use App\Models\User;
-use App\Service\UserService;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateUser extends CreateRecord
 {
     protected static string $resource = UserResource::class;
 
-    protected function handleRecordCreation(array $data): User
+    protected function afterCreate(): void
     {
-        $userService = app(UserService::class);
-        $user = $userService->createUser(
-            $data['name'],
-            $data['email'],
-            $data['password_create'],
-            $data['timezone'],
-            Weekday::from($data['week_start']),
-            $data['currency'],
-            verifyEmail: (bool) $data['is_email_verified']
-        );
+        /** @var User $user */
+        $user = $this->record;
 
-        return $user;
+        $user->ownedTeams()->save(Organization::forceCreate([
+            'user_id' => $user->id,
+            'name' => explode(' ', $user->name, 2)[0]."'s Organization",
+            'personal_team' => true,
+        ]));
     }
 }

app/Filament/Resources/UserResource/Pages/ListUsers.php

@@ -15,8 +15,7 @@ class ListUsers extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->icon('heroicon-s-plus'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/UserResource/Pages/ViewUser.php

@@ -7,7 +7,6 @@ namespace App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
-use STS\FilamentImpersonate\Pages\Actions\Impersonate;
 
 class ViewUser extends ViewRecord
 {
@@ -16,7 +15,6 @@ class ViewUser extends ViewRecord
     protected function getHeaderActions(): array
     {
         return [
-            Impersonate::make()->record($this->getRecord()),
             EditAction::make('edit')
                 ->icon('heroicon-s-pencil'),
         ];

app/Filament/Resources/UserResource/RelationManagers/OrganizationsRelationManager.php

@@ -5,18 +5,15 @@ declare(strict_types=1);
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
 use App\Enums\Role;
-use App\Exceptions\Api\ApiException;
 use App\Filament\Resources\OrganizationResource;
-use App\Models\Member;
 use App\Models\Organization;
-use App\Models\User;
-use App\Service\MemberService;
 use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\AttachAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
@@ -30,6 +27,10 @@ class OrganizationsRelationManager extends RelationManager
             ->schema([
                 Select::make('role')
                     ->options(Role::class),
+                TextInput::make('billable_rate')
+                    ->label('Billable rate (in Cents)')
+                    ->nullable()
+                    ->numeric(),
             ]);
     }
 
@@ -40,11 +41,15 @@ class OrganizationsRelationManager extends RelationManager
             ->columns([
                 TextColumn::make('name'),
                 TextColumn::make('role'),
-                TextColumn::make('membership.billable_rate')
-                    ->label('Billable rate')
-                    ->money(fn (Organization $resource) => $resource->currency, divideBy: 100),
+                TextColumn::make('billable_rate')
+                    ->money(fn (Organization $resource) => $resource->currency ?? 'EUR', divideBy: 100),
             ])
             ->headerActions([
+                Tables\Actions\AttachAction::make()->form(fn (AttachAction $action): array => [
+                    $action->getRecordSelect(),
+                    Select::make('role')
+                        ->options(Role::class),
+                ]),
             ])
             ->actions([
                 Action::make('view')
@@ -53,48 +58,13 @@ class OrganizationsRelationManager extends RelationManager
                     ->url(fn (Organization $record): string => OrganizationResource::getUrl('view', [
                         'record' => $record->getKey(),
                     ])),
-                Tables\Actions\EditAction::make()
-                    ->using(function (Organization $record, array $data): Organization {
-                        /** @var Member $member */
-                        $member = $record->getRelation('membership');
-
-                        if ($data['role'] !== $member->role) {
-                            try {
-                                app(MemberService::class)->changeRole($member, $record, Role::from($data['role']), true);
-                            } catch (ApiException $exception) {
-                                Notification::make()
-                                    ->danger()
-                                    ->title('Update failed')
-                                    ->body($exception->getTranslatedMessage())
-                                    ->persistent()
-                                    ->send();
-                            }
-                        }
-                        $member->save();
-
-                        return $record;
-                    }),
-                Tables\Actions\DetachAction::make()
-                    ->using(function (Organization $record): void {
-                        /** @var User $user */
-                        $user = $this->getOwnerRecord();
-                        $member = Member::query()
-                            ->whereBelongsTo($user, 'user')
-                            ->whereBelongsTo($record, 'organization')
-                            ->firstOrFail();
-                        try {
-                            app(MemberService::class)->removeMember($member, $record);
-                        } catch (ApiException $exception) {
-                            Notification::make()
-                                ->danger()
-                                ->title('Delete failed')
-                                ->body($exception->getTranslatedMessage())
-                                ->persistent()
-                                ->send();
-                        }
-                    }),
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DetachAction::make(),
             ])
             ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DetachBulkAction::make(),
+                ]),
             ]);
     }
 }

app/Filament/Widgets/ActiveUserOverview.php

@@ -14,7 +14,7 @@ class ActiveUserOverview extends BaseWidget
 {
     protected static ?int $sort = 1;
 
-    protected ?string $heading = 'A Registrations';
+    protected static ?string $heading = 'A Registrations';
 
     protected function getCards(): array
     {

app/Filament/Widgets/ServerOverview.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Filament\Widgets;
-
-use Filament\Widgets\Widget;
-use Illuminate\Support\Facades\Cache;
-
-class ServerOverview extends Widget
-{
-    protected static string $view = 'filament.widgets.server-overview';
-
-    /**
-     * @return array<string, mixed>
-     */
-    protected function getViewData(): array
-    {
-        /** @var string|null $currentVersion */
-        $currentVersion = config('app.version');
-        /** @var string|null $build */
-        $build = config('app.build');
-        $latestVersion = Cache::get('latest_version', null);
-
-        $needsUpdate = false;
-        if ($latestVersion !== null && $currentVersion !== null && version_compare($latestVersion, $currentVersion) > 0) {
-            $needsUpdate = true;
-        }
-
-        return [
-            'version' => $currentVersion,
-            'build' => $build,
-            'environment' => config('app.env'),
-            'currentVersion' => $latestVersion,
-            'needsUpdate' => $needsUpdate,
-        ];
-    }
-}

app/Http/Controllers/Api/V1/ApiTokenController.php

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Exceptions\Api\PersonalAccessClientIsNotConfiguredException;
-use App\Http\Requests\V1\ApiToken\ApiTokenStoreRequest;
-use App\Http\Resources\V1\ApiToken\ApiTokenCollection;
-use App\Http\Resources\V1\ApiToken\ApiTokenWithAccessTokenResource;
-use App\Models\Passport\Token;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class ApiTokenController extends Controller
-{
-    /**
-     * List all api token of the currently authenticated user
-     *
-     * This endpoint is independent of organization.
-     *
-     * @operationId getApiTokens
-     *
-     * @throws AuthorizationException
-     */
-    public function index(): ApiTokenCollection
-    {
-        $user = $this->user();
-
-        $tokens = $user->tokens()
-            ->where('client_id', '=', config('passport.personal_access_client.id'))
-            ->get();
-
-        return new ApiTokenCollection($tokens);
-    }
-
-    /**
-     * Create a new api token for the currently authenticated user
-     *
-     * The response will contain the access token that can be used to send authenticated API requests.
-     * Please note that the access token is only shown in this response and cannot be retrieved later.
-     *
-     * @operationId createApiToken
-     *
-     * @throws AuthorizationException|PersonalAccessClientIsNotConfiguredException
-     */
-    public function store(ApiTokenStoreRequest $request): ApiTokenWithAccessTokenResource
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-
-        $token = $user->createToken($request->getName(), ['*']);
-        /** @var Token $tokenModel */
-        $tokenModel = $token->token;
-
-        return new ApiTokenWithAccessTokenResource($tokenModel, $token->accessToken);
-    }
-
-    /**
-     * Revoke an api token
-     *
-     * @operationId revokeApiToken
-     *
-     * @throws AuthorizationException
-     * @throws PersonalAccessClientIsNotConfiguredException
-     */
-    public function revoke(Token $apiToken): JsonResponse
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-        if ($apiToken->user_id !== $user->getKey()) {
-            throw new AuthorizationException('API token does not belong to user');
-        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
-            throw new AuthorizationException('API token is not a personal access token');
-        }
-
-        $apiToken->revoke();
-
-        return response()->json(null, 204);
-    }
-
-    /**
-     * Delete an api token
-     *
-     * @operationId deleteApiToken
-     *
-     * @throws AuthorizationException|PersonalAccessClientIsNotConfiguredException
-     */
-    public function destroy(Token $apiToken): JsonResponse
-    {
-        $user = $this->user();
-
-        if (config('passport.personal_access_client.id') === null || config('passport.personal_access_client.secret') === null) {
-            throw new PersonalAccessClientIsNotConfiguredException;
-        }
-        if ($apiToken->user_id !== $user->getKey()) {
-            throw new AuthorizationException('API token does not belong to user');
-        }
-        if ($apiToken->client_id !== config('passport.personal_access_client.id')) {
-            throw new AuthorizationException('API token is not a personal access token');
-        }
-
-        $apiToken->delete();
-
-        return response()->json(null, 204);
-    }
-}

app/Http/Controllers/Api/V1/ChartController.php

@@ -1,172 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Enums\Role;
-use App\Models\Organization;
-use App\Service\DashboardService;
-use App\Service\PermissionStore;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class ChartController extends Controller
-{
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId weeklyProjectOverview
-     *
-     * @response array<int, array{value: int, name: string, color: string}>
-     */
-    public function weeklyProjectOverview(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $weeklyProjectOverview = $dashboardService->weeklyProjectOverview($user, $organization);
-
-        return response()->json($weeklyProjectOverview);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId latestTasks
-     *
-     * @response array<int, array{task_id: string, name: string, description: string|null, status: bool, time_entry_id: string|null}>
-     */
-    public function latestTasks(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $latestTasks = $dashboardService->latestTasks($user, $organization);
-
-        return response()->json($latestTasks);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId lastSevenDays
-     *
-     * @response array<int, array{ date: string, duration: int, history: array<int> }>
-     */
-    public function lastSevenDays(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $lastSevenDays = $dashboardService->lastSevenDays($user, $organization);
-
-        return response()->json($lastSevenDays);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId latestTeamActivity
-     *
-     * @response array<int, array{member_id: string, name: string, description: string|null, time_entry_id: string, task_id: string|null, status: bool }>
-     */
-    public function latestTeamActivity(Organization $organization, DashboardService $dashboardService, PermissionStore $permissionStore): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:all');
-
-        $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
-
-        return response()->json($latestTeamActivity);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId dailyTrackedHours
-     *
-     * @response array<int, array{date: string, duration: int}>
-     */
-    public function dailyTrackedHours(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
-
-        return response()->json($dailyTrackedHours);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId totalWeeklyTime
-     *
-     * @response int
-     */
-    public function totalWeeklyTime(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $totalWeeklyTime = $dashboardService->totalWeeklyTime($user, $organization);
-
-        return response()->json($totalWeeklyTime);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId totalWeeklyBillableTime
-     *
-     * @response int
-     */
-    public function totalWeeklyBillableTime(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $totalWeeklyBillableTime = $dashboardService->totalWeeklyBillableTime($user, $organization);
-
-        return response()->json($totalWeeklyBillableTime);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId totalWeeklyBillableAmount
-     *
-     * @response array{value: int, currency: string}
-     */
-    public function totalWeeklyBillableAmount(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-        if (! $showBillableRate) {
-            throw new AuthorizationException('You do not have permission to view billable rates.');
-        }
-
-        $totalWeeklyBillableAmount = $dashboardService->totalWeeklyBillableAmount($user, $organization);
-
-        return response()->json($totalWeeklyBillableAmount);
-    }
-
-    /**
-     * @throws AuthorizationException
-     *
-     * @operationId weeklyHistory
-     *
-     * @response array<int, array{date: string, duration: int}>
-     */
-    public function weeklyHistory(Organization $organization, DashboardService $dashboardService): JsonResponse
-    {
-        $this->checkPermission($organization, 'charts:view:own');
-        $user = $this->user();
-
-        $weeklyHistory = $dashboardService->getWeeklyHistory($user, $organization);
-
-        return response()->json($weeklyHistory);
-    }
-}

app/Http/Controllers/Api/V1/Controller.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Models\Organization;
-use App\Service\BillingContract;
 use App\Service\PermissionStore;
 use Illuminate\Auth\Access\AuthorizationException;
 
@@ -44,9 +43,4 @@ class Controller extends \App\Http\Controllers\Controller
     {
         return $this->permissionStore->has($organization, $permission);
     }
-
-    protected function canAccessPremiumFeatures(Organization $organization): bool
-    {
-        return app(BillingContract::class)->hasSubscription($organization) || app(BillingContract::class)->hasTrial($organization);
-    }
 }

app/Http/Controllers/Api/V1/CurrencyController.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Http\Controllers\Controller;
-use App\Service\CurrencyService;
-use Brick\Money\Currency;
-use Brick\Money\ISOCurrencyProvider;
-use Illuminate\Http\JsonResponse;
-
-class CurrencyController extends Controller
-{
-    /**
-     * Get all currencies
-     *
-     * @response array{code: string, name: string, symbol: string}[]
-     *
-     * @operationId getCurrencies
-     */
-    public function index(): JsonResponse
-    {
-        $currencyService = app(CurrencyService::class);
-
-        $currencies = array_values(array_map(
-            fn (Currency $currency): array => [
-                'code' => $currency->getCurrencyCode(),
-                'name' => $currency->getName(),
-                'symbol' => $currencyService->getCurrencySymbol($currency->getCurrencyCode()),
-            ],
-            ISOCurrencyProvider::getInstance()->getAvailableCurrencies()
-        ));
-
-        return response()->json($currencies);
-    }
-}

app/Http/Controllers/Api/V1/InvitationController.php

@@ -9,12 +9,13 @@ use App\Http\Requests\V1\Invitation\InvitationIndexRequest;
 use App\Http\Requests\V1\Invitation\InvitationStoreRequest;
 use App\Http\Resources\V1\Invitation\InvitationCollection;
 use App\Http\Resources\V1\Invitation\InvitationResource;
+use App\Mail\OrganizationInvitationMail;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Service\InvitationService;
-use App\Service\OrganizationInvitationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Mail;
 
 class InvitationController extends Controller
 {
@@ -72,11 +73,12 @@ class InvitationController extends Controller
      *
      * @operationId resendInvitationEmail
      */
-    public function resend(Organization $organization, OrganizationInvitation $invitation, OrganizationInvitationService $organizationInvitationService): JsonResponse
+    public function resend(Organization $organization, OrganizationInvitation $invitation): JsonResponse
     {
         $this->checkPermission($organization, 'invitations:resend', $invitation);
 
-        $organizationInvitationService->resend($invitation);
+        Mail::to($invitation->email)
+            ->queue(new OrganizationInvitationMail($invitation));
 
         return response()->json(null, 204);
     }

app/Http/Controllers/Api/V1/MemberController.php

@@ -6,31 +6,27 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
 use App\Events\MemberMadeToPlaceholder;
+use App\Events\MemberRemoved;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
-use App\Exceptions\Api\ChangingRoleOfPlaceholderIsNotAllowed;
 use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
-use App\Exceptions\Api\OnlyPlaceholdersCanBeMergedIntoAnotherMember;
 use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
-use App\Exceptions\Api\ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
-use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
 use App\Http\Requests\V1\Member\MemberIndexRequest;
-use App\Http\Requests\V1\Member\MemberMergeIntoRequest;
 use App\Http\Requests\V1\Member\MemberUpdateRequest;
 use App\Http\Resources\V1\Member\MemberCollection;
 use App\Http\Resources\V1\Member\MemberResource;
 use App\Models\Member;
 use App\Models\Organization;
+use App\Models\ProjectMember;
+use App\Models\TimeEntry;
 use App\Service\BillableRateService;
 use App\Service\InvitationService;
 use App\Service\MemberService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
 
 class MemberController extends Controller
 {
@@ -70,7 +66,6 @@ class MemberController extends Controller
      * @throws OrganizationNeedsAtLeastOneOwner
      * @throws OnlyOwnerCanChangeOwnership
      * @throws ChangingRoleToPlaceholderIsNotAllowed
-     * @throws ChangingRoleOfPlaceholderIsNotAllowed
      *
      * @operationId updateMember
      */
@@ -85,8 +80,22 @@ class MemberController extends Controller
         }
         if ($request->has('role') && $member->role !== $request->getRole()->value) {
             $newRole = $request->getRole();
-            $allowOwnerChange = $this->hasPermission($organization, 'members:change-ownership');
-            $memberService->changeRole($member, $organization, $newRole, $allowOwnerChange);
+            $oldRole = Role::from($member->role);
+            if ($oldRole === Role::Owner) {
+                throw new OrganizationNeedsAtLeastOneOwner;
+            }
+            if ($newRole === Role::Placeholder) {
+                throw new ChangingRoleToPlaceholderIsNotAllowed;
+            }
+            if ($newRole === Role::Owner) {
+                if ($this->hasPermission($organization, 'members:change-ownership')) {
+                    $memberService->changeOwnership($organization, $member);
+                } else {
+                    throw new OnlyOwnerCanChangeOwnership;
+                }
+            } else {
+                $member->role = $request->getRole()->value;
+            }
         }
         $member->save();
 
@@ -100,22 +109,29 @@ class MemberController extends Controller
      *
      * @operationId removeMember
      */
-    public function destroy(Organization $organization, Member $member, MemberService $memberService): JsonResponse
+    public function destroy(Organization $organization, Member $member): JsonResponse
     {
         $this->checkPermission($organization, 'members:delete', $member);
 
-        $memberService->removeMember($member, $organization);
+        if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
+            throw new EntityStillInUseApiException('member', 'time_entry');
+        }
+        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
+            throw new EntityStillInUseApiException('member', 'project_member');
+        }
+        if ($member->role === Role::Owner->value) {
+            throw new CanNotRemoveOwnerFromOrganization;
+        }
+
+        $member->delete();
+        MemberRemoved::dispatch($member, $organization);
 
         return response()
             ->json(null, 204);
     }
 
     /**
-     * Make a member a placeholder member
-     *
-     * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization|ChangingRoleOfPlaceholderIsNotAllowed
-     *
-     * @operationId makePlaceholder
+     * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization
      */
     public function makePlaceholder(Organization $organization, Member $member, MemberService $memberService): JsonResponse
     {
@@ -124,9 +140,6 @@ class MemberController extends Controller
         if ($member->role === Role::Owner->value) {
             throw new CanNotRemoveOwnerFromOrganization;
         }
-        if ($member->role === Role::Placeholder->value) {
-            throw new ChangingRoleOfPlaceholderIsNotAllowed;
-        }
 
         $memberService->makeMemberToPlaceholder($member);
 
@@ -135,41 +148,10 @@ class MemberController extends Controller
         return response()->json(null, 204);
     }
 
-    /**
-     * Merge one member into another
-     *
-     * @throws AuthorizationException
-     * @throws OnlyPlaceholdersCanBeMergedIntoAnotherMember
-     * @throws \Throwable
-     *
-     * @operationId mergeMember
-     */
-    public function mergeInto(Organization $organization, Member $member, MemberMergeIntoRequest $request, MemberService $memberService): JsonResponse
-    {
-        $this->checkPermission($organization, 'members:merge-into', $member);
-
-        $user = $member->user;
-        if ($member->role !== Role::Placeholder->value || ! $user->is_placeholder) {
-            throw new OnlyPlaceholdersCanBeMergedIntoAnotherMember;
-        }
-        $memberTo = Member::findOrFail($request->getMemberId());
-
-        DB::transaction(function () use ($organization, $member, $user, $memberTo, $memberService): void {
-            $memberService->assignOrganizationEntitiesToDifferentMember($organization, $member, $memberTo);
-            $member->delete();
-            $user->delete();
-        });
-
-        return response()->json(null, 204);
-    }
-
     /**
      * Invite a placeholder member to become a real member of the organization
      *
-     * @throws AuthorizationException
-     * @throws UserNotPlaceholderApiException
-     * @throws UserIsAlreadyMemberOfOrganizationApiException
-     * @throws ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException
+     * @throws AuthorizationException|UserNotPlaceholderApiException
      *
      * @operationId invitePlaceholder
      */
@@ -182,10 +164,6 @@ class MemberController extends Controller
             throw new UserNotPlaceholderApiException;
         }
 
-        if (Str::endsWith($user->email, '@solidtime-import.test')) {
-            throw new ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
-        }
-
         $invitationService->inviteUser($organization, $user->email, Role::Employee);
 
         return response()->json(null, 204);

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Enums\Role;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
 use App\Models\Organization;
@@ -24,9 +23,7 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:view');
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-
-        return new OrganizationResource($organization, $showBillableRate);
+        return new OrganizationResource($organization);
     }
 
     /**
@@ -40,38 +37,15 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:update');
 
-        if ($request->getName() !== null) {
-            $organization->name = $request->getName();
-        }
-        if ($request->getEmployeesCanSeeBillableRates() !== null) {
-            $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
-        }
-        if ($request->getNumberFormat() !== null) {
-            $organization->number_format = $request->getNumberFormat();
-        }
-        if ($request->getCurrencyFormat() !== null) {
-            $organization->currency_format = $request->getCurrencyFormat();
-        }
-        if ($request->getDateFormat() !== null) {
-            $organization->date_format = $request->getDateFormat();
-        }
-        if ($request->getIntervalFormat() !== null) {
-            $organization->interval_format = $request->getIntervalFormat();
-        }
-        if ($request->getTimeFormat() !== null) {
-            $organization->time_format = $request->getTimeFormat();
-        }
-        $hasBillableRate = $request->has('billable_rate');
-        if ($hasBillableRate) {
-            $oldBillableRate = $organization->billable_rate;
-            $organization->billable_rate = $request->getBillableRate();
-        }
+        $organization->name = $request->input('name');
+        $oldBillableRate = $organization->billable_rate;
+        $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
-        if ($hasBillableRate && $oldBillableRate !== $request->getBillableRate()) {
+        if ($oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 
-        return new OrganizationResource($organization, true);
+        return new OrganizationResource($organization);
     }
 }

app/Http/Controllers/Api/V1/ProjectController.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Enums\Role;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Http\Requests\V1\Project\ProjectIndexRequest;
 use App\Http\Requests\V1\Project\ProjectStoreRequest;
@@ -14,7 +13,6 @@ use App\Http\Resources\V1\Project\ProjectResource;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\TimeEntry;
 use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
@@ -62,9 +60,7 @@ class ProjectController extends Controller
 
         $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-
-        return new ProjectCollection($projects, $showBillableRate);
+        return new ProjectCollection($projects);
     }
 
     /**
@@ -78,12 +74,9 @@ class ProjectController extends Controller
     {
         $this->checkPermission($organization, 'projects:view', $project);
 
-        // Note: There is currently no need to check if a user is a member of the project,
-        // since this is only relevant for users with the role "employee" and they can not access this endpoint.
-
         $project->load('organization');
 
-        return new ProjectResource($project, true);
+        return new ProjectResource($project);
     }
 
     /**
@@ -102,14 +95,10 @@ class ProjectController extends Controller
         $project->is_billable = (bool) $request->input('is_billable');
         $project->billable_rate = $request->getBillableRate();
         $project->client_id = $request->input('client_id');
-        $project->is_public = $request->getIsPublic();
-        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
-            $project->estimated_time = $request->getEstimatedTime();
-        }
         $project->organization()->associate($organization);
         $project->save();
 
-        return new ProjectResource($project, true);
+        return new ProjectResource($project);
     }
 
     /**
@@ -128,32 +117,16 @@ class ProjectController extends Controller
         if ($request->has('is_archived')) {
             $project->archived_at = $request->getIsArchived() ? Carbon::now() : null;
         }
-        if ($request->has('is_public')) {
-            $project->is_public = $request->boolean('is_public');
-        }
-        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
-            $project->estimated_time = $request->getEstimatedTime();
-        }
         $oldBillableRate = $project->billable_rate;
-        $clientIdChanged = false;
         $project->billable_rate = $request->getBillableRate();
-        if ($project->client_id !== $request->input('client_id')) {
-            $project->client_id = $request->input('client_id');
-            $clientIdChanged = true;
-        }
+        $project->client_id = $request->input('client_id');
         $project->save();
 
         if ($oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForProject($project);
         }
-        if ($clientIdChanged) {
-            TimeEntry::query()
-                ->whereBelongsTo($organization, 'organization')
-                ->whereBelongsTo($project, 'project')
-                ->update(['client_id' => $project->client_id]);
-        }
 
-        return new ProjectResource($project, true);
+        return new ProjectResource($project);
     }
 
     /**
@@ -174,8 +147,8 @@ class ProjectController extends Controller
             throw new EntityStillInUseApiException('project', 'time_entry');
         }
 
-        DB::transaction(function () use (&$project): void {
-            $project->members->each(function (ProjectMember $member): void {
+        DB::transaction(function () use (&$project) {
+            $project->members->each(function (ProjectMember $member) {
                 $member->delete();
             });
 

app/Http/Controllers/Api/V1/Public/ReportController.php

@@ -1,92 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1\Public;
-
-use App\Enums\TimeEntryAggregationType;
-use App\Http\Controllers\Api\V1\Controller;
-use App\Http\Resources\V1\Report\DetailedWithDataReportResource;
-use App\Models\Report;
-use App\Models\TimeEntry;
-use App\Service\Dto\ReportPropertiesDto;
-use App\Service\TimeEntryAggregationService;
-use App\Service\TimeEntryFilter;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Http\Request;
-
-class ReportController extends Controller
-{
-    /**
-     * Get report by a share secret
-     *
-     * This endpoint is public and does not require authentication. The report must be public and not expired.
-     * The report is considered expired if the `public_until` field is set and the date is in the past.
-     * The report is considered public if the `is_public` field is set to `true`.
-     *
-     * @operationId getPublicReport
-     */
-    public function show(Request $request, TimeEntryAggregationService $timeEntryAggregationService): DetailedWithDataReportResource
-    {
-        $shareSecret = $request->header('X-Api-Key');
-        if (! is_string($shareSecret)) {
-            throw new ModelNotFoundException;
-        }
-
-        $report = Report::query()
-            ->with([
-                'organization',
-            ])
-            ->where('share_secret', '=', $shareSecret)
-            ->where('is_public', '=', true)
-            ->where(function (Builder $builder): void {
-                /** @var Builder<Report> $builder */
-                $builder->whereNull('public_until')
-                    ->orWhere('public_until', '>', now());
-            })
-            ->firstOrFail();
-        /** @var ReportPropertiesDto $properties */
-        $properties = $report->properties;
-
-        $timeEntriesQuery = TimeEntry::query()
-            ->whereBelongsTo($report->organization, 'organization');
-
-        $filter = new TimeEntryFilter($timeEntriesQuery);
-        $filter->addStart($properties->start);
-        $filter->addEnd($properties->end);
-        $filter->addActive($properties->active);
-        $filter->addBillable($properties->billable);
-        $filter->addMemberIdsFilter($properties->memberIds?->toArray());
-        $filter->addProjectIdsFilter($properties->projectIds?->toArray());
-        $filter->addTagIdsFilter($properties->tagIds?->toArray());
-        $filter->addTaskIdsFilter($properties->taskIds?->toArray());
-        $filter->addClientIdsFilter($properties->clientIds?->toArray());
-        $timeEntriesQuery = $filter->get();
-
-        $data = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
-            $timeEntriesQuery->clone(),
-            $report->properties->group,
-            $report->properties->subGroup,
-            $report->properties->timezone,
-            $report->properties->weekStart,
-            false,
-            $report->properties->start,
-            $report->properties->end,
-            true
-        );
-        $historyData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
-            $timeEntriesQuery->clone(),
-            TimeEntryAggregationType::fromInterval($report->properties->historyGroup),
-            null,
-            $report->properties->timezone,
-            $report->properties->weekStart,
-            true,
-            $report->properties->start,
-            $report->properties->end,
-            true
-        );
-
-        return new DetailedWithDataReportResource($report, $data, $historyData);
-    }
-}

app/Http/Controllers/Api/V1/ReportController.php

@@ -1,172 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Enums\Weekday;
-use App\Http\Requests\V1\Report\ReportStoreRequest;
-use App\Http\Requests\V1\Report\ReportUpdateRequest;
-use App\Http\Resources\V1\Report\DetailedReportResource;
-use App\Http\Resources\V1\Report\ReportCollection;
-use App\Http\Resources\V1\Report\ReportResource;
-use App\Models\Organization;
-use App\Models\Report;
-use App\Service\Dto\ReportPropertiesDto;
-use App\Service\ReportService;
-use App\Service\TimezoneService;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class ReportController extends Controller
-{
-    /**
-     * @throws AuthorizationException
-     */
-    protected function checkPermission(Organization $organization, string $permission, ?Report $report = null): void
-    {
-        parent::checkPermission($organization, $permission);
-        if ($report !== null && $report->organization_id !== $organization->id) {
-            throw new AuthorizationException('Report does not belong to organization');
-        }
-    }
-
-    /**
-     * Get reports
-     *
-     * @return ReportCollection<ReportResource>
-     *
-     * @throws AuthorizationException
-     *
-     * @operationId getReports
-     */
-    public function index(Organization $organization): ReportCollection
-    {
-        $this->checkPermission($organization, 'reports:view');
-
-        $reports = Report::query()
-            ->orderBy('created_at', 'desc')
-            ->whereBelongsTo($organization, 'organization')
-            ->paginate(config('app.pagination_per_page_default'));
-
-        return new ReportCollection($reports);
-    }
-
-    /**
-     * Get report
-     *
-     * @throws AuthorizationException
-     *
-     * @operationId getReport
-     */
-    public function show(Organization $organization, Report $report): DetailedReportResource
-    {
-        $this->checkPermission($organization, 'reports:view', $report);
-
-        return new DetailedReportResource($report);
-    }
-
-    /**
-     * Create report
-     *
-     * @throws AuthorizationException
-     *
-     * @operationId createReport
-     */
-    public function store(Organization $organization, ReportStoreRequest $request, TimezoneService $timezoneService, ReportService $reportService): DetailedReportResource
-    {
-        $this->checkPermission($organization, 'reports:create');
-        $user = $this->user();
-
-        $report = new Report;
-        $report->name = $request->getName();
-        $report->description = $request->getDescription();
-        $isPublic = $request->getIsPublic();
-        $report->is_public = $isPublic;
-        $properties = new ReportPropertiesDto;
-        $properties->group = $request->getPropertyGroup();
-        $properties->subGroup = $request->getPropertySubGroup();
-        $properties->historyGroup = $request->getPropertyHistoryGroup();
-        $properties->start = $request->getPropertyStart();
-        $properties->end = $request->getPropertyEnd();
-        $properties->active = $request->getPropertyActive();
-        $properties->setMemberIds($request->input('properties.member_ids', null));
-        $properties->billable = $request->getPropertyBillable();
-        $properties->setClientIds($request->input('properties.client_ids', null));
-        $properties->setProjectIds($request->input('properties.project_ids', null));
-        $properties->setTagIds($request->input('properties.tag_ids', null));
-        $properties->setTaskIds($request->input('properties.task_ids', null));
-        $properties->weekStart = $request->has('properties.week_start') ? Weekday::from($request->input('properties.week_start')) : $user->week_start;
-        $timezone = $user->timezone;
-        if ($request->has('properties.timezone')) {
-            if ($timezoneService->isValid($request->input('properties.timezone'))) {
-                $timezone = $request->input('properties.timezone');
-            }
-            if ($timezoneService->mapLegacyTimezone($request->input('properties.timezone')) !== null) {
-                $timezone = $timezoneService->mapLegacyTimezone($request->input('properties.timezone'));
-            }
-        }
-        $properties->timezone = $timezone;
-        $report->properties = $properties;
-        if ($isPublic) {
-            $report->share_secret = $reportService->generateSecret();
-            $report->public_until = $request->getPublicUntil();
-        } else {
-            $report->share_secret = null;
-            $report->public_until = null;
-        }
-        $report->organization()->associate($organization);
-        $report->save();
-
-        return new DetailedReportResource($report);
-    }
-
-    /**
-     * Update report
-     *
-     * @throws AuthorizationException
-     *
-     * @operationId updateReport
-     */
-    public function update(Organization $organization, Report $report, ReportUpdateRequest $request, ReportService $reportService): DetailedReportResource
-    {
-        $this->checkPermission($organization, 'reports:update', $report);
-
-        if ($request->has('name')) {
-            $report->name = $request->getName();
-        }
-        if ($request->has('description')) {
-            $report->description = $request->getDescription();
-        }
-        if ($request->has('is_public') && $request->getIsPublic() !== $report->is_public) {
-            $isPublic = $request->getIsPublic();
-            $report->is_public = $isPublic;
-            if ($isPublic) {
-                $report->share_secret = $reportService->generateSecret();
-                $report->public_until = $request->getPublicUntil();
-            } else {
-                $report->share_secret = null;
-                $report->public_until = null;
-            }
-        }
-        $report->save();
-
-        return new DetailedReportResource($report);
-    }
-
-    /**
-     * Delete report
-     *
-     * @throws AuthorizationException
-     *
-     * @operationId deleteReport
-     */
-    public function destroy(Organization $organization, Report $report): JsonResponse
-    {
-        $this->checkPermission($organization, 'reports:delete', $report);
-
-        $report->delete();
-
-        return response()->json(null, 204);
-    }
-}