From 9778434772de72f0926f71666617fe9600028921 Mon Sep 17 00:00:00 2001 From: EwelinaLasowy Date: Thu, 28 Apr 2022 07:56:11 +0200 Subject: [PATCH 01/30] wip --- .../Http/Controllers/ResumeController.php | 29 +++ resources/js/Pages/Resumes/Create.vue | 219 ++++++++++++++++++ resources/js/Pages/Resumes/Index.vue | 139 +++++++++++ resources/js/Shared/MainMenu.vue | 8 + routes/web.php | 4 + 5 files changed, 399 insertions(+) create mode 100644 app/Infrastructure/Http/Controllers/ResumeController.php create mode 100644 resources/js/Pages/Resumes/Create.vue create mode 100644 resources/js/Pages/Resumes/Index.vue diff --git a/app/Infrastructure/Http/Controllers/ResumeController.php b/app/Infrastructure/Http/Controllers/ResumeController.php new file mode 100644 index 0000000..6426eb0 --- /dev/null +++ b/app/Infrastructure/Http/Controllers/ResumeController.php @@ -0,0 +1,29 @@ + + +
+
+

+ Dodaj CV +

+
+
+

Informacje podstawowe

+
+ +
+ +

+ {{ form.errors.firstName }} +

+
+
+
+ +
+ +

+ {{ form.errors.lastName }} +

+
+
+
+ +
+

Języki - taki bajer jak na JustJoinIT

+
+
+

Wykształcenie

+
+ + Dodaj wykształcenie + +
+ +
+ +
+ +

+ {{ form.errors.firstName }} +

+
+
+
+ +
+ +

+ {{ form.errors.firstName }} +

+
+
+
+ +
+ +

+ {{ form.errors.firstName }} +

+
+
+
+ +
+ +

+ {{ form.errors.firstName }} +

+
+
+
+
+ + Anuluj + + +
+
+
+
+ + + diff --git a/resources/js/Pages/Resumes/Index.vue b/resources/js/Pages/Resumes/Index.vue new file mode 100644 index 0000000..2b5da05 --- /dev/null +++ b/resources/js/Pages/Resumes/Index.vue @@ -0,0 +1,139 @@ + + + diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index dc7305e..9a0042d 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -295,6 +295,7 @@ import { DocumentTextIcon, AdjustmentsIcon, KeyIcon, + TemplateIcon, } from '@heroicons/vue/outline' import { CheckIcon, ChevronDownIcon } from '@heroicons/vue/solid' @@ -372,6 +373,13 @@ const navigation = computed(() => icon: KeyIcon, can: true, }, + { + name: 'CV', + href: '/resumes', + section: 'Resumes', + icon: TemplateIcon, + can: true, + } ].filter(item => item.can)) diff --git a/routes/web.php b/routes/web.php index f35e8f6..3a43f81 100644 --- a/routes/web.php +++ b/routes/web.php @@ -10,6 +10,7 @@ use Toby\Infrastructure\Http\Controllers\HolidayController; use Toby\Infrastructure\Http\Controllers\KeysController; use Toby\Infrastructure\Http\Controllers\LogoutController; use Toby\Infrastructure\Http\Controllers\MonthlyUsageController; +use Toby\Infrastructure\Http\Controllers\ResumeController; use Toby\Infrastructure\Http\Controllers\SelectYearPeriodController; use Toby\Infrastructure\Http\Controllers\TimesheetController; use Toby\Infrastructure\Http\Controllers\UserController; @@ -34,6 +35,9 @@ Route::middleware(["auth", TrackUserLastActivity::class])->group(function (): vo ->except("show") ->whereNumber("holiday"); + Route::resource("resumes", ResumeController::class) + ->whereNumber("resume"); + Route::get("/keys", [KeysController::class, "index"]); Route::post("/keys", [KeysController::class, "store"]); Route::delete("/keys/{key}", [KeysController::class, "destroy"]); -- 2.50.1 From 0ae521a5c214cc4a96f2d0c6b8a5bae7533dcfb5 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Thu, 28 Apr 2022 11:46:18 +0200 Subject: [PATCH 02/30] wip --- package-lock.json | 45 ++- package.json | 3 +- resources/js/Pages/Resumes/Create.vue | 452 +++++++++++++++----------- resources/js/Pages/Resumes/Index.vue | 96 +++--- resources/js/Shared/MainMenu.vue | 2 +- 5 files changed, 348 insertions(+), 250 deletions(-) diff --git a/package-lock.json b/package-lock.json index 085c8b5..36a39f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "toby", "hasInstallScript": true, "dependencies": { "@headlessui/vue": "^1.5.0", @@ -31,7 +32,8 @@ "vue-loader": "^17.0.0", "vue-material-design-icons": "^5.0.0", "vue-toastification": "^2.0.0-rc.5", - "vue3-popper": "^1.4.2" + "vue3-popper": "^1.4.2", + "vuedraggable": "^4.1.0" }, "devDependencies": { "eslint": "^8.12.0", @@ -2642,9 +2644,9 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dependencies": { "lodash": "^4.17.14" } @@ -7983,6 +7985,11 @@ "websocket-driver": "^0.7.4" } }, + "node_modules/sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "node_modules/source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -8798,6 +8805,17 @@ "vue": "^3.2.20" } }, + "node_modules/vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "dependencies": { + "sortablejs": "1.14.0" + }, + "peerDependencies": { + "vue": "^3.0.1" + } + }, "node_modules/watchpack": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", @@ -11311,9 +11329,9 @@ } }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "requires": { "lodash": "^4.17.14" } @@ -15219,6 +15237,11 @@ "websocket-driver": "^0.7.4" } }, + "sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -15805,6 +15828,14 @@ "debounce": "^1.2.1" } }, + "vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "requires": { + "sortablejs": "1.14.0" + } + }, "watchpack": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", diff --git a/package.json b/package.json index 8896792..82a2abb 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,8 @@ "vue-loader": "^17.0.0", "vue-material-design-icons": "^5.0.0", "vue-toastification": "^2.0.0-rc.5", - "vue3-popper": "^1.4.2" + "vue3-popper": "^1.4.2", + "vuedraggable": "^4.1.0" }, "devDependencies": { "eslint": "^8.12.0", diff --git a/resources/js/Pages/Resumes/Create.vue b/resources/js/Pages/Resumes/Create.vue index 1b58049..6b0b401 100644 --- a/resources/js/Pages/Resumes/Create.vue +++ b/resources/js/Pages/Resumes/Create.vue @@ -1,187 +1,261 @@ + \ No newline at end of file diff --git a/resources/js/Pages/Resumes/Index.vue b/resources/js/Pages/Resumes/Index.vue index 2b5da05..cfc0ae1 100644 --- a/resources/js/Pages/Resumes/Index.vue +++ b/resources/js/Pages/Resumes/Index.vue @@ -20,46 +20,46 @@
- - - - - + + + + + - - - - - - - - + + + + + + + - - - - + + + + +
- Pracownik - - Data - - Dzień tygodnia - -
+ Pracownik + + Data + + Dzień tygodnia + +
- Jan Kowalski - - xd - - xd - +
+ Jan Kowalski + + xd + + xd + @@ -111,16 +111,16 @@ -
- Brak danych -
+ Brak danych +
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index 9a0042d..22a2c05 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -379,7 +379,7 @@ const navigation = computed(() => section: 'Resumes', icon: TemplateIcon, can: true, - } + }, ].filter(item => item.can)) -- 2.50.1 From 503c4e4629b8170e421a123e4e4bb6381ba4a80b Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Thu, 28 Apr 2022 15:26:35 +0200 Subject: [PATCH 03/30] wip --- .eslintrc.js | 6 - package-lock.json | 1 - resources/js/Pages/Resumes/Create.vue | 743 ++++++++++++++++++++------ 3 files changed, 572 insertions(+), 178 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index ba5b8c0..e8d2e95 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,4 @@ module.exports = { - plugins: ['tailwindcss'], env: { node: true, 'vue/setup-compiler-macros': true, @@ -16,10 +15,5 @@ module.exports = { 'comma-dangle': ['error', 'always-multiline'], 'object-curly-spacing': ['error', 'always'], 'vue/require-default-prop': 0, - 'tailwindcss/classnames-order': 'error', - 'tailwindcss/enforces-negative-arbitrary-values': 'error', - 'tailwindcss/enforces-shorthand': 'error', - 'tailwindcss/no-arbitrary-value': 'error', - 'tailwindcss/no-contradicting-classname': 'error', }, } diff --git a/package-lock.json b/package-lock.json index 36a39f1..480c23e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,7 +4,6 @@ "requires": true, "packages": { "": { - "name": "toby", "hasInstallScript": true, "dependencies": { "@headlessui/vue": "^1.5.0", diff --git a/resources/js/Pages/Resumes/Create.vue b/resources/js/Pages/Resumes/Create.vue index 6b0b401..993975d 100644 --- a/resources/js/Pages/Resumes/Create.vue +++ b/resources/js/Pages/Resumes/Create.vue @@ -12,7 +12,7 @@

Dane podstawowe

-
+