Skip to content

Commit

Permalink
Updated map
Browse files Browse the repository at this point in the history
  • Loading branch information
rapee committed Jan 31, 2017
1 parent 391012d commit 8ddd305
Show file tree
Hide file tree
Showing 11 changed files with 23,008 additions and 6,464 deletions.
4 changes: 2 additions & 2 deletions assets/templates/page-pin.tag
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ page-pin
strong(data-url='#user/{ pin.owner }') @{ app.get('app_user.name').toLowerCase() }
//- a(href='#user/{ pin.owner }') @{ pin.owner }
.card-text(html='{ util.parse_tags(pin.detail) }')
- var categories = util.remove_duplicate_tags( pin.categories, pin.details )
.tag-list(if='{ categories.length > 0 }')
.tag-list(if='{ categories && categories.length > 0 }')
a.tag-item(each='{ cat in categories }', href=('#tags/{ cat }')) {cat}
//- .card-area(if='{ pin.neighborhood }') ย่าน{ pin.neighborhood }

Expand Down Expand Up @@ -68,6 +67,7 @@ page-pin
***************/
self.pin = opts;
self.slider = false;
self.categories = util.remove_duplicate_tags(self.pin.categories, self.pin.details);

/***************
* CHANGE
Expand Down
2 changes: 2 additions & 0 deletions assets/templates/page-report.tag
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ page-report
form_data.tags = form_data.tags.concat(form_data.categories);
form_data.created_time = Date.now();
form_data.updated_time = form_data.created_time;
form_data.organization = '583ddb7a3db23914407f9b50';

$.ajax({
url: util.site_url('/pins', app.get('service.api.url')),
Expand All @@ -698,6 +699,7 @@ page-report
.fail(error => {
console.error('error:', error);
Materialize.toast('ไม่สามารถพินปัญหาได้ (' + error + ')', 5000, 'dialog-error');
$('#report-saving-modal').closeModal();
});
}

Expand Down
4 changes: 2 additions & 2 deletions assets/views/home.pug
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ append app_script
// TODO: remove this temporary fix for #84
const pins = _.map(data.data || [], pin => {
pin.location.coordinates = [
pin.location.coordinates[1],
pin.location.coordinates[0]
pin.location.coordinates[0],
pin.location.coordinates[1]
];
return pin;
});
Expand Down
2 changes: 1 addition & 1 deletion config/local.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"env": "local",
"site": {
"protocol": "http",
"hostname": ""
"hostname": "localhost:7000"
},
"debug": true
}
14,277 changes: 14,270 additions & 7 deletions public/css/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/main.css.map

Large diffs are not rendered by default.

10,937 changes: 5,993 additions & 4,944 deletions public/js/dep.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions public/js/dep.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 8ddd305

Please sign in to comment.