Merge remote-tracking branch 'origin/master'

This commit is contained in:
Peter Papp
2021-07-22 17:39:12 +02:00
50 changed files with 80 additions and 97 deletions

File diff suppressed because one or more lines are too long

View File

@@ -2,15 +2,15 @@
use App\Users\Actions\CreateNewUserAction;
use Domain\Pages\Controllers\PagesController;
use Domain\Zip\Controllers\ZipFilesController;
use Domain\Sharing\Controllers\ShareController;
use Domain\Zip\Controllers\ZipFolderController;
use Domain\Trash\Controllers\DumpTrashController;
use App\Users\Controllers\ResetPasswordController;
use Domain\Files\Controllers\UploadFileController;
use Domain\Zip\Controllers\ZipFilesController;
use App\Users\Controllers\ForgotPasswordController;
use Domain\Folders\Controllers\FavouriteController;
use Domain\Plans\Controllers\ActivePlansController;
use Domain\Zip\Controllers\ZipFolderController;
use Domain\Folders\Controllers\CreateFolderController;
use Domain\Sharing\Controllers\ShareViaEmailController;
use Domain\Items\Controllers\MoveFileOrFolderController;

View File

@@ -1,10 +1,10 @@
<?php
// Get avatars and system images
use App\Users\Controllers\GetAvatarController;
use Domain\Zip\Controllers\GetZipController;
use Domain\Settings\Controllers\GetAppImageController;
use App\Users\Controllers\GetAvatarController;
use Domain\Zip\Controllers\VisitorGetZipController;
use Domain\Settings\Controllers\GetAppImageController;
use Domain\Files\Controllers\FileAccess\GetFileController;
use Domain\Files\Controllers\FileAccess\GetThumbnailController;
use Domain\Files\Controllers\FileAccess\VisitorGetFileController;

View File

@@ -1,9 +1,9 @@
<?php
use Domain\SetupWizard\Controllers\CreateAdminAccountController;
use Domain\SetupWizard\Controllers\StorePlansController;
use Domain\SetupWizard\Controllers\StoreBillingsController;
use Domain\SetupWizard\Controllers\StoreAppSettingsController;
use Domain\SetupWizard\Controllers\CreateAdminAccountController;
use Domain\SetupWizard\Controllers\VerifyPurchaseCodeController;
use Domain\SetupWizard\Controllers\StoreDatabaseCredentialsController;
use Domain\SetupWizard\Controllers\StoreEnvironmentSettingsController;

View File

@@ -1,10 +1,10 @@
<?php
use Domain\Sharing\Controllers\ShareController;
use Domain\Files\Controllers\VisitorShowFileController;
use Domain\Files\Controllers\VisitorUploadFileController;
use Domain\Zip\Controllers\VisitorZipFilesController;
use Domain\Zip\Controllers\VisitorZipFolderController;
use Domain\Files\Controllers\VisitorShowFileController;
use Domain\Files\Controllers\VisitorUploadFileController;
use Domain\Folders\Controllers\VisitorCreateFolderController;
use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
use Domain\Items\Controllers\VisitorMoveFileOrFolderController;

View File

@@ -2,10 +2,6 @@
namespace App\Console\Commands;
use App\Users\Models\User;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Illuminate\Console\Command;
@@ -14,6 +10,10 @@ use Domain\Folders\Models\Folder;
use Domain\Settings\Models\Setting;
use Illuminate\Support\Facades\Storage;
use Illuminate\Foundation\Testing\WithFaker;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
class SetupDevEnvironment extends Command
{

View File

@@ -2,12 +2,12 @@
namespace App\Console\Commands;
use App\Users\Models\User;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
use Illuminate\Console\Command;
use Domain\Settings\Models\Setting;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
class SetupProdEnvironment extends Command
{

View File

@@ -1,14 +1,13 @@
<?php
namespace App\Http;
use Fruitcake\Cors\HandleCors;
use Support\Middleware\ProtectSetupWizardRoutes;
use Support\Middleware\TrimStrings;
use Support\Middleware\TrustProxies;
use Support\Middleware\EncryptCookies;
use Support\Middleware\VerifyCsrfToken;
use Illuminate\Session\Middleware\StartSession;
use Support\Middleware\ProtectSetupWizardRoutes;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
use Illuminate\Routing\Middleware\SubstituteBindings;
use Illuminate\View\Middleware\ShareErrorsFromSession;

View File

@@ -11,7 +11,7 @@ class CreateImageThumbnailAction
'image/jpeg',
'image/jpg',
'image/png',
'image/webp'
'image/webp',
];
/**
@@ -22,12 +22,10 @@ class CreateImageThumbnailAction
string $filename,
string $user_id
): string | null {
$mimeType = Storage::disk('local')->mimeType($file_path);
// Create thumbnail from image
if (in_array($mimeType, $this->availableFormats)) {
// Get thumbnail name
$thumbnail = "thumbnail-$filename";

View File

@@ -12,7 +12,8 @@ class UploadFileController extends Controller
public function __construct(
public UploadFileAction $uploadFiles,
public FakeUploadFileAction $fakeUploadFile,
) {}
) {
}
/**
* Upload file for authenticated master|editor user
@@ -20,7 +21,6 @@ class UploadFileController extends Controller
public function __invoke(
UploadRequest $request,
): File | array {
if (is_demo_account('howdy@hi5ve.digital')) {
return ($this->fakeUploadFile)($request);
}

View File

@@ -1,10 +1,10 @@
<?php
namespace Domain\Folders\Actions;
use Domain\Folders\Requests\CreateFolderRequest;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Auth;
use Domain\Folders\Requests\CreateFolderRequest;
class CreateFolderAction
{

View File

@@ -13,7 +13,8 @@ class CreateFolderController extends Controller
public function __construct(
public CreateFolderAction $createFolder,
public FakeCreateFolderAction $fakeCreateFolder,
) {}
) {
}
/**
* Create new folder for authenticated master|editor user

View File

@@ -1,5 +1,4 @@
<?php
namespace Domain\Homepage\Controllers;
use Illuminate\Http\Response;
@@ -16,7 +15,6 @@ class SendContactMessageController extends Controller
public function __invoke(
SendContactMessageRequest $request
): Response {
$contactEmail = get_setting('contact_email');
if ($contactEmail) {

View File

@@ -3,10 +3,10 @@ namespace Domain\Items\Actions;
use DB;
use Illuminate\Support\Arr;
use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Storage;
use Domain\Files\Models\File;
class DeleteFileOrFolderAction
{

View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Items\Actions;
use Domain\Folders\Models\Folder;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
class MoveFileOrFolderAction
{

View File

@@ -11,7 +11,8 @@ class DeleteFileOrFolderController extends Controller
{
public function __construct(
public DeleteFileOrFolderAction $deleteFileOrFolder,
){}
) {
}
/**
* Delete item for authenticated master|editor user
@@ -20,7 +21,9 @@ class DeleteFileOrFolderController extends Controller
DeleteItemRequest $request,
): Response {
abort_if(
is_demo_account(Auth::user()?->email), 204, 'Done.'
is_demo_account(Auth::user()?->email),
204,
'Done.'
);
foreach ($request->input('items') as $item) {

View File

@@ -11,7 +11,8 @@ class MoveFileOrFolderController extends Controller
{
public function __construct(
public MoveFileOrFolderAction $moveFileOrFolder,
) {}
) {
}
/**
* Move item for authenticated master|editor user

View File

@@ -15,7 +15,8 @@ class RenameFileOrFolderController extends Controller
public RenameFileOrFolderAction $renameFileOrFolder,
public UpdateFolderPropertyAction $updateFolderProperty,
public FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
) {}
) {
}
/**
* Rename item for authenticated master|editor user

View File

@@ -1,11 +1,8 @@
<?php
namespace Domain\Localization\Actions;
use Domain\Localization\Models\Language;
use Domain\Settings\Models\Setting;
use Domain\Localization\Models\Language;
class SeedDefaultLanguageAction
{

View File

@@ -1,9 +1,6 @@
<?php
namespace Domain\Localization\Actions;
use DB;
class SeedDefaultLanguageTranslationsAction

View File

@@ -1,9 +1,6 @@
<?php
namespace Domain\Localization\Actions;
use DB;
use Domain\Localization\Models\Language;
use Domain\Localization\Models\LanguageTranslation;

View File

@@ -1,7 +1,6 @@
<?php
namespace Domain\Localization\Controllers;
use Domain\Localization\Actions\SeedDefaultLanguageTranslationsAction;
use Illuminate\Http\Response;
use Domain\Settings\Models\Setting;
use App\Http\Controllers\Controller;

View File

@@ -1,12 +1,12 @@
<?php
namespace Domain\Localization\Models;
use Domain\Localization\Actions\SeedDefaultLanguageTranslationsAction;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\DB;
use Kyslik\ColumnSortable\Sortable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Domain\Localization\Actions\SeedDefaultLanguageTranslationsAction;
/**
* @method static whereLocale(string $param)

View File

@@ -1,16 +1,17 @@
<?php
namespace Domain\Maintenance\Controllers;
use Domain\Localization\Actions\UpgradeLanguageTranslationsAction;
use Gate;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Domain\Localization\Actions\UpgradeLanguageTranslationsAction;
class UpgradeTranslationsController extends Controller
{
public function __construct(
public UpgradeLanguageTranslationsAction $upgradeLanguageTranslations,
) {}
) {
}
/**
* Get new language translations from default translations

View File

@@ -1,9 +1,6 @@
<?php
namespace Domain\Pages\Actions;
use Domain\Pages\Models\Page;
class SeedDefaultPagesAction

View File

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @property string slug
* @property string title
* @property boolean visibility
* @property bool visibility
* @property string content
*/
class Page extends Model

View File

@@ -1,9 +1,6 @@
<?php
namespace Domain\Settings\Actions;
use Domain\Settings\Models\Setting;
class SeedDefaultSettingsAction

View File

@@ -1,9 +1,6 @@
<?php
namespace Domain\SetupWizard\Actions;
use Illuminate\Support\Facades\Storage;
class CreateDiskDirectoriesAction

View File

@@ -2,14 +2,14 @@
namespace Domain\SetupWizard\Controllers;
use App\Users\Models\User;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Domain\Settings\Models\Setting;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
/**
* Create and login admin account
@@ -20,7 +20,8 @@ class CreateAdminAccountController extends Controller
public SeedDefaultPagesAction $seedDefaultPages,
public SeedDefaultLanguageAction $seedDefaultLanguage,
public SeedDefaultSettingsAction $seedDefaultSettingsAction,
) {}
) {
}
public function __invoke(
Request $request

View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Sharing\Controllers;
use Illuminate\Http\Response;
use Domain\Zip\Models\Zip;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
@@ -58,7 +58,6 @@ class ShareController extends Controller
UpdateShareRequest $request,
Share $share,
): ShareResource {
// Update sharing record
$share->update([
'permission' => $request->input('permission'),

View File

@@ -2,11 +2,11 @@
namespace Domain\Sharing\Models;
use App\Users\Models\User;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Str;
use Database\Factories\ShareFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Notifications\Notifiable;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Factories\HasFactory;
/**

View File

@@ -11,8 +11,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
* @method static currentMonth()
* @property string id
* @property string user_id
* @property integer upload
* @property integer download
* @property int upload
* @property int download
*/
class Traffic extends Model
{

View File

@@ -13,7 +13,9 @@ class DumpTrashController extends Controller
public function __invoke(): Response
{
abort_if(
is_demo_account(Auth::user()->email), 204, 'Done!'
is_demo_account(Auth::user()->email),
204,
'Done!'
);
$user_id = Auth::id();

View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Zip\Actions;
use Illuminate\Support\Str;
use Domain\Zip\Models\Zip;
use Illuminate\Support\Str;
use Domain\Sharing\Models\Share;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth;

View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Zip\Actions;
use Illuminate\Support\Str;
use Domain\Zip\Models\Zip;
use Illuminate\Support\Str;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Auth;

View File

@@ -1,12 +1,11 @@
<?php
namespace Support\Middleware;
use Schema;
use Closure;
use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Schema;
use Doctrine\DBAL\Driver\PDOException;
class ProtectSetupWizardRoutes
{
@@ -25,7 +24,6 @@ class ProtectSetupWizardRoutes
}
return $next($request);
} catch (PDOException $e) {
return $next($request);
}

View File

@@ -3,10 +3,10 @@
use Carbon\Carbon;
use ByteUnits\Metric;
use App\Users\Models\User;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Collection;
use Domain\Settings\Models\Setting;
use Illuminate\Database\Eloquent\Model;
@@ -252,7 +252,7 @@ if (! function_exists('get_item')) {
/**
* Get folder or file item
*/
function get_item(string $type, string $id): Folder|File
function get_item(string $type, string $id): Folder | File
{
$model = $type === 'folder'
? 'folder'

View File

@@ -5,9 +5,9 @@ use Storage;
use Notification;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Zip\Models\Zip;
use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;

View File

@@ -4,10 +4,10 @@ namespace Tests\Domain\Files;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Zip\Models\Zip;
use Illuminate\Support\Str;
use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Zip\Models\Zip;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;

View File

@@ -1,8 +1,6 @@
<?php
namespace Tests\Domain\Homepage;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Mail;
use Tests\TestCase;
use App\Users\Models\User;
@@ -11,6 +9,8 @@ use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Domain\Settings\Models\Setting;
use Domain\Homepage\Mail\SendContactMessage;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
class HomepageTest extends TestCase
{

View File

@@ -1,11 +1,11 @@
<?php
namespace Tests\Domain\Languages;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Settings\Models\Setting;
use Domain\Localization\Models\Language;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
class AdminLanguageTranslatorTest extends TestCase
{

View File

@@ -1,9 +1,9 @@
<?php
namespace Tests\Domain\Languages;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Tests\TestCase;
use Domain\Localization\Models\Language;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
class TranslationsAccessTest extends TestCase
{

View File

@@ -1,10 +1,10 @@
<?php
namespace Tests\Domain\Pages;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Tests\TestCase;
use App\Users\Models\User;
use Laravel\Sanctum\Sanctum;
use Domain\Pages\Actions\SeedDefaultPagesAction;
class AdminPagesTest extends TestCase
{

View File

@@ -1,8 +1,8 @@
<?php
namespace Tests\Domain\Pages;
use Domain\Pages\Actions\SeedDefaultPagesAction;
use Tests\TestCase;
use Domain\Pages\Actions\SeedDefaultPagesAction;
class PagesTest extends TestCase
{

View File

@@ -1,12 +1,12 @@
<?php
namespace Tests\Domain\Settings;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Illuminate\Http\UploadedFile;
use Domain\Settings\Models\Setting;
use Domain\Settings\Actions\SeedDefaultSettingsAction;
class SettingsTest extends TestCase
{

View File

@@ -1,9 +1,9 @@
<?php
namespace Tests\Domain\SetupWizard;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
use Storage;
use Tests\TestCase;
use Domain\Localization\Actions\SeedDefaultLanguageAction;
class SetupServiceTest extends TestCase
{

View File

@@ -4,9 +4,9 @@ namespace Tests\Domain\Sharing;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Zip\Models\Zip;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Illuminate\Http\UploadedFile;

View File

@@ -4,9 +4,9 @@ namespace Tests\Domain\Zip;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Zip\Models\Zip;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Zip\Models\Zip;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;

View File

@@ -4,9 +4,9 @@ namespace Tests\Domain\Zip;
use Storage;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Zip\Models\Zip;
use Laravel\Sanctum\Sanctum;
use Domain\Files\Models\File;
use Domain\Zip\Models\Zip;
use Domain\Folders\Models\Folder;
use Illuminate\Http\UploadedFile;

View File

@@ -2,10 +2,10 @@
namespace Tests;
use Carbon\Carbon;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Notification;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
abstract class TestCase extends BaseTestCase