Skip to content

Commit f2daf5e

Browse files
committed
add list/show routes
1 parent 5ad5da4 commit f2daf5e

12 files changed

Lines changed: 37 additions & 24 deletions

src/controllers/modals/EditSnippetModalController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ angular.module('codexen')
1414
callSign: vm.snippet.callSign,
1515
mode: vm.snippet.mode == null ? null : vm.snippet.mode.toLowerCase(),
1616
content: vm.snippet.content,
17-
tags: angular.isArray(vm.snippet.tags) ? vm.snippet.tags.map(function (tag) { return {_id: tag._id, name: tag.name} }) : []
17+
tags: angular.isArray(vm.snippet.tags) ? vm.snippet.tags.map(function (tag) { return tag.name }) : []
1818
}
1919

2020
Snippet.update(vm.snippet._id, params)
2121
.success(function (data) {
22-
$modalInstance.close(data.snippet)
22+
$modalInstance.close(data)
2323
console.log('snippet created!', data)
2424
})
2525
}

src/controllers/modals/NewSnippetModalController.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ angular.module('codexen')
1111
callSign: vm.callSign,
1212
mode: vm.mode == null ? null : vm.mode.toLowerCase(),
1313
content: vm.content,
14-
tags: angular.isArray(vm.tags) ? vm.tags.map(function (tag) { return {_id: tag._id, name: tag.name} }) : []
14+
tags: angular.isArray(vm.tags) ? vm.tags.map(function (tag) { return tag.name }) : []
1515
}
1616

1717
Snippet.create(params)
1818
.success(function (data) {
19-
$modalInstance.close(data.snippet)
19+
$modalInstance.close(data)
2020
})
2121
}
2222

src/controllers/states/SnippetsDetailController.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ angular.module('codexen')
77

88
var snippetId = $state.params.id
99

10-
Snippet.show(snippetId)
10+
Snippet.show(snippetId, {
11+
'include': ['Tag']
12+
})
1113
.success(function (data) {
12-
vm.snippet = data.snippet
14+
vm.snippet = data
1315
vm.isLoaded = true
1416
})
1517

1618
vm.delete = function () {
17-
Snippet.delete(vm.snippet._id)
19+
Snippet.delete(vm.snippet.id)
1820
.success(function () {
1921
$rootScope.$broadcast('snippetDeleted')
2022
})

src/controllers/states/SnippetsListController.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ angular.module('codexen')
77

88
var loadSnippets = function () {
99
if ($auth.isAuthenticated) {
10-
console.log($auth.getPayload())
11-
var userId = $auth.getPayload().sub
12-
Snippet.findByUser(userId)
10+
Snippet.findMine({
11+
'include': ['Tag']
12+
})
1313
.success(function (data) {
14-
console.log('snippets fetched', data.snippets)
14+
console.log('snippets fetched', data)
1515
vm.isLoaded = true
16-
vm.snippets = data.snippets
16+
vm.snippets = data
1717
vm.isGuest = false
1818
})
1919
}else {

src/services/snippet.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@ angular.module('codexen')
1111
})
1212
}
1313

14+
var findMine = function (params) {
15+
var url = apiUrl + 'snippets/my'
16+
17+
return $http.get(url, {params: params})
18+
}
19+
1420
var create = function (params) {
1521
var url = apiUrl + 'snippets/create'
1622

1723
return $http.post(url, params)
1824
}
1925

20-
var show = function (id) {
26+
var show = function (id, params) {
2127
var url = apiUrl + 'snippets/id/' + id
2228

23-
return $http.get(url)
29+
return $http.get(url, {params: params})
2430
}
2531

2632
var update = function (id, params) {
@@ -37,6 +43,7 @@ angular.module('codexen')
3743

3844
return {
3945
findByUser: findByUser,
46+
findMine: findMine,
4047
create: create,
4148
show: show,
4249
delete: destroy,

src/styles/_index.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ textarea
2828
left: 0
2929
width: 200px
3030
background-color: $baseBackgroundColor
31-
border-right solid 1px $baseBorderColor
31+
border-right solid 2px $backgroundColorSelected
3232
box-sizing: border-box
3333
padding: 10px 0 10px 10px
3434

src/styles/directives/side-nav.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.nav-control-group
33
margin 0 5px
44
ul.nav.nav-pills
5+
margin-top 10px
56
li hr
67
margin: 5px 0
78
border-top none

src/tpls/directives/side-nav.tpl.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<img width="30" class="img-circle" ng-src="http://www.gravatar.com/avatar/{{ vm.currentUser.email | gravatar }}">
44
<a href ng-bind="vm.currentUser.name"></a>
55
<span class="nav-control-group pull-right">
6-
<a href class="btn btn-sm btn-primary"><i class="fa fa-gears"></i></a>
7-
<a href class="btn btn-sm btn-primary" ng-click="vm.signOut()"><i class="fa fa-sign-out"></i></a>
6+
<a href class="btn btn-sm btn-default"><i class="fa fa-gears"></i></a>
7+
<a href class="btn btn-sm btn-default" ng-click="vm.signOut()"><i class="fa fa-sign-out"></i></a>
88
</span>
99

1010
</div>

src/tpls/modals/edit-snippet-modal.tpl.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ <h4>Edit Snippet</h4>
2222
<div
2323
ui-ace="{
2424
mode: vm.snippet.mode.toLowerCase(),
25-
theme:'solarized_dark'
25+
theme:'solarized_dark',
26+
useWrapMode : true
2627
2728
}"
2829
ng-model="vm.snippet.content"
2930
></div>
3031
</div>
3132

3233
<div class="form-group">
33-
<ui-select multiple tagging="vm.transform" tagging-tokens="SPACE|,|/" ng-model="vm.snippet.tags" theme="bootstrap">
34+
<ui-select multiple tagging="vm.transform" tagging-tokens="SPACE|,|/" ng-model="vm.snippet.Tags" theme="bootstrap">
3435
<ui-select-match placeholder="Write Tags">{{$item.name}}</ui-select-match>
3536
<ui-select-choices repeat="tag in vm.tagCandidates" refresh="vm.refreshTagCandidates($select.search)"
3637
refresh-delay="200">

src/tpls/modals/new-snippet-modal.tpl.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ <h4>New Snippet</h4>
2222
<div
2323
ui-ace="{
2424
mode: vm.mode.toLowerCase(),
25-
theme:'solarized_dark'
25+
theme:'solarized_dark',
26+
useWrapMode : true
2627
2728
}"
2829
ng-model="vm.content"

0 commit comments

Comments
 (0)