Merge branch 'master' into 'production'

Master

See merge request Romulus21/portal!69

.idea/php.xml

@@ -28,7 +28,6 @@
       <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
       <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
       <path value="$PROJECT_DIR$/vendor/sebastian/type" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
       <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
       <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
       <path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
@@ -139,6 +138,10 @@
       <path value="$PROJECT_DIR$/vendor/php-http/discovery" />
       <path value="$PROJECT_DIR$/vendor/php-http/client-common" />
       <path value="$PROJECT_DIR$/vendor/http-interop/http-factory-guzzle" />
+      <path value="$PROJECT_DIR$/vendor/lcobucci/clock" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/laravel/envoy" />
+      <path value="$PROJECT_DIR$/vendor/predis/predis" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />

.idea/portal.iml

@@ -91,7 +91,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/resource-operations" />
@@ -138,6 +137,10 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/voku/portable-ascii" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/lcobucci/clock" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/laravel/envoy" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/predis/predis" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

Envoy.blade.php

@@ -56,9 +56,9 @@
     php artisan down
     git reset --hard HEAD
     git pull origin {{ $config->prod_branch }}
-    composer install
+    composer install --no-dev
-    npm install
+    npm install --only=dependencies
-    npm run production
+    npm run production --only=dependencies
     php artisan migrate --force
     php artisan optimize
     php artisan up

composer.json

@@ -19,12 +19,14 @@
         "laravel/slack-notification-channel": "^2.2",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.0",
+        "predis/predis": "^1.1",
         "sentry/sentry-laravel": "^2.0",
         "vlucas/phpdotenv": "^5.2"
     },
     "require-dev": {
         "facade/ignition": "^2.3.6",
         "fzaninotto/faker": "^1.9.1",
+        "laravel/envoy": "^2.4",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^8.5",

config/database.php

@@ -130,16 +130,16 @@ return [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', '6379'),
+            'port' => env('REDIS_PORT', 6379),
-            'database' => env('REDIS_DB', '0'),
+            'database' => env('REDIS_DB', 0),
         ],
 
         'cache' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', '6379'),
+            'port' => env('REDIS_PORT', 6379),
-            'database' => env('REDIS_CACHE_DB', '1'),
+            'database' => env('REDIS_CACHE_DB', 1),
         ],
 
     ],

package.json

@@ -18,21 +18,21 @@
         "eslint": "^6.8.0",
         "eslint-config-standard": "^14.1.1",
         "eslint-loader": "^3.0.4",
-        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-import": "^2.22.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^4.2.1",
-        "eslint-plugin-standard": "^4.0.1",
+        "eslint-plugin-standard": "^4.0.2",
         "eslint-plugin-vue": "^6.2.2",
-        "laravel-mix": "^5.0.1",
+        "laravel-mix": "^5.0.7",
         "laravel-mix-eslint": "^0.1.3",
         "laravel-mix-purgecss": "^5.0.0",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.20",
-        "resolve-url-loader": "^2.3.1",
+        "resolve-url-loader": "^3.1.2",
-        "sass": "^1.26.10",
+        "sass": "^1.28.0",
         "sass-loader": "^8.0.0",
-        "vue": "^2.5.17",
+        "vue": "^2.6.12",
-        "vue-router": "^3.4.1",
+        "vue-router": "^3.4.8",
-        "vue-template-compiler": "^2.6.10",
+        "vue-template-compiler": "^2.6.12",
         "vuex": "^3.5.1"
     },
     "dependencies": {
@@ -40,6 +40,6 @@
         "laravel-mix-svg-vue": "^0.2.6",
         "markdown-it": "^10.0.0",
         "markdown-it-checkbox": "^1.1.0",
-        "tailwindcss": "^1.6.2"
+        "tailwindcss": "^1.9.6"
     }
 }

public/js/app.js.LICENSE.txt

@@ -1,11 +1,11 @@
 /*!
- * Vue.js v2.6.11
+ * Vue.js v2.6.12
- * (c) 2014-2019 Evan You
+ * (c) 2014-2020 Evan You
  * Released under the MIT License.
  */
 
 /*!
- * vuex v3.5.1
+ * vuex v3.6.0
  * (c) 2020 Evan You
  * @license MIT
  */

resources/views/auth/login.blade.php

@@ -36,12 +36,12 @@
                 </label>
             </div>
 
-            <div class="flex justify-between">
+            <div class="flex justify-between items-center">
                 <button type="submit" class="btn-primary">
                     {{ __('Login') }}
                 </button>
                 @if (Route::has('password.request'))
-                    <a class="btn-secondary" href="{{ route('password.request') }}">
+                    <a class="text-white hover:text-gray-200" href="{{ route('password.request') }}">
                         {{ __('Forgot Your Password?') }}
                     </a>
                 @endif

resources/views/auth/register.blade.php

@@ -0,0 +1,60 @@
+@extends('layouts.app')
+
+@section('content')
+    <div class="bg-gray-200 mx-auto h-screen flex justify-center items-center">
+        <div class="w-96 m-auto bg-marine rounded p-4 mt-10 shadow-xl text-white">
+            <div class="text-3xl font-bold text-center mb-4">{{ __('Register') }}</div>
+            <form method="POST" action="{{ route('register') }}">
+                @csrf
+
+                <label for="email" class="mb-2 font-bold uppercase">{{ __('Name') }}</label>
+                <div class="mb-4">
+                    <input id="name" type="text" class="w-full border-2 text-black border-marine-light rounded p-2 @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autofocus>
+                    @error('name')
+                    <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                    @enderror
+                </div>
+
+                <label for="email" class="mb-2 font-bold uppercase">{{ __('E-Mail') }}</label>
+                <div class="mb-4">
+                    <input id="email" type="email" class="w-full border-2 text-black border-marine-light rounded p-2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
+                    @error('email')
+                    <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                    @enderror
+                </div>
+
+                <label for="password" class="mb-2 font-bold uppercase">{{ __('Password') }}</label>
+                <div class="mb-4">
+                    <input id="password" type="password" class="w-full border-2 text-black border-marine-light rounded p-2 @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
+
+                    @error('password')
+                    <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                    @enderror
+                </div>
+
+                <label for="password-confirm" class="mb-2 font-bold uppercase">{{ __('Password') }}</label>
+                <div class="mb-4">
+                    <input id="password-confirm" type="password" class="w-full border-2 text-black border-marine-light rounded p-2 @error('password_confirmation') is-invalid @enderror" name="password_confirmation" required autocomplete="new-password">
+
+                    @error('password_confirmation')
+                    <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                    @enderror
+                </div>
+
+                <div class="flex justify-between">
+                    <button type="submit" class="btn-primary">
+                        {{ __('Register') }}
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+@endsection