Skip to content

Commit

Permalink
chore: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@ScuffedNewt
ScuffedNewt committed Oct 25, 2024
1 parent f9b7f89 commit 66fc5aa
Show file tree
Hide file tree
Showing 227 changed files with 11,865 additions and 11,864 deletions.
12 changes: 6 additions & 6 deletions resources/views/account/_hide_alias_modal.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@if (!$alias)
<p>Invalid alias selected.</p>
@elseif($alias->is_primary)
<p>As this is your primary alias, you cannot hide it.</p>
<p>As this is your primary alias, you cannot hide it.</p>
@else
<p>This will {{ !$alias->is_visible ? 'un' : '' }}hide the alias <strong>{!! $alias->displayAlias !!}</strong>. </p>
<p>This will {{ !$alias->is_visible ? 'un' : '' }}hide the alias <strong>{!! $alias->displayAlias !!}</strong>. </p>
@if ($alias->is_visible)
<p>Logged-out users and logged-in users will not be able to see that this alias is associated with your account. Note that staff may be able to view your aliases regardless.</p>
@else
<p>Logged-out users and logged-in users will be able to view a list of your aliases from your profile page.</p>
@endif
<p>Logged-out users and logged-in users will not be able to see that this alias is associated with your account. Note that staff may be able to view your aliases regardless.</p>
@else
<p>Logged-out users and logged-in users will be able to view a list of your aliases from your profile page.</p>
@endif
{!! Form::open(['url' => 'account/hide-alias/' . $alias->id, 'class' => 'text-right']) !!}
{!! Form::submit((!$alias->is_visible ? 'Unhide' : 'Hide') . ' Alias', ['class' => 'btn btn-secondary']) !!}
{!! Form::close() !!}
Expand Down
10 changes: 5 additions & 5 deletions resources/views/account/_make_primary_modal.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@if (!$alias)
<p>Invalid alias selected.</p>
@elseif($alias->is_primary)
<p>This is already your primary alias!</p>
<p>This is already your primary alias!</p>
@elseif(!$alias->canMakePrimary)
<p>This alias cannot be made your primary alias.</p>
<p>This alias cannot be made your primary alias.</p>
@else
<p>This will make <strong>{!! $alias->displayAlias !!}</strong> your primary alias. Are you sure?</p>
<p>This will make <strong>{!! $alias->displayAlias !!}</strong> your primary alias. Are you sure?</p>
@if (!$alias->is_visible)
<p class="text-danger">This alias is currently hidden from the public. Setting it as your primary alias will make it visible to everyone!</p>
@endif
<p class="text-danger">This alias is currently hidden from the public. Setting it as your primary alias will make it visible to everyone!</p>
@endif
{!! Form::open(['url' => 'account/make-primary/' . $alias->id, 'class' => 'text-right']) !!}
{!! Form::submit('Make Primary Alias', ['class' => 'btn btn-primary']) !!}
{!! Form::close() !!}
Expand Down
4 changes: 2 additions & 2 deletions resources/views/account/_remove_alias_modal.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@if (!$alias)
<p>Invalid alias selected.</p>
@elseif($alias->is_primary)
<p>As this is your primary alias, you cannot remove it.</p>
<p>As this is your primary alias, you cannot remove it.</p>
@else
<p>This will remove the alias <strong>{!! $alias->displayAlias !!}</strong> from your account. </p>
<p>This will remove the alias <strong>{!! $alias->displayAlias !!}</strong> from your account. </p>
<p>This will not affect characters that you own, and art/design credits credited to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account will remain intact. Are you sure?</p>
{!! Form::open(['url' => 'account/remove-alias/' . $alias->id, 'class' => 'text-right']) !!}
{!! Form::submit('Remove Alias', ['class' => 'btn btn-danger']) !!}
Expand Down
132 changes: 66 additions & 66 deletions resources/views/account/aliases.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,86 +7,86 @@
@section('account-content')
{!! breadcrumbs(['My Account' => Auth::user()->url, 'Aliases' => 'account/aliases']) !!}

<h1>Aliases</h1>
<h1>Aliases</h1>

<p>To verify your identity, you can authenticate any number of accounts from these social media sites that you own. Characters credited to these social media accounts will be added to your account.</p>
<p>You must have a <strong>primary</strong> account linked. This account is displayed on your profile, and cannot be hidden and/or removed - to change it, you will need to change <strong>primary</strong> status to a different account. Non-primary
linked accounts can be hidden and/or removed at any time.</p>
<p>To verify your identity, you can authenticate any number of accounts from these social media sites that you own. Characters credited to these social media accounts will be added to your account.</p>
<p>You must have a <strong>primary</strong> account linked. This account is displayed on your profile, and cannot be hidden and/or removed - to change it, you will need to change <strong>primary</strong> status to a different account. Non-primary
linked accounts can be hidden and/or removed at any time.</p>

<h3>Linked Accounts</h3>
<div class="mb-4 logs-table">
<div class="logs-table-header">
<div class="row">
<div class="col-3">
<div class="logs-table-cell">Alias</div>
</div>
<div class="col-3">
<div class="logs-table-cell">Site</div>
</div>
<div class="col-1">
<div class="logs-table-cell"></div>
</div>
<div class="col-5">
<div class="logs-table-cell"></div>
</div>
<h3>Linked Accounts</h3>
<div class="mb-4 logs-table">
<div class="logs-table-header">
<div class="row">
<div class="col-3">
<div class="logs-table-cell">Alias</div>
</div>
<div class="col-3">
<div class="logs-table-cell">Site</div>
</div>
<div class="col-1">
<div class="logs-table-cell"></div>
</div>
<div class="col-5">
<div class="logs-table-cell"></div>
</div>
</div>
<div class="logs-table-body">
@foreach (Auth::user()->aliases()->orderBy('is_primary_alias', 'DESC')->orderBy('site')->get() as $alias)
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-3">
<div class="logs-table-cell"><a href="{{ $alias->url }}">{{ $alias->alias }}</a></div>
</div>
<div class="col-3">
<div class="logs-table-cell">
<i class="{{ $alias->config['icon'] }} fa-fw mr-1"></i> {{ config('lorekeeper.sites.' . $alias->site . '.full_name') }}
</div>
</div>
<div class="logs-table-body">
@foreach (Auth::user()->aliases()->orderBy('is_primary_alias', 'DESC')->orderBy('site')->get() as $alias)
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-3">
<div class="logs-table-cell"><a href="{{ $alias->url }}">{{ $alias->alias }}</a></div>
</div>
<div class="col-3">
<div class="logs-table-cell">
<i class="{{ $alias->config['icon'] }} fa-fw mr-1"></i> {{ config('lorekeeper.sites.' . $alias->site . '.full_name') }}
</div>
<div class="col-1">
<div class="logs-table-cell">
@if ($alias->is_primary_alias)
<span class="badge badge-success">Primary</span>
@endif
@if (!$alias->is_visible)
<i class="fas fa-eye-slash" data-toggle="tooltip" title="This alias is hidden from public view."></i>
@endif
</div>
</div>
<div class="col-1">
<div class="logs-table-cell">
@if ($alias->is_primary_alias)
<span class="badge badge-success">Primary</span>
@endif
@if (!$alias->is_visible)
<i class="fas fa-eye-slash" data-toggle="tooltip" title="This alias is hidden from public view."></i>
@endif
</div>
<div class="col-5 text-right">
<div class="logs-table-cell">
@if (!$alias->is_primary_alias || !config('lorekeeper.settings.require_alias'))
@if (!$alias->is_primary_alias && config('lorekeeper.sites.' . $alias->site . '.primary_alias'))
<a href="#" class="btn btn-outline-primary btn-sm make-primary" data-id="{{ $alias->id }}">Make Primary</a>
@endif
<a href="#" class="btn btn-outline-secondary btn-sm hide-alias" data-id="{{ $alias->id }}">{{ $alias->is_visible ? 'Hide' : 'Unhide' }}</a>
<a href="#" class="btn btn-outline-danger btn-sm remove-alias" data-id="{{ $alias->id }}">Remove</a>
@endif
</div>
</div>
<div class="col-5 text-right">
<div class="logs-table-cell">
@if (!$alias->is_primary_alias || !config('lorekeeper.settings.require_alias'))
@if (!$alias->is_primary_alias && config('lorekeeper.sites.' . $alias->site . '.primary_alias'))
<a href="#" class="btn btn-outline-primary btn-sm make-primary" data-id="{{ $alias->id }}">Make Primary</a>
@endif
<a href="#" class="btn btn-outline-secondary btn-sm hide-alias" data-id="{{ $alias->id }}">{{ $alias->is_visible ? 'Hide' : 'Unhide' }}</a>
<a href="#" class="btn btn-outline-danger btn-sm remove-alias" data-id="{{ $alias->id }}">Remove</a>
@endif
</div>
</div>
</div>
@endforeach
</div>
</div>
@endforeach
</div>
</div>

<h3>Link New Account</h3>
<h3>Link New Account</h3>

<p>Click on a button to link a social media account to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. You must be logged into the account you want to link to be able to continue.</p>
<p>Accounts on sites that have the <strong>Primary</strong> label can be used as a primary account, but will not automatically switch your primary account once authenticated. Added accounts are not visible on your profile by default.</p>
<p>Click on a button to link a social media account to your {{ config('lorekeeper.settings.site_name', 'Lorekeeper') }} account. You must be logged into the account you want to link to be able to continue.</p>
<p>Accounts on sites that have the <strong>Primary</strong> label can be used as a primary account, but will not automatically switch your primary account once authenticated. Added accounts are not visible on your profile by default.</p>

@foreach (config('lorekeeper.sites') as $provider => $site)
@if (isset($site['auth']) && $site['auth'])
<div class="d-flex mb-3">
<div class="d-flex justify-content-end align-items-center"><i class="{{ $site['icon'] }} fa-fw mr-3"></i></div>
<div class="">
<a href="{{ url('auth/redirect/' . $provider) }}" class="btn btn-outline-primary mr-3">Link <strong>{{ $site['full_name'] }}</strong> Account</a>
@if (isset($site['primary_alias']) && $site['primary_alias'])
<span class="badge badge-success">Primary</span>
@endif
</div>
@foreach (config('lorekeeper.sites') as $provider => $site)
@if (isset($site['auth']) && $site['auth'])
<div class="d-flex mb-3">
<div class="d-flex justify-content-end align-items-center"><i class="{{ $site['icon'] }} fa-fw mr-3"></i></div>
<div class="">
<a href="{{ url('auth/redirect/' . $provider) }}" class="btn btn-outline-primary mr-3">Link <strong>{{ $site['full_name'] }}</strong> Account</a>
@if (isset($site['primary_alias']) && $site['primary_alias'])
<span class="badge badge-success">Primary</span>
@endif
</div>
@endif
</div>
@endif
@endforeach
@endsection
@section('scripts')
Expand Down
18 changes: 9 additions & 9 deletions resources/views/account/banned.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
@section('content')
{!! breadcrumbs(['Banned' => 'banned']) !!}

<h1>Banned</h1>
<h1>Banned</h1>

<p>You are banned from site activities effective {!! format_date(Auth::user()->settings->banned_at) !!}. {{ Auth::user()->settings->ban_reason ? 'The following reason was given:' : '' }}</p>
<p>You are banned from site activities effective {!! format_date(Auth::user()->settings->banned_at) !!}. {{ Auth::user()->settings->ban_reason ? 'The following reason was given:' : '' }}</p>

@if (Auth::user()->settings->ban_reason)
<div class="alert alert-danger">
{!! nl2br(htmlentities(Auth::user()->settings->ban_reason)) !!}
</div>
@if (Auth::user()->settings->ban_reason)
<div class="alert alert-danger">
{!! nl2br(htmlentities(Auth::user()->settings->ban_reason)) !!}
</div>
@endif

<p>As such, you may not continue to to use site features. Items, currencies, characters and any other assets attached to your account cannot be transferred to another user, nor can another user transfer any assets to your account. Any pending
submissions have also been removed from the submission queue. </p>
<p>Contact a staff member if you feel this decision has been made in error, but please respect their final judgement on the matter.</p>
<p>As such, you may not continue to to use site features. Items, currencies, characters and any other assets attached to your account cannot be transferred to another user, nor can another user transfer any assets to your account. Any pending
submissions have also been removed from the submission queue. </p>
<p>Contact a staff member if you feel this decision has been made in error, but please respect their final judgement on the matter.</p>
@endsection
Loading

0 comments on commit 66fc5aa

Please sign in to comment.