mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
Merge branch '1.4.x' into design-reviews-1.4
This commit is contained in:
commit
047ff8721d
6 files changed
+12
-21
No files matched your search
@@ -20,7 +20,7 @@
|
||||
const resources = migrationFormToResources($formData);
|
||||
if ($provider.provider !== 'appwrite') return;
|
||||
|
||||
await getSdkForProject($selectedProject).migrations.migrateAppwrite(
|
||||
await getSdkForProject($selectedProject).migrations.createAppwriteMigration(
|
||||
resources,
|
||||
$provider.endpoint,
|
||||
$provider.projectID,
|
||||
@@ -46,4 +46,4 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<Wizard title="Create Project" {steps} on:exit={onExit} on:finish={onFinish} />
|
||||
<Wizard title="Create Migration" {steps} on:exit={onExit} on:finish={onFinish} />
|
||||
@@ -85,7 +85,7 @@
|
||||
<div class="u-margin-block-start-24">
|
||||
<Alert
|
||||
isStandalone
|
||||
dismissible
|
||||
dismissible={false}
|
||||
type="info"
|
||||
buttons={[
|
||||
{
|
||||
|
||||
@@ -151,17 +151,11 @@
|
||||
required
|
||||
placeholder="Enter host"
|
||||
bind:value={$provider.host} />
|
||||
<InputNumber
|
||||
id="port"
|
||||
label="Port"
|
||||
required
|
||||
placeholder="Enter port"
|
||||
bind:value={$provider.port} />
|
||||
<InputNumber id="port" label="Port" placeholder="5432" bind:value={$provider.port} />
|
||||
<InputText
|
||||
id="username"
|
||||
label="Username"
|
||||
required
|
||||
placeholder="Enter username"
|
||||
placeholder="postgres"
|
||||
bind:value={$provider.username} />
|
||||
<InputPassword
|
||||
id="password"
|
||||
@@ -203,14 +197,12 @@
|
||||
<InputText
|
||||
id="database"
|
||||
label="Database"
|
||||
required
|
||||
placeholder="Enter database"
|
||||
placeholder={$provider.subdomain || 'Enter database'}
|
||||
bind:value={$provider.database} />
|
||||
<InputText
|
||||
id="username"
|
||||
label="Username"
|
||||
required
|
||||
placeholder="Enter username"
|
||||
placeholder="postgres"
|
||||
bind:value={$provider.username} />
|
||||
<InputPassword
|
||||
id="password"
|
||||
|
||||
@@ -40,9 +40,9 @@
|
||||
$provider.endpoint,
|
||||
$provider.apiKey,
|
||||
$provider.host,
|
||||
$provider.username,
|
||||
$provider.username || 'postgres',
|
||||
$provider.password,
|
||||
$provider.port
|
||||
$provider.port || 5432
|
||||
);
|
||||
|
||||
invalidate(Dependencies.MIGRATIONS);
|
||||
@@ -67,8 +67,8 @@
|
||||
$provider.subdomain,
|
||||
$provider.region,
|
||||
$provider.adminSecret,
|
||||
$provider.database,
|
||||
$provider.username,
|
||||
$provider.database || $provider.subdomain,
|
||||
$provider.username || 'postgres',
|
||||
$provider.password
|
||||
);
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ async function getFirebaseProjects() {
|
||||
const res = await sdk.forProject.migrations.listFirebaseProjects();
|
||||
return res.projects;
|
||||
} catch (e) {
|
||||
if (e.code === 401) {
|
||||
if (e.type === 'user_identity_not_found') {
|
||||
return [];
|
||||
} else {
|
||||
throw e;
|
||||
|
||||
@@ -110,7 +110,6 @@
|
||||
id="endpoint"
|
||||
placeholder="https://[YOUR_APPWRITE_HOSTNAME]"
|
||||
autofocus
|
||||
value="http://localhost:3000/"
|
||||
on:input={(e) => {
|
||||
if (!submitted) return;
|
||||
const input = e.target;
|
||||
|
||||
Reference in new issue
Block a user