Merge pull request #170 from open-source-labs/dev

Dev
open-source-labs · Sep 22, 2022 · 939e8a2 · 939e8a2
2 parents 1037c95 + 015e17b
commit 939e8a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/src/components/nav-buttons/ExportMenu.vue b/src/components/nav-buttons/ExportMenu.vue
@@ -317,23 +317,18 @@ test('renders ${componentName}', () => {
 
         if (compClass !== "" && compID !== "") {
 
-          if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){
-            return `<template>\n  <div id = "${compID}" class = "${compClass}">\n${templateTagStr}${routeStr}  \n<Oauth/>\n\t</div>\n</template>`;
-          }
           return `<template>\n  <div id = "${compID}" class = "${compClass}">\n${templateTagStr}${routeStr}  \n\t</div>\n</template>`;
         }
         else if (compClass !== "" && compID === "") {
-          if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){
-            return `<template>\n  <div class = "${compClass}">\n${templateTagStr}${routeStr}  \t<Oauth/>\n\t</div>\n</template>`;
-          }
+
           return `<template>\n  <div class = "${compClass}">\n${templateTagStr}${routeStr}  \n\t</div>\n</template>`;
         }
         else if (compClass === "" && compID !== "") {
-          if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){return `<template>\n  <div id = "${compID}">\n${templateTagStr}${routeStr}\n<Oauth/>\n\t</div>\n</template>`;}
+
           return `<template>\n  <div id = "${compID}">\n${templateTagStr}${routeStr}  </div>\n</template>`;
         }
         else {
-          if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){return `<template>\n  <div>\n\t${str}${templateTagStr}${routeStr}\t<Oauth/> \n\t</div>\n</template>`;}
+
           return `<template>\n  <div>\n\t${str}${templateTagStr}${routeStr}  </div>\n</template>`;
         }
       }
@@ -416,22 +411,16 @@ test('renders ${componentName}', () => {
         let output;
         if (this.exportAsTypescript === "on") {
           output = "\n\n<script lang='ts'>\n";
-            if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){
-            output+=`import Oauth from '../components/oauth.vue';`
-          }
+
           output += imports + "\nexport default defineComponent ({\n  name: '" + componentName + "'";
         } else {
           output = "\n\n<script>\n";
-            if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){
-            output+=`import Oauth from '../components/oauth.vue';`
-          }
+
           output += imports + "\nexport default {\n  name: '" + componentName + "'";
 
         }
         output += ",\n  components: {\n";
-        if(this.$store.state.exportOauth ==='on'||this.$store.state.exportOauthGithub ==='on'){
-            output+=`Oauth,`
-          }
+
         output += childrenComponentNames + "  },\n";
         output += data;
         output += computed;

diff --git a/src/components/right-sidebar/RoutesTab.vue b/src/components/right-sidebar/RoutesTab.vue
@@ -30,9 +30,9 @@ Includes functionality to:
     </template>
     </q-input>
     <Routes></Routes>
-    <!-- <UploadMockup></UploadMockup> -->
+   <!-- <UploadMockup></UploadMockup>  -->
   </div>
-  
+
 </template>
 
 <script>

diff --git a/src/components/right-sidebar/UploadMockup.vue b/src/components/right-sidebar/UploadMockup.vue
@@ -74,7 +74,8 @@ export default {
           if (this.activeRoute !== "") {
             this.importImage({ img: res, route: this.activeRoute });
             if (this.imagePath[this.activeRoute]) {
-              this.source = "file:///" + this.imagePath[this.activeRoute];
+              this.source = "file://" + this.imagePath[this.activeRoute];
+              console.log(this.source);
             }
           }
         })
@@ -170,7 +171,7 @@ export default {
 
 .file-content {
   padding: 0em 1em 1em 1em;
-  
+
 }
 
 .browser-btn {