Merge branch 'master' of ssh://git.shikiryu.com:2200/Shikiryu/journal-intime into e2e
This commit is contained in:
		@@ -13,6 +13,16 @@
 | 
			
		||||
                {{ session('status') }}
 | 
			
		||||
            </div>
 | 
			
		||||
        @endif
 | 
			
		||||
        @if (session('success'))
 | 
			
		||||
            <div class="alert alert-success" role="alert">
 | 
			
		||||
                {{ session('success') }}
 | 
			
		||||
            </div>
 | 
			
		||||
        @endif
 | 
			
		||||
        @if (session('errors'))
 | 
			
		||||
            <div class="alert alert-danger" role="alert">
 | 
			
		||||
                {{ session('errors') }}
 | 
			
		||||
            </div>
 | 
			
		||||
        @endif
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="row flex-fill">
 | 
			
		||||
        <div class="col-sm-6 col-lg-3">
 | 
			
		||||
@@ -80,23 +90,19 @@
 | 
			
		||||
                    @endcomponent
 | 
			
		||||
                </div>
 | 
			
		||||
            @else
 | 
			
		||||
                <div class="row">
 | 
			
		||||
                    <div class="col-sm-12">
 | 
			
		||||
                        <div class="card">
 | 
			
		||||
                            <div class="card-header">
 | 
			
		||||
                                <h3 class="card-title">{{ strftime('%B %G', $today->format('U')) }}</h3>
 | 
			
		||||
                            </div>
 | 
			
		||||
                            <div class="card-body">
 | 
			
		||||
                                <div id="store">
 | 
			
		||||
                                @component('components/app', [
 | 
			
		||||
                                    'route' => url('store'),
 | 
			
		||||
                                    'crsf' => csrf_field(),
 | 
			
		||||
                                    'mustencrypt' => $must_encrypt,
 | 
			
		||||
                                    'possible' => !$already,
 | 
			
		||||
                                ])
 | 
			
		||||
                                @endcomponent
 | 
			
		||||
                                </div>
 | 
			
		||||
                            </div>
 | 
			
		||||
                <div class="card">
 | 
			
		||||
                    <div class="card-header">
 | 
			
		||||
                        <h3 class="card-title">{{ strftime('%B %G', $today->format('U')) }}</h3>
 | 
			
		||||
                    </div>
 | 
			
		||||
                    <div class="card-body">
 | 
			
		||||
                        <div id="store">
 | 
			
		||||
                        @component('components/app', [
 | 
			
		||||
                            'route' => url('store'),
 | 
			
		||||
                            'crsf' => csrf_field(),
 | 
			
		||||
                            'mustencrypt' => $must_encrypt,
 | 
			
		||||
                            'possible' => !$already,
 | 
			
		||||
                        ])
 | 
			
		||||
                        @endcomponent
 | 
			
		||||
                        </div>
 | 
			
		||||
                    </div>
 | 
			
		||||
                </div>
 | 
			
		||||
@@ -110,11 +116,18 @@
 | 
			
		||||
                        <h3 class="card-title">{{ ucfirst(\Carbon\Carbon::instance($post->date_post)->diffForHumans()) }}</h3>
 | 
			
		||||
                        <div class="card-options">
 | 
			
		||||
                            <a href="#" class="card-options-collapse" data-toggle="card-collapse"><i class="fe fe-chevron-up"></i></a>
 | 
			
		||||
                            <a href="#" class="card-options-remove" data-toggle="card-remove"><i class="fe fe-x"></i></a>
 | 
			
		||||
                            @if($today->format('Y-m-d') === \Carbon\Carbon::instance($post->date_post)->format('Y-m-d'))
 | 
			
		||||
                                <button class="btn btn-link" data-toggle="collapse" data-target="#collapse" aria-expanded="true" aria-controls="collapse"><i class="fe fe-edit-2"></i></button>
 | 
			
		||||
                                <form action="{{ url('delete') }}" method="post" accept-charset="utf-8">
 | 
			
		||||
                                    @csrf
 | 
			
		||||
                                    <button class="btn btn-link" data-toggle="card-remove"><i class="fe fe-x"></i></button>
 | 
			
		||||
                                </form>
 | 
			
		||||
                            @endif
 | 
			
		||||
                        </div>
 | 
			
		||||
                    </div>
 | 
			
		||||
                    <div class="card-body" data-encrypt>
 | 
			
		||||
                        {!! $tag_detector->linkTagFrom($post->content) !!}
 | 
			
		||||
                    <div class="card-body @if($today->format('Y-m-d') === \Carbon\Carbon::instance($post->date_post)->format('Y-m-d')) already @endif ">
 | 
			
		||||
                        @if($post->image != '')<p><img src="{{ route('display_image', ['post_id' => $post->id, 'options' => 'w:300', 'image_name' => $post->image]) }}"/></p>@endif
 | 
			
		||||
                        <p data-encrypt>{!! $tag_detector->linkTagFrom($post->content) !!}</p>
 | 
			
		||||
                    </div>
 | 
			
		||||
                    <div class="card-footer">
 | 
			
		||||
                        {{ \Carbon\Carbon::instance($post->date_post)->format('d F Y') }}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user