Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
7c59f45d
Commit
7c59f45d
authored
Oct 04, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added markup for sidebar
parent
c2cf1dd6
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
83 additions
and
7 deletions
+83
-7
app/assets/javascripts/boards/boards_bundle.js.es6
app/assets/javascripts/boards/boards_bundle.js.es6
+3
-1
app/assets/javascripts/boards/components/board_card.js.es6
app/assets/javascripts/boards/components/board_card.js.es6
+4
-0
app/assets/javascripts/boards/components/board_sidebar.js.es6
...assets/javascripts/boards/components/board_sidebar.js.es6
+25
-0
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+3
-1
app/views/projects/boards/components/_card.html.haml
app/views/projects/boards/components/_card.html.haml
+2
-1
app/views/projects/boards/components/_sidebar.html.haml
app/views/projects/boards/components/_sidebar.html.haml
+40
-0
app/views/projects/boards/show.html.haml
app/views/projects/boards/show.html.haml
+6
-4
No files found.
app/assets/javascripts/boards/boards_bundle.js.es6
View file @
7c59f45d
...
@@ -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,
...
...
app/assets/javascripts/boards/components/board_card.js.es6
View file @
7c59f45d
...
@@ -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);
}
}
}
}
});
});
...
...
app/assets/javascripts/boards/components/board_sidebar.js.es6
0 → 100644
View file @
7c59f45d
(() => {
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
}
}
});
})();
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @
7c59f45d
...
@@ -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: {}
...
...
app/views/projects/boards/components/_card.html.haml
View file @
7c59f45d
...
@@ -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"
,
...
...
app/views/projects/boards/components/_sidebar.html.haml
0 → 100644
View file @
7c59f45d
%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
app/views/projects/boards/show.html.haml
View file @
7c59f45d
...
@@ -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-list
.boards-app-loading.text-center
{
"v-if"
=>
"loading"
}
.boards-app-loading.text-center
{
"v-if"
=>
"loading"
}
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
=
render
"projects/boards/components/board"
=
render
"projects/boards/components/board"
=
render
"projects/boards/components/sidebar"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment