Arminta
/
watermanagement-backend-prod
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

Browse Source
master
varun 2 years ago
parent 56e4b322bf 16a6f4261b
commit 59d8be500a
7 changed files with 79 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
src/api-docs/api.html
Unescape View File

@ -49,8 +49,8 @@
<!-- Do not commit this file into the server , ignore it by adding it to .gitignore --> <!-- Do not commit this file into the server , ignore it by adding it to .gitignore -->
<!----------------**************************---------------------> <!----------------**************************--------------------->
<rapi-doc <rapi-doc
spec-url="http://35.207.198.4:5000/documentation/json" spec-url="http://35.207.198.4:3000/documentation/json"
<!-- spec-url="http://35.207.198.4:3000/documentation/json"-->
show-header = 'false' show-header = 'false'
allow-authentication ="true" allow-authentication ="true"
> >

67
src/api-docs/api.html.save
Unescape View File

@ -0,0 +1,67 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<style>
.btn{
width: 90px;
height: 32px;
font-size:13px;
background-color: #47AFE8;
color: #fff;
border: none;
margin: 0 2px;
border-radius: 2px;
cursor:pointer;
outline:none;
}
.txt{
width: 100px;
height: 30px;
font-size:13px;
background-color: transparent;
border: 1px solid #47AFE8;
color: #fff;
padding:0 8px;
margin: 0 2px;
border-radius: 2px;
outline:none;
}
rapi-doc{
width:100%;
}
</style>
<script type="module" src="https://unpkg.com/rapidoc/dist/rapidoc-min.js"></script>
<script>
function setApiKey(){
const docEl = document.getElementById('thedoc');
const keyInputEl = document.getElementById('key-val-input');
docEl.setAttribute('api-key-name','Authorization');
docEl.setAttribute('api-key-location','header');
docEl.setAttribute('api-key-value',keyInputEl.value);
}
</script>
</head>
<body>
<!-- Do not commit this file into the server , ignore it by adding it to .gitignore -->
<!----------------**************************--------------------->
<rapi-doc
spec-url="http://35.207.198.35.207.198.44:3000/documentation/json"
show-header = 'false'
allow-authentication ="true"
>
<!--
below html is custom html that adds an input field and a button in header
on clicking the button the 'api-key-value' is set to the value in input box
-->
<!--div slot='header' style='display:flex; margin:0 16px;'>
<input class='txt' id='key' type='text' >
<button class='btn' onclick='setApiKey()' > Set Key </button >
</div-->
</rapi-doc>
</body>
</html>

4
src/config/swagger.js
Unescape View File

@ -15,8 +15,8 @@ exports.options = {
// We have to change this beacause this is running on local // We have to change this beacause this is running on local
// we have to run on this on swagger // we have to run on this on swagger
//host: "localhost:5000", //Devlopemnt host on lcoal //host: "localhost:5000", //Devlopemnt host on lcoal
//host: "35.207.198.4:3000", //Production for swagger
host: "35.207.198.4:5000", //Production for swagger host: "35.207.198.4:3000",
schemes: ["http"], schemes: ["http"],
consumes: ["application/json"], consumes: ["application/json"],
produces: ["application/json"], produces: ["application/json"],

4
src/controllers/createConnectionController.js
Unescape View File

@ -107,7 +107,7 @@ exports.updateconnectionInfo = async (req, reply) => {
inputConnections: connection.inputConnections, inputConnections: connection.inputConnections,
input_type: connection.input_type, input_type: connection.input_type,
motor_status: connection.motor_status || "0", motor_status: connection.motor_status || "0",
inputismotor: connection.inputismotor || false // default to false if not specified inputismotor: connection.inputismotor // default to false if not specified
}; };
}); });
} }
@ -118,7 +118,7 @@ exports.updateconnectionInfo = async (req, reply) => {
return { return {
outputConnections: connection.outputConnections, outputConnections: connection.outputConnections,
output_type: connection.output_type, output_type: connection.output_type,
outputismotor: connection.outputismotor || false // default to false if not specified outputismotor: connection.outputismotor // default to false if not specified
}; };
}); });
} }

2
src/index.js
Unescape View File

@ -360,7 +360,7 @@ const start = async () => {
try { try {
await fastify.listen(5000, "0.0.0.0"); await fastify.listen(3000, "0.0.0.0");
fastify.log.info(`listening on ${fastify.server.address().port}`); fastify.log.info(`listening on ${fastify.server.address().port}`);
fastify.log.info(`server listening on ${fastify.config}`); fastify.log.info(`server listening on ${fastify.config}`);
} catch (err) { } catch (err) {

4
src/models/tanks.js
Unescape View File

@ -48,7 +48,7 @@ const tanksSchema = new mongoose.Schema({
{ {
inputConnections: { type: String }, inputConnections: { type: String },
input_type: { type: String }, input_type: { type: String },
inputismotor: { type: Boolean }, inputismotor: { type: Boolean, },
motor_status: { type: String, default: "0" } motor_status: { type: String, default: "0" }
} }
], ],
@ -56,7 +56,7 @@ const tanksSchema = new mongoose.Schema({
{ {
outputConnections: { type: String }, outputConnections: { type: String },
output_type: { type: String }, output_type: { type: String },
outputismotor: { type: Boolean }, outputismotor: { type: Boolean, },
motor_status: { type: String, default: "0" } motor_status: { type: String, default: "0" }
} }
] ]

Write Preview
Loading…
Cancel
Save