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
32f965b2
Unverified
Commit
32f965b2
authored
May 22, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added right sidebar components
parent
e97a8743
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
113 additions
and
0 deletions
+113
-0
ide.vue
app/assets/javascripts/ide/components/ide.vue
+6
-0
index.vue
...assets/javascripts/ide/components/right_sidebar/index.vue
+61
-0
pipelines.vue
...ts/javascripts/ide/components/right_sidebar/pipelines.vue
+46
-0
No files found.
app/assets/javascripts/ide/components/ide.vue
View file @
32f965b2
...
...
@@ -6,6 +6,7 @@ import RepoTabs from './repo_tabs.vue';
import
IdeStatusBar
from
'./ide_status_bar.vue'
;
import
RepoEditor
from
'./repo_editor.vue'
;
import
FindFile
from
'./file_finder/index.vue'
;
import
RightSidebar
from
'./right_sidebar/index.vue'
;
const
originalStopCallback
=
Mousetrap
.
stopCallback
;
...
...
@@ -16,6 +17,7 @@ export default {
IdeStatusBar
,
RepoEditor
,
FindFile
,
RightSidebar
,
},
computed
:
{
...
mapState
([
...
...
@@ -25,6 +27,7 @@ export default {
'currentMergeRequestId'
,
'fileFindVisible'
,
'emptyStateSvgPath'
,
'currentProjectId'
,
]),
...
mapGetters
([
'activeFile'
,
'hasChanges'
]),
},
...
...
@@ -122,6 +125,9 @@ export default {
</div>
</
template
>
</div>
<right-sidebar
v-if=
"currentProjectId"
/>
</div>
<ide-status-bar
:file=
"activeFile"
...
...
app/assets/javascripts/ide/components/right_sidebar/index.vue
0 → 100644
View file @
32f965b2
<
script
>
import
tooltip
from
'../../../vue_shared/directives/tooltip'
;
import
Icon
from
'../../../vue_shared/components/icon.vue'
;
import
Pipelines
from
'./pipelines.vue'
;
export
default
{
directives
:
{
tooltip
,
},
components
:
{
Icon
,
Pipelines
,
},
};
</
script
>
<
template
>
<div
class=
"multi-file-commit-panel ide-right-sidebar"
>
<div
class=
"multi-file-commit-panel-inner"
>
<pipelines
/>
</div>
<nav
class=
"ide-activity-bar"
>
<ul
class=
"list-unstyled"
>
<li
v-once
>
<a
v-tooltip
data-container=
"body"
data-placement=
"left"
:title=
"__('Pipelines')"
class=
"ide-sidebar-link"
href=
"a"
>
<icon
:size=
"16"
name=
"log"
/>
</a>
</li>
</ul>
</nav>
</div>
</
template
>
<
style
>
.ide-right-sidebar
{
width
:
auto
;
min-width
:
60px
;
}
.ide-right-sidebar
.ide-activity-bar
{
border-left
:
1px
solid
#eaeaea
;
}
.ide-right-sidebar
.multi-file-commit-panel-inner
{
width
:
300px
;
background-color
:
#fff
;
border-left
:
1px
solid
#eaeaea
;
}
</
style
>
app/assets/javascripts/ide/components/right_sidebar/pipelines.vue
0 → 100644
View file @
32f965b2
<
script
>
import
{
mapActions
,
mapState
}
from
'vuex'
;
import
LoadingIcon
from
'../../../vue_shared/components/loading_icon.vue'
;
import
CiIcon
from
'../../../vue_shared/components/ci_icon.vue'
;
export
default
{
components
:
{
LoadingIcon
,
CiIcon
,
},
computed
:
{
...
mapState
(
'pipelines'
,
[
'isLoadingPipeline'
,
'latestPipeline'
]),
statusIcon
()
{
return
{
group
:
this
.
latestPipeline
.
status
,
icon
:
`status_
${
this
.
latestPipeline
.
status
}
`
,
};
},
},
mounted
()
{
this
.
fetchLatestPipeline
();
},
methods
:
{
...
mapActions
(
'pipelines'
,
[
'fetchLatestPipeline'
]),
},
};
</
script
>
<
template
>
<div>
<loading-icon
v-if=
"isLoadingPipeline"
class=
"prepend-top-default"
size=
"2"
/>
<template
v-else-if=
"latestPipeline"
>
<ci-icon
:status=
"statusIcon"
/>
#
{{
latestPipeline
.
id
}}
</
template
>
</div>
</template>
<
style
>
</
style
>
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