Skip to content
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

Jump to bottom

Better support for keyboard navigation #37

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Better support for keyboard navigation #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a764b64
rename button props
radek00 Oct 18, 2023
3b6cc63
use form submit
radek00 Oct 18, 2023
51ec7a0
remove console log
radek00 Oct 18, 2023
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
9 changes: 4 additions & 5 deletions SecureSend/ClientApp/src/components/StyledButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<template>
<button
type="submit"
class="text-white focus:ring-4 focus:enabled::outline-none font-medium rounded-lg text-sm px-5 py-2.5 text-center disabled:cursor-not-allowed disabled:bg-gray-700"
:class="{
'bg-blue-600 hover:enabled::bg-blue-700 focus:enabled:ring-blue-800 hover:enabled:bg-blue-800':
type === ButtonType.primary,
category === ButtonType.primary,
'bg-gray-800 hover:enabled:bg-gray-900 focus:enabled:ring-gray-700':
type === ButtonType.back,
category === ButtonType.back,
'bg-red-600 hover:bg-red-700 focus:ring-red-900':
type === ButtonType.cancel,
category === ButtonType.cancel,
}"
>
<slot>Submit</slot>
Expand All @@ -19,6 +18,6 @@
import { ButtonType } from "@/models/enums/ButtonType";

defineProps<{
type: ButtonType;
category: ButtonType;
}>();
</script>
2 changes: 1 addition & 1 deletion SecureSend/ClientApp/src/views/FileDownloadView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const isPasswordValidComputed = computed(
errorMessage="Invalid password"
></SimpleInput>
</div>
<StyledButton @click="verifyPassword()" :type="ButtonType.primary"
<StyledButton @click="verifyPassword()" :category="ButtonType.primary"
>Unlock</StyledButton
>
</div>
Expand Down
19 changes: 10 additions & 9 deletions SecureSend/ClientApp/src/views/FileUploadView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div
<form
@submit="onSubmit"
class="w-11/12 lg:w-6/12 flex flex-col justify-between gap-4 h-11/12 p-6 border rounded-lg shadow bg-gray-800 border-gray-800"
>
<FormStepper class="px-[10px]" :step="step"></FormStepper>
Expand All @@ -12,7 +13,6 @@
:style="{ transform }"
>
<SchemaInput
@keyup.enter="onSubmit"
name="password"
type="password"
label="Encryption password"
Expand All @@ -30,7 +30,6 @@
>
<SchemaInput
:tabindex="step !== 1 ? -1 : 0"
@keyup.enter="onSubmit"
name="expiryDate"
type="date"
label="Expiry date"
Expand Down Expand Up @@ -61,25 +60,27 @@
>
<div class="flex gap-3 flex-col md:flex-row w-full md:w-auto md:gap-2">
<StyledButton
type="button"
class="w-full md:w-auto"
:type="ButtonType.primary"
:category="ButtonType.primary"
:disabled="step === 0 || isLoading || isUploadSetup"
@click="step -= 1"
>Back</StyledButton
>
<StyledButton
type="button"
:disabled="(step === 0 && !meta.dirty) || isLoading"
:type="ButtonType.cancel"
:category="ButtonType.cancel"
class="w-full md:w-auto"
@click="formReset()"
>Reset</StyledButton
>
</div>
<StyledButton
class="w-full md:w-auto"
:type="ButtonType.primary"
:category="ButtonType.primary"
:disabled="!meta.valid || isLoading"
@click="onSubmit()"
type="submit"
>
<span class="flex items-center justify-center">
{{ step < 2 ? "Next" : "Upload" }}
Expand All @@ -90,7 +91,7 @@
</span>
</StyledButton>
</div>
</div>
</form>
<ConfirmModalVue v-if="isRevealed" @close-click="confirm(true)">
<template #header>Share your files</template>
<template #body>
Expand All @@ -101,7 +102,7 @@
></SimpleInput>
</template>
<template #footer>
<StyledButton @click="copyToClipboard()" :type="ButtonType.primary"
<StyledButton @click="copyToClipboard()" :category="ButtonType.primary"
>Copy to clipboard</StyledButton
>
</template>
Expand Down
Loading