Merge pull request #5 from akpaevj/redesign

Redesign

app/controllers/dashboard_controller.rb

@@ -10,6 +10,7 @@ def index
     @statuses = getData(@selected_project_id)
     @projects = getProjects(@selected_project_id)
   end
+
 end
 
 private

app/views/dashboard/index.html.erb

@@ -1,6 +1,7 @@
 <% content_for :header_tags do %>
     <%= stylesheet_link_tag 'style', plugin: 'dashboard' %>
 	<%= javascript_include_tag 'script', plugin: 'dashboard' %>
+	<%= javascript_include_tag 'Sortable.min', plugin: 'dashboard' %>
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
 <% end %>
 
@@ -15,12 +16,12 @@
 <div class="issues_container">
 	<% @statuses.each do |status| %>
 		<div class="status_column" data-id="<%= status['id'] %>">
-			<div class="status_column_header" style="background-color: <%= status["color"] %>">
+			<div class="status_column_header" style="border-bottom-color: <%= status["color"] %>">
 				<span> <%= status["name"] %> </span>
 			</div>
 			<div class="status_column_issues">
 				<% status["issues"].each do |issue| %>
-					<div draggable="true" class="issue_card" data-status="<%= status['id'] %>" data-id="<%= issue['id'] %>" onclick="goToIssue(<%= issue['id'] %>)">
+					<div class="issue_card" data-status="<%= status['id'] %>" data-id="<%= issue['id'] %>" onclick="goToIssue(<%= issue['id'] %>)">
 						<div class="issue_card_header">
 							<span class="issue_card_header_date"><%= issue["created_at"] %></span>
 							<div class="issue_card_header_project" style="background-color: <%= @projects[issue['project_id']]['color'] %>"><%= issue["project"] %></div>

app/views/settings/_dashboard_settings.erb

@@ -25,6 +25,6 @@
         <input type="color" id="settings_<%= property_name %>" value="<%= settings[property_name] %>" name="settings[<%= property_name %>]">
       </td>
     </tr>
-  <% end %>  
+  <% end %>
   </tbody>
 </table>

assets/javascripts/script.js

@@ -15,6 +15,8 @@ function goToIssue(id) {
 }
 
 function init() {
+    document.querySelector('#main-menu').remove();
+
     document.querySelector('[name=project]').addEventListener('change', function(e) {
         if (this.value == "-1") {
             location.search = "";

assets/stylesheets/style.css

@@ -7,25 +7,25 @@
 .status_column {
     display: inline-flex;
     border-radius: 5px;
-    background-color: rgb(236, 236, 236);
     width: 100%;
-    height: 100%;
-    margin: 10px;
+    margin-left: 3px;
+    margin-right: 3px;
     flex-direction: column;
-    box-shadow: 0px 0px 5px 0px gray;
 }
 
 .status_column_header {
     display: flex;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-    background-color: rgb(169, 144, 238);
     width: 100%;
     height: 50px;
     align-items: center;
-    justify-content: center;
-    color: white;
-    font-size: large;
+    font-size: medium;
+    font-weight: 500;
+    margin-bottom: 5px;
+    border-bottom: 2px solid;
+}
+
+.status_column_header span {
+    margin-left: 10px;
 }
 
 .status_column_issues {
@@ -47,7 +47,7 @@
     margin-top: 5px;
     padding-top: 5px;
     padding-bottom: 5px;
-    background-color: white;
+    background-color: rgb(240, 240, 240);
     margin-bottom: 5px;
     align-items: flex-start;
     flex-direction: column;
@@ -56,7 +56,7 @@
 }
 
 .issue_card:hover {
-    background-color: rgb(248, 248, 248);
+    background-color: rgb(220, 220, 220);
     cursor: pointer;
 }
 

config/locales/en.yml

@@ -2,5 +2,7 @@ en:
   top_menu_item_title: "Dashboard"
   settings_header_statuses: "Colors of the status column header"
   settings_header_projects: "Project colors"
+  settings_header_other: "Other"
+  settings_enable_drag_and_drop: 'Enable "drag and drop" status changing'
   executor_not_set: "Not set"
   label_all: "All"

config/locales/ru.yml

@@ -2,5 +2,7 @@ ru:
   top_menu_item_title: "Панель задач"
   settings_header_statuses: "Цвета заголовков колонок статусов"
   settings_header_projects: "Цвета проектов"
+  settings_header_other: "Разное"
+  settings_enable_drag_and_drop: 'Включить "drag and drop" изменение статуса'
   executor_not_set: "Не установлен"
   label_all: "Все"

config/routes.rb

@@ -1 +1,2 @@
 get 'dashboard', to: 'dashboard#index'
+get 'dashboard/setIssueStatus', to: 'dashboard#setIssueStatus'

init.rb

@@ -2,7 +2,7 @@
   name 'Dashboard'
   author "Akpaev E.A."
   description "Plugin adds an issues dashboard to the application"
-  version '1.0.4'
+  version '1.0.5'
   url 'https://github.com/akpaevj/Dashboard'
   author_url 'https://github.com/akpaevj'
   menu :top_menu, :dashboard, { controller: 'dashboard', action: 'index' }, caption: :top_menu_item_title, first: true