-

.idea/LogViewer.iml

@@ -9,6 +9,10 @@
       <sourceFolder url="file://$MODULE_DIR$/code/tests" isTestSource="true" packagePrefix="Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/code/tests/Feature" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/code/tests/Unit" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/code-New/app" isTestSource="false" packagePrefix="App\" />
+      <sourceFolder url="file://$MODULE_DIR$/code-New/database/factories" isTestSource="false" packagePrefix="Database\Factories\" />
+      <sourceFolder url="file://$MODULE_DIR$/code-New/database/seeders" isTestSource="false" packagePrefix="Database\Seeders\" />
+      <sourceFolder url="file://$MODULE_DIR$/code-New/tests" isTestSource="true" packagePrefix="Tests\" />
       <excludeFolder url="file://$MODULE_DIR$/app/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/app/vendor/guzzlehttp/guzzle" />
       <excludeFolder url="file://$MODULE_DIR$/app/vendor/guzzlehttp/promises" />

.idea/php.xml

@@ -213,6 +213,109 @@
       <path value="$PROJECT_DIR$/code/vendor/nikic/php-parser" />
       <path value="$PROJECT_DIR$/code/vendor/egulias/email-validator" />
       <path value="$PROJECT_DIR$/code/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/code-New/vendor/composer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/event-dispatcher" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psr/http-client" />
+      <path value="$PROJECT_DIR$/code-New/vendor/filp/whoops" />
+      <path value="$PROJECT_DIR$/code-New/vendor/psy/psysh" />
+      <path value="$PROJECT_DIR$/code-New/vendor/brick/math" />
+      <path value="$PROJECT_DIR$/code-New/vendor/voku/portable-ascii" />
+      <path value="$PROJECT_DIR$/code-New/vendor/nette/schema" />
+      <path value="$PROJECT_DIR$/code-New/vendor/nette/utils" />
+      <path value="$PROJECT_DIR$/code-New/vendor/league/mime-type-detection" />
+      <path value="$PROJECT_DIR$/code-New/vendor/league/flysystem" />
+      <path value="$PROJECT_DIR$/code-New/vendor/league/flysystem-local" />
+      <path value="$PROJECT_DIR$/code-New/vendor/league/commonmark" />
+      <path value="$PROJECT_DIR$/code-New/vendor/league/config" />
+      <path value="$PROJECT_DIR$/code-New/vendor/ramsey/uuid" />
+      <path value="$PROJECT_DIR$/code-New/vendor/nesbot/carbon" />
+      <path value="$PROJECT_DIR$/code-New/vendor/ramsey/collection" />
+      <path value="$PROJECT_DIR$/code-New/vendor/egulias/email-validator" />
+      <path value="$PROJECT_DIR$/code-New/vendor/dflydev/dot-access-data" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/prompts" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/sail" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/sanctum" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/telescope" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/tinker" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/serializable-closure" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/framework" />
+      <path value="$PROJECT_DIR$/code-New/vendor/laravel/pint" />
+      <path value="$PROJECT_DIR$/code-New/vendor/monolog/monolog" />
+      <path value="$PROJECT_DIR$/code-New/vendor/mockery/mockery" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/http-kernel" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/uid" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/string" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-php83" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/mailer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-intl-idn" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/error-handler" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/finder" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-php72" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/polyfill-intl-grapheme" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/code-New/vendor/symfony/var-dumper" />
+      <path value="$PROJECT_DIR$/code-New/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/code-New/vendor/fakerphp/faker" />
+      <path value="$PROJECT_DIR$/code-New/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/fruitcake/php-cors" />
+      <path value="$PROJECT_DIR$/code-New/vendor/hamcrest/hamcrest-php" />
+      <path value="$PROJECT_DIR$/code-New/vendor/opcodesio/mail-parser" />
+      <path value="$PROJECT_DIR$/code-New/vendor/opcodesio/log-viewer" />
+      <path value="$PROJECT_DIR$/code-New/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/code-New/vendor/phpoption/phpoption" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/code-unit" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/complexity" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/code-New/vendor/webmozart/assert" />
+      <path value="$PROJECT_DIR$/code-New/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/code-New/vendor/nunomaduro/collision" />
+      <path value="$PROJECT_DIR$/code-New/vendor/nunomaduro/termwind" />
+      <path value="$PROJECT_DIR$/code-New/vendor/tijsverkoyen/css-to-inline-styles" />
+      <path value="$PROJECT_DIR$/code-New/vendor/graham-campbell/result-type" />
+      <path value="$PROJECT_DIR$/code-New/vendor/erlandmuchasaj/laravel-file-uploader" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />

.idea/phpunit.xml

@@ -5,6 +5,7 @@
       <list>
         <option value="$PROJECT_DIR$/app/tests" />
         <option value="$PROJECT_DIR$/code/tests" />
+        <option value="$PROJECT_DIR$/code-New/tests" />
       </list>
     </option>
   </component>

Dockerfile

@@ -23,11 +23,7 @@ COPY code/ /var/www
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-# Configure Xdebug
+COPY docker/php/php-prod.ini /usr/local/etc/php/conf.d
-#RUN pecl install xdebug
-#RUN docker-php-ext-enable xdebug
-#COPY docker/php/php.ini /usr/local/etc/php/
-#COPY docker/php/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 COPY start.sh /home/start.sh
 

DockerfileDevel

@@ -27,6 +27,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 #RUN pecl install xdebug
 #RUN docker-php-ext-enable xdebug
 #COPY docker/php/php.ini /usr/local/etc/php/
+
+COPY docker/php/php-prod.ini /usr/local/etc/php/conf.d/
+
 #COPY docker/php/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 COPY start.sh /home/start.sh

code/app/Http/Controllers/FileController.php

@@ -1,6 +1,5 @@
 <?php namespace App\Http\Controllers;
 
-use App\Models\File;
 use League\CommonMark\Node\Block\Document;
 use Validator;
 use Illuminate\Http\Request;
@@ -9,27 +8,19 @@ class FileController extends Controller
 {
     public function upload(Request $request)
     {
-        
         $validator = Validator::make($request->all(), [
-            'file' => 'required|mimes:log|max:10240',
+            'file' => 'required|mimes:txt,log|max:10240',
         ]);
 
         if ($validator->fails()) {
-
             return response()->json(['error' => $validator->errors()], 401);
         }
 
+        $user_id = $request->get('user_id');
 
         if ($file = $request->file('file')) {
-            $path = $file->store('public/files');
+            $fileName = (!empty($user_id) ? $user_id : 0) . '_' . time() . '.log';
-            $name = $file->getClientOriginalName();
+            $request->file->move(storage_path(date('Y-m-d')), $fileName);
-
-            //store your file into directory and db
-            $save = new File();
-            $save->name = $file;
-            $save->store_path = $path;
-            $save->save();
-
             return response()->json([
                 "success" => true,
                 "message" => "File successfully uploaded",

code/app/Http/Kernel.php

@@ -15,11 +15,11 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
-        \Fruitcake\Cors\HandleCors::class,
+        // \Fruitcake\Cors\HandleCors::class,
-        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+//        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+//        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+//        \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+//        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**

code/app/Providers/AppServiceProvider.php

@@ -26,11 +26,18 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        if(config('app.env') === 'production') {
+            \URL::forceScheme('https');
+        }else {
+            \URL::forceScheme('https');
+        }
+        
         /*
         LogViewer::auth(function ($request) {
             return $request->user()
                 && $request->user()->email == 'splin94@yandex.ru';
         });
         */
+
     }
 }

docker/nginx/nginx.conf

@@ -12,6 +12,7 @@ events {
 
 
 http {
+    client_max_body_size 50M;
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 

docker/php/php-prod.ini

@@ -0,0 +1,18 @@
+; Enable XDebug
+zend_extension = xdebug.so
+
+; XDebug configuration
+xdebug.remote_enable = 1
+xdebug.renite_enable = 1
+xdebug.max_nesting_level = 1000
+xdebug.profiler_enable_trigger = 1
+xdebug.profiler_output_dir = "/var/log"
+
+; Show PHP errors
+display_errors = on
+
+; Use PHP short tags
+short_open_tag = on
+
+post_max_size = 20M
+upload_max_filesize = 20M

docker/php/php.ini

@@ -13,3 +13,6 @@ display_errors = on
 
 ; Use PHP short tags
 short_open_tag = on
+
+post_max_size = 20M
+upload_max_filesize = 20M