Skip to content

Commit 99c6a9d

Browse files
author
Rendy Sutandy
committed
Merge branch 'feature/MasterCrud-Revisi-1' of https://github.com/nodejs-indonesia/starter-loopback-fireloop into feature/MasterCrud-Revisi-1
* 'feature/MasterCrud-Revisi-1' of https://github.com/nodejs-indonesia/starter-loopback-fireloop: we don't use the client folder we don't use that add location maps at maps.json add location maps at maps.ts change connection to mysql # Conflicts: # server/datasources.json
2 parents 434bcc5 + aa41f49 commit 99c6a9d

3 files changed

Lines changed: 8 additions & 21 deletions

File tree

common/models/chatdetail.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,6 @@
1010
"table": "chatdetail"
1111
},
1212
"properties": {
13-
"roomchatid": {
14-
"type": "Number",
15-
"required": false,
16-
"length": null,
17-
"precision": 10,
18-
"scale": 0,
19-
"mysql": {
20-
"columnName": "RoomChatId",
21-
"dataType": "int",
22-
"dataLength": null,
23-
"dataPrecision": 10,
24-
"dataScale": 0,
25-
"nullable": "Y"
26-
},
27-
"_selectable": true
28-
},
2913
"sender": {
3014
"type": "String",
3115
"required": false,

common/models/maps.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
"id": true,
1313
"required": false
1414
},
15-
"userID": {
16-
"type": "string"
17-
},
1815
"latitude": {
1916
"type": "string"
2017
},
2118
"longitude": {
2219
"type": "string"
20+
},
21+
"userID": {
22+
"type": "string"
23+
},
24+
"locationName": {
25+
"type": "string"
2326
}
2427
},
2528
"validations": [],

server/datasources.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"db": {
3-
"name": "db",
4-
"connector": "mysql",
53
"host": "174.138.24.126",
64
"port": 3306,
75
"database": "loopbackDb",
86
"password": "lbP4ss4Acc3ss",
7+
"name": "db",
8+
"connector": "mysql",
99
"user": "loopbackuser"
1010
},
1111
"storageSimpleUpload": {

0 commit comments

Comments
 (0)