Merge branch 'master' of http://git.daboryhost.com:10880/dabory/dbrerp

bootstrap/cache/packages.php

@@ -1,215 +1,215 @@
 <?php return array (
-  'appslabke/lara-izitoast' =>
+  'appslabke/lara-izitoast' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'LaraIzitoast\\LaraIzitoastServiceProvider',
     ),
   ),
-  'barryvdh/laravel-dompdf' =>
+  'barryvdh/laravel-dompdf' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Barryvdh\\DomPDF\\ServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'PDF' => 'Barryvdh\\DomPDF\\Facade',
     ),
   ),
-  'codezero/browser-locale' =>
+  'codezero/browser-locale' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'CodeZero\\BrowserLocale\\Laravel\\BrowserLocaleServiceProvider',
     ),
   ),
-  'codezero/laravel-localized-routes' =>
+  'codezero/laravel-localized-routes' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'CodeZero\\LocalizedRoutes\\LocalizedRoutesServiceProvider',
     ),
   ),
-  'codezero/laravel-localizer' =>
+  'codezero/laravel-localizer' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'CodeZero\\Localizer\\LocalizerServiceProvider',
     ),
   ),
-  'eusonlito/laravel-meta' =>
+  'eusonlito/laravel-meta' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Eusonlito\\LaravelMeta\\MetaServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Meta' => 'Eusonlito\\LaravelMeta\\Facade',
     ),
   ),
-  'facade/ignition' =>
+  'facade/ignition' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Facade\\Ignition\\IgnitionServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Flare' => 'Facade\\Ignition\\Facades\\Flare',
     ),
   ),
-  'fideloper/proxy' =>
+  'fideloper/proxy' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
     ),
   ),
-  'fruitcake/laravel-cors' =>
+  'fruitcake/laravel-cors' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Fruitcake\\Cors\\CorsServiceProvider',
     ),
   ),
-  'intervention/image' =>
+  'intervention/image' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Intervention\\Image\\ImageServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Image' => 'Intervention\\Image\\Facades\\Image',
     ),
   ),
-  'jenssegers/agent' =>
+  'jenssegers/agent' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Jenssegers\\Agent\\AgentServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Agent' => 'Jenssegers\\Agent\\Facades\\Agent',
     ),
   ),
-  'laravel/sail' =>
+  'laravel/sail' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Laravel\\Sail\\SailServiceProvider',
     ),
   ),
-  'laravel/socialite' =>
+  'laravel/socialite' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Laravel\\Socialite\\SocialiteServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Socialite' => 'Laravel\\Socialite\\Facades\\Socialite',
     ),
   ),
-  'laravel/tinker' =>
+  'laravel/tinker' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Laravel\\Tinker\\TinkerServiceProvider',
     ),
   ),
-  'laravel/ui' =>
+  'laravel/ui' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Laravel\\Ui\\UiServiceProvider',
     ),
   ),
-  'maatwebsite/excel' =>
+  'maatwebsite/excel' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Excel' => 'Maatwebsite\\Excel\\Facades\\Excel',
     ),
   ),
-  'mews/captcha' =>
+  'mews/captcha' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Mews\\Captcha\\CaptchaServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Captcha' => 'Mews\\Captcha\\Facades\\Captcha',
     ),
   ),
-  'mguinea/laravel-robots' =>
+  'mguinea/laravel-robots' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Mguinea\\Robots\\RobotsServiceProvider',
     ),
   ),
-  'milon/barcode' =>
+  'milon/barcode' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Milon\\Barcode\\BarcodeServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'DNS1D' => 'Milon\\Barcode\\Facades\\DNS1DFacade',
       'DNS2D' => 'Milon\\Barcode\\Facades\\DNS2DFacade',
     ),
   ),
-  'nesbot/carbon' =>
+  'nesbot/carbon' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Carbon\\Laravel\\ServiceProvider',
     ),
   ),
-  'nunomaduro/collision' =>
+  'nunomaduro/collision' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     ),
   ),
-  'simplesoftwareio/simple-qrcode' =>
+  'simplesoftwareio/simple-qrcode' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'QrCode' => 'SimpleSoftwareIO\\QrCode\\Facades\\QrCode',
     ),
   ),
-  'socialiteproviders/manager' =>
+  'socialiteproviders/manager' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'SocialiteProviders\\Manager\\ServiceProvider',
     ),
   ),
-  'stevebauman/location' =>
+  'stevebauman/location' => 
   array (
-    'providers' =>
+    'providers' => 
     array (
       0 => 'Stevebauman\\Location\\LocationServiceProvider',
     ),
-    'aliases' =>
+    'aliases' => 
     array (
       'Location' => 'Stevebauman\\Location\\Facades\\Location',
     ),
   ),
-);
+);

bootstrap/cache/services.php

@@ -1,5 +1,5 @@
 <?php return array (
-  'providers' =>
+  'providers' => 
   array (
     0 => 'Illuminate\\Auth\\AuthServiceProvider',
     1 => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
@@ -60,7 +60,7 @@
     56 => 'Jenssegers\\Agent\\AgentServiceProvider',
     57 => 'Mews\\Captcha\\CaptchaServiceProvider',
   ),
-  'eager' =>
+  'eager' => 
   array (
     0 => 'Illuminate\\Auth\\AuthServiceProvider',
     1 => 'Illuminate\\Cookie\\CookieServiceProvider',
@@ -104,7 +104,7 @@
     39 => 'Jenssegers\\Agent\\AgentServiceProvider',
     40 => 'Mews\\Captcha\\CaptchaServiceProvider',
   ),
-  'deferred' =>
+  'deferred' => 
   array (
     'Illuminate\\Broadcasting\\BroadcastManager' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
     'Illuminate\\Contracts\\Broadcasting\\Factory' => 'Illuminate\\Broadcasting\\BroadcastServiceProvider',
@@ -231,55 +231,55 @@
     'Laravel\\Socialite\\Contracts\\Factory' => 'SocialiteProviders\\Manager\\ServiceProvider',
     'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
   ),
-  'when' =>
+  'when' => 
   array (
-    'Illuminate\\Broadcasting\\BroadcastServiceProvider' =>
+    'Illuminate\\Broadcasting\\BroadcastServiceProvider' => 
     array (
     ),
-    'Illuminate\\Bus\\BusServiceProvider' =>
+    'Illuminate\\Bus\\BusServiceProvider' => 
     array (
     ),
-    'Illuminate\\Cache\\CacheServiceProvider' =>
+    'Illuminate\\Cache\\CacheServiceProvider' => 
     array (
     ),
-    'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' =>
+    'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider' => 
     array (
     ),
-    'Illuminate\\Hashing\\HashServiceProvider' =>
+    'Illuminate\\Hashing\\HashServiceProvider' => 
     array (
     ),
-    'Illuminate\\Mail\\MailServiceProvider' =>
+    'Illuminate\\Mail\\MailServiceProvider' => 
     array (
     ),
-    'Illuminate\\Pipeline\\PipelineServiceProvider' =>
+    'Illuminate\\Pipeline\\PipelineServiceProvider' => 
     array (
     ),
-    'Illuminate\\Queue\\QueueServiceProvider' =>
+    'Illuminate\\Queue\\QueueServiceProvider' => 
     array (
     ),
-    'Illuminate\\Redis\\RedisServiceProvider' =>
+    'Illuminate\\Redis\\RedisServiceProvider' => 
     array (
     ),
-    'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider' =>
+    'Illuminate\\Auth\\Passwords\\PasswordResetServiceProvider' => 
     array (
     ),
-    'Illuminate\\Translation\\TranslationServiceProvider' =>
+    'Illuminate\\Translation\\TranslationServiceProvider' => 
     array (
     ),
-    'Illuminate\\Validation\\ValidationServiceProvider' =>
+    'Illuminate\\Validation\\ValidationServiceProvider' => 
     array (
     ),
-    'Laravel\\Sail\\SailServiceProvider' =>
+    'Laravel\\Sail\\SailServiceProvider' => 
     array (
     ),
-    'Laravel\\Socialite\\SocialiteServiceProvider' =>
+    'Laravel\\Socialite\\SocialiteServiceProvider' => 
     array (
     ),
-    'Laravel\\Tinker\\TinkerServiceProvider' =>
+    'Laravel\\Tinker\\TinkerServiceProvider' => 
     array (
     ),
-    'SocialiteProviders\\Manager\\ServiceProvider' =>
+    'SocialiteProviders\\Manager\\ServiceProvider' => 
     array (
     ),
   ),
-);
+);

resources/views/auth/login.blade.php

@@ -91,22 +91,22 @@
             history.go(1);
         };
 
-        let passData = { returnValue : 200 };
-        window.parent.postMessage(passData, 'http://localhost:8000');
+        // let passData = { returnValue : 200 };
+        // window.parent.postMessage(passData, 'http://localhost:8000');
     }
 
-    window.addEventListener('message', function(e) {
-        //e.data ==> 수신 받은 데이터
-        //e.origin ==> 허용된 도메인
-        const req = JSON.parse(decoding(e.data))
-        console.log(req)
-        console.log(JSON.parse(decoding(req['PrintingJson'])))
-    });
+    // window.addEventListener('message', function(e) {
+    //     //e.data ==> 수신 받은 데이터
+    //     //e.origin ==> 허용된 도메인
+    //     const req = JSON.parse(decoding(e.data))
+    //     console.log(req)
+    //     console.log(JSON.parse(decoding(req['PrintingJson'])))
+    // });
 
-    function decoding(encoded){
-        //base64 decrypt
-        var parsedWordArray = CryptoJS.enc.Base64.parse(encoded);
-        var decoded = parsedWordArray.toString(CryptoJS.enc.Utf8);
-        return decoded;
-    }
+    // function decoding(encoded){
+    //     //base64 decrypt
+    //     var parsedWordArray = CryptoJS.enc.Base64.parse(encoded);
+    //     var decoded = parsedWordArray.toString(CryptoJS.enc.Utf8);
+    //     return decoded;
+    // }
 </script>