Skip to content

Commit 87026cc

Browse files
ArmanNikArmanNik
committed
fix: backend changes
1 parent ceb820f commit 87026cc

File tree

7 files changed

+92
-103
lines changed

7 files changed

+92
-103
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"e2e:ui": "playwright test tests/e2e --ui"
2020
},
2121
"dependencies": {
22-
"@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ae1eb53",
22+
"@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@d13e864",
2323
"@appwrite.io/pink-icons": "0.25.0",
2424
"@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@35f29290",
2525
"@appwrite.io/pink-legacy": "^1.0.1",

‎pnpm-lock.yaml

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/elements/selectSearchCheckbox.svelte

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@
99
<ActionMenu.Item.Button on:click>
1010
<Layout.Stack direction="row" gap="xs" alignItems="center">
1111
<InputCheckbox bind:checked={value} id="filter" size="s" />
12-
<!-- <button
13-
class="drop-button u-flex u-cross-center u-gap-12"
14-
style:--button-padding-horizontal={padding ? `${padding / 16}rem` : ''}
15-
style:--button-padding-vertical={padding ? `${padding / 16}rem` : ''}
16-
on:click|preventDefault
17-
type="button">
18-
</button> -->
12+
1913
<slot />
2014
</Layout.Stack>
2115
</ActionMenu.Item.Button>

‎src/routes/(console)/project-[project]/sites/create-site/domain.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
try {
1717
await sdk.forConsole.console.getResource(
1818
`${value}.${$consoleVariables._APP_DOMAIN_SITES}`,
19-
Type.Rules
19+
'rules' as unknown as Type //TODO: fix after Matej fixes backend
2020
);
2121
2222
domainIsValid = true;

‎src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte

+77-82
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
<Wizard column href={`${base}/project-${$page.params.project}/sites/site-${data.site.$id}`}>
3535
<!-- Creating a new stack -->
3636
<div style:position="relative" style="z-index: 1;">
37-
<Layout.Stack gap="xxl">
38-
<!-- TODO: switch to xxxl -->
39-
<Layout.Stack gap="xxl">
37+
<Layout.Stack gap="xxxl">
38+
<Layout.Stack gap="xxxl">
4039
<Layout.Stack gap="l" direction="column" alignItems="center">
4140
<Check />
4241
<Layout.Stack gap="xs" direction="column" alignItems="center">
@@ -58,105 +57,101 @@
5857
<div style="margin-block-start: var(--gap-xxl);">
5958
<Step.List>
6059
<Step.Item state="current" shortLine={true}>
61-
{#if !data.deployment.providerCommitHash}
62-
<Layout.Stack direction="row" gap="l">
63-
{#if !data.site.installationId && !data.site.providerRepositoryId}
64-
<Card
65-
isTile
66-
radius="s"
67-
padding="s"
68-
isButton
69-
on:click={() => (showConnectRepositry = true)}>
70-
<Layout.Stack gap="s">
71-
<Layout.Stack
72-
direction="row"
73-
justifyContent="space-between"
74-
alignItems="center">
75-
<Typography.Title size="s">
76-
Connect to repository
77-
</Typography.Title>
78-
<Icon
79-
icon={IconArrowSmRight}
80-
size="l"
81-
color="--color-fgcolor-neutral-weak" />
82-
</Layout.Stack>
83-
<Typography.Text variant="m-400">
84-
Connect to a new repository or an existing one.
85-
</Typography.Text>
86-
</Layout.Stack>
87-
</Card>
88-
{/if}
60+
<Layout.Stack direction="row" gap="l">
61+
{#if !data.site.installationId && !data.site.providerRepositoryId}
8962
<Card
9063
isTile
9164
radius="s"
9265
padding="s"
93-
href={`${base}/project-${$page.params.project}/sites/site-${data.site.$id}/domains`}>
94-
<Layout.Stack gap="s">
95-
<Layout.Stack
96-
direction="row"
97-
justifyContent="space-between"
98-
alignItems="center">
99-
<Typography.Title size="s">Add domain</Typography.Title>
100-
<Icon
101-
icon={IconArrowSmRight}
102-
size="l"
103-
color="--color-fgcolor-neutral-weak" />
104-
</Layout.Stack>
105-
<Typography.Text variant="m-400">
106-
Connect to an existing domain or purchase a new one.
107-
</Typography.Text>
108-
</Layout.Stack>
109-
</Card>
110-
<Card
111-
isTile
112-
radius="s"
11366
isButton
114-
padding="s"
115-
on:click={() => (showInviteCollaborator = true)}>
67+
on:click={() => (showConnectRepositry = true)}>
11668
<Layout.Stack gap="s">
11769
<Layout.Stack
11870
direction="row"
11971
justifyContent="space-between"
12072
alignItems="center">
121-
<Typography.Title size="s"
122-
>Add collaborators</Typography.Title>
73+
<Typography.Title size="s">
74+
Connect to repository
75+
</Typography.Title>
12376
<Icon
12477
icon={IconArrowSmRight}
12578
size="l"
12679
color="--color-fgcolor-neutral-weak" />
12780
</Layout.Stack>
12881
<Typography.Text variant="m-400">
129-
Share your progress and start collaborating with your
130-
team.
82+
Connect to a new repository or an existing one.
13183
</Typography.Text>
13284
</Layout.Stack>
13385
</Card>
134-
<Card
135-
isTile
136-
radius="s"
137-
isButton
138-
padding="s"
139-
on:click={() => (showOpenOnMobile = true)}>
140-
<Layout.Stack gap="s">
141-
<Layout.Stack
142-
direction="row"
143-
justifyContent="space-between"
144-
alignItems="center">
145-
<Typography.Title size="s"
146-
>Open on mobile</Typography.Title>
147-
<Icon
148-
icon={IconArrowSmRight}
149-
size="l"
150-
color="--color-fgcolor-neutral-weak" />
151-
</Layout.Stack>
152-
<Typography.Text variant="m-400">
153-
Open the preview of your site on any mobile or tablet
154-
device.
155-
</Typography.Text>
86+
{/if}
87+
<Card
88+
isTile
89+
radius="s"
90+
padding="s"
91+
href={`${base}/project-${$page.params.project}/sites/site-${data.site.$id}/domains`}>
92+
<Layout.Stack gap="s">
93+
<Layout.Stack
94+
direction="row"
95+
justifyContent="space-between"
96+
alignItems="center">
97+
<Typography.Title size="s">Add domain</Typography.Title>
98+
<Icon
99+
icon={IconArrowSmRight}
100+
size="l"
101+
color="--color-fgcolor-neutral-weak" />
156102
</Layout.Stack>
157-
</Card>
158-
</Layout.Stack>
159-
{/if}
103+
<Typography.Text variant="m-400">
104+
Connect to an existing domain or purchase a new one.
105+
</Typography.Text>
106+
</Layout.Stack>
107+
</Card>
108+
<Card
109+
isTile
110+
radius="s"
111+
isButton
112+
padding="s"
113+
on:click={() => (showInviteCollaborator = true)}>
114+
<Layout.Stack gap="s">
115+
<Layout.Stack
116+
direction="row"
117+
justifyContent="space-between"
118+
alignItems="center">
119+
<Typography.Title size="s"
120+
>Add collaborators</Typography.Title>
121+
<Icon
122+
icon={IconArrowSmRight}
123+
size="l"
124+
color="--color-fgcolor-neutral-weak" />
125+
</Layout.Stack>
126+
<Typography.Text variant="m-400">
127+
Share your progress and start collaborating with your team.
128+
</Typography.Text>
129+
</Layout.Stack>
130+
</Card>
131+
<Card
132+
isTile
133+
radius="s"
134+
isButton
135+
padding="s"
136+
on:click={() => (showOpenOnMobile = true)}>
137+
<Layout.Stack gap="s">
138+
<Layout.Stack
139+
direction="row"
140+
justifyContent="space-between"
141+
alignItems="center">
142+
<Typography.Title size="s">Open on mobile</Typography.Title>
143+
<Icon
144+
icon={IconArrowSmRight}
145+
size="l"
146+
color="--color-fgcolor-neutral-weak" />
147+
</Layout.Stack>
148+
<Typography.Text variant="m-400">
149+
Open the preview of your site on any mobile or tablet
150+
device.
151+
</Typography.Text>
152+
</Layout.Stack>
153+
</Card>
154+
</Layout.Stack>
160155
</Step.Item>
161156
</Step.List>
162157
</div>

‎src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte

+5-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import Details from '../../details.svelte';
1616
import ProductionBranch from '../../productionBranch.svelte';
1717
import Aside from '../../aside.svelte';
18-
import { BuildRuntime, Framework, ID, Query, ResourceType } from '@appwrite.io/console';
18+
import { BuildRuntime, Framework, ID, Query, ResourceType, Type } from '@appwrite.io/console';
1919
import type { Models } from '@appwrite.io/console';
2020
import { onMount } from 'svelte';
2121
import Configuration from '../../configuration.svelte';
@@ -113,12 +113,11 @@
113113
);
114114
await Promise.all(promises);
115115
116-
const deployment = await sdk.forProject.sites.createTemplateDeployment(
116+
const deployment = await sdk.forProject.sites.createVcsDeployment(
117117
site.$id,
118-
data.repository.id,
119-
undefined, //TODO: fix once matej is back
120-
rootDir,
121-
undefined //TODO: fix once matej is back
118+
Type.Branch,
119+
branch,
120+
true
122121
);
123122
124123
trackEvent(Submit.SiteCreate, {

‎src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte

+2-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@
165165
data.template.providerRepositoryId || undefined,
166166
data.template.providerOwner || undefined,
167167
framework.providerRootDirectory || undefined,
168-
data.template.providerVersion || undefined
168+
data.template.providerVersion || undefined,
169+
true
169170
);
170171
171172
trackEvent(Submit.SiteCreate, {

0 commit comments

Comments
 (0)