Merge remote-tracking branch 'origin/teams'

# Conflicts:
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.js
#	public/chunks/app-billings.js
#	public/chunks/app-email.js
#	public/chunks/app-index.js
#	public/chunks/app-language.js
#	public/chunks/app-others.js
#	public/chunks/app-payments.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/contact-us.js
#	public/chunks/database.js
#	public/chunks/environment-setup.js
#	public/chunks/installation-disclaimer.js
#	public/chunks/page-edit.js
#	public/chunks/plan-create.js
#	public/chunks/plan-delete.js
#	public/chunks/plan-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/settings-create-payment-methods.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-password.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/single-file.js
#	public/chunks/status-check.js
#	public/chunks/stripe-credentials.js
#	public/chunks/subscription-plans.js
#	public/chunks/upgrade-billing.js
#	public/chunks/upgrade-plan.js
#	public/chunks/user-create.js
#	public/chunks/user-delete.js
#	public/chunks/user-detail.js
#	public/chunks/user-invoices.js
#	public/chunks/user-password.js
#	public/chunks/user-storage.js
#	public/js/main.js
#	public/mix-manifest.json

.env.example

@@ -45,6 +45,7 @@ S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_DEFAULT_REGION=
 S3_BUCKET=
+S3_URL=
 
 CASHIER_LOGGER=stack
 CASHIER_CURRENCY=

.gitignore

@@ -20,3 +20,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 prettier.json
+/public/temp

changelog.md

@@ -0,0 +1,6 @@
+## Version 2.0
+#### Release date: 1. January 2022
+
+### File Preview
+
+- Application now generate multiple image sizes for better loading performance and is also frugal to your total data transfer 

composer.json

@@ -10,41 +10,44 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "brianium/paratest": "^6.3",
+        "brianium/paratest": "^6.3.2",
         "cartalyst/stripe-laravel": "^13.1",
-        "doctrine/dbal": "^2.13.2",
+        "cocur/slugify": "^4.0",
+        "doctrine/dbal": "^2.13.4",
         "fideloper/proxy": "^4.4.1",
         "fruitcake/laravel-cors": "^2.0.4",
         "gabrielelana/byte-units": "^0.5.0",
-        "guzzlehttp/guzzle": "^7.3.0",
+        "guzzlehttp/guzzle": "^7.4.0",
-        "intervention/image": "^2.6.0",
+        "intervention/image": "^2.7.0",
         "jaybizzle/laravel-crawler-detect": "^1.2",
         "kyslik/column-sortable": "^6.4.1",
         "laravel/cashier": "^12.15.0",
-        "laravel/fortify": "^1.7.14",
+        "laravel/fortify": "^1.8.3",
-        "laravel/framework": "^8.50.0",
+        "laravel/framework": "^8.69.0",
-        "laravel/sanctum": "^2.11.2",
+        "laravel/sanctum": "^2.12.1",
-        "laravel/tinker": "^2.6.1",
+        "laravel/tinker": "^2.6.2",
-        "laravel/ui": "^3.2.0",
+        "laravel/ui": "^3.3.1",
         "league/flysystem-aws-s3-v3": "^1.0.29",
         "league/flysystem-cached-adapter": "^1.1.0",
-        "spatie/laravel-backup": "^6.16.1",
+        "spatie/data-transfer-object": "^3.7.2",
-        "spatie/laravel-query-builder": "^3.5",
+        "spatie/laravel-backup": "^6.16.5",
+        "spatie/laravel-query-builder": "^3.6",
         "spatie/laravel-queueable-action": "^2.12",
         "spatie/laravel-tail": "^4.3.3",
-        "stechstudio/laravel-zipstream": "^4.4",
+        "stechstudio/laravel-zipstream": "^4.5",
         "teamtnt/laravel-scout-tntsearch-driver": "^11.5.0.0",
-        "vimeo/psalm": "^4.8.1"
+        "vimeo/psalm": "^4.11.2"
     },
     "require-dev": {
         "ext-json": "*",
-        "friendsofphp/php-cs-fixer": "^3.0.0",
         "barryvdh/laravel-ide-helper": "^2.10",
-        "facade/ignition": "^2.11.0",
+        "facade/ignition": "^2.16.0",
-        "fakerphp/faker": "^1.15.0",
+        "fakerphp/faker": "^1.16.0",
-        "mockery/mockery": "^1.4.3",
+        "friendsofphp/php-cs-fixer": "^3.2.1",
-        "nunomaduro/collision": "^5.5.0",
+        "mockery/mockery": "^1.4.4",
-        "phpunit/phpunit": "^9.5.6"
+        "nunomaduro/collision": "^5.10.0",
+        "nunomaduro/larastan": "^0.7.15",
+        "phpunit/phpunit": "^9.5.10"
     },
     "config": {
         "optimize-autoloader": true,

config/language-translations.php

@@ -346,7 +346,6 @@ return [
         'empty_page.title'                                   => 'Upload Your First File',
         'errors.capacity_digit'                              => 'The storage capacity must be lower than 10 digit number.',
         'file_detail.author'                                 => 'Author',
-        'file_detail.author_participant'                     => 'Public Participant',
         'file_detail.created_at'                             => 'Created at',
         'file_detail.items'                                  => 'Items',
         'file_detail.selected_multiple'                      => 'Selected Multiple Items',
@@ -587,10 +586,10 @@ return [
         'sidebar.favourites'                                 => 'Favourites',
         'sidebar.favourites_empty'                           => 'Drag here your favourite folder.',
         'sidebar.folders_empty'                              => 'Create some new folder.',
-        'sidebar.home'                                       => 'Files',
+        'sidebar.home'                                       => 'My Files',
         'sidebar.latest'                                     => 'Recent Uploads',
         'sidebar.locations_title'                            => 'Base',
-        'sidebar.my_shared'                                  => 'Shared Items',
+        'sidebar.my_shared'                                  => 'Publicly Shared',
         'sidebar.navigator_title'                            => 'Navigator',
         'sidebar.tools_title'                                => 'Tools',
         'storage.audios'                                     => 'Audios',
@@ -734,5 +733,6 @@ return [
         'popup.share.password_description'                   => 'Protect your item by your custom password.',
         'sharelink.share_via_email'                          => 'Share Link on Emails',
         'sharelink.copy_embed'                               => 'Copy Web Insert Code',
+        'popup.move_into_team_disclaimer'                    => 'Your folder <b class="text-theme dark-text-theme">will be moved</b> into Team Folders.',
     ],
 ];

config/vuefilemanager.php

@@ -6,6 +6,48 @@ return [
     'is_demo' => env('APP_DEMO', false),
 
     // Define size of chunk uploaded by MB.
-    // E.g. integer 128 means chunk size will be 128MB.
+    // E.g. integer 128 means chunk size will be 128 MB.
     'chunk_size' => env('CHUNK_SIZE', '128'),
+
+    'colors' => [
+        '#9ad2bf', '#9ad2cd', '#d29a9a', '#d2ce9a', '#9aadd2', '#c59ad2',
+    ],
+
+    'avatar_sizes' => [
+        [
+            'size' => 160,
+            'name' => 'md',
+        ],
+        [
+            'size' => 60,
+            'name' => 'sm',
+        ],
+        [
+            'size' => 42,
+            'name' => 'xs',
+        ],
+    ],
+
+    'image_sizes' => [
+        [
+            'size' => 1440,
+            'name' => 'xl',
+        ],
+        [
+            'size' => 960,
+            'name' => 'lg',
+        ],
+        [
+            'size' => 480,
+            'name' => 'md',
+        ],
+        [
+            'size' => 240,
+            'name' => 'sm',
+        ],
+        [
+            'size' => 120,
+            'name' => 'xs',
+        ],
+    ],
 ];

database/factories/FolderFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Database\Factories;
 
 use Domain\Folders\Models\Folder;
@@ -21,13 +22,14 @@ class FolderFactory extends Factory
     public function definition()
     {
         return [
-            'id'         => $this->faker->uuid,
+            'id'          => $this->faker->uuid,
-            'user_id'    => $this->faker->uuid,
+            'user_id'     => $this->faker->uuid,
-            'name'       => $this->faker->word,
+            'name'        => $this->faker->word,
-            'author'     => $this->faker->randomElement(
+            'team_folder' => false,
+            'author'      => $this->faker->randomElement(
                 ['user', 'member', 'visitor']
             ),
-            'created_at' => $this->faker->dateTimeBetween(
+            'created_at'  => $this->faker->dateTimeBetween(
                 $startDate = '-36 months',
                 $endDate = 'now',
                 $timezone = null

database/factories/TeamFolderInvitationFactory.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Database\Factories;
+
+use Domain\Teams\Models\TeamFolderInvitation;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class TeamFolderInvitationFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = TeamFolderInvitation::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'id'         => $this->faker->uuid,
+            'parent_id'  => $this->faker->uuid,
+            'inviter_id' => $this->faker->uuid,
+            'email'      => $this->faker->email,
+            'permission' => $this->faker->randomElement(['can-edit', 'can-view', 'can-view-and-download']),
+            'status'     => $this->faker->randomElement(['pending', 'accepted', 'rejected']),
+        ];
+    }
+}

database/migrations/2019_08_15_171328_create_file_manager_folders.php

@@ -21,8 +21,9 @@ class CreateFileManagerFolders 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->uuid('author_id')->nullable();
 
             $table->softDeletes();
             $table->timestamps();

database/migrations/2019_08_15_171345_create_file_manager_files.php

@@ -16,9 +16,8 @@ class CreateFileManagerFiles extends Migration
         Schema::create('files', function (Blueprint $table) {
             $table->uuid('id')->primary()->index();
             $table->uuid('user_id')->index();
-            $table->uuid('folder_id')->nullable();
+            $table->uuid('parent_id')->nullable();
 
-            $table->text('thumbnail')->nullable();
             $table->text('name');
             $table->string('basename')->index();
 
@@ -29,7 +28,6 @@ class CreateFileManagerFiles extends Migration
             $table->longText('metadata')->nullable();
 
             $table->enum('author', ['user', 'member', 'visitor'])->default('user');
-            $table->uuid('author_id')->nullable();
 
             $table->softDeletes();
             $table->timestamps();

database/migrations/2020_03_03_070319_create_favourites_folders_table.php

@@ -15,7 +15,7 @@ class CreateFavouritesFoldersTable extends Migration
     {
         Schema::create('favourite_folder', function (Blueprint $table) {
             $table->uuid('user_id');
-            $table->uuid('folder_id');
+            $table->uuid('parent_id');
             $table->charset = 'utf8mb4';
             $table->collation = 'utf8mb4_unicode_ci';
         });

database/migrations/2020_05_26_092649_create_user_settings_table.php

@@ -17,6 +17,7 @@ class CreateUserSettingsTable extends Migration
             $table->uuid('user_id')->index();
             $table->integer('storage_capacity')->default(5);
             $table->string('avatar')->nullable();
+            $table->string('color')->nullable();
             $table->text('name')->nullable();
             $table->text('address')->nullable();
             $table->text('state')->nullable();

database/migrations/2021_08_24_080638_create_team_folder_invitations_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTeamFolderInvitationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('team_folder_invitations', function (Blueprint $table) {
+            $table->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', 'rejected'])->default('pending');
+            $table->timestamps();
+            $table->charset = 'utf8mb4';
+            $table->collation = 'utf8mb4_unicode_ci';
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('invitations');
+    }
+}

database/migrations/2021_08_24_092726_create_team_folder_members_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateZipsTable extends Migration
+class CreateTeamFolderMembersTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,12 +13,10 @@ class CreateZipsTable extends Migration
      */
     public function up()
     {
-        Schema::create('zips', function (Blueprint $table) {
+        Schema::create('team_folder_members', function (Blueprint $table) {
-            $table->uuid('id')->primary()->index();
+            $table->uuid('parent_id');
-            $table->uuid('user_id')->index();
+            $table->uuid('user_id');
-            $table->string('shared_token')->nullable()->index();
+            $table->string('permission');
-            $table->text('basename');
-            $table->timestamps();
             $table->charset = 'utf8mb4';
             $table->collation = 'utf8mb4_unicode_ci';
         });
@@ -31,6 +29,6 @@ class CreateZipsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('zips');
+        Schema::dropIfExists('team_folder_members');
     }
 }

package.json

@@ -15,15 +15,19 @@
         "laravel-mix": "^5.0.9",
         "resolve-url-loader": "^2.3.1",
         "sass-loader": "^8.0.2",
+        "tailwindcss-debug-screens": "^2.2.0",
         "vue-template-compiler": "^2.6.12"
     },
     "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/vue-fontawesome": "^0.1.10",
+        "autoprefixer": "^9.8.8",
         "lodash": "^4.17.21",
         "node-sass": "^4.14.1",
         "pdfvuer": "1.7.5",
+        "postcss": "^7.0.39",
+        "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17",
         "twemoji": "^13.0.2",
         "vee-validate": "^3.4.5",
         "vue": "^2.6.12",

psalm.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="5"
     findUnusedVariablesAndParams="true"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

public/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~f04cfcbc.js.LICENSE.txt

@@ -0,0 +1 @@
+/*! Copyright Twitter Inc. and other contributors. Licensed under MIT */

public/chunks/setup-wizard.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[53],{oBQg:function(e,t,r){"use strict";r.r(t);var n=r("L2JU");function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var i={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){c(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){var e=this.$root.$data.config.installation;e&&"setup-done"===e&&this.$router.push({name:"SignIn"})}},u=r("KHd+"),a=Object(u.a)(i,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=a.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[56],{oBQg:function(e,t,r){"use strict";r.r(t);var n=r("L2JU");function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function c(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var i={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){c(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){var e=this.$root.$data.config.installation;e&&"setup-done"===e&&this.$router.push({name:"SignIn"})}},u=r("KHd+"),a=Object(u.a)(i,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=a.exports}}]);

public/vendors~chunks/admin~chunks/platform~chunks/settings~chunks/shared.js.LICENSE.txt

@@ -0,0 +1,30 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <http://feross.org>
+ * @license  MIT
+ */
+
+/*! Copyright Twitter Inc. and other contributors. Licensed under MIT */
+
+/**
+ * @licstart The following is the entire license notice for the
+ * Javascript code in this page
+ *
+ * Copyright 2020 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @licend The above is the entire license notice for the
+ * Javascript code in this page
+ */