dontsov/LogViewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dontsov:2c0da36a8fbb5146e94d17d7949c449f6d006beb
Branches Tags
dontsov:master
..
compare: dontsov:72d82f0fe0f613775e9e51e50d51a022bbb7ef14
Branches Tags
dontsov:master

No commits in common. "2c0da36a8fbb5146e94d17d7949c449f6d006beb" and "72d82f0fe0f613775e9e51e50d51a022bbb7ef14" have entirely different histories.
2c0da36a8f ... 72d82f0fe0

12 changed files with 24 additions and 151 deletions
Show Stats Expand all files Collapse all files

4
.idea/LogViewer.iml
View File

@ -9,10 +9,6 @@
<sourceFolder url="file://$MODULE_DIR$/code/tests" isTestSource="true" packagePrefix="Tests\" /> <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/Feature" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/code/tests/Unit" 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/composer" />
<excludeFolder url="file://$MODULE_DIR$/app/vendor/guzzlehttp/guzzle" /> <excludeFolder url="file://$MODULE_DIR$/app/vendor/guzzlehttp/guzzle" />
<excludeFolder url="file://$MODULE_DIR$/app/vendor/guzzlehttp/promises" /> <excludeFolder url="file://$MODULE_DIR$/app/vendor/guzzlehttp/promises" />

103
.idea/php.xml
View File

@ -213,109 +213,6 @@
<path value="$PROJECT_DIR$/code/vendor/nikic/php-parser" /> <path value="$PROJECT_DIR$/code/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/code/vendor/egulias/email-validator" /> <path value="$PROJECT_DIR$/code/vendor/egulias/email-validator" />
<path value="$PROJECT_DIR$/code/vendor/ralouphie/getallheaders" /> <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> </include_path>
</component> </component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" /> <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />

1
.idea/phpunit.xml
View File

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

6
Dockerfile
View File

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

3
DockerfileDevel
View File

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

17
code/app/Http/Controllers/FileController.php
View File

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

10
code/app/Http/Kernel.php
View File

@ -15,11 +15,11 @@ class Kernel extends HttpKernel
*/ */
protected $middleware = [ protected $middleware = [
// \App\Http\Middleware\TrustHosts::class, // \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,
]; ];
/** /**

7
code/app/Providers/AppServiceProvider.php
View File

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

BIN
code/storage/database.sqlite
View File

Binary file not shown.

1
docker/nginx/nginx.conf
View File

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

18
docker/php/php-prod.ini
View File

@ -1,18 +0,0 @@
; 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

5
docker/php/php.ini
View File

@ -12,7 +12,4 @@ xdebug.profiler_output_dir = "/var/log"
display_errors = on display_errors = on
; Use PHP short tags ; Use PHP short tags
short_open_tag = on short_open_tag = on
post_max_size = 20M
upload_max_filesize = 20M