Skip to content

Commit 093aecf

Browse files
lohanidamodarlohanidamodar
committed
Merge remote-tracking branch 'origin/main' into fix-add-payment-method
2 parents c9d9d7c + 05a4ae1 commit 093aecf

File tree

18 files changed

+132
-88
lines changed

18 files changed

+132
-88
lines changed

‎src/app.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<meta
66
name="description"
77
content="Appwrite is an open-source platform for building applications at any scale, using your preferred programming languages and tools." />
8-
<link rel="icon" type="image/svg+xml" href="/console/logos/appwrite-icon.svg" />
9-
<link rel="mask-icon" type="image/png" href="/console/logos/appwrite-icon.png" />
10-
<link rel="stylesheet" href="/console/css/loading.css" />
8+
<link rel="icon" type="image/svg+xml" href="%sveltekit.assets%/logos/appwrite-icon.svg" />
9+
<link rel="mask-icon" type="image/png" href="%sveltekit.assets%/logos/appwrite-icon.png" />
10+
<link rel="stylesheet" href="%sveltekit.assets%/css/loading.css" />
1111
<meta name="viewport" content="width=device-width, initial-scale=1" />
1212
%sveltekit.head%
1313
</head>
@@ -40,13 +40,13 @@
4040
<div></div>
4141
</div>
4242
<img
43-
src="/console/images/appwrite-logo-light.svg"
43+
src="%sveltekit.assets%/images/appwrite-logo-light.svg"
4444
width="120"
4545
height="22"
4646
class="logo-light"
4747
alt="Appwrite Logo" />
4848
<img
49-
src="/console/images/appwrite-logo-dark.svg"
49+
src="%sveltekit.assets%/images/appwrite-logo-dark.svg"
5050
width="120"
5151
height="22"
5252
class="logo-dark"

‎src/lib/components/billing/alerts/selectProjectCloud.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
let error = $state<string | null>(null);
2525
2626
onMount(() => {
27-
projects = page.data.projects?.projects || [];
27+
projects = page.data.allProjects?.projects || [];
2828
});
2929
3030
let projectsToArchive = $derived(

‎src/lib/stores/billing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const roles = [
6969

7070
export const teamStatusReadonly = 'readonly';
7171
export const billingLimitOutstandingInvoice = 'outstanding_invoice';
72-
export const billingProjectsLimitDate = '2024-09-01';
72+
export const billingProjectsLimitDate = '2025-09-01';
7373

7474
export const paymentMethods = derived(page, ($page) => $page.data.paymentMethods as PaymentList);
7575
export const addressList = derived(page, ($page) => $page.data.addressList as AddressesList);

‎src/routes/(console)/+layout.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
if (currentOrganizationId === org.$id) return;
298298
if (isCloud) {
299299
currentOrganizationId = org.$id;
300-
checkForProjectsLimit(org, data.projects?.projects?.length || 0);
300+
checkForProjectsLimit(org, data.allProjects?.projects?.length || 0);
301301
checkForEnterpriseTrial(org);
302302
await checkForUsageLimit(org);
303303
checkForMarkedForDeletion(org);

‎src/routes/(console)/+layout.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
5555
organizations,
5656
consoleVariables,
5757
version: versionData?.version ?? null,
58-
projects
58+
allProjects: projects
5959
};
6060
};
6161

‎src/routes/(console)/organization-[organization]/+page.svelte

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import { canWriteProjects } from '$lib/stores/roles';
2727
import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
2828
import { Badge, Icon, Typography, Alert, Tag, Tooltip } from '@appwrite.io/pink-svelte';
29+
import { isSmallViewport } from '$lib/stores/viewport';
2930
import {
3031
IconAndroid,
3132
IconApple,
@@ -129,7 +130,9 @@
129130
}
130131
131132
function formatName(name: string, limit: number = 19) {
132-
return name ? (name.length > limit ? `${name.slice(0, limit)}...` : name) : '-';
133+
const mobileLimit = 16;
134+
const actualLimit = $isSmallViewport ? mobileLimit : limit;
135+
return name ? (name.length > actualLimit ? `${name.slice(0, actualLimit)}...` : name) : '-';
133136
}
134137
135138
$: projectsToArchive = data.projects.projects.filter(
@@ -164,7 +167,7 @@
164167
</DropList>
165168
</div>
166169

167-
{#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && $canWriteProjects}
170+
{#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > 2 && $canWriteProjects}
168171
<Alert.Inline
169172
title={`${data.projects.total - data.organization.projects.length} projects will be archived on ${toLocaleDate(billingProjectsLimitDate)}`}>
170173
<Typography.Text>
@@ -219,6 +222,7 @@
219222
{#if isSetToArchive(project)}
220223
<Tag
221224
size="s"
225+
style="white-space: nowrap;"
222226
on:click={(event) => {
223227
event.preventDefault();
224228
showSelectProject = true;

‎src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
href={`${endpoint}/organizations/${page.params.organization}/invoices/${invoice.$id}/download`}>
162162
Download PDF
163163
</ActionMenu.Item.Anchor>
164-
{#if status === 'overdue' || status === 'failed'}
164+
{#if status === 'overdue' || status === 'failed' || status === 'abandoned'}
165165
<ActionMenu.Item.Button
166166
leadingIcon={IconRefresh}
167167
on:click={() => {

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@
6060
label="Services ID"
6161
autofocus={true}
6262
placeholder="com.company.appname"
63-
bind:value={appId} />
64-
<InputText id="keyID" label="Key ID" placeholder="SHAB13ROFN" bind:value={keyID} />
65-
<InputText id="teamID" label="Team ID" placeholder="ELA2CD3AED" bind:value={teamID} />
66-
<InputTextarea id="p8" label="P8 File" placeholder="" bind:value={p8} />
63+
bind:value={appId}
64+
required />
65+
<InputText id="keyID" label="Key ID" placeholder="SHAB13ROFN" bind:value={keyID} required />
66+
<InputText id="teamID" label="Team ID" placeholder="ELA2CD3AED" bind:value={teamID} required />
67+
<InputTextarea id="p8" label="P8 File" placeholder="" bind:value={p8} required />
6768
<Alert.Inline status="info">
6869
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
6970
</Alert.Inline>
@@ -73,10 +74,13 @@
7374
<svelte:fragment slot="footer">
7475
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7576
<Button
76-
disabled={(secret === provider.secret &&
77-
enabled === provider.enabled &&
78-
appId === provider.appId) ||
79-
!(appId && keyID && teamID && p8)}
77+
disabled={!appId ||
78+
!keyID ||
79+
!teamID ||
80+
!p8 ||
81+
(secret === provider.secret &&
82+
enabled === provider.enabled &&
83+
appId === provider.appId)}
8084
submit>Update</Button>
8185
</svelte:fragment>
8286
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,21 @@
5656
label="Client ID"
5757
autofocus={true}
5858
placeholder="Enter ID"
59-
bind:value={appId} />
59+
bind:value={appId}
60+
required />
6061
<InputPassword
6162
id="secret"
6263
label="Client Secret"
6364
placeholder="Enter Client Secret"
6465
minlength={0}
65-
bind:value={clientSecret} />
66+
bind:value={clientSecret}
67+
required />
6668
<InputText
6769
id="domain"
6870
label="Auth0 Domain"
69-
placeholder="Your Auth0 domain"
70-
bind:value={auth0Domain} />
71+
placeholder="your-tenant.auth0.com"
72+
bind:value={auth0Domain}
73+
required />
7174
<Alert.Inline status="info">
7275
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
7376
</Alert.Inline>
@@ -77,10 +80,12 @@
7780
<svelte:fragment slot="footer">
7881
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
7982
<Button
80-
disabled={(secret === provider.secret &&
81-
enabled === provider.enabled &&
82-
appId === provider.appId) ||
83-
!(appId && clientSecret && auth0Domain)}
83+
disabled={!appId ||
84+
!clientSecret ||
85+
!auth0Domain ||
86+
(secret === provider.secret &&
87+
enabled === provider.enabled &&
88+
appId === provider.appId)}
8489
submit>Update</Button>
8590
</svelte:fragment>
8691
</Modal>

‎src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,21 @@
6060
label="Client ID"
6161
autofocus={true}
6262
placeholder="Enter ID"
63-
bind:value={appId} />
63+
bind:value={appId}
64+
required />
6465
<InputPassword
6566
id="secret"
6667
label="Client Secret"
6768
placeholder="Enter Client Secret"
6869
minlength={0}
69-
bind:value={clientSecret} />
70+
bind:value={clientSecret}
71+
required />
7072
<InputText
7173
id="domain"
7274
label="Authentik Base-Domain"
7375
placeholder="Your Authentik domain"
74-
bind:value={authentikDomain} />
76+
bind:value={authentikDomain}
77+
required />
7578
<Alert.Inline status="info">
7679
To complete set up, add this OAuth2 redirect URI to your {provider.name} app configuration.
7780
</Alert.Inline>
@@ -81,10 +84,12 @@
8184
<svelte:fragment slot="footer">
8285
<Button secondary on:click={() => (provider = null)}>Cancel</Button>
8386
<Button
84-
disabled={(secret === provider.secret &&
85-
enabled === provider.enabled &&
86-
appId === provider.appId) ||
87-
!(appId && clientSecret && authentikDomain)}
87+
disabled={!appId ||
88+
!clientSecret ||
89+
!authentikDomain ||
90+
(secret === provider.secret &&
91+
enabled === provider.enabled &&
92+
appId === provider.appId)}
8893
submit>Update</Button>
8994
</svelte:fragment>
9095
</Modal>

0 commit comments

Comments
 (0)