Added time entry api endpoints; Increased phpstan level; renamed to solidtime

Author: korridor

.env.example

@@ -1,8 +1,9 @@
-APP_NAME=Laravel
+APP_NAME=solidtime
 APP_ENV=local
 APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
-APP_URL=http://localhost
+APP_URL=https://solidtime.test
+APP_FORCE_HTTPS=true
 
 SUPER_ADMINS=[email protected]
 
@@ -60,6 +61,6 @@ VITE_PUSHER_PORT="${PUSHER_PORT}"
 VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
 VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-NGINX_HOST_NAME=timetracker.test
+NGINX_HOST_NAME=solidtime.test
 NETWORK_NAME=reverse-proxy-docker-traefik_routing
 

LICENSE.txt renamed to LICENSE.md

@@ -34,13 +34,13 @@ Additional System Requirements:
 Add the following entry to your `/etc/hosts`
 
 ```
-127.0.0.1 timetracker.test
-127.0.0.1 playwright.timetracker.test
+127.0.0.1 solidtime.test
+127.0.0.1 playwright.solidtime.test
 ```
 
 ## Running E2E Tests
 
-`./vendor/bin/sail up -d ` will automatically start a Playwright UI server that you can access at `https://playwright.timetracker.test`. 
+`./vendor/bin/sail up -d ` will automatically start a Playwright UI server that you can access at `https://playwright.solidtime.test`. 
 Make sure that you use HTTPS otherwise the resources will not be loaded correctly.
 
 ## Recording E2E Tests
@@ -49,7 +49,7 @@ To record E2E tests, you need to install and execute playwright locally (outside
 
 ```bash
 npx playwright install
-npx playwright codegen timetracker.test
+npx playwright codegen solidtime.test
 ``` 
 
 ## Contributing

README.md

@@ -4,14 +4,15 @@
 
 namespace App\Actions\Fortify;
 
+use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Validation\Rules\Password;
 
 trait PasswordValidationRules
 {
     /**
      * Get the validation rules used to validate passwords.
      *
-     * @return array<int, \Illuminate\Contracts\Validation\Rule|array|string>
+     * @return array<int, Rule|string>
      */
     protected function passwordRules(): array
     {

app/Actions/Fortify/PasswordValidationRules.php

@@ -7,6 +7,7 @@
 use App\Models\Organization;
 use App\Models\User;
 use Closure;
+use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Jetstream\Contracts\AddsTeamMembers;
@@ -55,7 +56,7 @@ protected function validate(Organization $organization, string $email, ?string $
     /**
      * Get the validation rules for adding a team member.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\Rule|array|string>
+     * @return array<string, array<Rule|string>>
      */
     protected function rules(): array
     {

app/Actions/Jetstream/AddOrganizationMember.php

@@ -8,6 +8,7 @@
 use App\Models\OrganizationInvitation;
 use App\Models\User;
 use Closure;
+use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Gate;
@@ -59,7 +60,7 @@ protected function validate(Organization $organization, string $email, ?string $
     /**
      * Get the validation rules for inviting a team member.
      *
-     * @return array<string, ValidationRule|array|string>
+     * @return array<string, array<ValidationRule|Rule|string>>
      */
     protected function rules(Organization $organization): array
     {

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+use Exception;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ApiException extends Exception
+{
+    /**
+     * Render the exception into an HTTP response.
+     */
+    public function render(Request $request): JsonResponse
+    {
+        return response()
+            ->json([
+                'error' => true,
+                'message' => $this->getMessage(),
+            ], 400);
+    }
+}

app/Exceptions/ApiException.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+class TimeEntryStillRunning extends ApiException
+{
+}

app/Exceptions/TimeEntryStillRunning.php

@@ -25,15 +25,16 @@ class OrganizationResource extends Resource
     public static function form(Form $form): Form
     {
         return $form
+            ->columns(1)
             ->schema([
                 Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
-                Forms\Components\Toggle::make('Is personal?')
+                Forms\Components\Toggle::make('personal_team')
                     ->label('Is personal?')
                     ->required(),
-                Forms\Components\Select::make('owner_id')
+                Forms\Components\Select::make('user_id')
                     ->relationship(name: 'owner', titleAttribute: 'email')
                     ->searchable(['name', 'email'])
                     ->required(),
@@ -47,7 +48,8 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
-                Tables\Columns\ToggleColumn::make('is_personal')
+                Tables\Columns\IconColumn::make('personal_team')
+                    ->boolean()
                     ->label('Is personal?')
                     ->sortable(),
                 Tables\Columns\TextColumn::make('owner.email')

app/Filament/Resources/OrganizationResource.php

@@ -25,6 +25,7 @@ class UserResource extends Resource
     public static function form(Form $form): Form
     {
         return $form
+            ->columns(1)
             ->schema([
                 Forms\Components\TextInput::make('id')
                     ->label('ID')