Merge branch 'master' into snyk-upgrade-7e714de5faf3a7c9f3dcaf341add1ad1

origranot · Jul 27, 2024 · 9d539db · 9d539db
2 parents e7ac74a + 9044df0
commit 9d539db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/apps/frontend/Dockerfile b/apps/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts-alpine as dependencies
+FROM node:20.15.1-alpine3.20 as dependencies
 WORKDIR /app
 
 # Install Python for node-gyp
@@ -8,7 +8,7 @@ COPY package*.json ./
 RUN npm ci
 
 # Build Stage
-FROM node:lts-alpine as build
+FROM node:20.15.1-alpine3.20 as build
 WORKDIR /app
 
 # Arguments passed from docker-compose.yml / workflow
@@ -28,7 +28,7 @@ RUN npx nx build frontend --prod --skip-nx-cache \
     && npm prune --production
 
 # Production Stage
-FROM node:lts-alpine as production
+FROM node:20.15.1-alpine3.20 as production
 WORKDIR /app
 
 COPY --from=build /app/dist/apps/frontend ./frontend

diff --git a/apps/frontend/src/components/pricing/billing-card.tsx b/apps/frontend/src/components/pricing/billing-card.tsx
@@ -28,8 +28,8 @@ export const BillingCard = component$(
         )}
         <h4 class="font-medium text-lg text-gray-800 dark:text-neutral-200">{plan.DISPLAY_NAME}</h4>
         <span class="mt-7 font-bold text-5xl text-gray-800 dark:text-neutral-200">
-          {billing === 'yearly' ? `$${plan.YEARLY_PRICE}` : `$${plan.MONTHLY_PRICE}`}
-          <span class="text-sm font-normal dark:text-gray-400 text-gray-600"> / {billing === 'yearly' ? 'year' : 'month'}</span>
+          {billing === 'yearly' ? `$${plan.YEARLY_PRICE / 12}` : `$${plan.MONTHLY_PRICE}`}
+          <span class="text-sm font-normal dark:text-gray-400 text-gray-600"> / month</span>
         </span>
         <p class="mt-2 text-sm text-gray-500 dark:text-neutral-500">{plan.MONTHLY_PRICE <= 0 ? 'Forever free' : `Billed ${billing}`}</p>