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
Léo-Paul Géneau
gitlab-ce
Commits
751302a1
Commit
751302a1
authored
May 02, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move SidebarTimeTracking vue component
parent
b8a84830
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
17 deletions
+25
-17
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
...idebar/components/time_tracking/sidebar_time_tracking.vue
+19
-16
app/assets/javascripts/sidebar/mount_sidebar.js
app/assets/javascripts/sidebar/mount_sidebar.js
+1
-1
changelogs/unreleased/refactor-move-sidebar-time-tracking-vue-component.yml
...sed/refactor-move-sidebar-time-tracking-vue-component.yml
+5
-0
No files found.
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.
js
→
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.
vue
View file @
751302a1
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
...
@@ -10,14 +11,17 @@ import Mediator from '../../sidebar_mediator';
...
@@ -10,14 +11,17 @@ import Mediator from '../../sidebar_mediator';
import
eventHub
from
'
../../event_hub
'
;
import
eventHub
from
'
../../event_hub
'
;
export
default
{
export
default
{
components
:
{
IssuableTimeTracker
,
},
data
()
{
data
()
{
return
{
return
{
mediator
:
new
Mediator
(),
mediator
:
new
Mediator
(),
store
:
new
Store
(),
store
:
new
Store
(),
};
};
},
},
components
:
{
mounted
()
{
IssuableTimeTracker
,
this
.
listenForQuickActions
();
},
},
methods
:
{
methods
:
{
listenForQuickActions
()
{
listenForQuickActions
()
{
...
@@ -41,18 +45,17 @@ export default {
...
@@ -41,18 +45,17 @@ export default {
}
}
},
},
},
},
mounted
()
{
this
.
listenForQuickActions
();
},
template
:
`
<div class="block">
<issuable-time-tracker
:time_estimate="store.timeEstimate"
:time_spent="store.totalTimeSpent"
:human_time_estimate="store.humanTimeEstimate"
:human_time_spent="store.humanTotalTimeSpent"
:rootPath="store.rootPath"
/>
</div>
`
,
};
};
</
script
>
<
template
>
<div
class=
"block"
>
<issuable-time-tracker
:time_estimate=
"store.timeEstimate"
:time_spent=
"store.totalTimeSpent"
:human_time_estimate=
"store.humanTimeEstimate"
:human_time_spent=
"store.humanTotalTimeSpent"
:root-path=
"store.rootPath"
/>
</div>
</
template
>
app/assets/javascripts/sidebar/mount_sidebar.js
View file @
751302a1
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
SidebarTimeTracking
from
'
./components/time_tracking/sidebar_time_tracking
'
;
import
SidebarTimeTracking
from
'
./components/time_tracking/sidebar_time_tracking
.vue
'
;
import
SidebarAssignees
from
'
./components/assignees/sidebar_assignees.vue
'
;
import
SidebarAssignees
from
'
./components/assignees/sidebar_assignees.vue
'
;
import
ConfidentialIssueSidebar
from
'
./components/confidential/confidential_issue_sidebar.vue
'
;
import
ConfidentialIssueSidebar
from
'
./components/confidential/confidential_issue_sidebar.vue
'
;
import
SidebarMoveIssue
from
'
./lib/sidebar_move_issue
'
;
import
SidebarMoveIssue
from
'
./lib/sidebar_move_issue
'
;
...
...
changelogs/unreleased/refactor-move-sidebar-time-tracking-vue-component.yml
0 → 100644
View file @
751302a1
---
title
:
Move SidebarTimeTracking vue component
merge_request
:
18677
author
:
George Tsiolis
type
:
performance
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