diff --git a/.env.testing b/.env.testing index 09adae02..adaafed7 100644 --- a/.env.testing +++ b/.env.testing @@ -1,6 +1,6 @@ APP_NAME=Laravel APP_ENV=local -APP_KEY=base64:fzZomRn3E8Rb6UDR8oqFiNo8Y4L5RyX4oVVli3KiWQA= +APP_KEY=base64:yQs3FfCdjY2KGHl1JpLP7L8LLVq8RNOIu/sygWVXUBM= APP_DEBUG=true APP_URL=http://localhost APP_DEMO=false diff --git a/database/factories/FolderFactory.php b/database/factories/FolderFactory.php index 1aff4465..8a11ffaa 100644 --- a/database/factories/FolderFactory.php +++ b/database/factories/FolderFactory.php @@ -25,7 +25,6 @@ class FolderFactory extends Factory 'id' => $this->faker->uuid, 'user_id' => $this->faker->uuid, 'name' => $this->faker->word, - 'team_folder' => false, 'author' => $this->faker->randomElement( ['user', 'member', 'visitor'] ), diff --git a/database/factories/UserLimitationFactory.php b/database/factories/UserLimitationFactory.php index 0dcd51af..d9cacfa6 100644 --- a/database/factories/UserLimitationFactory.php +++ b/database/factories/UserLimitationFactory.php @@ -24,7 +24,6 @@ class UserLimitationFactory extends Factory return [ 'user_id' => $this->faker->uuid, 'max_storage_amount' => $this->faker->randomElement([100, 200, 300]), - 'max_team_members' => $this->faker->randomElement([10, 20, 30]), ]; } } diff --git a/database/migrations/2019_08_15_171328_create_folders_table.php b/database/migrations/2019_08_15_171328_create_folders_table.php index 133365eb..fcb5f1b1 100644 --- a/database/migrations/2019_08_15_171328_create_folders_table.php +++ b/database/migrations/2019_08_15_171328_create_folders_table.php @@ -21,8 +21,6 @@ class CreateFoldersTable extends Migration $table->string('color')->nullable(); $table->longText('emoji')->nullable(); - $table->boolean('team_folder')->default(0); - $table->enum('author', ['user', 'member', 'visitor'])->default('user'); $table->softDeletes(); diff --git a/database/migrations/2021_08_24_080638_create_team_folder_invitations_table.php b/database/migrations/2021_08_24_080638_create_team_folder_invitations_table.php deleted file mode 100644 index 27e8e06a..00000000 --- a/database/migrations/2021_08_24_080638_create_team_folder_invitations_table.php +++ /dev/null @@ -1,39 +0,0 @@ -uuid('id')->primary(); - $table->uuid('parent_id'); - $table->uuid('inviter_id'); - $table->text('email'); - $table->string('color')->nullable(); - $table->enum('permission', ['can-edit', 'can-view', 'can-view-and-download']); - $table->enum('status', ['pending', 'accepted', 'waiting-for-registration', 'rejected'])->default('pending'); - $table->timestamps(); - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_unicode_ci'; - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('invitations'); - } -} diff --git a/database/migrations/2021_08_24_092726_create_team_folder_members_table.php b/database/migrations/2021_08_24_092726_create_team_folder_members_table.php deleted file mode 100644 index 9428c489..00000000 --- a/database/migrations/2021_08_24_092726_create_team_folder_members_table.php +++ /dev/null @@ -1,34 +0,0 @@ -uuid('parent_id'); - $table->uuid('user_id'); - $table->string('permission'); - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_unicode_ci'; - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('team_folder_members'); - } -} diff --git a/database/migrations/2021_11_19_164732_create_user_limitations_table.php b/database/migrations/2021_11_19_164732_create_user_limitations_table.php index bb54c3b8..bc95c88d 100644 --- a/database/migrations/2021_11_19_164732_create_user_limitations_table.php +++ b/database/migrations/2021_11_19_164732_create_user_limitations_table.php @@ -16,7 +16,6 @@ class CreateUserLimitationsTable extends Migration Schema::create('user_limitations', function (Blueprint $table) { $table->uuid('user_id'); $table->text('max_storage_amount'); - $table->text('max_team_members'); $table->charset = 'utf8mb4'; $table->collation = 'utf8mb4_unicode_ci'; }); diff --git a/database/migrations/2022_02_17_073653_create_upload_requests_table.php b/database/migrations/2022_02_17_073653_create_upload_requests_table.php deleted file mode 100644 index 08ac829c..00000000 --- a/database/migrations/2022_02_17_073653_create_upload_requests_table.php +++ /dev/null @@ -1,39 +0,0 @@ -uuid('id'); - $table->uuid('user_id'); - $table->uuid('folder_id')->nullable(); - $table->enum('status', ['active', 'filling', 'filled', 'expired'])->default('active'); - $table->string('email')->nullable(); - $table->text('name')->nullable(); - $table->longText('notes')->nullable(); - $table->timestamps(); - $table->charset = 'utf8mb4'; - $table->collation = 'utf8mb4_unicode_ci'; - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('upload_requests'); - } -} diff --git a/database/migrations/2022_03_10_052753_create_notifications_table.php b/database/migrations/2022_03_10_052753_create_notifications_table.php deleted file mode 100644 index 395e2d3b..00000000 --- a/database/migrations/2022_03_10_052753_create_notifications_table.php +++ /dev/null @@ -1,36 +0,0 @@ -uuid('id')->primary(); - $table->string('type'); - $table->string('notifiable_type'); - $table->uuid('notifiable_id'); - $table->text('data'); - $table->timestamp('read_at')->nullable(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('notifications'); - } -}; diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b52cfc9f..4881e606 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -1,16 +1,6 @@ @php - use VueFileManager\Subscription\Domain\Plans\Models\Plan; - use VueFileManager\Subscription\Domain\Transactions\Models\Transaction; - use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription; try { - // Subscription - $isEmptySubscriptions = Subscription::count() === 0; - $isEmptyTransactions = Transaction::count() === 0; - $isEmptyPlans = Plan::count() === 0; - $plan = Plan::where('status', 'active') - ->where('type', 'metered'); - // User $isUser = auth()->check(); $user = Auth::user(); @@ -21,7 +11,6 @@ } catch (PDOException $e) { [$isUser, $isEmptyPlans, $isEmptyTransactions, $isEmptySubscriptions] = false; - $plan = null; $defaultEmoji = 'twemoji'; $defaultThemeMode = 'system'; } @@ -71,19 +60,11 @@
@endif - - {{--Adsense code--}} - @if(optional($settings)->allowed_adsense) - - - - @endif