Skip to content

Chore/20251218 #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SvenVw merged 11 commits into from
Dec 19, 2025
Merged

Chore/20251218 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4477d0
chore: update pnpm
SvenVw Dec 18, 2025
1c7bf6e
chore: update root packages
SvenVw Dec 18, 2025
a00508f
chore: update workspace packages
SvenVw Dec 18, 2025
e97684e
chore: update fdm-app packages
SvenVw Dec 18, 2025
bfe955d
chore: update and migrate fdm-app for file-storage v0.13.0
SvenVw Dec 18, 2025
f9d7af2
chore: remove deprecated types package of maplibre-gl
SvenVw Dec 18, 2025
2a71ddc
chore: update react-email packages
SvenVw Dec 18, 2025
bf4c1a1
fix: install package from github
SvenVw Dec 18, 2025
2393500
fix: maybe this fixes the gh action?
SvenVw Dec 18, 2025
61e6a8f
fix: version pinning
SvenVw Dec 18, 2025
c9fe717
fix: lockfile
SvenVw Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typecheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup pnpm 10
uses: pnpm/action-setup@v4
with:
version: 10.23.0
version: 10.26.0

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand Down
24 changes: 12 additions & 12 deletions fdm-app/app/components/blocks/email/invitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,60 +54,60 @@ export const InvitationEmail = ({
</Preview>
<Tailwind>
<Body className="bg-white my-auto mx-auto font-sans">
<Container className="border border-solid border-[#eaeaea] rounded my-[40px] mx-auto p-[20px] w-[465px]">
<Section className="mt-[30px]">
<Container className="border border-solid border-[#eaeaea] rounded my-10 mx-auto p-5 w-116.25">
<Section className="mt-7.5">
<Img
src={logoPath}
width="150"
alt={`${appName} Logo`}
className="my-0 mx-auto"
/>
</Section>
<Heading className="text-black text-[24px] font-normal text-center p-0 my-[30px] mx-0">
<Heading className="text-black text-[24px] font-normal text-center p-0 my-7.5 mx-0">
Je bent uitgenodigd!
</Heading>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Hallo {inviteeEmail},
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
{inviterName} heeft je uitgenodigd om lid te worden
van de organisatie <b>{organizationName}</b> in{" "}
{appName}.
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Met {appName} kun je op een eenvoudige manier de
nutriëntenbalans en organische stofbalans berekenen.
Het is ook mogelijk om te bekijken welke meststoffen
er geschikt zijn voor een perceel. Je kunt bedrijven
aanmaken en met andere gebruikers samenwerken.
</Text>
<Section className="mt-[32px] mb-[8px] text-center">
<Section className="mt-8 mb-2 text-center">
<Button
href={`${appBaseUrl}/organization/invitations/${invitationId}/respond?intent=accept`}
className="bg-[#0070f3] text-white border-solid border-[#0070f3] border-2 rounded mx-[24px] px-[12px] py-[12px] text-[14px] font-semibold no-underline"
className="bg-[#0070f3] text-white border-solid border-[#0070f3] border-2 rounded mx-6 px-3 py-3 text-[14px] font-semibold no-underline"
>
Accepteren
</Button>
<Button
href={`${appBaseUrl}/organization/invitations/${invitationId}/respond?intent=reject`}
className="bg-[#f5f5f5] text-[#171717] border-solid border-[#171717] border-2 rounded mx-[24px] px-[12px] py-[12px] text-[14px] font-semibold no-underline"
className="bg-[#f5f5f5] text-[#171717] border-solid border-[#171717] border-2 rounded mx-6 px-3 py-3 text-[14px] font-semibold no-underline"
>
Afwijzen
</Button>
</Section>
<Section className="mt-[32px] mb-[32px] text-center">
<Section className="mt-8 mb-8 text-center">
<Link
href={`${appBaseUrl}/organization/invitations`}
>
of bekijk je uitnodigingen
</Link>
</Section>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Als je deze uitnodiging niet wilt accepteren, kun je
deze e-mail negeren, of op bovenstaande knop klikken
om de uitnodiging te weigeren.
</Text>
<Text className="text-black text-[14px] leading-[24px] mt-[32px]">
<Text className="text-black text-[14px] leading-6 mt-8">
Met vriendelijke groet, <br /> Het {appName} team
</Text>
</Container>
Expand Down
30 changes: 15 additions & 15 deletions fdm-app/app/components/blocks/email/magic-link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
Link,
Preview,
Section,
Tailwind,
Text,
} from "@react-email/components"
import { Tailwind } from "@react-email/tailwind"

interface MagicLinkEmailProps {
url: string
Expand Down Expand Up @@ -44,63 +44,63 @@ export const MagicLinkEmail = ({
<Preview>{`Link om aan te melden bij ${appName}`}</Preview>
<Tailwind>
<Body className="bg-white my-auto mx-auto font-sans">
<Container className="border border-solid border-[#eaeaea] rounded my-[40px] mx-auto p-[20px] w-[465px]">
<Section className="mt-[30px] text-center">
<Container className="border border-solid border-[#eaeaea] rounded my-10 mx-auto p-5 w-116.25">
<Section className="mt-7.5 text-center">
<Img
src={`${appBaseUrl}/fdm-high-resolution-logo-transparent.png`}
width="150"
alt={`${appName} logo`}
className="my-0 mx-auto"
/>
</Section>
<Heading className="text-black text-[24px] font-normal text-center p-0 my-[30px] mx-0">
<Heading className="text-black text-[24px] font-normal text-center p-0 my-7.5 mx-0">
Aanmelden bij {appName}
</Heading>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Hallo,
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
U heeft een link aangevraagd om in te loggen bij{" "}
{appName}. Klik op de knop hieronder om verder te gaan:
</Text>
<Section className="mt-[32px] mb-[32px] text-center">
<Section className="mt-8 mb-8 text-center">
<Button
href={url}
aria-label={`Aanmelden bij ${appName}`}
className="bg-[#0070f3] text-white rounded px-[12px] py-[12px] text-[14px] font-semibold no-underline"
className="bg-[#0070f3] text-white rounded px-3 py-3 text-[14px] font-semibold no-underline"
>
Aanmelden bij {appName}
</Button>
</Section>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Werkt de knop niet? Kopieer en plak dan de onderstaande
link in uw browser:
</Text>
<Link
href={url}
className="text-[#0070f3] text-[12px] leading-[24px] break-all block mb-[16px]"
className="text-[#0070f3] text-[12px] leading-6 break-all block mb-4"
>
{url}
</Link>
<Text className="text-[#666666] text-[12px] leading-[24px] mt-[5px] block text-center mb-[32px]">
<Text className="text-[#666666] text-[12px] leading-6 mt-1.25 block text-center mb-8">
Deze link is éénmalig en voor 15 minuten geldig.
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Indien u dit niet heeft aangevraagd, kunt u deze e-mail
negeren.
</Text>
<Text className="text-black text-[14px] leading-[24px] mt-[32px]">
<Text className="text-black text-[14px] leading-6 mt-8">
Met vriendelijke groet,
<br />
{senderName ? senderName : `Het ${appName} team`}
</Text>
<Link
href={appBaseUrl}
className="text-[#666666] text-[12px] leading-[24px] mt-[20px] block text-center"
className="text-[#666666] text-[12px] leading-6 mt-5 block text-center"
>
{appName}
</Link>
<Text className="text-[#666666] text-[12px] leading-[24px] mt-[5px] block text-center">
<Text className="text-[#666666] text-[12px] leading-6 mt-1.25 block text-center">
{`Deze link is aangemaakt op ${emailTimestamp}`}
</Text>
</Container>
Expand Down
43 changes: 21 additions & 22 deletions fdm-app/app/components/blocks/email/welcome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,42 +51,42 @@ export function WelcomeEmail({
<Preview>{previewText}</Preview>
<Tailwind>
<Body className="bg-white my-auto mx-auto">
<Container className="border border-solid border-[#eaeaea] rounded my-[40px] mx-auto p-[20px] w-[465px]">
<Section className="mt-[32px] text-center">
<Container className="border border-solid border-[#eaeaea] rounded my-10 mx-auto p-5 w-116.25">
<Section className="mt-8 text-center">
<Img
src={logoPath}
width="150"
alt={`${appName} Logo`}
className="my-0 mx-auto"
/>
</Section>
<Heading className="text-black text-[24px] font-normal text-center p-0 my-[30px] mx-0">
<Heading className="text-black text-[24px] font-normal text-center p-0 my-7.5 mx-0">
Welkom bij {appName}, {name}! 👋
</Heading>
<Section className="my-[20px] mx-0 p-0">
<Text className="text-black text-[14px] leading-[24px]">
<Section className="my-5 mx-0 p-0">
<Text className="text-black text-[14px] leading-6">
Bedankt voor je aanmelding. Dit is een overzicht
van de belangrijkste functies.
</Text>
</Section>

<Hr className="border border-solid border-[#eaeaea] my-[26px] mx-0 w-full" />
<Hr className="border border-solid border-[#eaeaea] my-6.5 mx-0 w-full" />

<Section>
<Heading
as="h2"
className="text-black text-[20px] font-normal text-center p-0 my-[30px] mx-0"
className="text-black text-[20px] font-normal text-center p-0 my-7.5 mx-0"
>
Wat kun je nu doen?
</Heading>
<Text className="text-black text-[16px] font-bold leading-[24px]">
<Text className="text-black text-[16px] font-bold leading-6">
1. Een bedrijf aanmaken
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Door een bedrijf aan te maken, krijg je toegang
tot de volgende functies:
</Text>
<ul className="text-black text-[14px] leading-[24px] ml-4 list-disc pl-5">
<ul className="text-black text-[14px] leading-6 ml-4 list-disc pl-5">
<li>
Stikstofbalans, bemestingsadvies en
gebruiksruimte-apps.
Expand All @@ -105,18 +105,21 @@ export function WelcomeEmail({
</li>
</ul>

<Text className="text-black text-[16px] font-bold leading-[24px] mt-6">
<Text className="text-black text-[16px] font-bold leading-6 mt-6">
2. De Atlas verkennen
</Text>
<Text className="text-black text-[14px] leading-[24px]">
<Text className="text-black text-[14px] leading-6">
Je kunt er ook voor kiezen om de Atlas te
verkennen. Hier vind je onder andere:
</Text>
<ul className="text-black text-[14px] leading-[24px] ml-4 list-disc pl-5">
<ul className="text-black text-[14px] leading-6 ml-4 list-disc pl-5">
<li>
De volledige gewashistorie van percelen
sinds 2009.
</li>
<li>
Bekijk het microreliëf van percelen met de hoogtekaart.
</li>
<li>
Of een perceel in een gebied met beperkingen
voor de gebruiksruimte valt.
Expand All @@ -128,27 +131,23 @@ export function WelcomeEmail({
</ul>
</Section>

<Section className="text-center mt-[32px] mb-[32px]">
<Section className="text-center mt-8 mb-8">
<Button
className="bg-primary rounded text-primary-foreground text-[14px] font-semibold no-underline px-5 py-3"
style={{
backgroundColor: "#1a73e8",
color: "#ffffff",
}}
href={absoluteUrl}
>
Start met {appName}
</Button>
</Section>
<Section className="my-[20px] mx-0 p-0">
<Text className="text-black text-[14px] leading-[24px]">
<Section className="my-5 mx-0 p-0">
<Text className="text-black text-[14px] leading-6">
Heb je vragen of suggesties? We horen graag van
je. Je kunt ons ook bereiken door te reageren op
deze mail.
</Text>
</Section>
<Hr className="border border-solid border-[#eaeaea] my-[26px] mx-0 w-full" />
<Text className="text-[#666666] text-[12px] leading-[24px]">
<Hr className="border border-solid border-[#eaeaea] my-6.5 mx-0 w-full" />
<Text className="text-[#666666] text-[12px] leading-6">
Met vriendelijke groet, <br /> Het {appName} team
</Text>
</Container>
Expand Down
4 changes: 2 additions & 2 deletions fdm-app/app/routes/farm.$b_id_farm.$calendar.field.$b_id.soil.analysis.new.upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LocalFileStorage } from "@remix-run/file-storage/local"
import { createFsFileStorage } from "@remix-run/file-storage/fs"
import { type FileUpload, parseFormData } from "@remix-run/form-data-parser"
import {
addSoilAnalysis,
Expand Down Expand Up @@ -118,7 +118,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
// Get the session
const session = await getSession(request)

const fileStorage = new LocalFileStorage("./uploads/soil_analyses")
const fileStorage = createFsFileStorage("./uploads/soil_analyses")

const uploadHandler = async (fileUpload: FileUpload) => {
if (
Expand Down
4 changes: 2 additions & 2 deletions fdm-app/app/routes/farm.create.$b_id_farm.$calendar.fields.$b_id.soil.analysis.upload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LocalFileStorage } from "@remix-run/file-storage/local"
import { createFsFileStorage } from "@remix-run/file-storage/fs"
import { type FileUpload, parseFormData } from "@remix-run/form-data-parser"
import {
addSoilAnalysis,
Expand Down Expand Up @@ -119,7 +119,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
// Get the session
const session = await getSession(request)

const fileStorage = new LocalFileStorage("./uploads/soil_analyses")
const fileStorage = createFsFileStorage("./uploads/soil_analyses")

const uploadHandler = async (fileUpload: FileUpload) => {
if (
Expand Down
Loading