11// used when hosting the site on the ESP8266
2- var address = location . hostname ;
3- var urlBase = "" ;
2+ // var address = location.hostname;
3+ // var urlBase = "";
44
55// used when hosting the site somewhere other than the ESP8266 (handy for testing without waiting forever to upload to SPIFFS/LittleFS)
6- // var address = "192.168.1.13 ";
7- // var urlBase = "http://" + address + "/";
6+ var address = "192.168.86.30 " ;
7+ var urlBase = "http://" + address + "/" ;
88
99var postColorTimer = { } ;
1010var postValueTimer = { } ;
@@ -46,46 +46,53 @@ var patterns = [
4646 "Water"
4747] ;
4848
49- var ws = new ReconnectingWebSocket ( 'ws://' + address + ':81/' , [ 'arduino' ] ) ;
50- ws . debug = true ;
51-
52- ws . onmessage = function ( evt ) {
53- if ( evt . data != null )
54- {
55- var data = JSON . parse ( evt . data ) ;
56- if ( data == null ) return ;
57- switch ( data . name ) {
58- case "power" :
59- if ( data . value == 1 ) {
60- $ ( "#btnOn" ) . attr ( "class" , "btn btn-primary" ) ;
61- $ ( "#btnOff" ) . attr ( "class" , "btn btn-default " ) ;
62- } else {
63- $ ( "#btnOff" ) . attr ( "class" , "btn btn-primary" ) ;
64- $ ( "#btnOn" ) . attr ( "class" , "btn btn-default " ) ;
65- }
66- break ;
67-
68- case "pattern" :
69- $ ( ".grid-item-pattern" ) . attr ( "class" , "grid-item-pattern btn btn-default " ) ;
70- $ ( "#pattern-button-" + data . value ) . attr ( "class" , "grid-item-pattern btn btn-primary" ) ;
71- break ;
72- }
73- }
74- }
49+ // var ws = new ReconnectingWebSocket('ws://' + address + ':81/', ['arduino']);
50+ // ws.debug = true;
51+
52+ // ws.onmessage = function(evt) {
53+ // if(evt.data != null)
54+ // {
55+ // var data = JSON.parse(evt.data);
56+ // if(data == null) return;
57+ // switch(data.name) {
58+ // case "power":
59+ // if(data.value == 1) {
60+ // $("#btnOn").attr("class", "btn btn-primary");
61+ // $("#btnOff").attr("class", "btn btn-outline-secondary ");
62+ // } else {
63+ // $("#btnOff").attr("class", "btn btn-primary");
64+ // $("#btnOn").attr("class", "btn btn-outline-secondary ");
65+ // }
66+ // break;
67+
68+ // case "pattern":
69+ // $(".grid-item-pattern").attr("class", "grid-item-pattern btn btn-outline-secondary ");
70+ // $("#pattern-button-" + data.value).attr("class", "grid-item-pattern btn btn-primary");
71+ // break;
72+ // }
73+ // }
74+ // }
7575
7676$ ( document ) . ready ( function ( ) {
7777 $ ( "#status" ) . html ( "Connecting, please wait..." ) ;
7878
7979 $ . get ( urlBase + "all" , function ( data ) {
8080 $ ( "#status" ) . html ( "Loading, please wait..." ) ;
8181
82+ // get product name for main page
83+ $ . get ( urlBase + "product" , function ( data ) {
84+ const name = data [ 'productName' ] ;
85+ // Set overall page title
86+ $ ( document ) . attr ( "title" , name + " by EvilGenius Labs" ) ;
87+ } ) ;
88+
8289 $ . each ( data , function ( index , field ) {
8390 switch ( field . name ) {
8491 case "power" :
8592 if ( field . value == 1 ) {
86- $ ( "#btnOn" ) . attr ( "class" , "btn btn-primary" ) ;
93+ $ ( "#btnOn" ) . attr ( "class" , "col-2 btn btn-primary" ) ;
8794 } else {
88- $ ( "#btnOff" ) . attr ( "class" , "btn btn-primary" ) ;
95+ $ ( "#btnOff" ) . attr ( "class" , "col-2 btn btn-primary" ) ;
8996 }
9097 break ;
9198
@@ -94,27 +101,29 @@ $(document).ready(function() {
94101 break ;
95102 }
96103 } ) ;
104+
105+ $ ( "#status" ) . html ( "" ) ;
97106 } ) ;
98107
99108 addColorButtons ( ) ;
100109
101110 $ ( "#btnOn" ) . click ( function ( ) {
102111 postValue ( "power" , 1 ) ;
103- $ ( "#btnOn" ) . attr ( "class" , "btn btn-primary" ) ;
104- $ ( "#btnOff" ) . attr ( "class" , "btn btn-default " ) ;
112+ $ ( "#btnOn" ) . attr ( "class" , "col-2 btn btn-primary" ) ;
113+ $ ( "#btnOff" ) . attr ( "class" , "col-2 btn btn-outline-secondary " ) ;
105114 } ) ;
106115
107116 $ ( "#btnOff" ) . click ( function ( ) {
108117 postValue ( "power" , 0 ) ;
109- $ ( "#btnOff" ) . attr ( "class" , "btn btn-primary" ) ;
110- $ ( "#btnOn" ) . attr ( "class" , "btn btn-default " ) ;
118+ $ ( "#btnOff" ) . attr ( "class" , "col-2 btn btn-primary" ) ;
119+ $ ( "#btnOn" ) . attr ( "class" , "col-2 btn btn-outline-secondary " ) ;
111120 } ) ;
112121
113122 $ ( "#status" ) . html ( "Ready" ) ;
114123} ) ;
115124
116125function addColorButtons ( ) {
117- var hues = 25 ;
126+ var hues = 12 ;
118127 var hueStep = 360 / hues ;
119128
120129 var levels = 10 ;
@@ -125,12 +134,6 @@ function addColorButtons() {
125134 addColorButton ( h * hueStep , 100 , l ) ;
126135 }
127136 }
128-
129- $ ( '.grid-color' ) . isotope ( {
130- itemSelector : '.grid-item-color' ,
131- layoutMode : 'fitRows'
132- } ) ;
133-
134137}
135138
136139var colorButtonIndex = 0 ;
@@ -144,13 +147,13 @@ function addColorButton(h, s, l) {
144147 var rgb = $ ( this ) . css ( 'backgroundColor' ) ;
145148 var components = rgbToComponents ( rgb ) ;
146149
147- $ ( ".grid-item- color" ) . css ( "border" , "none" ) ;
150+ $ ( ".color" ) . css ( "border" , "none" ) ;
148151 $ ( this ) . css ( "border" , "1px solid" ) ;
149152
150153 postColor ( "solidColor" , components ) ;
151154 } ) ;
152155
153- $ ( "#colorButtonsRow " ) . append ( template ) ;
156+ $ ( "#colors " ) . append ( template ) ;
154157}
155158
156159function addPatternButtons ( patternField ) {
@@ -163,20 +166,14 @@ function addPatternButtons(patternField) {
163166 template . text ( pattern ) ;
164167 template . click ( function ( ) {
165168 postValue ( "patternName" , pattern ) ;
166- $ ( ".grid-item-color" ) . css ( "border" , "none" ) ;
167- $ ( ".grid-item-pattern" ) . attr ( "class" , "grid-item-pattern btn btn-default" ) ;
168- $ ( this ) . attr ( "class" , "grid-item-pattern btn btn-primary" ) ;
169+ $ ( ".pattern" ) . attr ( "class" , "col btn btn-outline-secondary pattern" ) ;
170+ $ ( this ) . attr ( "class" , "col btn btn-primary pattern" ) ;
169171 } ) ;
170172
171- $ ( "#patternGrid" ) . append ( template ) ;
172- } ) ;
173-
174- $ ( '.grid-pattern' ) . isotope ( {
175- itemSelector : '.grid-item-pattern' ,
176- layoutMode : 'fitRows'
173+ $ ( "#patterns" ) . append ( template ) ;
177174 } ) ;
178175
179- $ ( "#pattern-button-" + patternField . value ) . attr ( "class" , "grid-item-pattern btn btn-primary" ) ;
176+ $ ( "#pattern-button-" + patternField . value ) . attr ( "class" , "col btn btn-primary pattern " ) ;
180177}
181178
182179function postValue ( name , value ) {
0 commit comments