From 34b1d05f961f9be5c7f4e512a8e409c9dc494b39 Mon Sep 17 00:00:00 2001 From: Gustavo Luigi Date: Tue, 1 Jun 2021 17:44:02 -0300 Subject: [PATCH] clear code and change theme settings --- content/author.blade.php | 161 +----------------- content/dashboard/account.blade.php | 2 +- content/dashboard/addNachrichten.blade.php | 4 +- content/dashboard/auth/login.blade.php | 2 +- .../auth/passwords/confirm.blade.php | 2 +- .../dashboard/auth/passwords/email.blade.php | 2 +- .../dashboard/auth/passwords/reset.blade.php | 2 +- content/dashboard/auth/register.blade.php | 2 +- content/dashboard/auth/verify.blade.php | 2 +- content/dashboard/editNachrichten.blade.php | 4 +- content/dashboard/home.blade.php | 2 +- content/dashboard/profile.blade.php | 2 +- content/includes/integrations.blade.php | 12 +- content/includes/premium-pass-qr.blade.php | 4 +- content/lists/default.blade.php | 32 ++-- content/news.blade.php | 32 ++-- 16 files changed, 57 insertions(+), 210 deletions(-) diff --git a/content/author.blade.php b/content/author.blade.php index c20e5d1..228b561 100644 --- a/content/author.blade.php +++ b/content/author.blade.php @@ -1,11 +1,5 @@ @extends('template.'.config('settings.template').'.content.master') @section('content') - - - - - - @if (\Route::currentRouteName() != 'author.get')
@@ -13,57 +7,46 @@ - @foreach ($categories as $category) @endforeach
-
@if (isset($categoryModel))

- @if($categoryModel->icon == 'bitcoin') @else @endif - {{ $categoryModel->name }}

@else

-

{{ \Setting::get('name')}}

+

{{ config('settings.name')}}

@endif -

@if (isset($categoryModel)) {{ $categoryModel->description }} @else - {{ \Setting::get('description')}} + {{ config('settings.description')}} @endif
- -

@endif -
@if (\Route::currentRouteName() == 'author.get') @@ -75,28 +58,21 @@


{{ $author->name }}

- -

{{ $author->description }}

- - -
@if (isset($author->social_networks['email'])) | @endif - @if (isset($author->social_networks['site'])) {{ $author->social_networks['site'] }} @endif

-
- @foreach ($social as $value) @if (isset($author->social_networks[$value])) @endif @endforeach -

-
@endif - @if (\Route::currentRouteName() == 'welcome')


{{ __('public.popular-authors') }}

- @foreach ($authors as $author)

@@ -145,7 +116,6 @@
@endforeach - -



- @endif
- - - -
- -
- - - @if (env('APP_WRITE', false))

@@ -187,16 +146,8 @@ {{ __('public.propose-content') }} Neuen Inhalt einreichen

- - @endif - - - - @include('template.'.\Setting::get('template', 'default').'.content.includes.create-content') - - - + @include('template.'.config('settings.template').'.content.includes.create-content')
@if (session()->has('success'))
@@ -215,7 +166,6 @@
@endif - @if (session()->has('error'))
@@ -233,20 +183,13 @@
@endif -
@foreach($nachrichten as $nach) -
- - @if ($nach->paid != 0 and (empty($nach->premium_until) or $nach->premium_until > date('Y-m-d')) and !\Session::get('premium_code'))
- -
- @if($nach->created_at->diffInHours(date('Y-m-d H:i:s')) < 1)
@@ -255,11 +198,9 @@

@endif -

{{$nach->title}}

 -
@if ($nach->user and $nach->user->public_author == 1) @@ -270,7 +211,6 @@ {{date('d.m.Y H:i', strtotime($nach->created_at))}} @endif
- @if ($nach->category)
@@ -278,13 +218,10 @@
@endif - @if ($nach->image) @endif -
-
@@ -292,85 +229,58 @@ {!! \Str::limit($nach->nachrichten, 285, ' ...') !!}
- @if ($nach->type_id == 2)

{{ __('public.work-location') }}

{{ isset($nach->additional_fields['workplace']) ? \Str::limit($nach->additional_fields['workplace'], 30, ' ...') : '-'}}

-

{{ __('public.contact-data') }}

{!! isset($nach->additional_fields['contact_info']) ? \Str::limit($nach->additional_fields['contact_info'], 30, ' ...') : '-' !!}

@endif -
-
-

{{ __('public.premium-content') }}

- @if (!empty($nach->premium_until) and $nach->premium_until > date('Y-m-d')) {{ __('public.article-requires-payment') }}mjn
-
 @endif -

To read the article - @if (!empty($nach->premium_until) and $nach->premium_until > date('Y-m-d')) {{ __('public.now') }}now @endif {{ __('public.please-pay') }} {{ $nach->paid }} sats

-

Pay {{ $nach->paid }} sats
{{ __('public.use') }} {{ __('public.premium-pass') }} - - @include('template.'.\Setting::get('template', 'default').'.content.includes.explain-lightning') - + @include('template.'.config('settings.template').'.content.includes.explain-lightning')

-
-
-
- - - -
- - - @if (env('APP_COMMENTS', false)) @endif - - -
- @else
- @if(\Session::get('premium_code') and $nach->paid != 0 and (empty($nach->premium_until) or $nach->premium_until > date('Y-m-d')))
Premium content
@endif -
@if($nach->created_at->diffInHours(date('Y-m-d H:i:s')) < 1)
@@ -417,11 +322,9 @@

@endif -

{{$nach->title}}

 -
@if ($nach->user and $nach->user->public_author == 1) @@ -431,7 +334,6 @@ {{date('d.m.Y H:i', strtotime($nach->created_at))}} @endif
- @if ($nach->category)
@@ -439,104 +341,70 @@
@endif - @if ($nach->image) @endif - -

{!! $nach->nachrichten !!}

- @if ($nach->type_id == 2)

{{ __('public.work-location') }}

{{ isset($nach->additional_fields['workplace']) ? $nach->additional_fields['workplace'] : '-'}}

-

{{ __('public.contact-data') }}

{!! isset($nach->additional_fields['contact_info']) ? $nach->additional_fields['contact_info'] : '-' !!}

@endif - @if($nach->type_id == 3)
-
- @if($nach->show_total_paid_action == 1) - @if ($nach->actions->count() > 1) -
- {{ __('public.vote-distribution') }}
@foreach ($nach->actions as $action)
{{ !empty($nach->total_paid_actions()) ? round(($action->payments()->where('status', 1)->sum('amount') * 100) / $nach->total_paid_actions()) : 0 }}%
- @endforeach

-
@endif @endif - - - - - - @foreach ($nach->actions as $action) -
- {{ $action->description }}
- @if ($action->type == 2)
@endif - -
@endforeach
-
@foreach ($nach->actions as $action) -
{{ $action->name }} for {{ $action->amount }} sats.
@endforeach
@endif - @if(sizeof($nach->files) > 0)
{{ __('public.files-download') }}
- - @foreach ($nach->files as $file)
@@ -549,31 +417,19 @@ @endforeach
@endif -
- - - - - @if (env('APP_COMMENTS', false)) @endif - - -
@endif -
- @endforeach - {{ $nachrichten->links() }}
- - - - @stop diff --git a/content/dashboard/account.blade.php b/content/dashboard/account.blade.php index 572fd2a..aa1a3b6 100644 --- a/content/dashboard/account.blade.php +++ b/content/dashboard/account.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/addNachrichten.blade.php b/content/dashboard/addNachrichten.blade.php index d7a2735..1715c32 100644 --- a/content/dashboard/addNachrichten.blade.php +++ b/content/dashboard/addNachrichten.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
@@ -172,7 +172,7 @@ @endif
- @if (\Setting::get('lnd_status')) + @if (config('settings.lnd_status'))
Define as Premium Content
diff --git a/content/dashboard/auth/login.blade.php b/content/dashboard/auth/login.blade.php index 6340646..8bf20e2 100644 --- a/content/dashboard/auth/login.blade.php +++ b/content/dashboard/auth/login.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/auth/passwords/confirm.blade.php b/content/dashboard/auth/passwords/confirm.blade.php index 27dfdeb..10e604a 100644 --- a/content/dashboard/auth/passwords/confirm.blade.php +++ b/content/dashboard/auth/passwords/confirm.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/auth/passwords/email.blade.php b/content/dashboard/auth/passwords/email.blade.php index f2cc6b0..6ea7846 100644 --- a/content/dashboard/auth/passwords/email.blade.php +++ b/content/dashboard/auth/passwords/email.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/auth/passwords/reset.blade.php b/content/dashboard/auth/passwords/reset.blade.php index 3392fc8..f91136a 100644 --- a/content/dashboard/auth/passwords/reset.blade.php +++ b/content/dashboard/auth/passwords/reset.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/auth/register.blade.php b/content/dashboard/auth/register.blade.php index 4975460..1032626 100644 --- a/content/dashboard/auth/register.blade.php +++ b/content/dashboard/auth/register.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/auth/verify.blade.php b/content/dashboard/auth/verify.blade.php index 608bd00..eef74da 100644 --- a/content/dashboard/auth/verify.blade.php +++ b/content/dashboard/auth/verify.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/dashboard/editNachrichten.blade.php b/content/dashboard/editNachrichten.blade.php index c6985a0..7d87626 100644 --- a/content/dashboard/editNachrichten.blade.php +++ b/content/dashboard/editNachrichten.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content') @@ -154,7 +154,7 @@
- @if (\Setting::get('lnd_status')) + @if (config('settings.lnd_status'))
Define as Premium Content
diff --git a/content/dashboard/home.blade.php b/content/dashboard/home.blade.php index d7eba79..0072870 100644 --- a/content/dashboard/home.blade.php +++ b/content/dashboard/home.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content') diff --git a/content/dashboard/profile.blade.php b/content/dashboard/profile.blade.php index c7ba072..4fe6084 100644 --- a/content/dashboard/profile.blade.php +++ b/content/dashboard/profile.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app') +@extends('template.'.config('settings.template').'.content.dashboard.app') @section('content')
diff --git a/content/includes/integrations.blade.php b/content/includes/integrations.blade.php index 16e9942..fc3d075 100644 --- a/content/includes/integrations.blade.php +++ b/content/includes/integrations.blade.php @@ -1,7 +1,7 @@ @if(App::environment('production')) - @if (!empty(\Setting::get('facebook', ''))) + @if (!empty(config('settings.facebook'))) @endif - @if (!empty(\Setting::get('analytics', ''))) + @if (!empty(config('settings.analytics'))) - + @endif diff --git a/content/includes/premium-pass-qr.blade.php b/content/includes/premium-pass-qr.blade.php index 911e531..190dfc1 100644 --- a/content/includes/premium-pass-qr.blade.php +++ b/content/includes/premium-pass-qr.blade.php @@ -37,7 +37,7 @@ } - @if (\Setting::get('stripe_status', 0)) + @if (config('settings.stripe_status')) Alternative: Pay with Credit Card @@ -75,7 +75,7 @@
- +
diff --git a/content/lists/default.blade.php b/content/lists/default.blade.php index d9ae0c2..c4ba71d 100644 --- a/content/lists/default.blade.php +++ b/content/lists/default.blade.php @@ -74,10 +74,10 @@ } - @if (\Setting::get('image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image)) + @if (config('settings.image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image)) @endif @@ -97,9 +97,9 @@

- {{ \Setting::get('name')}} + {{ config('settings.name')}}
- {{ \Setting::get('tagline')}} + {{ config('settings.tagline')}}
@@ -110,7 +110,7 @@ @if(\Session::get('premium_code')) - @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-banner') + @include('template.'.config('settings.template').'.content.includes.premium-banner') @endif @if (!\Session::get('premium_code')) @@ -132,7 +132,7 @@
- @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass') + @include('template.'.config('settings.template').'.content.includes.premium-pass') - @if (\Setting::get('image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image)) + @if (config('settings.image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image)) @endif @@ -97,9 +97,9 @@

- {{ \Setting::get('name')}} + {{ config('settings.name')}}
- {{ \Setting::get('tagline')}} + {{ config('settings.tagline')}}
@@ -110,7 +110,7 @@ @if(\Session::get('premium_code')) - @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-banner') + @include('template.'.config('settings.template').'.content.includes.premium-banner') @endif @if (!\Session::get('premium_code')) @@ -132,7 +132,7 @@
- @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass') + @include('template.'.config('settings.template').'.content.includes.premium-pass')