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

-

Browse Source
This commit is contained in:
splin94@yandex.ru 2023-11-14 09:25:06 +00:00
parent 79ade1d659
commit 2c0da36a8f
10 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/LogViewer.iml
View File

@ -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" />

12
.idea/php.xml
View File

@ -229,19 +229,13 @@
<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/nikic/php-parser" />
<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/spatie/laravel-ignition" />
<path value="$PROJECT_DIR$/code-New/vendor/ramsey/collection" />
<path value="$PROJECT_DIR$/code-New/vendor/spatie/backtrace" />
<path value="$PROJECT_DIR$/code-New/vendor/spatie/flare-client-php" />
<path value="$PROJECT_DIR$/code-New/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/code-New/vendor/spatie/ignition" />
<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" />
@ -255,7 +249,6 @@
<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/myclabs/deep-copy" />
<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" />
@ -318,13 +311,8 @@
<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/guzzlehttp/uri-template" />
<path value="$PROJECT_DIR$/code-New/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/code-New/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/code-New/vendor/guzzlehttp/guzzle" />
<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/dragonmantank/cron-expression" />
<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" />

1
.idea/phpunit.xml
View File

@ -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>

2
Dockerfile
View File

@ -23,7 +23,7 @@ COPY code/ /var/www
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/
COPY docker/php/php-prod.ini /usr/local/etc/php/conf.d
COPY start.sh /home/start.sh

11
DockerfileDevel
View File

@ -24,10 +24,13 @@ COPY code/ /var/www
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
# 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
#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

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

@ -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');
$name = $file->getClientOriginalName();
//store your file into directory and db
$save = new File();
$save->name = $file;
$save->store_path = $path;
$save->save();
$fileName = (!empty($user_id) ? $user_id : 0) . '_' . time() . '.log';
$request->file->move(storage_path(date('Y-m-d')), $fileName);
return response()->json([
"success" => true,
"message" => "File successfully uploaded",

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

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

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

@ -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';
});
*/
}
}

BIN
code/storage/database.sqlite
View File

Binary file not shown.

1
docker/nginx/nginx.conf
View File

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