refresh admin-panel #603

usernaimandrey · 2023-06-14T16:47:06Z

Немного обновил админку

usernaimandrey · 2023-06-15T08:12:45Z

app/views/layouts/shared/_footer.html.slim

@@ -1,4 +1,4 @@
-footer.bg-light.border-top.mt-5.py-5
+footer.bg-body-tertiary.border-top.py-4.mt-auto


прижал футтер

херня жеж когда все в одном ПРе
разделяй давай :batya:

разделил

amshkv · 2023-06-27T13:33:48Z

app/views/web/admin/careers/_steps.html.slim

+        td
+           = link_to admin_career_step_path(career, step), class: 'btn btn-outline-primary btn-sm me-1' do
+              span.bi.bi-eye-fill
+           = link_to edit_admin_career_step_path(career, step), class: 'btn btn-outline-primary btn-sm me-1', title: t('.edit') do


тут me-1 зачем?
по красоте можно попробовать сделать через https://getbootstrap.com/docs/5.3/components/button-group
но это вкусовщина

попробовал через групу кнопок

amshkv · 2023-06-27T13:37:04Z

app/views/web/admin/resumes/index.html.slim

-            = link_to t('.restore'), restore_admin_resume_path(resume), method: :patch, class: 'btn btn-success btn-sm'
-          - elsif resume.may_archive?
-            = link_to t('.archive'), archive_admin_resume_path(resume), method: :patch, class: 'btn btn-danger btn-sm'
+          .text-center


какая-то несогласованность, нигде этого нет, а тут есть

amshkv · 2023-06-27T13:47:56Z

app/views/web/admin/resumes/index.html.slim

+            - if resume.may_restore?
+              = link_to restore_admin_resume_path(resume), method: :patch, class: 'btn btn-outline-primary btn-sm', data: { confirm: t('confirm') }, title: t('.restore') do
+                span.bi.bi-activity
+            - elsif resume.may_archive?
+              = link_to archive_admin_resume_path(resume), method: :patch, class: 'btn btn-outline-primary btn-sm', data: { confirm: t('confirm') }, title: t('.archive') do
+                span.bi.bi-file-earmark-zip


опасные кнопки, а цвета у них одинаковые
дестрой - сделай красной
опубликование - зеленой

и я бы confirm cделал попонятнее, типа согласны архивировать\заархивировать

amshkv · 2023-06-27T13:49:53Z

app/views/web/admin/resumes/index.html.slim

+            - if resume.may_restore?
+              = link_to restore_admin_resume_path(resume), method: :patch, class: 'btn btn-outline-primary btn-sm', data: { confirm: t('confirm') }, title: t('.restore') do
+                span.bi.bi-activity
+            - elsif resume.may_archive?
+              = link_to archive_admin_resume_path(resume), method: :patch, class: 'btn btn-outline-primary btn-sm', data: { confirm: t('confirm') }, title: t('.archive') do
+                span.bi.bi-file-earmark-zip


иконка непонятная, давай поищем получше, для удаления можно корзину взять
для восстановления что-то типа значка разоврота
ну и спросил бы девченок, понято ли им

amshkv · 2023-06-27T13:50:26Z

app/views/web/admin/home/index.html.slim

  tbody
    - @admins.each do |admin|
      tr
        td = link_to admin, user_path(admin)
        td = admin.aasm(:state).human_state
        td = admin.email
        td = l admin.created_at, format: :short
+        td
+          = link_to user_path(admin), class: 'btn btn-outline-primary' do


давай тоже маленькими

amshkv

требуется немного попраивить иконки и их цвет и можно будет принимать

amshkv · 2023-06-27T13:56:25Z

app/views/web/admin/careers/_item_step_fields.html.slim

    .col-md-7
      = f.association :career_step, collection: @steps, hint: t('.step')
    .col-md-2
      = f.input :order, hint: t('.order')
+    .col-sm-1
+      = link_to_remove_association f, class: 'btn btn-xs btn-warning', title: t('.remove_field') do
+        span.bi.bi-trash3-fill
+    - if f.object.career_step
+      .col-sm-1
+         = link_to edit_admin_career_step_path(@career, f.object.career_step), class: 'btn btn-outline-primary me-1', title: t('.edit') do
+          span.bi.bi-gear-fill


если посчитать - стало 11 колонок, а не 12
предлагаю сделать
col-md-7 (или 8)
col-md-2
col-md-3 и в этот md 3 (или 2) положить обе кнопки

amshkv · 2023-07-03T09:19:17Z

app/views/web/admin/careers/_item_step_fields.html.slim

+      - if f.object.career_step
+        = link_to edit_admin_career_step_path(@career, f.object.career_step), class: 'btn btn-outline-primary me-1', title: t('.edit') do
+          span.bi.bi-gear-fill
+      = link_to_remove_association f, class: 'btn btn-xs btn-warning', title: t('.remove_field') do


лучше наверное красным? но хз

наверное вроде как по ярче смотрится

amshkv · 2023-07-03T09:22:05Z

app/views/web/admin/careers/show.html.slim

-  .col-sm-9
-    = @career.name
+  = t('.career_track', name: @career.name)
+.coll


это что за класс такой?

да хз, удалить наверное забыл

amshkv · 2023-07-03T09:49:29Z

app/views/web/admin/home/index.html.slim

- content_for :header do
-  = t('.admins')
-


в итоге без заголовков сделали и без меню?

А меню зачем, там единственное что можно сделать это профиль посмотреть

чтобы одинаково было)

amshkv · 2023-07-03T10:05:00Z

Андрей, верни заголовки блокам!)

amshkv · 2023-07-03T10:09:17Z

amshkv · 2023-07-03T10:09:54Z

падает в ошибку show архивного резюме и черновика

usernaimandrey · 2023-07-03T11:02:50Z

падает в ошибку show архивного резюме и черновика

я как временное решение поставмл условие, но думаю админу надо сделать возможным просматривать архивные и драфтовые резюме, но это в др ПР-е

usernaimandrey marked this pull request as draft June 14, 2023 16:48

usernaimandrey changed the title ~~refresh admin-panel~~ [CV-1-2314]refresh admin-panel Jun 15, 2023

usernaimandrey changed the title ~~[CV-1-2314]refresh admin-panel~~ [TL-2314]refresh admin-panel Jun 15, 2023

usernaimandrey force-pushed the refresh-admin-panel branch from 4f6e4a7 to bdbf0ef Compare June 15, 2023 08:01

usernaimandrey marked this pull request as ready for review June 15, 2023 08:01

usernaimandrey changed the title ~~[TL-2314]refresh admin-panel~~ [TL-2314][TL-2808]refresh admin-panel Jun 15, 2023

usernaimandrey commented Jun 15, 2023

View reviewed changes

usernaimandrey requested a review from amshkv June 15, 2023 08:13

amshkv changed the title ~~[TL-2314][TL-2808]refresh admin-panel~~ [TL-2314][TL-2808][TL-105]refresh admin-panel Jun 15, 2023

amshkv changed the title ~~[TL-2314][TL-2808][TL-105]refresh admin-panel~~ [TL-2314][TL-2808]refresh admin-panel Jun 15, 2023

Hexlet deleted a comment from notion-workspace bot Jun 15, 2023

usernaimandrey changed the title ~~[TL-2314][TL-2808]refresh admin-panel~~ refresh admin-panel Jun 15, 2023

usernaimandrey added 3 commits June 16, 2023 13:35

refresh admin-panel

c33496d

fix

b08f3da

add linck edit step to form

481b607

usernaimandrey force-pushed the refresh-admin-panel branch from ba23bed to 481b607 Compare June 16, 2023 10:39

amshkv reviewed Jun 27, 2023

View reviewed changes

usernaimandrey added 2 commits June 28, 2023 17:57

fix button && confirm messages

19468b1

fix

21e73d8

usernaimandrey requested a review from amshkv June 30, 2023 10:00

usernaimandrey added 2 commits June 30, 2023 14:09

add menu edit

f0c3558

update button archive

04d4ce9

usernaimandrey mentioned this pull request Jun 30, 2023

Implement a separate interface for adding a student #614

Merged

amshkv reviewed Jul 3, 2023

View reviewed changes

fix

e3a8342

usernaimandrey requested a review from amshkv July 3, 2023 09:36

amshkv reviewed Jul 3, 2023

View reviewed changes

add headers && hide show archived resume

7031843

usernaimandrey requested a review from amshkv July 3, 2023 11:03

usernaimandrey merged commit b35d9cc into main Jul 4, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refresh admin-panel #603

refresh admin-panel #603

usernaimandrey commented Jun 14, 2023 •

edited

usernaimandrey Jun 15, 2023

amshkv Jun 15, 2023

usernaimandrey Jun 15, 2023

amshkv Jun 27, 2023

usernaimandrey Jun 28, 2023

amshkv Jun 27, 2023

amshkv Jun 27, 2023

amshkv Jun 27, 2023

amshkv Jun 27, 2023

amshkv left a comment

amshkv Jun 27, 2023

amshkv Jul 3, 2023

usernaimandrey Jul 3, 2023

amshkv Jul 3, 2023

usernaimandrey Jul 3, 2023

amshkv Jul 3, 2023

usernaimandrey Jul 3, 2023

amshkv Jul 3, 2023

amshkv commented Jul 3, 2023

amshkv commented Jul 3, 2023

amshkv commented Jul 3, 2023 •

edited

usernaimandrey commented Jul 3, 2023 •

edited

		@@ -1,4 +1,4 @@
		footer.bg-light.border-top.mt-5.py-5
		footer.bg-body-tertiary.border-top.py-4.mt-auto

refresh admin-panel #603

refresh admin-panel #603

Conversation

usernaimandrey commented Jun 14, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amshkv left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amshkv commented Jul 3, 2023

amshkv commented Jul 3, 2023

amshkv commented Jul 3, 2023 • edited

usernaimandrey commented Jul 3, 2023 • edited

usernaimandrey commented Jun 14, 2023 •

edited

amshkv commented Jul 3, 2023 •

edited

usernaimandrey commented Jul 3, 2023 •

edited