feedback

immich-app · Jul 16, 2024 · 2ab18bf · 2ab18bf
1 parent f6ca688
commit 2ab18bf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 52 deletions.
diff --git a/apps/buy.immich.app/+layout.svelte b/apps/buy.immich.app/+layout.svelte
@@ -5,24 +5,6 @@
   // document.documentElement.classList.add('dark');
 </script>
 
-<svelte:head>
-  <title>Immich - Purchase License</title>
-  <meta name="theme-color" content="currentColor" />
-  <meta name="description" content="Buy a license to support Immich" />
-
-  <!-- Facebook Meta Tags -->
-  <meta property="og:type" content="website" />
-  <meta property="og:title" content="Immich Licenses" />
-  <meta property="og:description" content="Buy a license to support Immich" />
-  <meta property="og:image" content="/img/social-preview.png" />
-
-  <!-- Twitter Meta Tags -->
-  <meta name="twitter:card" content="summary_large_image" />
-  <meta name="twitter:title" content="Immich Licenses" />
-  <meta name="twitter:description" content="Buy a license to support Immich" />
-  <meta name="twitter:image" content="/img/social-preview.png" />
-</svelte:head>
-
 <section class="grid grid-rows-[auto_60px] h-auto lg:h-screen">
   <slot />
 

diff --git a/apps/buy.immich.app/+page.svelte b/apps/buy.immich.app/+page.svelte
@@ -11,17 +11,16 @@
   export let data: PageData;
 
   const redirectUrl = FUTO_ROUTES.paymentPortal;
-  const immichBuyBase = new URL('https://buy.immich.app');
+  const immichBuySuccess = new URL('https://buy.immich.app/success');
+  // const immichBuySuccess = new URL('http://10.1.15.216:5173/success');
   const isRedirecting = data.productId && data.instanceUrl;
 
   onMount(() => {
     if (data.productId && data.instanceUrl) {
-      console.log('Navigating to FUTO Pay');
-
-      immichBuyBase.searchParams.append('instanceUrl', data.instanceUrl);
+      immichBuySuccess.searchParams.append('instanceUrl', data.instanceUrl);
 
       redirectUrl.searchParams.append('product', data.productId);
-      redirectUrl.searchParams.append('success', immichBuyBase.href);
+      redirectUrl.searchParams.append('success', immichBuySuccess.href);
 
       setTimeout(() => {
         window.location.href = redirectUrl.href;

diff --git a/apps/buy.immich.app/+page.ts b/apps/buy.immich.app/+page.ts
@@ -1,4 +1,3 @@
-import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
 
 export const ssr = false;
@@ -11,21 +10,9 @@ enum ProductType {
 export const load = (async ({ url }) => {
   const productId = url.searchParams.get('productId') as ProductType;
   const instanceUrl = url.searchParams.get('instanceUrl') as string;
-  const orderId = url.searchParams.get('orderId') as string;
-
-  if (orderId && instanceUrl) {
-    // http://10.1.15.216:5173/?instanceUrl=http%3A%2F%2F10.1.15.216%3A2283&orderId=c945fba0-088b-479b-b6af-0ec23d632108
-
-    const successUrl = new URL(`/success`, url.href);
-    successUrl.searchParams.append('instanceUrl', instanceUrl);
-    successUrl.searchParams.append('orderId', orderId);
-
-    redirect(308, successUrl);
-  }
 
   return {
     productId,
     instanceUrl,
-    orderId,
   };
 }) satisfies PageLoad;
diff --git a/apps/buy.immich.app/success/+page.svelte b/apps/buy.immich.app/success/+page.svelte
@@ -3,10 +3,11 @@
   import LoadingSpinner from '$lib/components/loading-spinner.svelte';
   import { FUTO_ROUTES } from '$lib/utils/endpoints';
   import { mdiCheckCircleOutline } from '@mdi/js';
-  import type { PageData } from '../$types';
   import { onMount } from 'svelte';
   import { fade } from 'svelte/transition';
 
+  import type { PageData } from './$types';
+
   enum PurchaseStatus {
     Pending = -1,
     Failed = 0,
@@ -65,7 +66,8 @@
       }
 
       if (data.status === PurchaseStatus.Pending) {
-        console.log('Purchase is still pending');
+        paymentStatus = data.status;
+        clearTimers();
       }
     }
   };
@@ -82,20 +84,6 @@
 
 <svelte:head>
   <title>Immich - Purchase Success</title>
-  <meta name="theme-color" content="currentColor" />
-  <meta name="description" content="Buy a license to support Immich" />
-
-  <!-- Facebook Meta Tags -->
-  <meta property="og:type" content="website" />
-  <meta property="og:title" content="Immich Licenses" />
-  <meta property="og:description" content="Buy a license to support Immich" />
-  <meta property="og:image" content="/img/social-preview.png" />
-
-  <!-- Twitter Meta Tags -->
-  <meta name="twitter:card" content="summary_large_image" />
-  <meta name="twitter:title" content="Immich Licenses" />
-  <meta name="twitter:description" content="Buy a license to support Immich" />
-  <meta name="twitter:image" content="/img/social-preview.png" />
 </svelte:head>
 
 <div class="w-full h-full md:max-w-[900px] px-4 py-10 sm:px-20 lg:p-10 m-auto">
@@ -130,6 +118,10 @@
         <p>Getting payment status</p>
       {/if}
 
+      {#if paymentStatus === PurchaseStatus.Pending}
+        <p>Purchase is still pending, please check your email after a few minutes for the license key</p>
+      {/if}
+
       {#if paymentStatus === PurchaseStatus.Succeeded}
         <p class="text-xl font-bold">Success</p>
 

diff --git a/apps/buy.immich.app/success/+page.ts b/apps/buy.immich.app/success/+page.ts
@@ -3,6 +3,7 @@ import type { PageLoad } from './$types';
 export const load = (async ({ url }) => {
   const orderId = url.searchParams.get('orderId') as string;
   const instanceUrl = url.searchParams.get('instanceUrl') as string;
+
   return {
     orderId,
     instanceUrl,

diff --git a/src/lib/utils/endpoints.ts b/src/lib/utils/endpoints.ts
@@ -1,3 +1,4 @@
+// const FUTO_BASE_URL = 'https://futopay-test.azurewebsites.net';
 const FUTO_BASE_URL = 'https://pay.futo.org';
 
 export const FUTO_ROUTES = {