From fbbe3940293a140c3bdb382f2446a669ec376f17 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Tue, 13 Sep 2022 13:24:06 +0400 Subject: [PATCH 01/16] exposed prefixed ids for projects table [SCI_7172] --- app/assets/stylesheets/projects.scss | 22 ++++++++++++------- app/models/project.rb | 4 ++++ app/views/projects/index.html.erb | 1 + .../projects/index/_project_card.html.erb | 4 ++++ config/locales/en.yml | 2 ++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 25b6bae4b..8298b9b3b 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -854,7 +854,7 @@ li.module-hover { } &.list { - grid-template-columns: max-content repeat(calc(var(--list-columns-number) - 3), minmax(100px, auto)) max-content max-content; + grid-template-columns: max-content repeat(calc(var(--list-columns-number) - 2), minmax(100px, auto)) max-content max-content; .projects-group { display: contents; @@ -932,23 +932,28 @@ li.module-hover { } } - .start-date-cell { + .project-code-cell { grid-column: 3; } - .visibility-cell { + .start-date-cell { grid-column: 4; } - .user-cell { + .visibility-cell { grid-column: 5; } + .user-cell { + grid-column: 6; + } + .actions-cell { align-items: center; display: flex; - grid-column: 6; + grid-column: 7; position: initial; + display: block; } } @@ -1046,11 +1051,12 @@ li.module-hover { } &.list { - --list-columns-number: 7; + --list-columns-number: 8; grid-auto-rows: 3em 1px; grid-template-columns: max-content repeat(calc(var(--list-columns-number) - 2), minmax(100px, auto)) max-content; .card { + &.folder-card { .name { grid-column: 6 span; @@ -1058,11 +1064,11 @@ li.module-hover { } .archived-date-cell { - grid-column: 6; + grid-column: 7; } .actions-cell { - grid-column: 7; + grid-column: 8; position: initial; } } diff --git a/app/models/project.rb b/app/models/project.rb index eda28a225..0dece87ad 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -308,6 +308,10 @@ class Project < ApplicationRecord report.destroy if report.present? end + def code + "PR#{id}" + end + private def project_folder_team diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 3c948cb1f..89b18a66b 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -28,6 +28,7 @@
<%= t('.card.name') %>
+
<%= t('.card.id') %>
<%= t('.card.start_date') %>
<%= t('.card.visibility') %>
<%= t('.card.users') %>
diff --git a/app/views/projects/index/_project_card.html.erb b/app/views/projects/index/_project_card.html.erb index 2beb628fe..b9b37933a 100644 --- a/app/views/projects/index/_project_card.html.erb +++ b/app/views/projects/index/_project_card.html.erb @@ -30,6 +30,10 @@ <%= render partial: 'projects/index/project_actions_dropdown.html.erb', locals: { project: project, view: 'cards' } %> +
+ <%= project.code %> +
+
<%= t('projects.index.card.start_date') %> <%= l(project.created_at, format: :full_date) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 32cb83050..685ee9a4e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -433,6 +433,7 @@ en: more_comments: "More Comments" card: start_date: "Start date" + id: "ID" visibility: "Visible to" users: "Members" name: "Project name" @@ -1110,6 +1111,7 @@ en: restore_button: "Restore" card: name: "Experiment" + id: "ID" start_date: "Start date" modified_date: "Modified date" archived_date: "Archived date" From 2c393a1befbd37c20734e1bb4c7cb9db0c5b39b4 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Tue, 13 Sep 2022 13:31:04 +0400 Subject: [PATCH 02/16] exposed prefixed ids for projects table [SCI_7172] --- app/assets/stylesheets/projects.scss | 2 -- app/models/project.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 8298b9b3b..5d017c791 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -953,7 +953,6 @@ li.module-hover { display: flex; grid-column: 7; position: initial; - display: block; } } @@ -1056,7 +1055,6 @@ li.module-hover { grid-template-columns: max-content repeat(calc(var(--list-columns-number) - 2), minmax(100px, auto)) max-content; .card { - &.folder-card { .name { grid-column: 6 span; diff --git a/app/models/project.rb b/app/models/project.rb index 0dece87ad..a32e625e9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -308,7 +308,7 @@ class Project < ApplicationRecord report.destroy if report.present? end - def code + def code "PR#{id}" end From 0a1b879c3d4d6322539766cc15a4a73bcf4af2d3 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Tue, 13 Sep 2022 15:49:12 +0400 Subject: [PATCH 03/16] exposed prefixed ids for projects table [SCI_7172] --- app/models/project.rb | 7 +++---- .../20220913100826_add_project_code_index.rb | 12 ++++++++++++ db/structure.sql | 18 +++++++++++++----- 3 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20220913100826_add_project_code_index.rb diff --git a/app/models/project.rb b/app/models/project.rb index a32e625e9..c2f75ca03 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -7,6 +7,9 @@ class Project < ApplicationRecord include PermissionExtends include Assignable + ID_PREFIX = 'PR' + include PrefixedIdModel + enum visibility: { hidden: 0, visible: 1 } auto_strip_attributes :name, nullify: false @@ -308,10 +311,6 @@ class Project < ApplicationRecord report.destroy if report.present? end - def code - "PR#{id}" - end - private def project_folder_team diff --git a/db/migrate/20220913100826_add_project_code_index.rb b/db/migrate/20220913100826_add_project_code_index.rb new file mode 100644 index 000000000..5ee7efe87 --- /dev/null +++ b/db/migrate/20220913100826_add_project_code_index.rb @@ -0,0 +1,12 @@ +class AddProjectCodeIndex < ActiveRecord::Migration[6.1] + def up + ActiveRecord::Base.connection.execute( + "CREATE INDEX index_projects_on_project_code ON "\ + "projects using gin (('PR'::text || id) gin_trgm_ops);" + ) + end + + def down + remove_index :projects, name: 'index_projects_on_project_code' + end +end diff --git a/db/structure.sql b/db/structure.sql index 68cfef0c4..c4b9e38ed 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5479,6 +5479,13 @@ CREATE INDEX index_projects_on_last_modified_by_id ON public.projects USING btre CREATE INDEX index_projects_on_name ON public.projects USING gin (public.trim_html_tags((name)::text) public.gin_trgm_ops); +-- +-- Name: index_projects_on_project_code; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_projects_on_project_code ON public.projects USING gin ((('PR'::text || id)) public.gin_trgm_ops); + + -- -- Name: index_projects_on_project_folder_id; Type: INDEX; Schema: public; Owner: - -- @@ -5816,10 +5823,10 @@ CREATE INDEX index_repository_cells_on_repository_row_id ON public.repository_ce -- --- Name: index_repository_cells_on_value; Type: INDEX; Schema: public; Owner: - +-- Name: index_repository_cells_on_value_type_and_value_id; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_repository_cells_on_value ON public.repository_cells USING btree (value_type, value_id); +CREATE INDEX index_repository_cells_on_value_type_and_value_id ON public.repository_cells USING btree (value_type, value_id); -- @@ -6845,10 +6852,10 @@ CREATE INDEX index_view_states_on_user_id ON public.view_states USING btree (use -- --- Name: index_view_states_on_viewable; Type: INDEX; Schema: public; Owner: - +-- Name: index_view_states_on_viewable_type_and_viewable_id; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_view_states_on_viewable ON public.view_states USING btree (viewable_type, viewable_id); +CREATE INDEX index_view_states_on_viewable_type_and_viewable_id ON public.view_states USING btree (viewable_type, viewable_id); -- @@ -8517,6 +8524,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220530144300'), ('20220602120714'), ('20220705091621'), -('20220818094636'); +('20220818094636'), +('20220913100826'); From 133302964c2f1e1d2759eebf3d37e0fc99596b6a Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Tue, 13 Sep 2022 15:53:41 +0400 Subject: [PATCH 04/16] exposed prefixed ids for projects table [SCI_7172] --- app/models/project.rb | 2 +- db/migrate/20220913100826_add_project_code_index.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index c2f75ca03..f0266549b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -7,7 +7,7 @@ class Project < ApplicationRecord include PermissionExtends include Assignable - ID_PREFIX = 'PR' + ID_PREFIX = 'PR'.freeze include PrefixedIdModel enum visibility: { hidden: 0, visible: 1 } diff --git a/db/migrate/20220913100826_add_project_code_index.rb b/db/migrate/20220913100826_add_project_code_index.rb index 5ee7efe87..a893a89e9 100644 --- a/db/migrate/20220913100826_add_project_code_index.rb +++ b/db/migrate/20220913100826_add_project_code_index.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class AddProjectCodeIndex < ActiveRecord::Migration[6.1] def up ActiveRecord::Base.connection.execute( From 22aa04a5acd51e9fe604972d8b2ee03642f21b20 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Tue, 13 Sep 2022 15:57:17 +0400 Subject: [PATCH 05/16] exposed prefixed ids for projects table [SCI_7172] --- app/models/project.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index f0266549b..30cd365d8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Project < ApplicationRecord include ArchivableModel include SearchableModel @@ -7,7 +9,7 @@ class Project < ApplicationRecord include PermissionExtends include Assignable - ID_PREFIX = 'PR'.freeze + ID_PREFIX = 'PR' include PrefixedIdModel enum visibility: { hidden: 0, visible: 1 } From b31f60026a2d0bb2812a80e5103109ed9d0e84c6 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 15 Sep 2022 22:20:04 +0400 Subject: [PATCH 06/16] Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] --- app/assets/javascripts/projects/index.js | 8 ++- app/assets/stylesheets/projects.scss | 60 ++++++++++++++++--- app/helpers/cards_view_helper.rb | 2 +- app/views/projects/index.html.erb | 2 +- .../projects/index/_project_card.html.erb | 8 ++- 5 files changed, 66 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index ccf83aa2f..a1dad849e 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -517,7 +517,13 @@ var ProjectsIndex = (function() { $(projectsPageSelector) .on('ajax:success', '.change-projects-view-type-form', function(ev, data) { - $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + // $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + if (data.cards_view_type_class =='list') { + $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); + } + else if (data.cards_view_type_class =='cards') { + $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); + } $(projectsPageSelector).find('.cards-switch .button-to').removeClass('selected'); $(ev.target).find('.button-to').addClass('selected'); $(ev.target).parents('.dropdown.view-switch').removeClass('open'); diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 5d017c791..1f245a212 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -682,25 +682,24 @@ li.module-hover { } } + &.project-card { border-radius: 4px; box-shadow: $flyout-shadow; - + .project-name-cell { align-items: center; display: flex; - height: 2em; - margin: 0 1.75em; overflow: hidden; + margin-left: -55px; + margin-top: 10px; + a { color: inherit; - overflow: hidden; - white-space: nowrap; } .name { - line-height: 2em; margin: 0; overflow: hidden; text-overflow: ellipsis; @@ -902,7 +901,7 @@ li.module-hover { } .name { - grid-column: 5 span; + grid-column: 6 span; line-height: 3em; &:before { @@ -1057,7 +1056,7 @@ li.module-hover { .card { &.folder-card { .name { - grid-column: 6 span; + grid-column: 7 span; } } @@ -1086,3 +1085,48 @@ li.module-hover { margin: 1em 0; } } + + + + + +.cards-wrapper.last-page.cards { + grid-gap: 25px; + + .project-card { + .project-name-cell { + position: relative; + top: 12%; + + a { + color: inherit; + } + + .name { + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + max-width: 200px; + } + } + + .project-code-cell { + position: relative; + padding-left: 10%; + margin-top:4px; + height: min-content; + } + + .data-row { + position: relative; + top: 5%; + .card-label { + color: gray !important; + } + } + + + + } +} diff --git a/app/helpers/cards_view_helper.rb b/app/helpers/cards_view_helper.rb index 5dde2f9d6..f11e5ca5f 100644 --- a/app/helpers/cards_view_helper.rb +++ b/app/helpers/cards_view_helper.rb @@ -2,6 +2,6 @@ module CardsViewHelper def cards_view_type_class(view_type) - view_type == 'table' ? 'list' : '' + view_type == 'table' ? 'list' : 'cards' end end diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 89b18a66b..72dfc871e 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -17,7 +17,7 @@ <%= render partial: 'projects/index/modals/export_projects' %>
-
diff --git a/app/views/projects/index/_project_card.html.erb b/app/views/projects/index/_project_card.html.erb index b9b37933a..87d6dc91d 100644 --- a/app/views/projects/index/_project_card.html.erb +++ b/app/views/projects/index/_project_card.html.erb @@ -11,6 +11,10 @@
+
+ <%= project.code %> +
+
<% if project.archived? %> <%= link_to project_url(project, view_mode: :archived) do %> @@ -30,9 +34,7 @@ <%= render partial: 'projects/index/project_actions_dropdown.html.erb', locals: { project: project, view: 'cards' } %>
-
- <%= project.code %> -
+
<%= t('projects.index.card.start_date') %> From 102eed82416709ed3282c3ff613df55a45a68f0f Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 15 Sep 2022 22:27:23 +0400 Subject: [PATCH 07/16] Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] --- app/assets/javascripts/projects/index.js | 6 ++---- app/assets/stylesheets/projects.scss | 7 +------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index a1dad849e..67360a7b8 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -517,11 +517,9 @@ var ProjectsIndex = (function() { $(projectsPageSelector) .on('ajax:success', '.change-projects-view-type-form', function(ev, data) { - // $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); - if (data.cards_view_type_class =='list') { + if (data.cards_view_type_class === 'list') { $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); - } - else if (data.cards_view_type_class =='cards') { + } else if (data.cards_view_type_class === 'cards') { $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); } $(projectsPageSelector).find('.cards-switch .button-to').removeClass('selected'); diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 1f245a212..e98afc99a 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -682,7 +682,6 @@ li.module-hover { } } - &.project-card { border-radius: 4px; box-shadow: $flyout-shadow; @@ -694,7 +693,6 @@ li.module-hover { margin-left: -55px; margin-top: 10px; - a { color: inherit; } @@ -1097,7 +1095,7 @@ li.module-hover { .project-name-cell { position: relative; top: 12%; - + a { color: inherit; } @@ -1125,8 +1123,5 @@ li.module-hover { color: gray !important; } } - - - } } From 3f3c2a350415190433909746200e7b9b9df3736c Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 7 Oct 2022 15:27:33 +0400 Subject: [PATCH 08/16] project name card size change --- app/assets/stylesheets/projects.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index e98afc99a..c61f9022e 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -1095,6 +1095,7 @@ li.module-hover { .project-name-cell { position: relative; top: 12%; + min-height: 35px; a { color: inherit; From f7472d25b9af1ba364b826e621622db819810cf9 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 7 Oct 2022 17:14:43 +0400 Subject: [PATCH 09/16] more styling fixes --- app/assets/stylesheets/projects.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index c61f9022e..79c65be0c 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -1093,6 +1093,7 @@ li.module-hover { .project-card { .project-name-cell { + align-items: start !important; position: relative; top: 12%; min-height: 35px; From 94e28ecc8d9700d4d6a7508150bb58cd8ae229d8 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 13 Oct 2022 19:22:41 +0400 Subject: [PATCH 10/16] fixed switching from cards to list --- app/views/projects/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 72dfc871e..19f415559 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -17,7 +17,7 @@ <%= render partial: 'projects/index/modals/export_projects' %>
-
From 62febd44ddcd480586e819081d60b9e792218c4e Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 13 Oct 2022 20:31:37 +0400 Subject: [PATCH 11/16] centered project code for tables --- app/assets/stylesheets/projects.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 79c65be0c..9d21d4dba 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -930,6 +930,8 @@ li.module-hover { } .project-code-cell { + display: flex; + align-items: center; grid-column: 3; } From fe488ed00ffc20c082eac38cd52cc3632279d92d Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 28 Oct 2022 11:38:38 +0400 Subject: [PATCH 12/16] fixed unstable project name and code styling in cards --- app/assets/stylesheets/projects.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 9d21d4dba..4b91fd4fa 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -690,8 +690,6 @@ li.module-hover { align-items: center; display: flex; overflow: hidden; - margin-left: -55px; - margin-top: 10px; a { color: inherit; @@ -1096,9 +1094,11 @@ li.module-hover { .project-card { .project-name-cell { align-items: start !important; - position: relative; top: 12%; min-height: 35px; + position: absolute; + left: 14px; + top: 42px; a { color: inherit; @@ -1115,9 +1115,9 @@ li.module-hover { .project-code-cell { position: relative; - padding-left: 10%; + padding-left: 20px; margin-top:4px; - height: min-content; + height: min-content; } .data-row { From 7f09fb8997fea5a6b3e3d8f13b23cb6456376edb Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 17 Nov 2022 22:25:54 +0400 Subject: [PATCH 13/16] Archived projects cards and table updates [SCI-7201] --- app/assets/stylesheets/projects.scss | 73 +++++++++++++++++-- .../projects/index/_project_card.html.erb | 20 +++-- 2 files changed, 77 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 4b91fd4fa..812a0f405 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -685,12 +685,12 @@ li.module-hover { &.project-card { border-radius: 4px; box-shadow: $flyout-shadow; - + .project-name-cell { align-items: center; display: flex; overflow: hidden; - + a { color: inherit; } @@ -1018,6 +1018,7 @@ li.module-hover { display: none !important; } + .projects-container { .project-actions-menu { .btn-light:hover { @@ -1028,6 +1029,56 @@ li.module-hover { .cards-wrapper { grid-auto-rows: 2.5em; + .visibility-cell { + .value { + color: $color-black; + } + } + + .start-date-cell { + .value { + color: $color-black; + } + } + + .archived-date-cell { + .value { + color: $color-black;; + } + } + + &.last-page.cards { + .project-card { + .start-date-cell { + top: 36px; + + .value { + color: $color-black; + } + } + + .archived-date-cell { + top: 26px; + + .value { + color: $color-black; + } + } + + .visibility-cell { + top: 16px; + + .value { + color: $color-black; + } + } + + .user-cell { + top: 6px; + } + } + } + .card.project-card { .data-row { color: $color-silver-chalice; @@ -1103,7 +1154,7 @@ li.module-hover { a { color: inherit; } - + .name { overflow: hidden; display: -webkit-box; @@ -1116,8 +1167,8 @@ li.module-hover { .project-code-cell { position: relative; padding-left: 20px; - margin-top:4px; - height: min-content; + margin-top:5px; + height: min-content; } .data-row { @@ -1126,6 +1177,18 @@ li.module-hover { .card-label { color: gray !important; } + + &.start-date-cell { + top: 30px; + } + + &.visibility-cell { + top: 18px; + } + + &.user-cell { + top: 5px; + } } } } diff --git a/app/views/projects/index/_project_card.html.erb b/app/views/projects/index/_project_card.html.erb index 3df88988a..cc3a90727 100644 --- a/app/views/projects/index/_project_card.html.erb +++ b/app/views/projects/index/_project_card.html.erb @@ -11,7 +11,7 @@
<%= project.code %>
- +
<% if project.archived? %> <%= link_to project_url(project, view_mode: :archived) do %> @@ -38,14 +38,20 @@
- -
<%= t('projects.index.card.start_date') %> <%= l(project.created_at, format: :full_date) %> <%= l(project.created_at, format: :full_with_comma) %>
+ <% if project.archived? %> +
+ <%= t('projects.index.card.archived_date') %> + <%= l(project.archived_on, format: :full_date) %> + <%= l(project.archived_on, format: :full_with_comma) %> +
+ <% end %> +
<%= t('projects.index.card.visibility') %> @@ -74,12 +80,4 @@ <% end %>
- - <% if project.archived? %> -
- <%= t('projects.index.card.archived_date') %> - <%= l(project.archived_on, format: :full_date) %> - <%= l(project.archived_on, format: :full_with_comma) %> -
- <% end %>
From 44d74b5797802bba9e0d9b89c4b454718e6ea2bd Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 17 Nov 2022 22:29:15 +0400 Subject: [PATCH 14/16] refactoring projects scss --- app/assets/stylesheets/projects.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 812a0f405..2f778dbf7 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -1043,7 +1043,7 @@ li.module-hover { .archived-date-cell { .value { - color: $color-black;; + color: $color-black; } } @@ -1167,7 +1167,7 @@ li.module-hover { .project-code-cell { position: relative; padding-left: 20px; - margin-top:5px; + margin-top: 5px; height: min-content; } From 76884bafc170d2afffe08421760c9b2b05d8e83d Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 2 Dec 2022 15:53:22 +0400 Subject: [PATCH 15/16] code cleanup --- app/assets/javascripts/projects/index.js | 6 +----- app/assets/stylesheets/projects.scss | 17 +++++++---------- .../20220913100826_add_project_code_index.rb | 14 -------------- db/structure.sql | 9 --------- 4 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 db/migrate/20220913100826_add_project_code_index.rb diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index e1fe51e38..d2e20665a 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -519,11 +519,7 @@ var ProjectsIndex = (function() { $(projectsPageSelector) .on('ajax:success', '.change-projects-view-type-form', function(ev, data) { - if (data.cards_view_type_class === 'list') { - $(cardsWrapper).removeClass('cards').addClass(data.cards_view_type_class); - } else if (data.cards_view_type_class === 'cards') { - $(cardsWrapper).removeClass('list').addClass(data.cards_view_type_class); - } + $(cardsWrapper).removeClass('list cards').addClass(data.cards_view_type_class); $(projectsPageSelector).find('.cards-switch .button-to').removeClass('selected'); $(ev.target).find('.button-to').addClass('selected'); $(ev.target).parents('.dropdown.view-switch').removeClass('open'); diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 2f778dbf7..62d0cd3de 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -1135,10 +1135,6 @@ li.module-hover { } } - - - - .cards-wrapper.last-page.cards { grid-gap: 25px; @@ -1156,26 +1152,27 @@ li.module-hover { } .name { - overflow: hidden; + -webkit-box-orient: vertical; display: -webkit-box; -webkit-line-clamp: 2; - -webkit-box-orient: vertical; max-width: 200px; + overflow: hidden; } } .project-code-cell { - position: relative; - padding-left: 20px; - margin-top: 5px; height: min-content; + margin-top: 5px; + padding-left: 20px; + position: relative; } .data-row { position: relative; top: 5%; + .card-label { - color: gray !important; + color: #808080 !important; } &.start-date-cell { diff --git a/db/migrate/20220913100826_add_project_code_index.rb b/db/migrate/20220913100826_add_project_code_index.rb deleted file mode 100644 index a893a89e9..000000000 --- a/db/migrate/20220913100826_add_project_code_index.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -class AddProjectCodeIndex < ActiveRecord::Migration[6.1] - def up - ActiveRecord::Base.connection.execute( - "CREATE INDEX index_projects_on_project_code ON "\ - "projects using gin (('PR'::text || id) gin_trgm_ops);" - ) - end - - def down - remove_index :projects, name: 'index_projects_on_project_code' - end -end diff --git a/db/structure.sql b/db/structure.sql index dc2605b91..6f1eec5da 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5505,13 +5505,6 @@ CREATE INDEX index_projects_on_last_modified_by_id ON public.projects USING btre CREATE INDEX index_projects_on_name ON public.projects USING gin (public.trim_html_tags((name)::text) public.gin_trgm_ops); --- --- Name: index_projects_on_project_code; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX index_projects_on_project_code ON public.projects USING gin ((('PR'::text || id)) public.gin_trgm_ops); - - -- -- Name: index_projects_on_project_folder_id; Type: INDEX; Schema: public; Owner: - -- @@ -8571,8 +8564,6 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220621153016'), ('20220624091046'), ('20220705091621'), -('20220818094636'), -('20220913100826'); ('20220726133419'), ('20220803122405'), ('20220818094636'), From eff5d12253c0e47417b4d1174468f24121d344bb Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 2 Dec 2022 20:10:03 +0400 Subject: [PATCH 16/16] removed last-page class by default --- app/assets/stylesheets/projects.scss | 2 +- app/views/projects/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 62d0cd3de..76db6f24d 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -1135,7 +1135,7 @@ li.module-hover { } } -.cards-wrapper.last-page.cards { +.cards-wrapper.cards { grid-gap: 25px; .project-card { diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 19f415559..89b18a66b 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -17,7 +17,7 @@ <%= render partial: 'projects/index/modals/export_projects' %>
-