Merge pull request #12 from oslabs-beta/alex/bug-component-info-render

Alex/bug component info render

Author: sn163

.env.example

@@ -9,5 +9,5 @@ SLACK_REDIRECT_URI = "REDIRECT URL HERE"
 
 # https://www.npmjs.com/package/dotenv
 # https://www.npmjs.com/package/quasar-dotenv 
-# https://v1.quasar.dev/quasar-cli/handling-process-env
-# https://v1.quasar.dev/quasar-cli/quasar-conf-js#using-dotenv
+# https://v1.quasar.dev/quasar-cli/handling-process-env 
+# https://v1.quasar.dev/quasar-cli/quasar-conf-js#using-dotenv 

package-lock.json

@@ -1,6 +1,6 @@
 /**
  * This file is used specifically and only for development. It installs
- * `electron-debug` & `vue-devtools`. There shouldn't be any need to
+ * `electron-debug`. There shouldn't be any need to
  *  modify this file, but it can be used to extend your development
  *  environment.
  */

secretStuff/slackApiStuff.js

@@ -128,11 +128,11 @@ For Sign In with Slack, but we are now using the Add to Slack feature instead
 // }
 
 // Turns on event listener for Slack Oauth deep linking back app
-// TODO: Deep linking currently doesn't work properly in dev mode - requires fix
+// TODO: Deep linking currently doesn't work properly in dev mode on windows - requires fix
 
 function setOauthListener() {
-  logEverywhere(`process.env.SLACK_CLIENT_ID in electron-main:  ${process.env.SLACK_CLIENT_ID}`);
-  logEverywhere(`process.env.SLACK_CLIENT_SECRET in electron-main:  ${process.env.SLACK_CLIENT_SECRET}`);
+  // logEverywhere(`process.env.SLACK_CLIENT_ID in electron-main:  ${process.env.SLACK_CLIENT_ID}`);
+  // logEverywhere(`process.env.SLACK_CLIENT_SECRET in electron-main:  ${process.env.SLACK_CLIENT_SECRET}`);
 
   return deeplink.on("received", link => {
     logEverywhere(`auth worked here link: ${link}`);

src-electron/main-process/electron-main.dev.js

@@ -15,7 +15,8 @@ const ignoredActions = new Set([
   'setActiveComponent',
   'setActiveLayer',
   'upOneLayer',
-  'setActiveHTML'
+  'setActiveHTML',
+  'updateComponentNameInputValue'
 ])
 
 let redoMixin = {

src-electron/main-process/electron-main.js

@@ -225,7 +225,7 @@ export default {
     }
   },
   updated() {
-    // if there are no active component, all boxes are unhighlighted
+    // if there are no active components, all boxes are unhighlighted
     if (this.activeComponent === "") {
       if (this.$refs.boxes) {
         this.$refs.boxes.forEach(element => {
@@ -352,11 +352,13 @@ export default {
 
     // unhighlights all inactive components
     onActivated(componentData) {
+      console.log('onActivated - comp display, componentData', componentData)
       if (this.$refs.boxes) {
         this.$refs.boxes.forEach(element => {
           if (element.$attrs.id !== componentData.componentName) {
             element.enabled = false;
             element.$emit("deactivated");
+            // this.setActiveComponent(componentData.componentName)
             element.$emit("update:active", false);
           }
         });
@@ -387,6 +389,7 @@ export default {
 
     // user can change component's layer order
     handleLayer(e) {
+      console.log('handeLayer\'s e: ', e)
       e.preventDefault();
       const payload = {
         activeComponent: this.activeComponent,