Commit 7c59f45d authored by Phil Hughes's avatar Phil Hughes

Added markup for sidebar

parent c2cf1dd6
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
//= require_tree ./services //= require_tree ./services
//= require_tree ./mixins //= require_tree ./mixins
//= require ./components/board //= require ./components/board
//= require ./components/board_sidebar
//= require ./components/new_list_dropdown //= require ./components/new_list_dropdown
//= require ./vue_resource_interceptor //= require ./vue_resource_interceptor
...@@ -22,7 +23,8 @@ $(() => { ...@@ -22,7 +23,8 @@ $(() => {
gl.IssueBoardsApp = new Vue({ gl.IssueBoardsApp = new Vue({
el: $boardApp, el: $boardApp,
components: { components: {
'board': gl.issueBoards.Board 'board': gl.issueBoards.Board,
'board-sidebar': gl.issueBoards.BoardSidebar
}, },
data: { data: {
state: Store.state, state: Store.state,
......
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
$('.labels-filter .dropdown-toggle-text').text(labelToggleText); $('.labels-filter .dropdown-toggle-text').text(labelToggleText);
Store.updateFiltersUrl(); Store.updateFiltersUrl();
},
showIssue () {
Store.state.detailIssue = this.issue;
console.log(Store.state.detailIssue);
} }
} }
}); });
......
(() => {
const Store = gl.issueBoards.BoardsStore;
window.gl = window.gl || {};
window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.BoardSidebar = Vue.extend({
data() {
return {
issue: Store.state.detailIssue
};
},
ready: function () {
console.log(this.issue);
},
watch: {
issue: {
handler () {
console.log('a');
},
deep: true
}
}
});
})();
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
gl.issueBoards.BoardsStore = { gl.issueBoards.BoardsStore = {
disabled: false, disabled: false,
state: {}, state: {
detailIssue: {}
},
moving: { moving: {
issue: {}, issue: {},
list: {} list: {}
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
":disabled" => "disabled", ":disabled" => "disabled",
"track-by" => "id" } "track-by" => "id" }
%li.card{ ":class" => "{ 'user-can-drag': !disabled && issue.id, 'is-disabled': disabled || !issue.id }", %li.card{ ":class" => "{ 'user-can-drag': !disabled && issue.id, 'is-disabled': disabled || !issue.id }",
":index" => "index" } ":index" => "index",
"@click" => "showIssue" }
%h4.card-title %h4.card-title
= icon("eye-slash", class: "confidential-icon", "v-if" => "issue.confidential") = icon("eye-slash", class: "confidential-icon", "v-if" => "issue.confidential")
%a{ ":href" => "issueLinkBase + '/' + issue.id", %a{ ":href" => "issueLinkBase + '/' + issue.id",
......
%board-sidebar{ "inline-template" => true }
%aside.right-sidebar.right-sidebar-expanded{ "v-if" => "showSidebar" }
.issuable-sidebar
.block.issuable-sidebar-header
%span.issuable-header-text.hide-collapsed.pull-left
%strong Test
%br/
%span #13
%a.gutter-toggle.pull-right.js-sidebar-toggle{ role: "button", href: "#", aria: { label: "Toggle sidebar" } }
= icon("times")
.block.assignee
.title.hide-collapsed
Assignee
= icon("spinner spin", class: "block-loading")
= link_to "Edit", "#", class: "edit-link pull-right"
.value.hide-collapsed
%span.assign-yourself.no-value
No assignee
\-
%a.js-assign-yourself{ href: "#" }
assign yourself
.block.milestone
.title.hide-collapsed
Milestone
= icon("spinner spin", class: "block-loading")
.value.hide-collapsed
%span.no-value
None
.block.due_date
.title.hide-collapsed
Due date
= icon("spinner spin", class: "block-loading")
.value.hide-collapsed
%span.no-value No due date
.block.labels
.title.hide-collapsed
Labels
= icon("spinner spin", class: "block-loading")
.value.issuable-show-labels.hide-collapsed
%span.no-value None
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
= render 'shared/issuable/filter', type: :boards = render 'shared/issuable/filter', type: :boards
.boards-list#board-app{ "v-cloak" => true, #board-app{ "v-cloak" => true,
"data-endpoint" => "#{namespace_project_board_path(@project.namespace, @project)}", "data-endpoint" => "#{namespace_project_board_path(@project.namespace, @project)}",
"data-disabled" => "#{!can?(current_user, :admin_list, @project)}", "data-disabled" => "#{!can?(current_user, :admin_list, @project)}",
"data-issue-link-base" => "#{namespace_project_issues_path(@project.namespace, @project)}" } "data-issue-link-base" => "#{namespace_project_issues_path(@project.namespace, @project)}" }
.boards-app-loading.text-center{ "v-if" => "loading" } .boards-list
= icon("spinner spin") .boards-app-loading.text-center{ "v-if" => "loading" }
= render "projects/boards/components/board" = icon("spinner spin")
= render "projects/boards/components/board"
= render "projects/boards/components/sidebar"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment