Skip to content

Commit

Permalink
fix: UI improved
Browse files Browse the repository at this point in the history
  • Loading branch information
ylc395 committed Dec 3, 2021
1 parent feec349 commit c00c747
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
30 changes: 17 additions & 13 deletions src/driver/webview/app/Publisher/GeneratingModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,23 @@ export default defineComponent({
</div>
</template>
<template #extra>
<Button v-if="progress.result" @click="reset">Confirm</Button>
<Button v-if="progress.result === 'success'" @click="preview">Preview</Button>
<Button
v-if="progress.result === 'success' && isGithubInfoValid"
type="primary"
@click="publish"
>Publish</Button
>
<Button
v-if="progress.result === 'success' && !isGithubInfoValid"
@click="switchToGithubTab"
>Edit Github information</Button
>
<div>
<div
v-if="progress.result === 'success'"
class="flex justify-between mx-auto w-72 mb-3"
>
<Button class="flex-grow mr-2" type="primary" @click="preview">Preview</Button>
<Button v-if="isGithubInfoValid" class="flex-grow" type="primary" @click="publish"
>Publish</Button
>
<Button v-else class="flex-grow" type="primary" @click="switchToGithubTab"
>Edit Github information</Button
>
</div>
<Button v-if="progress.result" block class="mx-auto w-72" @click="reset"
>Confirm</Button
>
</div>
</template>
</Result>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/driver/webview/app/Publisher/PreviewModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ export default defineComponent({
components: { Modal, Result, Button },
setup() {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const { publish } = inject(publishToken)!;
const { publish, isGithubInfoValid } = inject(publishToken)!;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const { startPreviewing, port, message, reset } = inject(previewToken)!;
return {
modalProps: useModalProps(),
isGithubInfoValid,
startPreviewing,
port,
message,
Expand Down Expand Up @@ -44,7 +45,7 @@ export default defineComponent({
</template>
<template #extra>
<Button @click="reset">Confirm</Button>
<Button v-if="port" type="primary" @click="publish">Publish</Button>
<Button v-if="port && isGithubInfoValid" type="primary" @click="publish">Publish</Button>
</template>
</Result>
</Modal>
Expand Down

0 comments on commit c00c747

Please sign in to comment.