Skip to content

Michael/final #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexlaw528 merged 2 commits into from
Sep 22, 2022
Merged

Michael/final #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1037c95
Merge pull request #168 from open-source-labs/dev
Koregano73 Sep 21, 2022
63425ed
final version
sunhonghaoparis Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions src/components/nav-buttons/ExportMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`;
}
}
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/right-sidebar/RoutesTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ Includes functionality to:
</template>
</q-input>
<Routes></Routes>
<!-- <UploadMockup></UploadMockup> -->
<!-- <UploadMockup></UploadMockup> -->
</div>

</template>

<script>
Expand Down
5 changes: 3 additions & 2 deletions src/components/right-sidebar/UploadMockup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
})
Expand Down Expand Up @@ -170,7 +171,7 @@ export default {

.file-content {
padding: 0em 1em 1em 1em;

}

.browser-btn {
Expand Down