Merge pull request #53 from meceware/dev

v1.2.2

Author: meceware

.github/workflows/docker-build.yml

@@ -28,6 +28,10 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          # Improve network reliability for ARM builds
+          driver-opts: |
+            network=host
 
       - name: Log in to GitHub Container Registry
         uses: docker/#-action@v3
@@ -58,4 +62,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          network: host
+          allow: network.host

src/app/account/account-container.js

@@ -60,8 +60,12 @@ const TimezoneManager = ({ user }) => {
     try {
       setLoading(true);
       setSelectedTimezone(value);
-      await UserUpdateTimezone(value);
-      toast.success('Timezone updated successfully');
+      const { success } = await UserUpdateTimezone(value);
+      if (success) {
+        toast.success('Timezone updated successfully');
+      } else {
+        toast.error('Failed to update timezone');
+      }
     } catch (error) {
       toast.error('Failed to update timezone');
     } finally {
@@ -85,8 +89,12 @@ const CurrencyManager = ({ user }) => {
     try {
       setLoading(true);
       setSelectedCurrency(currency);
-      await UserUpdateCurrency(currency);
-      toast.success('Currency updated successfully');
+      const { success } = await UserUpdateCurrency(currency);
+      if (success) {
+        toast.success('Currency updated successfully');
+      } else {
+        toast.error('Failed to update currency');
+      }
     } catch (error) {
       toast.error('Failed to update currency');
     } finally {
@@ -128,8 +136,12 @@ const NotificationManager  = ({user}) => {
       setLoading(true);
       const validated = SchemaUserNotifications.parse(notifications);
       if (!validated) throw new Error('Invalid notifications data');
-      await UserUpdateNotifications(notifications);
-      toast.success('Notification preferences saved');
+      const { success } = await UserUpdateNotifications(notifications);
+      if (success) {
+        toast.success('Notification preferences saved');
+      } else {
+        toast.error('Failed to save notification preferences');
+      }
     } catch (error) {
       toast.error('Failed to save notification preferences');
     } finally {
@@ -165,9 +177,13 @@ const UserProfile = ({ user }) => {
     if (loading) return;
     try {
       setLoading(true);
-      await UserUpdateName(name);
-      setIsEditing(false);
-      toast.success('Your name has been updated successfully.');
+      const { success } = await UserUpdateName(name);
+      if (success) {
+        setIsEditing(false);
+        toast.success('Your name has been updated successfully.');
+      } else {
+        toast.error('Failed to update your name!');
+      }
     } catch (error) {
       toast.error('Failed to update your name!');
     } finally {

src/app/account/actions.js

@@ -134,14 +134,20 @@ export const UserUpdateTimezone = async (timezone) => {
     throw new Error('Invalid timezone data');
   }
 
-  return await prisma.user.update({
+  const updated = await prisma.user.update({
     where: {
       id: session.user.id,
     },
     data: {
       timezone: validatedData,
     }
   });
+
+  if (!updated) {
+    return { success: false, timezone: validatedData };
+  }
+
+  return { success: true, timezone: updated.timezone };
 };
 
 export const UserUpdateCurrency = async (currency) => {
@@ -155,14 +161,20 @@ export const UserUpdateCurrency = async (currency) => {
     throw new Error('Invalid currency data');
   }
 
-  return await prisma.user.update({
+  const updated = await prisma.user.update({
     where: {
       id: session.user.id,
     },
     data: {
       currency: validatedData,
     }
   });
+
+  if (!updated) {
+    return { success: false, currency: validatedData };
+  }
+
+  return { success: true, currency: updated.currency };
 };
 
 export const UserUpdateNotifications = async (notifications) => {
@@ -176,7 +188,7 @@ export const UserUpdateNotifications = async (notifications) => {
     throw new Error('Invalid notifications data');
   }
 
-  return await prisma.user.update({
+  const updated = await prisma.user.update({
     where: {
       id: session.user.id,
     },
@@ -192,6 +204,12 @@ export const UserUpdateNotifications = async (notifications) => {
       }),
     }
   });
+
+  if (!updated) {
+    return { success: false, notifications: validatedData };
+  }
+
+  return { success: true, notifications: updated.notifications };
 };
 
 export const UserUpdateName = async (name) => {
@@ -205,14 +223,20 @@ export const UserUpdateName = async (name) => {
     throw new Error('Invalid name data');
   }
 
-  return await prisma.user.update({
+  const updated = await prisma.user.update({
     where: {
       id: session.user.id,
     },
     data: {
       name: validatedData,
     }
   });
+
+  if (!updated) {
+    return { success: false, name: validatedData };
+  }
+
+  return { success: true, name: updated.name };
 };
 
 export const UserExportData = async () => {

src/app/account/page.js

@@ -8,7 +8,7 @@ import { paddleGetStatus } from '@/lib/paddle/status';
 import { paddleGetSession } from '@/lib/paddle/status';
 
 const PageAccount = async () => {
-  const { userWithoutId, paddleStatus } = await paddleGetSession();
+  const { user, paddleStatus } = await paddleGetSession();
 
   // const paddleCustomer = await paddleGetCustomer(user.id);
   // console.log('paddleCustomer', paddleCustomer);
@@ -20,7 +20,7 @@ const PageAccount = async () => {
   return (
     <div className='container flex flex-col items-center justify-center gap-6 text-center'>
       <AccountSettings
-        user={userWithoutId}
+        user={user}
         paddleStatus={paddleStatus}
      />
     </div>

src/app/edit/[slug]/page.js

@@ -10,9 +10,9 @@ import { SubscriptionGuard } from '@/components/subscription-guard';
 
 const PageSubscriptionEdit = async ({ params }) => {
   const slug = (await params).slug;
-  const { user, userWithoutId, paddleStatus } = await paddleGetSession();
+  const { session, user, paddleStatus } = await paddleGetSession();
 
-  const subscription = await SubscriptionGet(slug, user.id);
+  const subscription = await SubscriptionGet(slug, session?.user?.id);
   if (!subscription) {
     return notFound();
   }
@@ -24,7 +24,7 @@ const PageSubscriptionEdit = async ({ params }) => {
   return (
     <SubscriptionGuard paddleStatus={paddleStatus}>
       <div className='container flex flex-col items-center justify-center gap-6 text-center'>
-        <SubscriptionEdit user={userWithoutId} subscription={ subscription } />
+        <SubscriptionEdit user={user} subscription={ subscription } />
       </div>
     </SubscriptionGuard>
   )

src/app/edit/new/page.js

@@ -6,12 +6,12 @@ import { paddleGetSession } from '@/lib/paddle/status';
 import { SubscriptionGuard } from '@/components/subscription-guard';
 
 const PageNewSubscription = async () => {
-  const { userWithoutId, paddleStatus } = await paddleGetSession();
+  const { user, paddleStatus } = await paddleGetSession();
 
   return (
     <SubscriptionGuard paddleStatus={paddleStatus}>
       <div className='container flex flex-col items-center justify-center gap-6 text-center'>
-        <SubscriptionEdit user={userWithoutId} />
+        <SubscriptionEdit user={user} />
       </div>
     </SubscriptionGuard>
   )

src/app/layout.js

@@ -90,12 +90,80 @@ export const viewport = {
   initialScale: 1,
 };
 
+const jsonLd = {
+  '@context': 'https://schema.org',
+  '@type': 'SoftwareApplication',
+  '@id': `${siteConfig.url}/#software`,
+  'name': siteConfig.name,
+  'description': siteConfig.description,
+  'applicationCategory': 'FinanceApplication',
+  'operatingSystem': 'Web',
+  'url': siteConfig.url,
+  'offers': [
+    {
+      '@type': 'Offer',
+      'name': 'Premium Plan',
+      'category': 'SubscriptionPlan',
+      'price': '1.50',
+      'priceCurrency': 'EUR',
+      'availability': 'https://schema.org/InStock',
+      'priceValidUntil': `${(new Date()).getFullYear()}-12-31`,
+      'seller': {
+        '@type': 'Organization',
+        'name': siteConfig.author.name,
+        'url': siteConfig.author.url
+      }
+    },
+    {
+      '@type': 'Offer',
+      'name': 'Self-Hosted Edition',
+      'price': '0',
+      'priceCurrency': 'EUR',
+      'availability': 'https://schema.org/InStock',
+      'seller': {
+        '@type': 'Organization',
+        'name': siteConfig.author.name,
+        'url': siteConfig.author.url
+      }
+    }
+  ],
+  'featureList': [
+    'Subscription tracking',
+    'Payment reminders',
+    'Multi-currency support',
+    'Expense analytics',
+    'Timezone support',
+    'Push notifications',
+    'Email notifications',
+  ],
+  'screenshot': `${siteConfig.url}/images/og.png`,
+  'softwareVersion': '1.0',
+  'datePublished': '2025-02-25',
+  'keywords': siteConfig.keywords,
+  'author': {
+    '@type': 'Organization',
+    'name': siteConfig.author.name,
+    'url': siteConfig.author.url
+  },
+  'provider': {
+    '@type': 'Organization',
+    'name': siteConfig.author.name,
+    'url': siteConfig.author.url
+  }
+};
+
 // Root Layout
 export default async function RootLayout({ children }) {
   const session = await auth();
 
   return (
     <html lang='en' suppressHydrationWarning>
+      <head>
+        <script
+          type='application/ld+json'
+          dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
+        />
+      </head>
       <body className={`${inter.className} antialiased`}>
         <SessionProvider session={session}>
           <ThemeProvider attribute='class' defaultTheme='system' enableSystem disableTransitionOnChange>

src/app/reports/page.js

@@ -7,21 +7,28 @@ import { paddleGetSession } from '@/lib/paddle/status';
 import { SubscriptionGuard } from '@/components/subscription-guard';
 
 const PageReports = async () => {
-  const { user, paddleStatus } = await paddleGetSession();
+  const { session, paddleStatus } = await paddleGetSession();
 
   const subscriptions = await prisma.subscription.findMany({
     where: {
-      userId: user.id,
+      userId: session?.user?.id,
     },
     include: {
       categories: {
         select: {
-          id: true,
           name: true,
           color: true
         }
       }
     },
+    omit: {
+      userId: true,
+      createdAt: true,
+      updatedAt: true,
+      nextNotificationTime: true,
+      nextNotificationDetails: true,
+      notes: true,
+    },
     orderBy: {
       paymentDate: 'asc'
     }
@@ -30,7 +37,7 @@ const PageReports = async () => {
   return (
     <SubscriptionGuard paddleStatus={paddleStatus}>
       <div className='flex flex-col items-center w-full max-w-3xl gap-4'>
-        <SubscriptionReports subscriptions={ subscriptions?.map(({ userId, ...rest }) => rest) } />
+        <SubscriptionReports subscriptions={subscriptions} />
       </div>
     </SubscriptionGuard>
   )

src/app/robots.js

@@ -7,12 +7,8 @@ export default function robots() {
       allow: '/',
       disallow: [
         '/account',
-        '/api',
         '/api/*',
-        '/edit',
-        '/edit/new',
         '/edit/*',
-        '/#',
         '/reports',
         '/signout',
       ],

src/components/cookie-consent.js

@@ -75,6 +75,7 @@ export function CookieConsent() {
           <Checkbox
             checked={preferences.essential}
             disabled={true}
+            title='Essential Cookies'
           />
           <div className='grid gap-1.5 leading-none'>
             <label className='font-medium'>
@@ -94,6 +95,7 @@ export function CookieConsent() {
             onCheckedChange={(checked) =>
               setPreferences(prev => ({ ...prev, functional: checked === true }))
             }
+            title='Functional Cookies'
           />
           <div className='grid gap-1.5 leading-none'>
             <label className='font-medium'>
@@ -113,6 +115,7 @@ export function CookieConsent() {
             onCheckedChange={(checked) =>
               setPreferences(prev => ({ ...prev, analytics: checked === true }))
             }
+            title='Analytics Cookies'
           />
           <div className='grid gap-1.5 leading-none'>
             <label className='font-medium'>

src/components/header.js

@@ -39,6 +39,7 @@ export default function Header({ mainNavigation = (<></>), iconNavigation = (<><
                 alt='Description of the image'
                 width={32}
                 height={32}
+                priority
               />
               <div className='inline-flex gap-0 justify-center items-end'>
                 <span className='font-semibold text-xl'>Wapy</span>