diff --git a/.gitignore b/.gitignore index b3697c53..41943da7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,7 @@ yarn-error.log .vagrant /ssl/BaltimoreCyberTrustRoot.crt.pem /public/resource-packs/* -/public/js/* \ No newline at end of file +/public/js/* +/.idea/* +_ide_helper.php +.phpstorm.meta.php \ No newline at end of file diff --git a/.idea/RuneManager-OSRS.iml b/.idea/RuneManager-OSRS.iml deleted file mode 100644 index 7512372d..00000000 --- a/.idea/RuneManager-OSRS.iml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a17..00000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index c8d6567e..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index f9425584..00000000 --- a/.idea/php.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml deleted file mode 100644 index 0e6ddb06..00000000 --- a/.idea/phpunit.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 56c6ce83..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @foreach (Helper::listAccountTypes() as $accountType) - - @endforeach - - - -
- -
- - - - - -
- @csrf - @method('DELETE') - -
-
- -
-
-
- -

How to authenticate:

- -
    -
  1. Make sure you have the RuneManager plugin enabled
    2. -
  2. Enter your RuneManager user credentials in the RuneManager plugin configurations
    3. -
  3. Log in on your Old School RuneScape account
    4. -
  4. Type in chat:
    - !auth {{ $authStatus->code }} -
    5. -
  5. You should get the response:
    - Attempting to authenticate account {{ $authStatus->username }} to user {{ $authStatus->user->name }} -
    6. -
  6. And then:
    - Account successfully authenticated! -
    7. -
- -

Other responses mean:

- - - -@endsection \ No newline at end of file +
+

Account authentication status for:

+ +

{{ $authStatus->username }}

+ +
+ + +
+ {{ ucfirst($authStatus->status) }} +
+
+ +
+ + +
+ {{ $authStatus->code }} +
+
+ +
+ @csrf + @method('PATCH') + +
+ + +
+ + @if ($authStatus->account_type !== "normal") + {{ Helper::formatAccountTypeName($authStatus->account_type) }} icon + @endif + {{ Helper::formatAccountTypeName($authStatus->account_type) }} + + +
+
+ +
+ +
+ +
+
+
+
+
+ +
+ @csrf + @method('DELETE') + +
+
+ +
+
+
+ +

How to authenticate:

+ +
    +
  1. Make sure you have the RuneManager plugin enabled
    2. +
  2. Enter your RuneManager user credentials in the RuneManager plugin configurations
    3. +
  3. Log in on your Old School RuneScape account
    4. +
  4. Type in chat:
    + !auth {{ $authStatus->code }} +
    5. +
  5. You should get the response:
    + Attempting to authenticate account {{ $authStatus->username }} to + user {{ $authStatus->user->name }} +
    6. +
  6. And then:
    + Account successfully authenticated! +
    7. +
+ +

Other responses mean:

+ +
    +
  • + Not a supported account type. Valid account types: normal, ironman, hardcore ironman, ultimate + ironman
    + This means you are attempting to authenticate the account on an unsupported game mode such as DMM, Leagues etc.
    + To fix this you have to log in to a normal world +
    • +
  • + This account has no pending status
    + This means this account has (or has not successfully) already been authenticated to RuneManager +
    • +
  • + This account is registered as <account type>, not <account type>
    + This means you are attempting to authenticate the account with a different account type than the registered account type
    + To fix this you can update the account type above +
    • +
  • + Invalid code
    + This means you have most likely written the code wrong. Try again +
    • +
  • + Could not fetch player data from hiscores
    + This means RuneManager was not able to fetch player hiscores from Old School RuneScape. This is most likely an error on the Old School hiscore server +
    • +
+
+@endsection diff --git a/resources/views/account/create.blade.php b/resources/views/account/create.blade.php index 46ac191c..f5b1aaf3 100644 --- a/resources/views/account/create.blade.php +++ b/resources/views/account/create.blade.php @@ -1,66 +1,73 @@ @extends('layouts.layout') @section('title') - Link account + Link account @endsection @section('content') -
-

Link account

+
+

Link account

-
- @csrf + + @csrf -
- +
+ -
- +
+ - @error('username') - + @error('username') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
- +
+ -
- @foreach (Helper::listAccountTypes() as $accountType) - @if ($accountType === 'normal') -
- -
- @else -
- -
- @endif - @endforeach +
+ @foreach (Helper::listAccountTypes() as $accountType) + @if ($accountType === 'normal') +
+ +
+ @else +
+ +
+ @endif + @endforeach - @error('accountType') - + @error('accountType') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
-
- -
-
-
-
-@endsection \ No newline at end of file +
+
+ +
+
+ +
+@endsection diff --git a/resources/views/account/index.blade.php b/resources/views/account/index.blade.php index c5a81576..13ad9573 100644 --- a/resources/views/account/index.blade.php +++ b/resources/views/account/index.blade.php @@ -1,56 +1,85 @@ @extends('layouts.layout') @section('title') - Accounts + Accounts @endsection @section('content') -
- @if (count($accounts) > 0) -

Search for accounts

+
+ @if ($accounts->isNotEmpty()) +

Search for accounts

-
- @csrf + + @csrf -
+
-
- - - @error('search') - +
+ + + @error('search') + {{ $message }} - @enderror -
- - - - - @if ($query) -

Search results for "{{ $query }}"

- @else -

Accounts

- @endif - -
- @foreach($accounts as $account) - -
- {{ $account->username }} - @if ($account->user->icon_id) - Profile icon - @endif -
- - @endforeach -
- @else -
- Sad face -

There are no linked accounts...

-

Link an account here!

-
- @endif -
-@endsection \ No newline at end of file + @enderror +
+ + + + + @if ($query) +

Search results for "{{ $query }}"

+ @else +

Accounts

+ @endif + +
+ @foreach($accounts as $account) + +
+
+
+ Profile icon +
+ +
+
+ + @if ($account->account_type !== "normal") + {{ Helper::formatAccountTypeName($account->account_type) }} icon + @endif + {{ $account->username }} + +
+ + Total level icon + {{ $account->level }} + +
+
+
+
+ + @endforeach +
+ @else +
+ Sad face +

There are no linked accounts

+

Link an account here!

+
+ @endif +
+@endsection diff --git a/resources/views/account/show.blade.php b/resources/views/account/show.blade.php index e0e0999a..436b8d29 100644 --- a/resources/views/account/show.blade.php +++ b/resources/views/account/show.blade.php @@ -1,22 +1,28 @@ @extends('layouts.layout') @section('title') - {{ $account->username }} + {{ $account->username }} @endsection @section('content') -
- @if ($account->user->private === 0 || (Auth::check() && $account->user->id == Auth::user()->id)) -
- Profile icon -
+
+ @if ($account->user->private === 0 || (Auth::check() && $account->user->id == Auth::user()->id)) +
+
+ +
- - @else -
- Sad face -

This user is private

-
- @endif -
-@endsection \ No newline at end of file +
+ +
+
+ @else +
+ Sad face +

This user is private

+
+ @endif +
+@endsection diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 2c55188d..775909bd 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -1,67 +1,67 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -
-
-
-
-
-
Total users
-

{{ $users }}

-
-
+
+
+
+
+
+
Total users
+

{{ $users }}

+
+
-
-
-
-
Lorem ipsum
-

dolor sit amet

-
-
+
+
+
+
Lorem ipsum
+

dolor sit amet

+
+
-
-
-
-
Lorem ipsum
-

dolor sit amet

-
-
+
+
+
+
Lorem ipsum
+

dolor sit amet

+
+
-
-
-
-
Lorem ipsum
-

dolor sit amet

-
-
-
+
+
+
+
Lorem ipsum
+

dolor sit amet

+
+
+
-
- @for ($i = 0; $i < 2; $i++) -
-
Tittel
-
-
Lorem ipsum
-

dolor sit amet

-
-
- @endfor -
+
+ @for ($i = 0; $i < 2; $i++) +
+
Tittel
+
+
Lorem ipsum
+

dolor sit amet

+
+
+ @endfor +
-
- @for ($i = 0; $i < 2; $i++) -
-
Tittel
-
-
Lorem ipsum
-

dolor sit amet

-
-
- @endfor -
-
-@endsection \ No newline at end of file +
+ @for ($i = 0; $i < 2; $i++) +
+
Tittel
+
+
Lorem ipsum
+

dolor sit amet

+
+
+ @endfor +
+
+@endsection diff --git a/resources/views/admin/member/create.blade.php b/resources/views/admin/member/create.blade.php index 12a84b9b..94d12c4d 100644 --- a/resources/views/admin/member/create.blade.php +++ b/resources/views/admin/member/create.blade.php @@ -1,29 +1,30 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -

Register an OSRS account

-

If you want to preregister an OSRS account for future use / reference, you can do it here.

-

This means this account will not be able to be linked for a new user, but have to be linked manually.

+

Register an OSRS account

+

If you want to preregister an OSRS account for future use / reference, you can do it here.

+

This means this account will not be able to be linked for a new user, but have to be linked manually.

-
- @csrf + + @csrf - + - + - @error('username') - + @error('username') + {{ $message }} - @enderror + @enderror -
- -
- -@endsection \ No newline at end of file +
+ +
+ +@endsection diff --git a/resources/views/admin/member/index.blade.php b/resources/views/admin/member/index.blade.php index e32d19e2..277f9749 100644 --- a/resources/views/admin/member/index.blade.php +++ b/resources/views/admin/member/index.blade.php @@ -1,61 +1,66 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') - @section('navigation') - Register account - @endsection +@section('navigation') + Register account +@endsection + +
+
+

Search for OSRS accounts

+
-
-
-

Search for OSRS accounts

-
+
+ @csrf - - @csrf +
-
+
+ -
- - - @error('search') - + @error('search') + {{ $message }} - @enderror -
- - - -
- - @if ($query)

Search results for "{{ $query }}"

@endif - - - - - - - - - - - - @foreach ($members as $member) - - - - - - - - - - - @endforeach -
Account IDUsernameRankLevelXPLinked userRegisteredActions
{{ $member->id }}{{ $member->username }}{{ number_format($member->rank) }}{{ $member->level }}{{ number_format($member->xp) }}@if ($member->user_id)@if ($member->user->icon_id)Profile icon@endif{{ $member->user_id }} - {{ $member->user->name }}@endif{{ \Carbon\Carbon::parse($member->created_at)->format('d. M Y H:i') }}Show
-@endsection \ No newline at end of file + @enderror +
+ + + +
+ +@if ($query)

Search results for "{{ $query }}"

@endif + + + + + + + + + + + + @foreach ($members as $member) + + + + + + + + + + + @endforeach +
Account IDUsernameRankLevelXPLinked userRegisteredActions
{{ $member->id }}{{ $member->username }}{{ number_format($member->rank) }}{{ $member->level }}{{ number_format($member->xp) }}@if ($member->user_id)@if ($member->user->icon_id)Profile icon@endif{{ $member->user_id }} - {{ $member->user->name }}@endif{{ \Carbon\Carbon::parse($member->created_at)->format('d. M Y H:i') }}Show
+@endsection diff --git a/resources/views/admin/member/show.blade.php b/resources/views/admin/member/show.blade.php index 21ddc4d1..092acf04 100644 --- a/resources/views/admin/member/show.blade.php +++ b/resources/views/admin/member/show.blade.php @@ -1,70 +1,72 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -
-
-

{{ $member->username }}

+
+
+

{{ $member->username }}

- Rank: {{ number_format($member->rank) }} -
- Total XP: {{ number_format($member->xp) }} -
- Total Level: {{ $member->level }} -
- Joined: {{ \Carbon\Carbon::parse($member->created_at)->format('d. M Y') }} -
+ Rank: {{ number_format($member->rank) }} +
+ Total XP: {{ number_format($member->xp) }} +
+ Total Level: {{ $member->level }} +
+ Joined: {{ \Carbon\Carbon::parse($member->created_at)->format('d. M Y') }} +
-
-
Transfer ownership of this account:
+
+
Transfer ownership of this account:
-
- @method('PATCH') - @csrf - - @if ($member->user_id) - - @else - - @endif - - + + @method('PATCH') + @csrf - @error('user_id') - + @if ($member->user_id) + + @else + + @endif + + + + @error('user_id') + {{ $message }} - @enderror + @enderror - - -
-
+ + +
+
- - - - - - - - - @foreach (Helper::accountStats($member->id) as $skillId => $skill) - - - - - - - - @endforeach -
SkillLevelXPRankLast trained
- - {{ ucfirst(Helper::listSkills()[$skillId]) }} skill icon - {{ ucfirst(Helper::listSkills()[$skillId]) }} - - {{ $skill[0]->level }}{{ number_format($skill[0]->xp) }}{{ number_format($skill[0]->rank) }}{{ \Carbon\Carbon::parse($skill[0]->updated_at)->format('d. M Y H:i') }}
-@endsection \ No newline at end of file + + + + + + + + + @foreach (Helper::accountStats($member->id) as $skillId => $skill) + + + + + + + + @endforeach +
SkillLevelXPRankLast trained
+ + {{ ucfirst(Helper::listSkills()[$skillId]) }} skill icon + {{ ucfirst(Helper::listSkills()[$skillId]) }} + + {{ $skill[0]->level }}{{ number_format($skill[0]->xp) }}{{ number_format($skill[0]->rank) }}{{ \Carbon\Carbon::parse($skill[0]->updated_at)->format('d. M Y H:i') }}
+@endsection diff --git a/resources/views/admin/news/create.blade.php b/resources/views/admin/news/create.blade.php index e8dbcc79..ad8dc8e1 100644 --- a/resources/views/admin/news/create.blade.php +++ b/resources/views/admin/news/create.blade.php @@ -1,84 +1,88 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -

{{ __('title.create-newspost') }}

+

{{ __('title.create-newspost') }}

-
- @csrf + + @csrf -
- +
+ -
- -
-
+
+ +
+
-
- +
+ -
- +
+ - @error('title') - + @error('title') + {{ $message }} - @enderror -
-
- -
- - -
- - - @error('category_id') - + @enderror +
+
+ +
+ + +
+ + + @error('category_id') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
- +
+ -
- +
+ - @error('shortstory') - + @error('shortstory') + {{ $message }} - @enderror -
-
+ @enderror +
+
- + - @error('longstory') - + @error('longstory') + {{ $message }} - @enderror - -
- -
- - - - -@endsection \ No newline at end of file + @enderror + +
+ +
+ + + + +@endsection diff --git a/resources/views/admin/news/edit.blade.php b/resources/views/admin/news/edit.blade.php index 0a338edf..2b6d8040 100644 --- a/resources/views/admin/news/edit.blade.php +++ b/resources/views/admin/news/edit.blade.php @@ -1,126 +1,134 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') - @section('navigation') -
- @method('DELETE') - @csrf +@section('navigation') + + @method('DELETE') + @csrf - -
- @endsection + + +@endsection -

Update newspost "{{ $post->title }}"

+

Update newspost "{{ $post->title }}"

-
-
- '{{ $post->title }}' news post image -
+
+
+ '{{ $post->title }}' news post image +
-
-
- @method('PATCH') - @csrf +
+ + @method('PATCH') + @csrf -
- +
+ -
- +
+ - @error('user_id') - + @error('user_id') + {{ $message }} - @enderror -
-
- -
- - -
-
- - Current image ID: {{ $post->image_id }} -
- -
- - - -
-
-
- -
- - -
- - - @error('title') - + @enderror +
+
+ +
+ + +
+
+ + Current image ID: {{ $post->image_id }} +
+ +
+ + + +
+
+
+ +
+ + +
+ + + @error('title') + {{ $message }} - @enderror -
-
- -
- - -
- - - @error('category_id') - + @enderror +
+
+ +
+ + +
+ + + @error('category_id') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
- +
+ -
- +
+ - @error('shortstory') - + @error('shortstory') + {{ $message }} - @enderror -
-
+ @enderror +
+
- + - @error('longstory') - + @error('longstory') + {{ $message }} - @enderror - -
- -
- -
- - - -
-@endsection \ No newline at end of file + @enderror + +
+ +
+ +
+ + + +
+@endsection diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php index febf92f6..570f1379 100644 --- a/resources/views/admin/news/index.blade.php +++ b/resources/views/admin/news/index.blade.php @@ -1,42 +1,42 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -

News

+

News

- - - - - - - - - - +
News IDTitleShortstoryCategoryAuthorPostedActions
+ + + + + + + + + - @foreach ($newsPosts as $news) - - - - - - - - + + + + + + + - - @endforeach -
News IDTitleShortstoryCategoryAuthorPostedActions
{{ $news->id }}{{ $news->title }}{{ $news->shortstory }}{{ $news->category->category }}{{ $news->user->name }}{{ \Carbon\Carbon::parse($news->created_at)->format('d. M Y H:i') }} - Show - Edit -
- @method('DELETE') - @csrf + @foreach ($newsPosts as $news) +
{{ $news->id }}{{ $news->title }}{{ $news->shortstory }}{{ $news->category->category }}{{ $news->user->name }}{{ \Carbon\Carbon::parse($news->created_at)->format('d. M Y H:i') }} + Show + Edit + + @method('DELETE') + @csrf - - -
-@endsection \ No newline at end of file + + + + + @endforeach + +@endsection diff --git a/resources/views/admin/news/show.blade.php b/resources/views/admin/news/show.blade.php index cd83b7c9..df3d73de 100644 --- a/resources/views/admin/news/show.blade.php +++ b/resources/views/admin/news/show.blade.php @@ -1,25 +1,26 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') - @section('navigation') -
- @method('DELETE') - @csrf +@section('navigation') + + @method('DELETE') + @csrf - -
- @endsection + + +@endsection -
-
- '{{ $post->title }}' news post image -
-

{{ $post->title }}

-

{{ $post->shortstory }}

- {!! $post->longstory !!} -
-@endsection \ No newline at end of file +
+
+ '{{ $post->title }}' news post image +
+

{{ $post->title }}

+

{{ $post->shortstory }}

+ {!! $post->longstory !!} +
+@endsection diff --git a/resources/views/admin/rank/index.blade.php b/resources/views/admin/rank/index.blade.php index aa6d9f9e..92cd2788 100644 --- a/resources/views/admin/rank/index.blade.php +++ b/resources/views/admin/rank/index.blade.php @@ -1,24 +1,24 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -

Ranks and permissions

+

Ranks and permissions

- - - - - - - @foreach ($roles as $role) - - - - - @endforeach -
IDRankPermissions
{{ $role->id }}{{ $role->name}}{{ $role->}} -
-@endsection \ No newline at end of file + + + + + + + @foreach ($roles as $role) + + + + + @endforeach +
IDRankPermissions
{{ $role->id }}{{ $role->name}}{{ $role->}} +
+@endsection diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php index 549db6c0..cd11a4c6 100644 --- a/resources/views/admin/user/edit.blade.php +++ b/resources/views/admin/user/edit.blade.php @@ -1,115 +1,127 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') - @section('navigation') - - @endsection - -
-
- @if ($user->icon_id)Profile icon@endif -

{{ $user->name }}

-

@role('admin') [Admin] @endrole

-
- -
- @method('PATCH') - @csrf - -
- - -
- - - @error('name') - +@section('navigation') + +@endsection + +
+
+ @if ($user->icon_id)Profile icon@endif +

{{ $user->name }}

+

@role('admin') [Admin] @endrole

+
+ + + @method('PATCH') + @csrf + +
+ + +
+ + + @error('name') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
- +
+ -
- +
+ - @error('email') - + @error('email') + {{ $message }} - @enderror -
-
- -
- - -
- - - @error('private') - + @enderror +
+
+ +
+ + +
+ + + @error('private') + {{ $message }} - @enderror -
-
- -
- - -
- - Type in the ID of an icon you wish to display as the profile icon. Search icons here - - @error('email') - + @enderror +
+
+ +
+ + +
+ + Type in the ID of an icon you wish to display as the profile + icon. Search icons here + + @error('email') + {{ $message }} - @enderror -
-
+ @enderror +
+
- @if (count($user->member) > 0) -
Transfer ownership of OSRS accounts:
+ @if (count($user->member) > 0) +
Transfer ownership of OSRS accounts:
- @foreach ($user->member as $accountNumber => $account) -
- + @foreach ($user->member as $accountNumber => $account) +
+ -
- +
+ - + - @error('account[{{ $account->id }}]') - + @error('account[{{ $account->id }}]') + {{ $message }} - @enderror -
-
- - @php $accountNumber++ @endphp - @endforeach - @endif - -
- -
- -
-@endsection \ No newline at end of file + @enderror +
+
+ + @php $accountNumber++ @endphp + @endforeach + @endif + +
+ +
+ +
+@endsection diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php index e543f113..40320d74 100644 --- a/resources/views/admin/user/index.blade.php +++ b/resources/views/admin/user/index.blade.php @@ -1,63 +1,71 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') -
-
-

Search for users

-
+
+
+

Search for users

+
-
- @csrf + + @csrf -
+
-
- - - @error('search') - +
+ + + @error('search') + {{ $message }} - @enderror -
- - - -
- - @if ($query)

Search results for "{{ $query }}"

@endif - - - - - - - - - - - @foreach ($users as $user) - - - - - - - - - - @endforeach -
User IDUsernameEmailPrivateLinked OSRS accountRegisteredActions
{{ $user->id }}@if ($user->icon_id)Profile icon@endif {{ $user->name }}{{ $user->email }}{{ ($user->private === 0 ? 'False' : 'True') }} - @foreach ($user->member as $member) - @if (count($user->member) > 1) -

{{ $member->id }} - {{ $member->username }}

- @else - {{ $member->id }} - {{ $member->username }} - @endif - @endforeach - 		{{ \Carbon\Carbon::parse($user->created_at)->format('d. M Y H:i') }}ShowEditBan?
-@endsection \ No newline at end of file + @enderror +
+ + + +
+ + @if ($query)

Search results for "{{ $query }}"

@endif + + + + + + + + + + + @foreach ($users as $user) + + + + + + + + + + @endforeach +
User IDUsernameEmailPrivateLinked OSRS accountRegisteredActions
{{ $user->id }}@if ($user->icon_id)Profile icon@endif {{ $user->name }}{{ $user->email }}{{ ($user->private === 0 ? 'False' : 'True') }} + @foreach ($user->member as $member) + @if (count($user->member) > 1) +

{{ $member->id }} + - {{ $member->username }}

+ @else + {{ $member->id }} + - {{ $member->username }} + @endif + @endforeach + 		{{ \Carbon\Carbon::parse($user->created_at)->format('d. M Y H:i') }}ShowEditBan?
+@endsection diff --git a/resources/views/admin/user/show.blade.php b/resources/views/admin/user/show.blade.php index edafc75a..a6900ee2 100644 --- a/resources/views/admin/user/show.blade.php +++ b/resources/views/admin/user/show.blade.php @@ -1,70 +1,73 @@ @extends('layouts.admin') @section('title') - TITLE + TITLE @endsection @section('content') - @section('navigation') - Edit +@section('navigation') + Edit - - @endsection + +@endsection + +
+
+
+ @if ($user->icon_id) +
+ Profile icon +
+ @endif +

{{ $user->name }}

+

rank

-
-
-
- @if ($user->icon_id) -
- Profile icon -
- @endif -

{{ $user->name }}

-

rank

+

About

+

Email: {{ $user->email }}

+

Icon ID: {{ (is_null($user->icon_id)) ? 'None' : $user->icon_id }}

+

Private: {{ ($user->private === 0 ? 'False' : 'True') }}

+

User ID: {{ $user->id }}

+

Joined: {{ \Carbon\Carbon::parse($user->created_at)->format('d. M Y H:i') }}

+

Last updated: {{ \Carbon\Carbon::parse($user->updated_at)->format('d. M Y H:i') }}

+
+
-

About

-

Email: {{ $user->email }}

-

Icon ID: {{ (is_null($user->icon_id)) ? 'None' : $user->icon_id }}

-

Private: {{ ($user->private === 0 ? 'False' : 'True') }}

-

User ID: {{ $user->id }}

-

Joined: {{ \Carbon\Carbon::parse($user->created_at)->format('d. M Y H:i') }}

-

Last updated: {{ \Carbon\Carbon::parse($user->updated_at)->format('d. M Y H:i') }}

-
-
+
+
+

OSRS accounts

-
-
-

OSRS accounts

+ @foreach ($accounts as $amount => $account) +
+
+
+

@if (count($user->member) > 1) {{ ++$amount }} - @endif{{ $account->username }}

+

+ Rank: {{ number_format($account->rank) }} | + Level: {{ $account->level }} | + Total XP: {{ number_format($account->xp) }} +

+
+
- @foreach ($accounts as $amount => $account) -
-
-
-

@if (count($user->member) > 1) {{ ++$amount }} - @endif{{ $account->username }}

-

- Rank: {{ number_format($account->rank) }} | - Level: {{ $account->level }} | - Total XP: {{ number_format($account->xp) }} -

-
-
+
+
+ @foreach (Helper::accountStats($account->id) as $skillId => $skill) + + {{ ucfirst(Helper::listSkills()[$skillId]) }} skill icon -
-
- @foreach (Helper::accountStats($account->id) as $skillId => $skill) - - {{ ucfirst(Helper::listSkills()[$skillId]) }} skill icon - - {{ json_decode($skill[0]->level, true) }} - - @endforeach -
-
-
- @endforeach -
-
-
-@endsection \ No newline at end of file + {{ json_decode($skill[0]->level, true) }} + + @endforeach +
+
+
+ @endforeach +
+
+
+@endsection diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 3f72c10e..4c73420c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,73 +1,76 @@ @extends('layouts.layout') @section('title') - Login + Login @endsection @section('content') -
-

Login

+
+

Login

-
- @csrf + + @csrf -
- +
+ -
- +
+ - @error('email') - + @error('email') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
- +
+ -
- +
+ - @error('password') - + @error('password') + {{ $message }} - @enderror -
-
+ @enderror +
+
-
-
-
- +
+
+
+ - -
-
-
+ +
+
+
-
-
- +
+
+ - - {{ __('Register') }} - + + {{ __('Register') }} + - @if (Route::has('password.request')) - - {{ __('Forgot Your Password?') }} - - @endif -
-
- -
-@endsection \ No newline at end of file + @if (Route::has('password.request')) + + {{ __('Forgot Your Password?') }} + + @endif +
+
+ +
+@endsection diff --git a/resources/views/auth/passwords/confirm.blade.php b/resources/views/auth/passwords/confirm.blade.php index ca78fc1d..924f076d 100644 --- a/resources/views/auth/passwords/confirm.blade.php +++ b/resources/views/auth/passwords/confirm.blade.php @@ -1,49 +1,52 @@ @extends('layouts.app') @section('content') -
-
-
-
-
{{ __('Confirm Password') }}
+
+
+
+
+
{{ __('Confirm Password') }}
-
- {{ __('Please confirm your password before continuing.') }} +
+ {{ __('Please confirm your password before continuing.') }} -
- @csrf + + @csrf -
- +
+ -
- +
+ - @error('password') + @error('password') {{ $message }} - @enderror + @enderror +
-
- -
-
- - - @if (Route::has('password.request')) - - {{ __('Forgot Your Password?') }} - - @endif + +
+
+ + + @if (Route::has('password.request')) + + {{ __('Forgot Your Password?') }} + + @endif +
-
- + +
-
@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 1fea9845..bb7e36ca 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,47 +1,50 @@ @extends('layouts.app') @section('content') -
-
-
-
-
{{ __('Reset Password') }}
+
+
+
+
+
{{ __('Reset Password') }}
-
- @if (session('status')) - - @endif +
+ @if (session('status')) + + @endif -
- @csrf + + @csrf -
- +
+ -
- +
+ - @error('email') + @error('email') {{ $message }} - @enderror + @enderror +
-
-
-
- +
+
+ +
-
- + +
-
@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 989931d3..7d7682ca 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,65 +1,73 @@ @extends('layouts.app') @section('content') -
-
-
-
-
{{ __('Reset Password') }}
+
+
+
+
+
{{ __('Reset Password') }}
-
-
- @csrf +
+ + @csrf - + -
- +
+ -
- +
+ - @error('email') + @error('email') {{ $message }} - @enderror + @enderror +
-
-
- +
+ -
- +
+ - @error('password') + @error('password') {{ $message }} - @enderror + @enderror +
-
-
- +
+ -
- +
+ +
-
-
-
- +
+
+ +
-
- + +
-
@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 7d081349..37f17901 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -15,10 +15,11 @@
- + @error('name') - + {{ $message }} @enderror @@ -29,10 +30,11 @@
- + @error('email') - + {{ $message }} @enderror @@ -43,10 +45,11 @@
- + @error('password') - + {{ $message }} @enderror @@ -54,10 +57,12 @@
- +
- +
@@ -70,4 +75,4 @@
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php index 9f8c1bc0..52d2446b 100644 --- a/resources/views/auth/verify.blade.php +++ b/resources/views/auth/verify.blade.php @@ -1,28 +1,30 @@ @extends('layouts.app') @section('content') -
-
-
-
-
{{ __('Verify Your Email Address') }}
+
+
+
+
+
{{ __('Verify Your Email Address') }}
-
- @if (session('resent')) - - @endif +
+ @if (session('resent')) + + @endif - {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, -
- @csrf - . -
+ {{ __('Before proceeding, please check your email for a verification link.') }} + {{ __('If you did not receive the email') }}, +
+ @csrf + + . +
+
-
@endsection diff --git a/resources/views/hiscore.blade.php b/resources/views/hiscore.blade.php index 40705be4..5b99be66 100644 --- a/resources/views/hiscore.blade.php +++ b/resources/views/hiscore.blade.php @@ -1,70 +1,92 @@ @extends('layouts.layout') @section('title') - {{ ucfirst($hiscore) }} + {{ ucfirst(Helper::collectionAttribute($hiscoreName, "alias")) }} @endsection @section('content') - + -
-
- -
- Overall skill icon -
- Skills -
- +
+
+ +
+ Skills icon +
+ Skills +
+ - -
- Overall skill icon -
- Bosses -
- -
+ +
+ Bosses icon +
+ Bosses +
+ +
-
-
+
+
- @foreach ($hiscoreListTop as $skill) - {{ ucfirst($skill) }} {{ $hiscoreType }} icon - @endforeach + @foreach ($hiscoreListTop as $hiscore) + + {{ ucfirst($hiscore) }} {{ $hiscoreType }} icon + + @endforeach -
- {{ ucfirst($hiscore) }} {{ $hiscoreType }} icon

{{ ucfirst($hiscore) }}

 - @foreach ($hiscoreList as $skill) - {{ ucfirst($skill) }} {{ $hiscoreType }} icon

{{ ucfirst($skill) }}

 - @endforeach -
- - @foreach ($hiscoreListBottom as $skill) - {{ ucfirst($skill) }} {{ $hiscoreType }} icon - @endforeach +
+

+ {{ ucfirst($hiscoreName) }} {{ $hiscoreType }} icon +
+ {{ ucfirst(($hiscoreType === "boss" ? Helper::collectionAttribute($hiscoreName, "alias") : $hiscoreName)) }} +

+
+ + @foreach ($hiscoreListBottom as $hiscore) + + {{ ucfirst($hiscore) }} {{ $hiscoreType }} icon + + @endforeach -
-
+
+
- @if ($accountCount > 0) -
- - {{ ucfirst($hiscore) }} skill icon - -
+ @if ($accountCount > 0) +
+ {{ ucfirst($hiscoreName) }} {{ $hiscoreType }} icon +
- @if ($hiscoreType == "skill") - - @elseif ($hiscoreType == "boss") - - @endif - @else -
- Sad face -

No accounts, no hiscores...

-

Link an account here!

-
- @endif -
-@endsection \ No newline at end of file + @if ($hiscoreType == "skill") + + @elseif ($hiscoreType == "boss") + + @endif + @else +
+ Sad face +

No accounts, no hiscores...

+

Link an account here!

+
+ @endif +
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 6a83179a..ceae6e89 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,74 +1,94 @@ @extends('layouts.layout') @section('title') - {{ Auth::user()->name }} + {{ Auth::user()->name }} @endsection @section('content') -
-
-
-
- Profile icon -
- Edit profile -
-
+
+
+
+ Profile icon +

Welcome, {{ Auth::user()->name }}

-
-

Welcome, {{ Auth::user()->name }}

+

Joined: {{ \Carbon\Carbon::parse($user->created_at)->format('d. M Y') }}

+
-

Joined: {{ \Carbon\Carbon::parse($user->created_at)->format('d. M Y') }}

-
+
+ Current status: +
+ @if ($user->private === 0) + Happy face + Not private + @else + Sad face + Private + @endif -
- @if ($user->private === 0) - Current status: -
- Friend icon - Not private - @else - Current status: -
- Ignore icon - Private - @endif -
-
+

Edit profile

+
+
-
-

Accounts

+
+
+
+

Accounts

-
+
- @foreach ($user->account as $account) -
-
-

@if ($account->account_type != "normal")Account type icon@endif{{ $account->username }}

-
+ @foreach ($user->account as $account) +
+
+

+ @if ($account->account_type !== "normal") + {{ Helper::formatAccountTypeName($account->account_type) }} icon + @endif + {{ $account->username }} +

+
-
- Total level: -
- {{ $account->level }} -
-
+
+ Total level: +
+ {{ $account->level }} +
+
-
- @endforeach +
+ @endforeach -
- -
- Link account -
- -
-
+
+ +
+ Link account +
+ +
+
+
+
- @foreach ($user->account as $account) -
- - @endforeach -
-@endsection \ No newline at end of file + @foreach ($user->account as $account) +
+
+
+ +
+ +
+ +
+
+ @endforeach +
+@endsection diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index f87963fb..8b9bbddd 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -1,144 +1,168 @@ @extends('layouts.layout') @section('title') - Home + Home @endsection @section('content') - - -
-
-
-

Welcome to {{ config('app.name', 'RuneManager') }}

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. -
-
- -
-
- @guest -
- -
- Log in -
- - - -
- Register -
- -
- @else - -
- @if (Auth::user()->icon_id) - Profile icon - @endif - {{ Auth::user()->name }} -
- - -

Home

- @endif -
-
-
- -
-
-
-
- -
- Hiscores -
- -
- -
- -
- Calendar -
- -
- -
- -
- Account -
- -
-
-
- -
-
-
-
- Skills -
-
- -
-
- Bosses -
-
- -
-
- Clues -
-
-
-
-
- -
-

Latest news and updates

- - @forelse ($recentPosts as $post) -
-
-
-
- - '{{ $post->title }}' news post image - -
-
-
-
- {{ $post->title }} -
-
-

{{ $post->user->name }} | {{ $post->category->category }}

-
-
- {{ $post->shortstory }} -

Read more

-
-
-
-
- {{ \Carbon\Carbon::parse($post->created_at)->format('M') }} -
- {{ \Carbon\Carbon::parse($post->created_at)->format('d') }} -
-
-
-
- @empty -

test

- @endforelse - - @if (!empty($recentPosts)) - Read more - @endif -
-@endsection \ No newline at end of file + + +
+
+
+

Welcome to {{ config('app.name', 'RuneManager') }}

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +
+
+ +
+
+ @guest +
+ +
+ Log in +
+ + + +
+ Register +
+ +
+ @else + +
+ Profile icon + {{ Auth::user()->name }} +
+ + + +
+ Profile +
+ + + +
+ Edit profile +
+ + @endif +
+
+
+ +
+
+
+
+ +
+ Hiscores +
+ +
+ +
+ +
+ Calendar +
+ +
+ +
+ +
+ Account +
+ +
+
+
+ +
+
+
+
+ Skills +
+
+ +
+
+ Bosses +
+
+ +
+
+ Clues +
+
+
+
+
+ + @if ($recentPosts->isNotEmpty()) +
+

Latest news and updates

+ + @foreach ($recentPosts as $post) +
+
+
+
+ + '{{ $post->title }}' news post image + +
+
+
+
+ {{ $post->title }} +
+
+

{{ $post->user->name }} | {{ $post->category->category }}

+
+
+ {{ $post->shortstory }} +

+ + + Read more + + +

+
+
+
+
+ {{ \Carbon\Carbon::parse($post->created_at)->format('M') }} +
+ {{ \Carbon\Carbon::parse($post->created_at)->format('d') }} +
+
+
+
+ + @if ($loop->last) + + Read more + + @endif + @endforeach +
+ @endif +@endsection diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index eb504e6c..2ecf551c 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -16,145 +16,150 @@ - + -
-
-