Merge branch 'typescript' of https://github.com/oslabs-beta/OverVue into typescript

Author: jigarxp

src/components/Canvas.vue

@@ -330,15 +330,15 @@
                 color="transparent"
                 text-color="primary"
                 label="–"
-                @click="(e) => handleLayer(e)"
+                @click="(e : Event) => handleLayer(e)"
               />
               <p id="counter">{{ componentData.z }}</p>
               <q-btn
                 class="minorAction"
                 color="transparent"
                 text-color="primary"
                 label="+"
-                @click="(e) => handleLayer(e)"
+                @click="(e : Event) => handleLayer(e)"
               />
             </q-item>
             <q-item clickable v-ripple v-close-popup @click="handleAddChild">
@@ -1446,7 +1446,7 @@ li:hover {
     linear-gradient(90deg, rgba(255, 255, 255, 0.8) 1px, transparent 1px),
     linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
     linear-gradient(90deg, rgba(255, 255, 255, 0.3) 1px, transparent 1px);
-  -pie-background: linear-gradient(
+    -pie-background: linear-gradient(
         rgba(255, 255, 255, 0.8) 1px,
         transparent 1px
       ) -2px -2px / 100px,

src/store/actions.ts

@@ -900,8 +900,8 @@ const actions: Store<"main", State, {}, Actions> = {
     const updatedComponent = this.routes[this.activeRoute].filter(
       (element) => element.componentName === payload.activeComponent
     )[0];
-    updatedComponent.h = payload.h;
-    updatedComponent.w = payload.w;
+    (updatedComponent.h as number | undefined) = payload.h;
+    (updatedComponent.w as number | undefined) = payload.w;
     updatedComponent.x = payload.x;
     updatedComponent.y = payload.y;
   },