Merge remote-tracking branch 'origin/main' into poc-invoice-cycle-ref

appwrite · Jan 26, 2025 · 4fbd814 · 4fbd814
2 parents acb814b + 2125ba9
commit 4fbd814
Show file tree

Hide file tree

Showing 15 changed files with 200 additions and 182 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,8 +17,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ vars.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5
@@ -54,8 +54,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ vars.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5
@@ -90,8 +90,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ vars.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "1.4.6",
+        "@appwrite.io/console": "1.4.7",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/components/billing/planComparisonBox.svelte b/src/lib/components/billing/planComparisonBox.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { BillingPlan } from '$lib/constants';
     import { formatNum } from '$lib/helpers/string';
-    import { plansInfo, tierFree, tierPro, type Tier } from '$lib/stores/billing';
+    import { plansInfo, tierFree, tierPro, tierScale, type Tier } from '$lib/stores/billing';
     import { Card, SecondaryTabs, SecondaryTabsItem } from '..';
 
     let selectedTab: Tier = BillingPlan.FREE;
@@ -23,11 +23,11 @@
                 on:click={() => (selectedTab = BillingPlan.PRO)}>
                 {tierPro.name}
             </SecondaryTabsItem>
-            <!-- <SecondaryTabsItem
+            <SecondaryTabsItem
                 disabled={selectedTab === BillingPlan.SCALE}
                 on:click={() => (selectedTab = BillingPlan.SCALE)}>
                 {tierScale.name}
-            </SecondaryTabsItem> -->
+            </SecondaryTabsItem>
         </SecondaryTabs>
     </div>
 
@@ -109,7 +109,7 @@
             <p class="u-margin-block-start-8">Everything in the Pro plan, plus:</p>
             <ul class="un-order-list u-margin-inline-start-4">
                 <li>Unlimited seats</li>
-                <li>Organization roles <span class="inline-tag">Coming soon</span></li>
+                <li>Organization roles</li>
                 <li>SOC-2, HIPAA compliance</li>
                 <li>SSO <span class="inline-tag">Coming soon</span></li>
                 <li>Priority support</li>

diff --git a/src/lib/elements/flag.svelte b/src/lib/elements/flag.svelte
@@ -12,7 +12,7 @@
 
     export function getFlag(country: string, width: number, height: number, quality: number) {
         if (!isValueOfStringEnum(Flag, country)) return '';
-        let flag = sdk.forProject.avatars
+        let flag = sdk.forConsole.avatars
             .getFlag(country, width * 2, height * 2, quality)
             ?.toString();
         flag?.includes('&project=')

diff --git a/src/lib/helpers/pricingRedirect.ts b/src/lib/helpers/pricingRedirect.ts
@@ -4,10 +4,21 @@ import { base } from '$app/paths';
 export function checkPricingRefAndRedirect(searchParams: URLSearchParams, shouldRegister = false) {
     if (searchParams.has('type')) {
         const paramType = searchParams.get('type');
+        const hasPlan = searchParams.has('plan');
+        if (paramType === 'create') {
+            shouldRegister
+                ? goto(
+                      `${base}/register?type=create${hasPlan ? `&plan=${searchParams.get('plan')}` : ''}`
+                  )
+                : goto(
+                      `${base}/create-organization?type=create${hasPlan ? `&plan=${searchParams.get('plan')}` : ''}`
+                  );
+        }
+        //Legacy
         if (paramType === 'createPro') {
             shouldRegister
-                ? goto(`${base}/register?type=createPro`)
-                : goto(`${base}/create-organization?type=createPro`);
+                ? goto(`${base}/register?type=create&plan=tier-1`)
+                : goto(`${base}/create-organization?type=create&plan=tier-1`);
         }
     }
 }
diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
@@ -129,7 +129,7 @@
                     <Pill button on:click={() => (showDropdown = !showDropdown)}>
                         <span class="icon-info" />{total}/{limit} created
                     </Pill>
-                {:else}
+                {:else if $organization?.billingPlan !== BillingPlan.SCALE}
                     <Pill button on:click={() => (showDropdown = !showDropdown)}>
                         <span class="icon-info" />Limits applied
                     </Pill>

diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
@@ -175,7 +175,7 @@ export type TierData = {
 
 export const tierFree: TierData = {
     name: 'Free',
-    description: 'For personal hobby projects of small scale and students.'
+    description: 'A great fit for passion projects and small applications.'
 };
 
 export const tierGitHubEducation: TierData = {
@@ -185,11 +185,13 @@ export const tierGitHubEducation: TierData = {
 
 export const tierPro: TierData = {
     name: 'Pro',
-    description: 'For pro developers and production projects that need the ability to scale.'
+    description:
+        'For production applications that need powerful functionality and resources to scale.'
 };
 export const tierScale: TierData = {
     name: 'Scale',
-    description: 'For scaling teams and agencies that need dedicated support.'
+    description:
+        'For teams that handle more complex and large projects and need more control and support.'
 };
 
 export const tierCustom: TierData = {

diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
@@ -61,8 +61,7 @@ function createPreferences() {
 
         getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
             return (
-                preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ??
-                null
+                preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ?? []
             );
         },
         setLimit: (limit: Preferences['limit']) =>

diff --git a/src/routes/(console)/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte
@@ -33,11 +33,11 @@
               {
                   value: BillingPlan.PRO,
                   label: `${tierToPlan(BillingPlan.PRO).name} - ${formatCurrency($plansInfo.get(BillingPlan.PRO).price)} / month + add-ons`
+              },
+              {
+                  value: BillingPlan.SCALE,
+                  label: `${tierToPlan(BillingPlan.SCALE).name} - ${formatCurrency($plansInfo.get(BillingPlan.SCALE).price)}/month + usage`
               }
-              // {
-              //     value: BillingPlan.SCALE,
-              //     label: `${tierToPlan(BillingPlan.SCALE).name} - ${formatCurrency($plansInfo.get(BillingPlan.SCALE).price)}/month + usage`
-              // }
           ]
         : [];