diff --git a/app/Http/Controllers/Main.php b/app/Http/Controllers/Main.php index e634659..21427e9 100755 --- a/app/Http/Controllers/Main.php +++ b/app/Http/Controllers/Main.php @@ -9,11 +9,8 @@ namespace App\Http\Controllers; set_time_limit(-1); -use App\Paper\Airly; use App\Paper\Paper; use Illuminate\Support\Facades\DB; -use Mike42\Escpos\PrintConnectors\FilePrintConnector; -use Mike42\Escpos\Printer; use Intervention\Image\ImageManagerStatic as Image; use Mike42\Escpos\EscposImage; use Illuminate\Http\Request; @@ -219,11 +216,13 @@ class Main extends Controller 'text' => $this->templateReplace($request->input('text')), 'icon' => $request->input('icon'), 'type' => self::NOTE, + 'private' => $request->input('private', 0), 'created_at' => time(), 'updated_at' => time() ]); $note = DB::table('note')->where('id', $id)->first(); } else { + DB::table('note') ->where('id', $note->id) ->update([ @@ -231,6 +230,7 @@ class Main extends Controller 'topic_slug' => str_slug($request->input('title'), '_'), 'text' => $request->input('text'), 'icon' => $request->input('icon'), + 'private' => $request->input('private',0), 'updated_at' => time(), ]); } @@ -250,6 +250,7 @@ class Main extends Controller 'text' => $note->text, 'icon_selected' => $note->icon, 'type' => $note->type, + 'private' => $note->private, 'id' => $note->id, 'icons' => $this->paper->getIcons(), 'topic_slug' => $note->topic_slug, @@ -273,6 +274,7 @@ class Main extends Controller 'text' => $request->input('text'), 'icon' => $request->input('icon'), 'type' => self::NOTE, + 'private' => $request->input('private',0), 'created_at' => time(), 'updated_at' => time() ]); @@ -286,6 +288,7 @@ class Main extends Controller 'text' => $request->input('text'), 'icon' => $request->input('icon'), 'type' => self::TEMPLATE, + 'private' => $request->input('private',0), 'created_at' => time(), 'updated_at' => time() ]); diff --git a/config/app.php b/config/app.php index b024188..b069632 100755 --- a/config/app.php +++ b/config/app.php @@ -12,7 +12,7 @@ return [ | any other location as required by the application or its packages. */ - 'name' => 'Laravel', + 'name' => 'Paper.Pi', /* |-------------------------------------------------------------------------- @@ -64,7 +64,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'Europe/Warsaw', /* |-------------------------------------------------------------------------- diff --git a/resources/views/form/create.blade.php b/resources/views/form/create.blade.php index 304dd3f..b1b95b8 100644 --- a/resources/views/form/create.blade.php +++ b/resources/views/form/create.blade.php @@ -33,6 +33,11 @@ @if(isset($id)) @endif + +
+ + +
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php index b3c9ca8..ceadb3c 100755 --- a/resources/views/list.blade.php +++ b/resources/views/list.blade.php @@ -50,22 +50,26 @@

@if(isset($filter)) Lista notatek z ikonką @else Lista notatek @endif

+ + @foreach($notes as $note) -
-
- {{ $note->topic?$note->topic:str_limit($note->text, 30, '...') }} - + @if($note->private != 1 || $_SERVER['REMOTE_ADDR'] == '192.168.0.1') + -
-
- {{ csrf_field() }} - -
-
-
+ @endif @endforeach

Szablony notatek