From b0bb470162089bf1d964a03de0d0b059cc8f3aec Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 11 Nov 2024 15:26:24 +0100 Subject: [PATCH] feat: show on mobile modal --- src/lib/components/card.svelte | 8 +- src/lib/elements/forms/inputText.svelte | 1 + .../(components)/addCollaboratorModal.svelte | 82 +++++++++++++++++++ .../(components)/connectRepoModal.svelte | 11 +-- .../(components)/openOnMobileModal.svelte | 38 +++++++++ .../sites/create-site/finish/+page.svelte | 46 +++++++---- 6 files changed, 160 insertions(+), 26 deletions(-) create mode 100644 src/routes/(console)/project-[project]/sites/create-site/finish/(components)/addCollaboratorModal.svelte create mode 100644 src/routes/(console)/project-[project]/sites/create-site/finish/(components)/openOnMobileModal.svelte diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index c0d29e304..dbbc17085 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -33,18 +33,19 @@ export let style = ''; export let padding: $$Props['padding'] = 'm'; export let radius: $$Props['radius'] = 'm'; + export let variant: $$Props['variant'] = 'primary'; $: resolvedClasses = [!isTile && 'common-section', classes].filter(Boolean).join(' '); {#if href} - + {:else if isButton} - + @@ -55,7 +56,8 @@ {style} border={isDashed ? 'dashed' : 'solid'} {padding} - {radius}> + {radius} + {variant}> diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte index dba221fa7..4bacd646c 100644 --- a/src/lib/elements/forms/inputText.svelte +++ b/src/lib/elements/forms/inputText.svelte @@ -50,6 +50,7 @@ {maxlength} {label} {nullable} + {readonly} autofocus={autofocus || undefined} autocomplete={autocomplete ? 'on' : 'off'} helper={error} diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/addCollaboratorModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/addCollaboratorModal.svelte new file mode 100644 index 000000000..7639cc1a5 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/addCollaboratorModal.svelte @@ -0,0 +1,82 @@ + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte index 7a5b191ae..be20b2484 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/connectRepoModal.svelte @@ -74,7 +74,11 @@ }); - + {:else if repositoryBehaviour === 'new'} - {/if} diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/openOnMobileModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/openOnMobileModal.svelte new file mode 100644 index 000000000..90d67c59a --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/(components)/openOnMobileModal.svelte @@ -0,0 +1,38 @@ + + + + + + + QR code + + + + + copy(siteURL)} /> + + + + + + + diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte index f6fad3986..7a71b365e 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte @@ -13,10 +13,14 @@ import { humanFileSize } from '$lib/helpers/sizeConvertion'; import { calculateTime } from '$lib/helpers/timeConversion'; import ConnectRepoModal from './(components)/connectRepoModal.svelte'; + import OpenOnMobileModal from './(components)/openOnMobileModal.svelte'; export let data: PageData; let showConnectRepositry = false; + let showOpenOnMobile = false; + let showInviteCollaborator = false; + let showAddDomain = false; $: size = humanFileSize(data.deployment.buildSize); @@ -103,21 +107,23 @@ {#if !data.deployment.providerCommitHash} - (showConnectRepositry = true)}> - - - Connect to repository - + {#if !data.site.installationId} + (showConnectRepositry = true)}> + + + Connect to repository + + + + Connect to a new repository or an existing one. + - - Connect to a new repository or an existing one. - - - - + + {/if} + (showAddDomain = true)}> - + (showInviteCollaborator = true)}> - + (showOpenOnMobile = true)}> Close + href="{`${base}/project-${$page.params.project}/sites/site-${$page.params.site}`}}"> + Close + {#if showConnectRepositry} {/if} +{#if showOpenOnMobile} + +{/if}