diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_27-06-21_21_11_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_27-06-21_21_11_[Default_Changelist]/shelved.patch new file mode 100644 index 0000000..be488e9 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_27-06-21_21_11_[Default_Changelist]/shelved.patch @@ -0,0 +1,1583 @@ +Index: app/Cache/Cache.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+> 3600) {\n $json = file_get_contents('https://api.mojang.com/users/profiles/'.$uuid.'./names');\n if(empty($json)) {\n $json = file_get_contents(storage_path('app/uuid/'.$uuid.'.json'));\n $json = json_decode($json, true);\n return $json['name'];\n }\n\n $json = json_decode($json, true);\n if(isset($json['error'])) {\n $json = file_get_contents(storage_path('app/uuid/'.$uuid.'.json'));\n $json = json_decode($json, true);\n return $json['name'];\n }\n\n $name = $json[count($json) -1]['name'];\n $json = [];\n $json['id'] = $uuid;\n $json['name'] = $name;\n self::saveJson($json);\n return $json['name'];\n } else {\n return $json['name'];\n }\n } else {\n $json = file_get_contents('https://api.mojang.com/user/profiles/'.$uuid.'/names');\n if(empty($json))\n return $uuid;\n\n $json = json_decode($json, true);\n if(isset($json['error']))\n return $uuid;\n\n $name = $json[count($json) -1]['name'];\n $json = [];\n $json['id'] = $uuid;\n $json['name'] = $name;\n self::saveJson($json);\n return $json['name'];\n }\n }\n\n public static function getUUID($username) {\n foreach(glob(storage_path('app/uuid/*')) as $file) {\n $json = file_get_contents($file);\n $json = json_decode($json, true);\n if($json['name'] !== $username)\n continue;\n\n if((time() - strtotime($json['time'])) > 3600) {\n $json = file_get_contents('https://api.mojang.com/users/profiles/minecraft/'.$username);\n if(empty($json)) {\n unlink(storage_path('app/uuid/'.$file));\n return $username;\n }\n\n $json = json_decode($json, true);\n if(isset($json['error'])) {\n unlink(storage_path('app/uuid/'.$file));\n return $username;\n }\n\n self::saveJson($json);\n return $json['id'];\n } else {\n return $json['id'];\n }\n }\n\n $json = file_get_contents('https://api.mojang.com/users/profiles/minecraft/'.$username);\n if(empty($json))\n return $username;\n\n $json = json_decode($json, true);\n if(isset($json['error']))\n return $username;\n\n self::saveJson($json);\n return $json['id'];\n }\n\n public static function saveJson($json) {\n $array = [\n 'id' => $json['id'],\n 'name' => $json['name'],\n 'time' => date('d-m-Y H:m:s')\n ];\n\n file_put_contents(storage_path('app/uuid/'.$json['id'].'.json'), json_encode($array));\n }\n\n}\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/app/Cache/Cache.php b/app/Cache/Cache.php +--- a/app/Cache/Cache.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/app/Cache/Cache.php (date 1624815957652) +@@ -27,9 +27,6 @@ + $json['id'] = $uuid; + $json['name'] = $name; + self::saveJson($json); +- return $json['name']; +- } else { +- return $json['name']; + } + } else { + $json = file_get_contents('https://api.mojang.com/user/profiles/'.$uuid.'/names'); +@@ -45,8 +42,9 @@ + $json['id'] = $uuid; + $json['name'] = $name; + self::saveJson($json); +- return $json['name']; +- } ++ } ++ ++ return $json['name']; + } + + public static function getUUID($username) { +@@ -70,10 +68,9 @@ + } + + self::saveJson($json); +- return $json['id']; +- } else { +- return $json['id']; +- } ++ } ++ ++ return $json['id']; + } + + $json = file_get_contents('https://api.mojang.com/users/profiles/minecraft/'.$username); +Index: resources/views/layouts/panel.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n ThemePark\n\n \n \n \n \n\n \n \n @yield('css')\n \n\n\n\n\n\n\n@yield('content')\n\n\n\n\n\n\n\n@yield('javascript')\n\n\n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/layouts/panel.blade.php b/resources/views/layouts/panel.blade.php +--- a/resources/views/layouts/panel.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/layouts/panel.blade.php (date 1624819971363) +@@ -1,30 +1,6 @@ +- +- +- +- +- +- +- ThemePark +- +- +- +- +- ++@extends('layouts.default') + +- +- +- @yield('css') +- +- +- +- +- ++@section('body') + + + @yield('content') + +- ++@endsection + + \n \n \n \n \n {{ config('app.name', 'ThemePark') }}\n\n \n \n \n\n\n\n
\n
\n
\n @csrf\n

ThemePark

\n\n
\n
\n \n \n
\n @error('two_factor')\n {{ $message }}\n @enderror\n
\n\n \n {{ __('Logout') }}\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n@section('content')\n
\n
\n
\n
\n
{{ __('2FA Authenticate') }}
\n\n
\n
\n @csrf\n\n
\n \n\n
\n \n\n @error('two_factor')\n \n {{ $message }}\n \n @enderror\n
\n
\n\n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n@endsection\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/2fa/authenticate.blade.php b/resources/views/2fa/authenticate.blade.php +--- a/resources/views/2fa/authenticate.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/2fa/authenticate.blade.php (date 1624817819107) +@@ -1,95 +1,41 @@ +- +- +- +- +- +- +- +- {{ config('app.name', 'ThemePark') }} +- +- +- +- +- +- +- +-
+-
+-
+- @csrf +-

ThemePark

+- +-
+-
+- +- +-
+- @error('two_factor') +- {{ $message }} +- @enderror +-
++@extends('layouts.default') + +- +- {{ __('Logout') }} +-
+-
+-
+- +- +- +- +- +- +- +- +- +- +-@section('content') +-
+-
+-
+-
+-
{{ __('2FA Authenticate') }}
++
++
++
++
{{ __('2FA Authenticate') }}
+ +-
+-
+- @csrf ++
++ ++ @csrf + +-
+- ++
++ + +-
+- ++
++ + +- @error('two_factor') ++ @error('two_factor') + + {{ $message }} + +- @enderror +-
+-
++ @enderror ++
++
+ +-
+-
+- +-
+-
+- +-
+-
+-
+-
+-
++
++
++ ++
++
++ ++
++
++
++
++ + @endsection +Index: resources/views/auth/login.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>getLocale()) }}\">\n\n \n \n \n \n \n {{ config('app.name', 'Laravel') }}\n\n \n \n \n\n\n\n
\n
\n
\n @csrf\n

ThemePark

\n @if($errors->any())\n\n
\n {{ __('Invalid Username or Password') }}\n ×\n
\n\n @endif\n
\n \n \n
\n
\n \n \n
\n\n \n

No account yet, {{ __('Register one') }} or,\n
Did you {{ __('forget your password') }}?

\n
\n
\n
\n\n\n\n\n\n\n\n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php +--- a/resources/views/auth/login.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/auth/login.blade.php (date 1624817864555) +@@ -1,22 +1,6 @@ +- +- +- +- +- +- +- +- {{ config('app.name', 'Laravel') }} ++@extends('layouts.default') + +- +- +- +- +- +- ++@section('body') +
+
+
+@@ -45,17 +29,4 @@ +
+
+
+- +- +- +- +- +- +- +- ++@endsection +Index: resources/views/auth/register.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>getLocale()) }}\">\n\n \n \n \n \n \n {{ config('app.name', 'Laravel') }}\n\n \n \n \n\n\n\n
\n
\n
\n @csrf\n

ThemePark

\n @if($errors->any())\n\n
\n {{ __($errors->first()) }}\n ×\n
\n\n @endif\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n \n

Already have an account, {{ __('Login') }}

\n
\n
\n
\n\n\n\n\n\n\n\n\n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php +--- a/resources/views/auth/register.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/auth/register.blade.php (date 1624818070946) +@@ -1,22 +1,6 @@ +- +- +- +- +- +- +- +- {{ config('app.name', 'Laravel') }} ++@extends('layouts.default') + +- +- +- +- +- +- ++@section('body') +
+
+
+@@ -55,25 +39,15 @@ +
+
+
++@endsection + +- +- +- +- +- ++@section('javascript') + +- +- ++@endsection +Index: resources/views/auth/verify.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>getLocale()) }}\">\n\n \n \n \n \n \n {{ config('app.name', 'Laravel') }}\n\n \n \n \n\n\n\n
\n
\n

ThemePark

\n @if (session('resent'))\n\n
\n {{ __('Email has been resend.') }}\n ×\n
\n\n @endif\n

{{ __('Before proceeding, please check your email for a verification link. If you did not receive an email press the button bellow to resend the email.') }}

\n
\n @csrf\n .\n
\n
\n
\n\n\n\n\n\n\n\n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php +--- a/resources/views/auth/verify.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/auth/verify.blade.php (date 1624818591637) +@@ -1,22 +1,6 @@ +- +- +- +- +- +- +- +- {{ config('app.name', 'Laravel') }} ++@extends('layouts.default') + +- +- +- +- +- +- ++@section('body') +
+
+

ThemePark

+@@ -35,17 +19,4 @@ + +
+
+- +- +- +- +- +- +- +- ++@endsection +Index: resources/views/auth/passwords/reset.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>getLocale()) }}\">\n\n \n \n \n \n \n {{ config('app.name', 'Laravel') }}\n\n \n \n \n\n\n\n
\n
\n
\n @csrf\n \n

ThemePark

\n\n
\n
\n \n \n
\n @error('email')\n {{ $message }}\n @enderror\n
\n\n
\n
\n \n \n
\n @error('password')\n {{ $message }}\n @enderror\n
\n\n
\n \n \n
\n\n \n
\n
\n
\n\n\n\n\n\n\n\n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php +--- a/resources/views/auth/passwords/reset.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/auth/passwords/reset.blade.php (date 1624818628752) +@@ -1,22 +1,6 @@ +- +- +- +- +- +- +- +- {{ config('app.name', 'Laravel') }} ++@extends('layouts.default') + +- +- +- +- +- +- ++@section('body') +
+
+
+@@ -53,17 +37,4 @@ +
+
+
+- +- +- +- +- +- +- +- ++@endsection +Index: resources/views/auth/passwords/email.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>getLocale()) }}\">\n\n \n \n \n \n \n {{ config('app.name', 'Laravel') }}\n\n \n \n \n\n\n\n
\n
\n
\n @csrf\n

ThemePark

\n @if(session('status'))\n\n
\n {{ __('Email has been send.') }}\n ×\n
\n\n @endif\n
\n \n \n
\n\n \n
\n
\n
\n\n\n\n\n\n\n\n\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php +--- a/resources/views/auth/passwords/email.blade.php (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/resources/views/auth/passwords/email.blade.php (date 1624818610252) +@@ -1,22 +1,6 @@ +- +- +- +- +- +- +- +- {{ config('app.name', 'Laravel') }} ++@extends('layouts.default') + +- +- +- +- +- +- ++@section('body') +
+
+
+@@ -39,17 +23,4 @@ +
+
+
+- +- +- +- +- +- +- +- ++@endsection +Index: resources/views/layouts/default.blade.php +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php +new file mode 100644 +--- /dev/null (date 1624817648476) ++++ b/resources/views/layouts/default.blade.php (date 1624817648476) +@@ -0,0 +1,44 @@ ++ ++ ++ ++ ++ ++ ++ {{ env('APP_NAME', 'ThemePark') }} ++ ++ ++ ++ ++ ++ ++ ++ ++ @yield('css') ++ ++ ++ ++ ++@yield('body') ++ ++ ++ ++ ++ ++ ++ ++@yield('javascript') ++ ++ ++ +Index: public/assets/css/skin.css +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>.user-image, .user-header img {\n border: 0 !important;\n border-radius: 0 !important;\n}\n\n.navbar-nav>.user-menu>.dropdown-menu>li.user-header>p {\n color: #fff !important;\n font-weight: 600;\n}\n\n.logo-lg img, .logo-mini img {\n filter: brightness(0) invert(1);\n}\n\n.bg-aqua {\n background-color: #239af6 !important;\n}\n\n.small-box .inner {\n min-height: 102px;\n}\n\n.small-box .icon {\n color: #fff !important;\n font-size: 65px;\n margin-top: 10px;\n}\n\n.label.label-status {\n line-height: unset !important;\n font-size: 15px !important;\n}\n\n.main-footer span {\n font-weight: 600;\n}\n\n.main-footer span a img {\n height: 20px !important;\n}\n\n.main-header .navbar {\n background-color: #239af6;\n}\n\n.main-header .navbar .nav > li > a {\n color: #ffffff;\n}\n\n.main-header .navbar .nav > li > a:hover,\n.main-header .navbar .nav > li > a:active,\n.main-header .navbar .nav > li > a:focus,\n.main-header .navbar .nav .open > a,\n.main-header .navbar .nav .open > a:hover,\n.main-header .navbar .nav .open > a:focus,\n.main-header .navbar .nav > .active > a {\n background: #0984e3;\n color: #fff;\n}\n\n.main-header .navbar .sidebar-toggle {\n color: #fff;\n}\n\n.main-header .navbar .sidebar-toggle:hover {\n color: #f6f6f6;\n background: #0984e3;\n}\n\n.main-header .navbar .sidebar-toggle {\n color: #fff;\n}\n\n.main-header .navbar .sidebar-toggle:hover {\n background-color: #0984e3;\n}\n\n@media (max-width: 767px) {\n .main-header .navbar .dropdown-menu li.divider {\n background-color: #0984e3;\n }\n\n .main-header .navbar .dropdown-menu li a {\n color: #fff;\n }\n\n .main-header .navbar .dropdown-menu li a:hover {\n background: #0984e3;\n }\n}\n\n.main-header .logo {\n background-color: #0984e3;\n color: #ffffff;\n border-bottom: 0 solid transparent;\n}\n\n.main-header .logo:hover {\n background-color: #0984e3;\n}\n\n.main-header li.user-header {\n background-color: #239af6;\n}\n\n.content-header {\n background: transparent;\n}\n\n.wrapper,\n.main-sidebar,\n.left-side {\n background-color: #222d32;\n}\n\n.user-panel > .info,\n.user-panel > .info > a {\n color: #fff;\n}\n\n.sidebar-menu > li.header {\n color: #4b646f;\n background: #1a2226;\n}\n\n.sidebar-menu > li > a {\n border-left: 3px solid transparent;\n}\n\n.sidebar-menu > li:hover > a,\n.sidebar-menu > li.active > a,\n.sidebar-menu > li.menu-open > a {\n color: #ffffff;\n background: #1e282c;\n}\n\n.sidebar-menu > li.active > a {\n border-left-color: #239af6;\n}\n\n.sidebar-menu > li > .treeview-menu {\n margin: 0 1px;\n background: #2c3b41;\n}\n\n.sidebar a {\n color: #b8c7ce;\n}\n\n.sidebar a:hover {\n text-decoration: none;\n}\n\n.sidebar-menu .treeview-menu > li > a {\n color: #8aa4af;\n}\n\n.sidebar-menu .treeview-menu > li.active > a,\n\n.sidebar-menu .treeview-menu > li > a:hover {\n color: #fff;\n}\n\n.sidebar-form {\n border-radius: 3px;\n border: 1px solid #374850;\n margin: 10px 10px;\n}\n\n.sidebar-form input[type=\"text\"],\n.sidebar-form .btn {\n box-shadow: none;\n background-color: #374850;\n border: 1px solid transparent;\n height: 35px;\n}\n\n.sidebar-form input[type=\"text\"] {\n color: #666;\n border-top-left-radius: 2px;\n border-top-right-radius: 0;\n border-bottom-right-radius: 0;\n border-bottom-left-radius: 2px;\n}\n\n.sidebar-form input[type=\"text\"]:focus,\n.sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n background-color: #fff;\n color: #666;\n}\n\n.sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n border-left-color: #fff;\n}\n\n.sidebar-form .btn {\n color: #999;\n border-top-left-radius: 0;\n border-top-right-radius: 2px;\n border-bottom-right-radius: 2px;\n border-bottom-left-radius: 0;\n}\n\n.form-control {\n margin-bottom: 5px;\n}\n\n.input-group {\n margin-bottom: 15px;\n}\n\np {\n word-break: break-word;\n}\n\n.box.box-primary {\n border-top-color: #239af6 !important;\n}\n\n.btn.btn-primary {\n background-color: #239af6 !important;\n color: #fff !important;\n}\n\n.btn.btn-primary:hover {\n background-color: #0984e3 !important;\n color: #fff !important;\n}\n\n.logo-mini img {\n display: block;\n width: 40px;\n margin-left: 5px;\n margin-top: 10px;\n}\n\n.logo-lg img {\n display: block;\n height: 30px;\n margin: auto;\n margin-top: 10px !important;\n}\n\n.help-block {\n font-size: 12px;\n margin-top: -12px;\n margin-bottom: -5px;\n}\n\ndiv.pull-left.image {\n margin-top: 5px;\n}\n\nth.ip, td.ip {\n width: 335px;\n}\n\n.role, .project-status {\n font-weight: 700;\n padding: 5px;\n border-radius: 3px;\n color: #fff;\n background-color: transparent;\n display: inline-block;\n width: fit-content;\n}\n\ndiv.btn-group, div.btn-group .multiselect {\n width: 100% !important;\n margin-top: -2px;\n}\n\ndiv.form-group {\n margin-top: -10px;\n}\n\ninput.form-control {\n border-top-right-radius: 3px !important;\n border-bottom-right-radius: 3px !important;\n}\n\n.input-group .input-group-addon {\n border-top-left-radius: 3px !important;\n border-bottom-left-radius: 3px !important;\n}\n\n.bg-blue-gradient {\n background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #0984e3), color-stop(1, #239af6)) !important;\n}\n\ni.no {\n color: #e74c3c;\n font-weight: 900;\n font-size: 25px;\n}\n\ni.yes {\n color: #2ecc71;\n font-weight: 900;\n font-size: 25px;\n}\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/public/assets/css/skin.css b/public/assets/css/skin.css +--- a/public/assets/css/skin.css (revision ad320963fca3182b6d718e23467cdc491b1cdeb4) ++++ b/public/assets/css/skin.css (date 1624818676848) +@@ -177,10 +177,7 @@ + + .sidebar-form input[type="text"] { + color: #666; +- border-top-left-radius: 2px; +- border-top-right-radius: 0; +- border-bottom-right-radius: 0; +- border-bottom-left-radius: 2px; ++ border-radius: 2px 0 0 2px; + } + + .sidebar-form input[type="text"]:focus, +@@ -195,10 +192,7 @@ + + .sidebar-form .btn { + color: #999; +- border-top-left-radius: 0; +- border-top-right-radius: 2px; +- border-bottom-right-radius: 2px; +- border-bottom-left-radius: 0; ++ border-radius: 0 2px 2px 0; + } + + .form-control { diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_27-06-21_21_11__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_27-06-21_21_11__Default_Changelist_.xml new file mode 100644 index 0000000..389fe68 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_27-06-21_21_11__Default_Changelist_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file