Skip to content

Commit c608f6f

Browse files
ScuffedNewtScuffedNewt
authored
Merge pull request #280 from perappu/extension-pr/claymores-and-companions
fix: hardcoded experience ID, broken links, other housekeeping
2 parents 452443b + f34bdd8 commit c608f6f

9 files changed

Lines changed: 36 additions & 46 deletions

File tree

‎app/Console/Commands/ConvertExperiencePoints.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,28 @@ public function handle() {
3838
// run migration to create experience points table
3939
$this->call('migrate');
4040

41-
Experience::create([
42-
'name' => 'Level Experience',
43-
'has_image' => false,
44-
'description' => 'Experience points are earned by characters and users through various actions. They can be used to level up.',
45-
'is_visible' => false,
46-
]);
41+
if (Experience::first() == null) {
42+
$experience = Experience::create([
43+
'name' => 'Level Experience',
44+
'has_image' => false,
45+
'description' => 'Experience points are earned by characters and users through various actions. They can be used to level up.',
46+
'is_visible' => false,
47+
]);
48+
} else {
49+
$experience = Experience::first();
50+
}
4751

4852
// Convert user experience points
4953
// chunk the updates to avoid memory issues
5054
$userCount = UserLevel::count();
5155
$this->info("Converting experience points for {$userCount} users...");
5256
$bar = $this->output->createProgressBar($userCount);
5357
$bar->start();
54-
UserLevel::chunk(100, function ($userLevels) use ($bar) {
58+
UserLevel::chunk(100, function ($userLevels) use ($bar, $experience) {
5559
foreach ($userLevels as $userLevel) {
5660
UserExperience::create([
5761
'user_id' => $userLevel->user_id,
58-
'experience_id' => 1,
62+
'experience_id' => $experience->id,
5963
'quantity' => $userLevel->current_exp,
6064
]);
6165
$bar->advance();
@@ -69,11 +73,11 @@ public function handle() {
6973
$this->info("Converting experience points for {$characterCount} characters...");
7074
$bar = $this->output->createProgressBar($characterCount);
7175
$bar->start();
72-
CharacterLevel::chunk(100, function ($characterLevels) use ($bar) {
76+
CharacterLevel::chunk(100, function ($characterLevels) use ($bar, $experience) {
7377
foreach ($characterLevels as $characterLevel) {
7478
CharacterExperience::create([
7579
'character_id' => $characterLevel->character_id,
76-
'experience_id' => 1,
80+
'experience_id' => $experience->id,
7781
'quantity' => $characterLevel->current_exp,
7882
]);
7983
$bar->advance();

‎app/Http/Controllers/Admin/SubmissionController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public function getSubmission($id) {
9292
'page' => 'submission',
9393
'expanded_rewards' => config('lorekeeper.extensions.character_reward_expansion.expanded'),
9494
'characters' => Character::visible(Auth::user() ?? null)->myo(0)->orderBy('slug', 'DESC')->get()->pluck('fullName', 'slug')->toArray(),
95-
'skills' => Skill::pluck('name', 'id')->toArray(),
9695
] + ($submission->status == 'Pending' ? [
9796
'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
9897
'items' => Item::orderBy('name')->pluck('name', 'id'),
@@ -106,6 +105,7 @@ public function getSubmission($id) {
106105
'classes' => CharacterClass::orderBy('name')->pluck('name', 'id'),
107106
'points' => Stat::orderBy('name')->pluck('name', 'id')->toArray(),
108107
'experiences' => Experience::orderBy('name')->pluck('name', 'id')->toArray(),
108+
'skills' => Skill::pluck('name', 'id')->toArray(),
109109
] : []));
110110
}
111111

@@ -158,7 +158,6 @@ public function getClaim($id) {
158158
'itemsrow' => Item::all()->keyBy('id'),
159159
'expanded_rewards' => config('lorekeeper.extensions.character_reward_expansion.expanded'),
160160
'characters' => Character::visible(Auth::user() ?? null)->myo(0)->orderBy('slug', 'DESC')->get()->pluck('fullName', 'slug')->toArray(),
161-
'skills' => Skill::pluck('name', 'id')->toArray(),
162161
] + ($submission->status == 'Pending' ? [
163162
'characterCurrencies' => Currency::where('is_character_owned', 1)->orderBy('sort_character', 'DESC')->pluck('name', 'id'),
164163
'items' => Item::orderBy('name')->pluck('name', 'id'),
@@ -171,6 +170,7 @@ public function getClaim($id) {
171170
'classes' => CharacterClass::orderBy('name')->pluck('name', 'id'),
172171
'points' => Stat::orderBy('name')->pluck('name', 'id')->toArray(),
173172
'experiences' => Experience::orderBy('name')->pluck('name', 'id')->toArray(),
173+
'skills' => Skill::pluck('name', 'id')->toArray(),
174174
] : []));
175175
}
176176

‎resources/views/admin/submissions/submission.blade.php‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -395,33 +395,6 @@
395395
$submissionForm.attr('action', '{{ url()->current() }}/cancel');
396396
$submissionForm.submit();
397397
});
398-
399-
$('.original.skill-select').selectize();
400-
401-
$('#add-skill').on('click', function(e) {
402-
e.preventDefault();
403-
addSkillRow();
404-
});
405-
$('.remove-skill').on('click', function(e) {
406-
e.preventDefault();
407-
removeSkillRow($(this));
408-
});
409-
410-
function addSkillRow() {
411-
var $clone = $('.skill-row').clone();
412-
$('#skillList').append($clone);
413-
$clone.removeClass('hide skill-row');
414-
$clone.addClass('d-flex');
415-
$clone.find('.remove-skill').on('click', function(e) {
416-
e.preventDefault();
417-
removeSkillRow($(this));
418-
})
419-
$clone.find('.skill-select').selectize();
420-
}
421-
422-
function removeSkillRow($trigger) {
423-
$trigger.parent().remove();
424-
}
425398
});
426399
</script>
427400
@endif

‎resources/views/character/_sidebar.blade.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
<div class="sidebar-item"><a href="{{ $character->url . '/pets' }}" class="{{ set_active('character/' . $character->slug . '/pets') }}">Pets</a></div>
99
<div class="sidebar-item"><a href="{{ $character->url . '/inventory' }}" class="{{ set_active('character/' . $character->slug . '/inventory') }}">Inventory</a></div>
1010
<div class="sidebar-item"><a href="{{ $character->url . '/bank' }}" class="{{ set_active('character/' . $character->slug . '/bank') }}">Bank</a></div>
11+
{{-- not implemented
1112
@if (config('lorekeeper.claymores_and_companions.visibility_settings.gear') || config('lorekeeper.claymores_and_companions.visibility_settings.weapons'))
1213
<div class="sidebar-item"><a href="{{ $character->url . '/equipment' }}" class="{{ set_active('character/' . $character->slug . '/equipment') }}">Equipment</a></div>
1314
@endif
15+
--}}
1416
@if (config('lorekeeper.claymores_and_companions.visibility_settings.character_levels') || config('lorekeeper.claymores_and_companions.visibility_settings.character_stats'))
1517
<div class="sidebar-item"><a href="{{ $character->url . '/stats' }}" class="{{ set_active('character/' . $character->slug . '/stats') }}">Stats</a></div>
1618
@endif

‎resources/views/character/stats/count_logs.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@endsection
66

77
@section('profile-content')
8-
{!! breadcrumbs(['Characters' => 'characters', $character->slug => $character->url, 'Level' => $character->url . '/level', 'Logs' => $character->url . '/stats/logs/count']) !!}
8+
{!! breadcrumbs(['Characters' => 'characters', $character->slug => $character->url, 'Stat Information' => $character->url . '/stats', 'Stat Logs' => $character->url . '/stats/logs', 'Count Logs' => $character->url . '/stats/logs/count']) !!}
99

1010
<h1>
1111
{!! $character->displayName !!}'s Count Logs

‎resources/views/character/stats/exp_logs.blade.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
@endsection
66

77
@section('profile-content')
8-
{!! breadcrumbs(['Characters' => 'characters', $character->slug => $character->url, 'Stat Information' => $character->url . '/stats', 'Experience Logs' => $character->url . '/stats/logs/experience']) !!}
8+
{!! breadcrumbs([
9+
'Characters' => 'characters',
10+
$character->slug => $character->url,
11+
'Stat Information' => $character->url . '/stats',
12+
'Stat Logs' => $character->url . '/stats/logs',
13+
'Experience Logs' => $character->url . '/stats/logs/experience',
14+
]) !!}
915

1016
<h1>
1117
{!! $character->displayName !!}'s Experience Logs

‎resources/views/character/stats/level_logs.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@endsection
66

77
@section('profile-content')
8-
{!! breadcrumbs(['Characters' => 'characters', $character->slug => $character->url, 'Level' => $character->url . '/level', 'Logs' => $character->url . '/stats/logs/level']) !!}
8+
{!! breadcrumbs(['Characters' => 'characters', $character->slug => $character->url, 'Stat Information' => $character->url . '/stats', 'Stat Logs' => $character->url . '/stats/logs', 'Level Logs' => $character->url . '/stats/logs/level']) !!}
99

1010
<h1>
1111
{!! $character->displayName !!}'s Level Logs

‎resources/views/character/stats/stat_logs.blade.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
@extends('character.layout', ['isMyo' => $character->is_myo_slot])
22

33
@section('profile-title')
4-
{{ $character->slug }}'s Stat Logs
4+
{{ $character->slug }}'s Stat Activity Logs
55
@endsection
66

77
@section('profile-content')
8-
{!! breadcrumbs(['Characters' => 'characters', $character->slug => $character->url, 'Stat Information' => $character->url . '/stats', 'Stat Logs' => $character->url . '/stats/logs']) !!}
8+
{!! breadcrumbs([
9+
'Characters' => 'characters',
10+
$character->slug => $character->url,
11+
'Stat Information' => $character->url . '/stats',
12+
'Stat Logs' => $character->url . '/stats/logs',
13+
'Stat Activity Logs' => $character->url . '/stats/logs/stat-points',
14+
]) !!}
915

1016
<h1>
11-
{!! $character->displayName !!}'s Stat Logs
17+
{!! $character->displayName !!}'s Stat Activity Logs
1218
</h1>
1319

1420
<h3>Transfers</h3>

‎routes/lorekeeper/browse.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
Route::get('{slug}', 'CharacterController@getCharacter');
9191
Route::get('{slug}/profile', 'CharacterController@getCharacterProfile');
9292
Route::get('{slug}/bank', 'CharacterController@getCharacterBank');
93-
Route::get('{slug}/level', 'CharacterController@getCharacterLevel');
9493
Route::get('{slug}/status-effects', 'CharacterController@getCharacterStatusEffects');
9594
Route::get('{slug}/inventory', 'CharacterController@getCharacterInventory');
9695
Route::get('{slug}/images', 'CharacterController@getCharacterImages');

0 commit comments

Comments
 (0)