From 5c55f1860af3a6ad8acd1c1df9d3222cd71a684f Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Tue, 10 May 2022 10:14:48 +0200 Subject: [PATCH] wip --- database/factories/ResumeFactory.php | 10 +- resources/js/Composables/useLevels.js | 22 +-- resources/js/Pages/Resumes/Create.vue | 79 ++++++-- resources/js/Pages/Resumes/Edit.vue | 173 +++++++----------- .../js/Shared/Forms/MultipleCombobox.vue | 76 ++++++++ 5 files changed, 226 insertions(+), 134 deletions(-) create mode 100644 resources/js/Shared/Forms/MultipleCombobox.vue diff --git a/database/factories/ResumeFactory.php b/database/factories/ResumeFactory.php index a0e6208..b3c6952 100644 --- a/database/factories/ResumeFactory.php +++ b/database/factories/ResumeFactory.php @@ -44,12 +44,12 @@ class ResumeFactory extends Factory protected function generateLanguages(): array { - $languages = new Collection(["english", "polish", "germany"]); + $languages = new Collection(["English", "Polish", "German"]); $number = $this->faker->numberBetween(1, $languages->count()); return $languages->random($number) ->map(fn(string $language): array => [ - "language" => $language, + "name" => $language, "level" => $this->faker->numberBetween(1, 6), ]) ->all(); @@ -57,12 +57,12 @@ class ResumeFactory extends Factory protected function generateTechnologies(): array { - $technologies = Technology::all(); + $technologies = Technology::all()->pluck("name"); $number = $this->faker->numberBetween(2, $technologies->count()); return $technologies->random($number) ->map(fn(string $technology): array => [ - "technology" => $technology, + "name" => $technology, "level" => $this->faker->numberBetween(1, 5), ]) ->all(); @@ -71,7 +71,7 @@ class ResumeFactory extends Factory protected function generateProjects(): array { $items = []; - $technologies = Technology::all(); + $technologies = Technology::all()->pluck("name"); for ($i = 0; $i < $this->faker->numberBetween(1, 3); $i++) { $number = $this->faker->numberBetween(2, $technologies->count()); diff --git a/resources/js/Composables/useLevels.js b/resources/js/Composables/useLevels.js index ad9c375..d24cbaa 100644 --- a/resources/js/Composables/useLevels.js +++ b/resources/js/Composables/useLevels.js @@ -1,34 +1,34 @@ const technologyLevels = [ { - level: 0, + level: 1, name: 'Beginner', activeColor: 'bg-rose-400', backgroundColor: 'bg-rose-100', textColor: 'text-rose-400', }, { - level: 1, + level: 2, name: 'Junior', activeColor: 'bg-orange-400', backgroundColor: 'bg-orange-100', textColor: 'text-orange-400', }, { - level: 2, + level: 3, name: 'Regular', activeColor: 'bg-amber-400', backgroundColor: 'bg-amber-100', textColor: 'text-yellow-500', }, { - level: 3, + level: 4, name: 'Advanced', activeColor: 'bg-emerald-400', backgroundColor: 'bg-emerald-100', textColor: 'text-emerald-400', }, { - level: 4, + level: 5, name: 'Master', activeColor: 'bg-blumilk-400', backgroundColor: 'bg-blumilk-100', @@ -37,42 +37,42 @@ const technologyLevels = [ ] const languageLevels = [ { - level: 0, + level: 1, name: 'A1', activeColor: 'bg-rose-400', backgroundColor: 'bg-rose-100', textColor: 'text-rose-400', }, { - level: 1, + level: 2, name: 'A2', activeColor: 'bg-orange-400', backgroundColor: 'bg-orange-100', textColor: 'text-orange-400', }, { - level: 2, + level: 3, name: 'B1', activeColor: 'bg-amber-400', backgroundColor: 'bg-amber-100', textColor: 'text-yellow-500', }, { - level: 3, + level: 4, name: 'B2', activeColor: 'bg-emerald-400', backgroundColor: 'bg-emerald-100', textColor: 'text-emerald-400', }, { - level: 4, + level: 5, name: 'C1', activeColor: 'bg-blumilk-400', backgroundColor: 'bg-blumilk-100', textColor: 'text-blumilk-400', }, { - level: 5, + level: 6, name: 'C2', activeColor: 'bg-gray-600', backgroundColor: 'bg-gray-200', diff --git a/resources/js/Pages/Resumes/Create.vue b/resources/js/Pages/Resumes/Create.vue index 51a9fdb..577c131 100644 --- a/resources/js/Pages/Resumes/Create.vue +++ b/resources/js/Pages/Resumes/Create.vue @@ -138,10 +138,13 @@ @add-item="addEducation" @remove-item="(index) => form.educations.splice(index, 1)" > -