continue work on #21 and #5

spencermize · Feb 7, 2019 · 72290cb · 72290cb
1 parent 96015e6
commit 72290cb
Show file tree

Hide file tree

Showing 15 changed files with 335 additions and 160 deletions.
diff --git a/public/css/style.css b/public/css/style.css
diff --git a/public/css/style.css.map b/public/css/style.css.map
diff --git a/public/js/main.js b/public/js/main.js
diff --git a/public/views/partials/colorOverrides.hbs b/public/views/partials/colorOverrides.hbs
@@ -1,6 +1,6 @@
 <script id="colorOverrides-temp" type="text/x-handlebars-template">
     <style id="color-overrides">
-        .card-body,.navbar,.goals-container{
+        .card-body,.navbar{
             background-color:\{{MAINBG}};
             color:\{{MAINTXT}};
         }
@@ -41,5 +41,8 @@
         .btn-primary{
             color: #fff;
         }
+        ::-webkit-scrollbar-thumb {
+            background: \{{DARKER}};
+        }
     </style>
 </script>
diff --git a/public/views/partials/goals.hbs b/public/views/partials/goals.hbs
@@ -1,23 +1,31 @@
 <script id="goals-temp" type="text/x-handlebars-template">
-<select class="form-control variable mb-3">
-	<option data-min="50" data-max="250" data-unit="bpm" data-decimal="0">Heartrate</option>
-	<option data-min="2" data-max="40" data-unit="\{{units}} / hour" data-decimal="1">Speed</option>
-	<option data-min="2" data-max="150" data-unit="" data-decimal="0">Cadence</option>
-	<option>Power</option>
-</select>
-<div class="goals-container mb-3">
-	<div class="goals-grid">
-		
+<div class="container-fluid">
+	<div class="form-row">
+		<select class="form-control variable mb-3 col">
+			<option data-min="50" data-max="250" data-unit="bpm" data-type="hr" data-decimal="0">Heartrate</option>
+			<option data-min="2" data-max="40" data-unit="\{{units}} / hour" data-type="speed" data-decimal="1">Speed</option>
+			<option data-min="2" data-max="150" data-unit="" data-decimal="0" data-type="cadence">Cadence</option>
+			<option>Power</option>
+		</select>
+		<select class="form-control length-units mb-3 col">
+			<option data-type="\{{units}}" data-increment=".25" data-min=".25" data-decimal="2" data-max="50">Distance</option>
+			<option data-type="minutes" data-increment="1" data-min="1" data-decimal="0" data-max="60">Time</option>	
+		</select>
 	</div>
-</div>
-<button class="btn btn-primary" data-cmd="Goals.addGoal">Add Goal</button>
-<button class="btn btn-primary" data-cmd="addTime">Add Time</button>
-<div class="goal-item-template d-none">
-	<div class="item" data-toggle="tooltip">
-		<div class="item-content">
-			<div class="clicker">
-				<div class="closer control mr-4" data-cmd='Goals.removeGoal'><i class="fas fa-times-circle"></i></div>
-				<div class="cloner control" data-cmd='Goals.cloneGoal'><i class="fas fa-clone"></i></div>
+	<div class="goals-container mb-3">
+		<div class="goals-grid">
+			
+		</div>
+	</div>
+	<button class="btn btn-primary" data-cmd="Goals.addGoal">Add Goal</button>
+	<div class="length-display">Length: <span></span></div>
+	<div class="goal-item-template">
+		<div class="item" data-toggle="tooltip">
+			<div class="item-content">
+				<div class="clicker">
+					<div class="closer control mr-4" data-cmd='Goals.removeGoal'><i class="fas fa-times-circle"></i></div>
+					<div class="cloner control" data-cmd='Goals.cloneGoal'><i class="fas fa-clone"></i></div>
+				</div>
 			</div>
 		</div>
 	</div>

diff --git a/src/js/main.js b/src/js/main.js
@@ -42,7 +42,7 @@ $(function(){
 	}else{
 		V.loadInterface();
 		V.loadProfile();
-		V.Goals = Goals;
+		V.Goals = new Goals();
 		ConnectionStatus();
 	}
 	updatePhoto();

diff --git a/src/js/modules/Charts.js b/src/js/modules/Charts.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 function Charts(){
 	console.log('building charts');
-	var charts = $('[data-chart]');
+	var charts = $('[data-chart]').not(".initialized");
 	charts.each(function (_ind, el) {
 		console.log('initializing' + el);
 		var v = $(el);
@@ -50,6 +50,7 @@ function Charts(){
 			});
 		});		
 		console.log(`initialized.${name}`)
+		v.addClass("initialized");
 		$(document).trigger(`initialized.${name}`);					
 	});
 	$(document).on('clear.veload', function () {

diff --git a/src/js/modules/DataListeners.js b/src/js/modules/DataListeners.js
@@ -80,25 +80,7 @@ function DataListeners(){
         });
         setColors();
     })
-    $(document).on("settingsShown.veload",function(){
-        _.forEach(V.status,function(value,key){
-            var el = $(`[data-param="${key}"]:not(:focus)`);
-            if(el.is('button')){
-                el.toggleClass("active",value);
-            }else{
-                el.val(value);
-            }    
-        });        
-        _.forEach(V.user,function(value,key){
-            var el = $(`[data-param="${key}"]:not(:focus)`);
-            if(el.is('button')){
-                el.toggleClass("active",value);
-            }else{
-                el.val(value);
-            }  
-        });
-        setColors();
-    })
+
     $(document).on("urlsUpdated.veload",function(_e){
         $.post(`${V.opts.urls.remote.userUrl}?value=${V.opts.urlComponents.local.url}`,function(){