From 2268afc8dca5d89e4835a73fb503ffc35e2e74d8 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Wed, 16 Nov 2016 23:57:18 +0000 Subject: [PATCH] Add missing images Also commented out the MQTT auth routes --- index.js | 82 +++++++++---------- static/images/decrementTargetTemperature.png | Bin 0 -> 618 bytes static/images/incrementTargetTemperature.png | Bin 0 -> 641 bytes static/images/setTargetTemperature.png | Bin 0 -> 603 bytes 4 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 static/images/decrementTargetTemperature.png create mode 100644 static/images/incrementTargetTemperature.png create mode 100644 static/images/setTargetTemperature.png diff --git a/index.js b/index.js index 7d757a9..524fa68 100644 --- a/index.js +++ b/index.js @@ -4,9 +4,9 @@ var mqtt = require('mqtt'); var http = require('http'); var https = require('https'); var flash = require('connect-flash'); +var morgan = require('morgan'); var express = require('express'); var session = require('express-session'); -var morgan = require('morgan'); var passport = require('passport'); var mongoose = require('mongoose'); var bodyParser = require('body-parser'); @@ -204,13 +204,6 @@ var accessTokenStrategy = new PassportOAuthBearer(function(token, done) { passport.use(accessTokenStrategy); -app.get('/cleanDB', function(req,res){ - Account.remove({}); - Devices.remove({}); - Topics.remove({}); - res.send(); -}); - app.get('/', function(req,res){ res.render('pages/index', {user: req.user, home: true}); }); @@ -624,44 +617,51 @@ app.delete('/service/:id', }); // Work around for not being able to access Mongo from container -app.post('/mqtt/auth',function(req,res){ - var username = req.body.username; - var password = req.body.password; - var topic = req.body.topic; - var acc = req.body.acc; +// app.post('/mqtt/auth',function(req,res){ +// var username = req.body.username; +// var password = req.body.password; +// var topic = req.body.topic; +// var acc = req.body.acc; - passport.authenticate('local',function(err,user,info){ - if (!err && user) { - return res.status(200).send(); - } else { - return res.status(401).send(); - } - })(req, res, function () { +// passport.authenticate('local',function(err,user,info){ +// if (!err && user) { +// return res.status(200).send(); +// } else { +// return res.status(401).send(); +// } +// })(req, res, function () { - }); -}); +// }); +// }); -app.post('/mqtt/acl',function(req,res){ - var username = req.body.username; - var clientid = req.body.clientid; - var topic = req.body.topic; - var acc = req.body.acc; +// app.post('/mqtt/acl',function(req,res){ +// var username = req.body.username; +// var clientid = req.body.clientid; +// var topic = req.body.topic; +// var acc = req.body.acc; - if (topic.indexOf(username+'/') === 0) { - res.status(200).send(); - } else { - res.status(401).send(); - } -}); +// if (topic.indexOf(username+'/') === 0) { +// res.status(200).send(); +// } else { +// res.status(401).send(); +// } +// }); -app.post('/mqtt/superuser',function(req,res){ - var username = req.body.username; - if (username === mqtt_user) { - res.status(200).send(); - } else { - res.status(401).send(); - } -}); +// app.post('/mqtt/superuser',function(req,res){ +// var username = req.body.username; +// if (username === mqtt_user) { +// res.status(200).send(); +// } else { +// res.status(401).send(); +// } +// }); + +// app.get('/cleanDB', function(req,res){ +// Account.remove({}); +// Devices.remove({}); +// Topics.remove({}); +// res.send(); +// }); var server = http.Server(app); if (app_id.match(/^https:\/\/localhost:/)) { diff --git a/static/images/decrementTargetTemperature.png b/static/images/decrementTargetTemperature.png new file mode 100644 index 0000000000000000000000000000000000000000..17b01fddc3c1b39f9bd0219daa5f54030d0cfd2d GIT binary patch literal 618 zcmV-w0+s!VP)*?02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00GiTL_t(&-tC!7C`CaS$A8}M zZ0^!V%Fb4{%94bVLSdnlg)A(|PFb+Gu(9#jN!d_Vgq4*gmpl@2%PWs#;eTqn9k+XR z>CQC2I-U9E`Tb(PK}!+%09XSmwP@Ch*Q=dfcLz61KzzVUPTm*i(@oFK(zQlI8{Wh&{M zB^|*P#=&6|DEc9z>+0Lpx!L+-;ejExTYaxUtFhlcR)2@hg7+n&MfPA)C42(yNxmhU z1t;`%BYZO)MU?-Je08!9b9K>5ha%ubq5+Ci93P)j#8@LZu7#^s_G(1TitY`%pW0l~ zb1Kt$BjdBcHE^MAWSD>r#g5o4xJIS=3G}6io08bL-p5wcBf$Z%2sBDmCD3eS_8Dlx z5xV&PcJ|yQvG{jPE}WV?a3`k0)Ke0G+3vgs3MebpQYW07*qoM6N<$ Ef(d07o&W#< literal 0 HcmV?d00001 diff --git a/static/images/incrementTargetTemperature.png b/static/images/incrementTargetTemperature.png new file mode 100644 index 0000000000000000000000000000000000000000..085705c0ea46853f84c664e5c90b23ecc84d937f GIT binary patch literal 641 zcmV-{0)G98P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00HSqL_t(&-tCz&NSi?zhM#IR zO;ubnW+{T3t8^7QDq;l@w9s@A3LT__V@o%|q1hc=T(sRp=%V1%5}lknwlQc#Drul; zLp8rc-oO!lgNY%3?zk6z{=56WyX4J#-`#f?@bK{P@bK{P@NgFofLA~U_yZJyePGH( zvc13-5a_uA{u}jG*9fnOSP57H;y?^okkSG0+$F+Uk$M|qdnwzVD`ba^sXG#4AC@f- zBn{th_xaF=5fY9W<=-LpTH7Pw8u+Dp!B)b};0#E#W1w~r4vg*PzIX$af%Urf0U)Jv z9{3#PuOAqsn?b_pn=r;I)Qw$mC5D?p5%{2TF6uAS35DARTNEBP6#fCEeGEIM@Fnm< z<%>?L*y__YG29cOYNL1bi)%`E4O)re0psBC1?am)(H*sYZBt?s8R6Qo@X#PTr?xUM zY2@4A)jnf0;f(q`Q$1A|^A%va&bDbY;i7IgYP-a7$U=7@+lcB%HZNLzz(0`&=x=a* zEH&`4hHzF3*Avx0h4^giJ*M|ho2T?g^+_9wuL0-4snW=r7`yU)ZS(a`Qd6}8EH?0a zFS1$f$5vxrgacp$7#FEQV8T%LFYpvcFiZ9B>b8_L=Mq^nr+%kw>J&Jk`p?5M@E8vd bk4CrwDA=)b^)j^a00000NkvXXu0mjf@;Vp- literal 0 HcmV?d00001 diff --git a/static/images/setTargetTemperature.png b/static/images/setTargetTemperature.png new file mode 100644 index 0000000000000000000000000000000000000000..2a19142e48b0c83741d982a2eaee761b2233a796 GIT binary patch literal 603 zcmV-h0;K(kP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00F~EL_t(o!|j+$C`3^h$A6yV znawO`BV}hRTV+W?Nui8|QWmnXBs*on-onPlV<%-pS<$evvSi335mO!$=Gy#kou)Cl zgL9?xuiHJ}<97e|`@VC}cMdo>IQ%M#fMFm3JOU|T2k7_<luSj}8cbEi|A~BJ}HYD42SmbJrR5s+W*U5GT#0=m4pf4&dkYL0ZKjg6c zx(eVOxRrcwi(n930?|Sr{z-ykKpI%g(pLjdKFfmz6?a4y6WzAO*~5 zd~RzN2Z`XfU?YNcMg&iQ1y_RsaR&@)eDm*Wu(-hI8o%gQsT5m9wb3YS0cD>=Y(u&| z^^MlstOJ8wuXJgk-B_=WrSGyyFrk;WNsb%!=m8m^Gt0JYlVD2Sv;PM;$|C3iyRtP% zKD0SW%77P<1Srqbjy>h^`89$`O_X}cYdL&Yb#K!B)Mkq3m9_;VqI1ACaG_<*|L{%u zj@l#`Q|dCnKpwwokxS}-Xcc`T=mASWvq;nctw!XYftIi~PCeRtc%NM7VUjb~cL7RG@pcktri;Nb9md;qI~kdixP-Ut8y002ovPDHLkV1jo}08{_~ literal 0 HcmV?d00001