diff --git a/.gitignore b/.gitignore index 99ccde4..f2032b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,24 @@ +.DS_Store +.env +.env.backup +.env.production +.phpunit.result.cache +/.fleet +/.idea /.phpunit.cache +/.vscode +/caddy +/data/caddy /node_modules /public/build /public/hot /public/storage /storage/*.key /vendor -.env -.env.backup -.env.production -.phpunit.result.cache -Homestead.json -Homestead.yaml auth.json -npm-debug.log -yarn-error.log -/.fleet -/.idea -/.vscode -.DS_Store - -/caddy frankenphp frankenphp-worker.php +Homestead.json +Homestead.yaml +npm-debug.log +yarn-error.log diff --git a/composer.lock b/composer.lock index 3dc0859..f563681 100644 --- a/composer.lock +++ b/composer.lock @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.314.4", + "version": "3.314.5", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "fd1261a60495a7aeb2661d8b7eecfd5fc16abd41" + "reference": "0c1adaa22c3d333ac20dcc87dd355e9a013a05fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fd1261a60495a7aeb2661d8b7eecfd5fc16abd41", - "reference": "fd1261a60495a7aeb2661d8b7eecfd5fc16abd41", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0c1adaa22c3d333ac20dcc87dd355e9a013a05fd", + "reference": "0c1adaa22c3d333ac20dcc87dd355e9a013a05fd", "shasum": "" }, "require": { @@ -151,9 +151,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.314.4" + "source": "https://github.com/aws/aws-sdk-php/tree/3.314.5" }, - "time": "2024-06-18T18:13:34+00:00" + "time": "2024-06-19T18:11:48+00:00" }, { "name": "bacon/bacon-qr-code", @@ -1984,16 +1984,16 @@ }, { "name": "laravel/framework", - "version": "v11.11.0", + "version": "v11.11.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "194102876df42f9f5bb618efa55fa7e15ebf40aa" + "reference": "c9b52e84bd18f155e5ba59b948c7da3e7f37e87f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/194102876df42f9f5bb618efa55fa7e15ebf40aa", - "reference": "194102876df42f9f5bb618efa55fa7e15ebf40aa", + "url": "https://api.github.com/repos/laravel/framework/zipball/c9b52e84bd18f155e5ba59b948c7da3e7f37e87f", + "reference": "c9b52e84bd18f155e5ba59b948c7da3e7f37e87f", "shasum": "" }, "require": { @@ -2185,7 +2185,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-18T17:40:27+00:00" + "time": "2024-06-20T10:54:53+00:00" }, { "name": "laravel/horizon", @@ -10103,16 +10103,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.2.3", + "version": "11.2.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "8475044fbb0af57c8daea06bcfe21e2785401f97" + "reference": "be9e3ed32a1287a9bfda15936cc86fef4e4cf591" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8475044fbb0af57c8daea06bcfe21e2785401f97", - "reference": "8475044fbb0af57c8daea06bcfe21e2785401f97", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/be9e3ed32a1287a9bfda15936cc86fef4e4cf591", + "reference": "be9e3ed32a1287a9bfda15936cc86fef4e4cf591", "shasum": "" }, "require": { @@ -10183,7 +10183,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.2.3" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.2.5" }, "funding": [ { @@ -10199,7 +10199,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T05:31:11+00:00" + "time": "2024-06-20T13:11:31+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/composer/.htaccess b/config/composer/.htaccess new file mode 100644 index 0000000..14249c5 --- /dev/null +++ b/config/composer/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/data/caddy/certificates/local/localhost/localhost.crt b/data/caddy/certificates/local/localhost/localhost.crt deleted file mode 100644 index e93e50c..0000000 --- a/data/caddy/certificates/local/localhost/localhost.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBvDCCAWOgAwIBAgIQUPkU4Z3HUQbYRjRljGOjMjAKBggqhkjOPQQDAjAzMTEw -LwYDVQQDEyhDYWRkeSBMb2NhbCBBdXRob3JpdHkgLSBFQ0MgSW50ZXJtZWRpYXRl -MB4XDTI0MDYyMDAzMTAxNVoXDTI0MDYyMDE1MTAxNVowADBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABFjRwZWZ/E0iWVeB2RmGXD0VnRo9/zj5tQVAbMrovA0pDeaZ -pwvJGUpeOJZ7Rl0pEnn6E9VdWkEfE8TwkiDkmnKjgYswgYgwDgYDVR0PAQH/BAQD -AgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUuFKW -KHlfrt2bkwFod5O1ePbhFbQwHwYDVR0jBBgwFoAULkuRvmee4uyHjngRY7tcF4E4 -cK0wFwYDVR0RAQH/BA0wC4IJbG9jYWxob3N0MAoGCCqGSM49BAMCA0cAMEQCIHWP -CnqrAygZAByGMoluAQ3fwBxSOS5Z1LRtND4wuOJFAiBf/trU/r9AFHSrTe1GRfdg -m6xB6pZW4bro5a1k2Q7c3Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIByDCCAW2gAwIBAgIQIllJh/YSmMWMU2lIn1FQVjAKBggqhkjOPQQDAjAwMS4w -LAYDVQQDEyVDYWRkeSBMb2NhbCBBdXRob3JpdHkgLSAyMDI0IEVDQyBSb290MB4X -DTI0MDYyMDAzMTAxNVoXDTI0MDYyNzAzMTAxNVowMzExMC8GA1UEAxMoQ2FkZHkg -TG9jYWwgQXV0aG9yaXR5IC0gRUNDIEludGVybWVkaWF0ZTBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABFxBGjt1vYtRzmwckuNWL4vGjXdx/LvFyzHj3Jx3bmjPm3fM -l8xAXGBYsdPjPmm4GLkf3Gfd+L78FQxthNLp+CujZjBkMA4GA1UdDwEB/wQEAwIB -BjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQuS5G+Z57i7IeOeBFju1wX -gThwrTAfBgNVHSMEGDAWgBSjUti0EevDfOiFojU7pHtguMv/5TAKBggqhkjOPQQD -AgNJADBGAiEArY5ftzJtAXT3dWiV4AaxUk99oNmdAPZBhNmcwHEwf6YCIQC95l4h -JLzYrTC/nsl92Z8JEueCiFsUsCjgwjNV5OQT0w== ------END CERTIFICATE----- diff --git a/data/caddy/certificates/local/localhost/localhost.json b/data/caddy/certificates/local/localhost/localhost.json deleted file mode 100644 index 1d36945..0000000 --- a/data/caddy/certificates/local/localhost/localhost.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sans": [ - "localhost" - ], - "issuer_data": null -} \ No newline at end of file diff --git a/data/caddy/certificates/local/localhost/localhost.key b/data/caddy/certificates/local/localhost/localhost.key deleted file mode 100644 index 944cf47..0000000 --- a/data/caddy/certificates/local/localhost/localhost.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIO8L7+17S/xd2FvywlJiPrIDIn8h7X9cxAMv96iochhnoAoGCCqGSM49 -AwEHoUQDQgAEWNHBlZn8TSJZV4HZGYZcPRWdGj3/OPm1BUBsyui8DSkN5pmnC8kZ -Sl44lntGXSkSefoT1V1aQR8TxPCSIOSacg== ------END EC PRIVATE KEY----- diff --git a/data/caddy/instance.uuid b/data/caddy/instance.uuid deleted file mode 100644 index 5af579f..0000000 --- a/data/caddy/instance.uuid +++ /dev/null @@ -1 +0,0 @@ -adf48f36-64b4-4db4-96a4-f87a52e59f44 \ No newline at end of file diff --git a/data/caddy/last_clean.json b/data/caddy/last_clean.json deleted file mode 100644 index 6eb55d8..0000000 --- a/data/caddy/last_clean.json +++ /dev/null @@ -1 +0,0 @@ -{"tls":{"timestamp":"2024-06-20T02:40:43.59823126Z","instance_id":"adf48f36-64b4-4db4-96a4-f87a52e59f44"}} \ No newline at end of file diff --git a/data/caddy/pki/authorities/local/intermediate.crt b/data/caddy/pki/authorities/local/intermediate.crt deleted file mode 100644 index 6cd0c8d..0000000 --- a/data/caddy/pki/authorities/local/intermediate.crt +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIByDCCAW2gAwIBAgIQIllJh/YSmMWMU2lIn1FQVjAKBggqhkjOPQQDAjAwMS4w -LAYDVQQDEyVDYWRkeSBMb2NhbCBBdXRob3JpdHkgLSAyMDI0IEVDQyBSb290MB4X -DTI0MDYyMDAzMTAxNVoXDTI0MDYyNzAzMTAxNVowMzExMC8GA1UEAxMoQ2FkZHkg -TG9jYWwgQXV0aG9yaXR5IC0gRUNDIEludGVybWVkaWF0ZTBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABFxBGjt1vYtRzmwckuNWL4vGjXdx/LvFyzHj3Jx3bmjPm3fM -l8xAXGBYsdPjPmm4GLkf3Gfd+L78FQxthNLp+CujZjBkMA4GA1UdDwEB/wQEAwIB -BjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQuS5G+Z57i7IeOeBFju1wX -gThwrTAfBgNVHSMEGDAWgBSjUti0EevDfOiFojU7pHtguMv/5TAKBggqhkjOPQQD -AgNJADBGAiEArY5ftzJtAXT3dWiV4AaxUk99oNmdAPZBhNmcwHEwf6YCIQC95l4h -JLzYrTC/nsl92Z8JEueCiFsUsCjgwjNV5OQT0w== ------END CERTIFICATE----- diff --git a/data/caddy/pki/authorities/local/intermediate.key b/data/caddy/pki/authorities/local/intermediate.key deleted file mode 100644 index ac9a20b..0000000 --- a/data/caddy/pki/authorities/local/intermediate.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIH/U421H6TJK+A+wharUGKbJMFYUWI+tpllxHEMCQjtsoAoGCCqGSM49 -AwEHoUQDQgAEXEEaO3W9i1HObByS41Yvi8aNd3H8u8XLMePcnHduaM+bd8yXzEBc -YFix0+M+abgYuR/cZ934vvwVDG2E0un4Kw== ------END EC PRIVATE KEY----- diff --git a/data/caddy/pki/authorities/local/root.crt b/data/caddy/pki/authorities/local/root.crt deleted file mode 100644 index e0bebbb..0000000 --- a/data/caddy/pki/authorities/local/root.crt +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBpDCCAUqgAwIBAgIRANsipO9KwE/leWJcuFrPB+wwCgYIKoZIzj0EAwIwMDEu -MCwGA1UEAxMlQ2FkZHkgTG9jYWwgQXV0aG9yaXR5IC0gMjAyNCBFQ0MgUm9vdDAe -Fw0yNDA2MjAwMzEwMTVaFw0zNDA0MjkwMzEwMTVaMDAxLjAsBgNVBAMTJUNhZGR5 -IExvY2FsIEF1dGhvcml0eSAtIDIwMjQgRUNDIFJvb3QwWTATBgcqhkjOPQIBBggq -hkjOPQMBBwNCAAQV0JrBvTOYnR9xu/RHAXfxv4JprDJppBP/lfzeFmhUNvIdsCbq -0AmvlDW/F6YhX6bdA3X20iNE3LTlMD+vhcxmo0UwQzAOBgNVHQ8BAf8EBAMCAQYw -EgYDVR0TAQH/BAgwBgEB/wIBATAdBgNVHQ4EFgQUo1LYtBHrw3zohaI1O6R7YLjL -/+UwCgYIKoZIzj0EAwIDSAAwRQIhAKvg96k6Znn7wdM1mNrsilxEu43z7MAQ3kuh -Tjj9DsSOAiBPyLow3G3zTbwMT7cP14REfLNk0szBhD86H5ULQcffdQ== ------END CERTIFICATE----- diff --git a/data/caddy/pki/authorities/local/root.key b/data/caddy/pki/authorities/local/root.key deleted file mode 100644 index 6cd8791..0000000 --- a/data/caddy/pki/authorities/local/root.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIHFAkiM79Q5BpZqTse9f/pezqyE9bGXpFiyLi5+2WtvKoAoGCCqGSM49 -AwEHoUQDQgAEFdCawb0zmJ0fcbv0RwF38b+CaawyaaQT/5X83hZoVDbyHbAm6tAJ -r5Q1vxemIV+m3QN19tIjRNy05TA/r4XMZg== ------END EC PRIVATE KEY----- diff --git a/data/composer/.htaccess b/data/composer/.htaccess new file mode 100644 index 0000000..14249c5 --- /dev/null +++ b/data/composer/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index eedac39..de17187 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -28,7 +28,6 @@ class UserFactory extends Factory 'remember_token' => Str::random(10), 'user_role_id' => null, 'profile_photo_path' => null, - 'current_team_id' => null, ]; } diff --git a/database/migrations/2024_06_17_021924_create_user_roles_table.php b/database/migrations/0000_00_00_000000_create_user_roles_table.php similarity index 100% rename from database/migrations/2024_06_17_021924_create_user_roles_table.php rename to database/migrations/0000_00_00_000000_create_user_roles_table.php diff --git a/database/migrations/0001_01_01_000000_create_users_table.php b/database/migrations/0001_01_01_000000_create_users_table.php index 3b49aca..56b2ca6 100644 --- a/database/migrations/0001_01_01_000000_create_users_table.php +++ b/database/migrations/0001_01_01_000000_create_users_table.php @@ -1,5 +1,6 @@ string('email')->unique(); $table->timestamp('email_verified_at')->nullable(); $table->string('password'); + $table->foreignIdFor(UserRole::class)->nullable()->default(null)->constrained('user_roles'); $table->rememberToken(); - $table->foreignId('current_team_id')->nullable(); $table->string('profile_photo_path', 2048)->nullable(); $table->timestamps(); }); diff --git a/database/migrations/2024_06_17_023510_update_users_table_with_user_role.php b/database/migrations/2024_06_17_023510_update_users_table_with_user_role.php deleted file mode 100644 index 9daa80b..0000000 --- a/database/migrations/2024_06_17_023510_update_users_table_with_user_role.php +++ /dev/null @@ -1,28 +0,0 @@ -foreignIdFor(UserRole::class) - ->nullable() - ->after('remember_token') - ->constrained() - ->cascadeOnUpdate() - ->nullOnDelete(); - }); - } - - public function down(): void - { - Schema::table('users', function (Blueprint $table) { - $table->dropForeign(['user_role_id']); - }); - } -}; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index cdc5924..a84e5b2 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -25,11 +25,11 @@ class DatabaseSeeder extends Seeder // Add 5 administrators. $administrator = UserRole::factory()->administrator()->create(); - User::factory(5)->create(['user_role_id' => $administrator->id]); + User::factory(5)->for($administrator, 'role')->create(); // Add 10 moderators. $moderator = UserRole::factory()->moderator()->create(); - User::factory(10)->create(['user_role_id' => $moderator->id]); + User::factory(5)->for($moderator, 'role')->create(); // Add 100 users. $users = User::factory(100)->create(); diff --git a/package-lock.json b/package-lock.json index 8a574be..9cdc4e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "forge", + "name": "html", "lockfileVersion": 3, "requires": true, "packages": { @@ -1160,9 +1160,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.806", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.806.tgz", - "integrity": "sha512-nkoEX2QIB8kwCOtvtgwhXWy2IHVcOLQZu9Qo36uaGB835mdX/h8uLRlosL6QIhLVUnAiicXRW00PwaPZC74Nrg==", + "version": "1.4.807", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.807.tgz", + "integrity": "sha512-kSmJl2ZwhNf/bcIuCH/imtNOKlpkLDn2jqT5FJ+/0CXjhnFaOa9cOe9gHKKy71eM49izwuQjZhKk+lWQ1JxB7A==", "dev": true, "license": "ISC" }, diff --git a/routes/console.php b/routes/console.php index f907db9..511f247 100644 --- a/routes/console.php +++ b/routes/console.php @@ -4,3 +4,5 @@ use App\Console\Commands\ImportHub; use Illuminate\Support\Facades\Schedule; Schedule::command(ImportHub::class)->hourly(); + +Schedule::command('horizon:snapshot')->everyFiveMinutes();