02 done

Stefan Bauckmeier · Stefan Bauckmeier · commit 4d4d59c65faa · 2016-12-11T13:15:15.000+01:00
diff --git a/02 - JS + CSS Clock/index.html b/02 - JS + CSS Clock/index.html
@@ -5,16 +5,13 @@
   <title>JS + CSS Clock</title>
 </head>
 <body>
-
-
-    <div class="clock">
-      <div class="clock-face">
-        <div class="hand hour-hand"></div>
-        <div class="hand min-hand"></div>
-        <div class="hand second-hand"></div>
-      </div>
+  <div class="clock">
+    <div class="clock-face">
+      <div class="hand hour-hand"></div>
+      <div class="hand min-hand"></div>
+      <div class="hand second-hand"></div>
     </div>
-
+  </div>
 
   <style>
     html {
@@ -56,41 +53,61 @@
     }
 
     .hand {
+      position: absolute;
       width:50%;
       height:6px;
-      background:black;
-      position: absolute;
       top:50%;
+      background:black;
       transform-origin: 100%;
-      transform: rotate(90deg);
       transition: all 0.05s;
       transition-timing-function: cubic-bezier(0.1, 2.7, 0.58, 1);
     }
-</style>
 
-<script>
-  const secondHand = document.querySelector('.second-hand');
-  const minsHand = document.querySelector('.min-hand');
-  const hourHand = document.querySelector('.hour-hand');
+    .hand.hour-hand {
+      width:30%;
+      left: 20%;
+    }
+    .hand.min-hand {
+      width:40%;
+      left: 10%;
+    }
+
+
+  </style>
 
-  function setDate() {
-    const now = new Date();
+  <script>
+    class Clock {
+      constructor() {
+        let klass = this;
 
-    const seconds = now.getSeconds();
-    const secondsDegrees = ((seconds / 60) * 360) + 90;
-    secondHand.style.transform = `rotate(${secondsDegrees}deg)`;
+        this.secondHand = document.querySelector('.hand.second-hand');
+        this.minuteHand = document.querySelector('.hand.min-hand');
+        this.hourHand = document.querySelector('.hand.hour-hand');
 
-    const mins = now.getMinutes();
-    const minsDegrees = ((mins / 60) * 360) + 90;
-    minsHand.style.transform = `rotate(${minsDegrees}deg)`;
+        this.redraw();
+        window.setInterval(function() { klass.redraw() }, 1000);
+      }
 
-    const hour = now.getMinutes();
-    const hourDegrees = ((mins / 12) * 360) + 90;
-    hourHand.style.transform = `rotate(${hourDegrees}deg)`;
-  }
+      redraw() {
+        let time = new Date();
 
-  setInterval(setDate, 1000);
+        this.setHandTo(this.secondHand, 360 / 60 * time.getSeconds());
+        this.setHandTo(this.minuteHand, 360 / 60 * time.getMinutes());
+        this.setHandTo(this.hourHand, 360 / 12 * time.getHours());
+      }
+
+      setHandTo(handElement, degree) {
+        // initial state is on 45min (270deg), so we have to adopt the rotation to this
+        let fixedDegree = 90 + degree;
+        if (fixedDegree >= 360) {
+          fixedDegree = fixedDegree - 360;
+        }
+
+        handElement.setAttribute('style', `transform: rotate(${fixedDegree}deg)`);
+      }
+    }
 
-</script>
+    new Clock();
+  </script>
 </body>
 </html>
