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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
77723e2f
Commit
77723e2f
authored
Jun 21, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move boards modal EmptyState vue component
parent
7c11ed8c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
32 deletions
+41
-32
app/assets/javascripts/boards/components/modal/empty_state.vue
...ssets/javascripts/boards/components/modal/empty_state.vue
+33
-29
app/assets/javascripts/boards/components/modal/index.js
app/assets/javascripts/boards/components/modal/index.js
+2
-2
changelogs/unreleased/move-boards-modal-empty-state-vue-component.yml
...nreleased/move-boards-modal-empty-state-vue-component.yml
+5
-0
spec/javascripts/test_bundle.js
spec/javascripts/test_bundle.js
+1
-1
No files found.
app/assets/javascripts/boards/components/modal/empty_state.
js
→
app/assets/javascripts/boards/components/modal/empty_state.
vue
View file @
77723e2f
import
Vue
from
'
vue
'
;
<
script
>
import
ModalStore
from
'
../../stores/modal_store
'
;
import
ModalStore
from
'
../../stores/modal_store
'
;
import
modalMixin
from
'
../../mixins/modal_mixins
'
;
import
modalMixin
from
'
../../mixins/modal_mixins
'
;
gl
.
issueBoards
.
ModalEmptyState
=
Vue
.
extend
(
{
export
default
{
mixins
:
[
modalMixin
],
mixins
:
[
modalMixin
],
props
:
{
props
:
{
newIssuePath
:
{
newIssuePath
:
{
...
@@ -38,32 +38,36 @@ gl.issueBoards.ModalEmptyState = Vue.extend({
...
@@ -38,32 +38,36 @@ gl.issueBoards.ModalEmptyState = Vue.extend({
return
obj
;
return
obj
;
},
},
},
},
template
:
`
};
<section class="empty-state">
</
script
>
<div class="row">
<div class="col-12 col-md-6 order-md-last">
<
template
>
<aside class="svg-content"><img :src="emptyStateSvg"/></aside>
<section
class=
"empty-state"
>
</div>
<div
class=
"row"
>
<div class="col-12 col-md-6 order-md-first">
<div
class=
"col-12 col-md-6 order-md-last"
>
<div class="text-content">
<aside
class=
"svg-content"
><img
:src=
"emptyStateSvg"
/></aside>
<h4>{{ contents.title }}</h4>
</div>
<p v-html="contents.content"></p>
<div
class=
"col-12 col-md-6 order-md-first"
>
<a
<div
class=
"text-content"
>
:href="newIssuePath"
<h4>
{{
contents
.
title
}}
</h4>
class="btn btn-success btn-inverted"
<p
v-html=
"contents.content"
></p>
v-if="activeTab === 'all'">
<a
New issue
v-if=
"activeTab === 'all'"
</a>
:href=
"newIssuePath"
<button
class=
"btn btn-success btn-inverted"
type="button"
>
class="btn btn-default"
New issue
@click="changeTab('all')"
</a>
v-if="activeTab === 'selected'">
<button
Open issues
v-if=
"activeTab === 'selected'"
</button>
class=
"btn btn-default"
</div>
type=
"button"
@
click=
"changeTab('all')"
>
Open issues
</button>
</div>
</div>
</div>
</div>
</
section
>
</
div
>
`
,
</section>
});
</
template
>
app/assets/javascripts/boards/components/modal/index.js
View file @
77723e2f
...
@@ -6,15 +6,15 @@ import loadingIcon from '~/vue_shared/components/loading_icon.vue';
...
@@ -6,15 +6,15 @@ import loadingIcon from '~/vue_shared/components/loading_icon.vue';
import
'
./header
'
;
import
'
./header
'
;
import
'
./list
'
;
import
'
./list
'
;
import
'
./footer
'
;
import
'
./footer
'
;
import
'
./empty_stat
e
'
;
import
EmptyState
from
'
./empty_state.vu
e
'
;
import
ModalStore
from
'
../../stores/modal_store
'
;
import
ModalStore
from
'
../../stores/modal_store
'
;
gl
.
issueBoards
.
IssuesModal
=
Vue
.
extend
({
gl
.
issueBoards
.
IssuesModal
=
Vue
.
extend
({
components
:
{
components
:
{
EmptyState
,
'
modal-header
'
:
gl
.
issueBoards
.
ModalHeader
,
'
modal-header
'
:
gl
.
issueBoards
.
ModalHeader
,
'
modal-list
'
:
gl
.
issueBoards
.
ModalList
,
'
modal-list
'
:
gl
.
issueBoards
.
ModalList
,
'
modal-footer
'
:
gl
.
issueBoards
.
ModalFooter
,
'
modal-footer
'
:
gl
.
issueBoards
.
ModalFooter
,
'
empty-state
'
:
gl
.
issueBoards
.
ModalEmptyState
,
loadingIcon
,
loadingIcon
,
},
},
props
:
{
props
:
{
...
...
changelogs/unreleased/move-boards-modal-empty-state-vue-component.yml
0 → 100644
View file @
77723e2f
---
title
:
Move boards modal EmptyState vue component
merge_request
:
20068
author
:
George Tsiolis
type
:
performance
spec/javascripts/test_bundle.js
View file @
77723e2f
...
@@ -135,7 +135,7 @@ if (process.env.BABEL_ENV === 'coverage') {
...
@@ -135,7 +135,7 @@ if (process.env.BABEL_ENV === 'coverage') {
// exempt these files from the coverage report
// exempt these files from the coverage report
const
troubleMakers
=
[
const
troubleMakers
=
[
'
./blob_edit/blob_bundle.js
'
,
'
./blob_edit/blob_bundle.js
'
,
'
./boards/components/modal/empty_state.
js
'
,
'
./boards/components/modal/empty_state.
vue
'
,
'
./boards/components/modal/footer.js
'
,
'
./boards/components/modal/footer.js
'
,
'
./boards/components/modal/header.js
'
,
'
./boards/components/modal/header.js
'
,
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
...
...
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