BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1cb9de1b
Commit
1cb9de1b
authored
Aug 08, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added loading icon to boards vue app
parent
d1a2be9f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
boards_bundle.js.es6
app/assets/javascripts/boards/boards_bundle.js.es6
+9
-3
boards.scss
app/assets/stylesheets/pages/boards.scss
+5
-0
show.html.haml
app/views/projects/boards/show.html.haml
+3
-1
No files found.
app/assets/javascripts/boards/boards_bundle.js.es6
View file @
1cb9de1b
...
@@ -11,7 +11,6 @@ $(function () {
...
@@ -11,7 +11,6 @@ $(function () {
if (!window.gl) {
if (!window.gl) {
window.gl = {};
window.gl = {};
}
}
gl.boardService = new BoardService($('#board-app').data('endpoint'));
if (gl.IssueBoardsApp) {
if (gl.IssueBoardsApp) {
gl.IssueBoardsApp.$destroy(true);
gl.IssueBoardsApp.$destroy(true);
...
@@ -20,14 +19,20 @@ $(function () {
...
@@ -20,14 +19,20 @@ $(function () {
gl.IssueBoardsApp = new Vue({
gl.IssueBoardsApp = new Vue({
el: '#board-app',
el: '#board-app',
props: {
props: {
disabled: Boolean
disabled: Boolean,
endpoint: String
},
},
data: {
data: {
state: BoardsStore.state
state: BoardsStore.state,
loading: true
},
},
init: function () {
init: function () {
BoardsStore.create();
BoardsStore.create();
},
},
created: function () {
this.loading = true;
gl.boardService = new BoardService(this.endpoint);
},
ready: function () {
ready: function () {
BoardsStore.disabled = this.disabled;
BoardsStore.disabled = this.disabled;
gl.boardService.all()
gl.boardService.all()
...
@@ -45,6 +50,7 @@ $(function () {
...
@@ -45,6 +50,7 @@ $(function () {
});
});
BoardsStore.addBlankState();
BoardsStore.addBlankState();
this.loading = false;
});
});
}
}
});
});
...
...
app/assets/stylesheets/pages/boards.scss
View file @
1cb9de1b
...
@@ -71,6 +71,11 @@
...
@@ -71,6 +71,11 @@
}
}
}
}
.boards-app-loading
{
width
:
100%
;
font-size
:
34px
;
}
.boards-list
{
.boards-list
{
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
...
...
app/views/projects/boards/show.html.haml
View file @
1cb9de1b
...
@@ -10,6 +10,8 @@
...
@@ -10,6 +10,8 @@
=
render
'shared/issuable/filter'
,
type: :boards
=
render
'shared/issuable/filter'
,
type: :boards
.boards-list
#board-app
{
"
data-endpoint"
=>
"#{namespace_project_board_path(@project.namespace, @project)}
"
,
.boards-list
#board-app
{
"
:endpoint"
=>
"'#{namespace_project_board_path(@project.namespace, @project)}'
"
,
":disabled"
=>
"#{current_user.nil?}"
}
":disabled"
=>
"#{current_user.nil?}"
}
.boards-app-loading.text-center
{
"v-if"
=>
"loading"
}
=
icon
(
"spinner spin"
)
=
render
"projects/boards/components/board"
=
render
"projects/boards/components/board"
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