Skip to content

omfj/send email on deleted event and update deps #54

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
omfj merged 1 commit into from
Mar 12, 2026
Merged

omfj/send email on deleted event and update deps #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"add-invitation": "pnpm dlx tsx ./programmerbar-web/src/scripts/add-invitation.ts"
},
"devDependencies": {
"turbo": "2.7.2",
"turbo": "2.8.16",
"typescript": "5.9.3"
}
}
7,122 changes: 3,660 additions & 3,462 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions programmerbar-cms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
"clean": "rm -rf .sanity node_modules .turbo"
},
"dependencies": {
"@sanity/client": "7.14.0",
"@sanity/client": "7.17.0",
"@sanity/icons": "3.7.4",
"@sanity/vision": "5.6.0",
"groq": "5.6.0",
"react": "19.2.3",
"react-dom": "19.2.3",
"sanity": "5.6.0",
"sanity-plugin-markdown": "8.0.4",
"@sanity/vision": "5.14.1",
"groq": "5.14.1",
"react": "19.2.4",
"react-dom": "19.2.4",
"sanity": "5.14.1",
"sanity-plugin-markdown": "8.0.5",
"sanity-plugin-media": "4.1.1",
"styled-components": "6.3.8"
"styled-components": "6.3.11"
},
"devDependencies": {
"@sanity/eslint-config-studio": "6.0.0",
"@types/react": "19.2.9",
"@types/react": "19.2.14",
"eslint": "9.39.2",
"prettier": "3.8.1",
"typescript": "5.9.3"
Expand Down
0 ...-email-templates/templates/contact-us.tsx → ...bar-email-templates/emails/contact-us.tsx
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...merbar-email-templates/templates/index.ts → ...rammerbar-email-templates/emails/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * from "./contact-us";
export * from "./invitation";
export * from "./new-shift";
export * from "./shift-cancelled";
export * from "./voulenteer-request";
0 ...-email-templates/templates/invitation.tsx → ...bar-email-templates/emails/invitation.tsx
View file
Open in desktop
File renamed without changes.
0 ...r-email-templates/templates/new-shift.tsx → ...rbar-email-templates/emails/new-shift.tsx
View file
Open in desktop
File renamed without changes.
50 changes: 50 additions & 0 deletions programmerbar-email-templates/emails/shift-cancelled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { Body, Container, Head, Html, Text, Tailwind } from "@react-email/components";
import { z } from "zod";

export const ShiftCancelledEmailSchema = z.object({
event: z.object({
name: z.string(),
date: z.string()
}),
user: z.object({
name: z.string(),
email: z.email()
})
});

export type ShiftCancelledEmailSchemaType = z.infer<typeof ShiftCancelledEmailSchema>;

export function ShiftCancelledEmail({ event, user }: ShiftCancelledEmailSchemaType) {
return (
<Html>
<Head />
<Tailwind>
<Body className="mx-auto my-auto bg-white px-2 font-sans">
<Container className="mx-auto my-[40px] max-w-[465px] rounded border border-solid border-[#eaeaea] p-[20px]">
<Text className="text-center text-2xl font-medium">
Hei {user.name}, arrangementet er avlyst!
</Text>

<Text className="mt-4">
Arrangementet <strong>{event.name}</strong> ({event.date}) er blitt slettet, og vakten
din er derfor også avlyst.
</Text>

<Text className="mt-4">Ta kontakt med styret hvis du har spørsmål.</Text>
</Container>
</Body>
</Tailwind>
</Html>
);
}

ShiftCancelledEmail.PreviewProps = {
event: {
name: "Programmerbar fredagsåpent",
date: "fredag 14. mars 2026"
},
user: {
name: "Ola Nordmann",
email: "ola.nordmann@example.com"
}
} as ShiftCancelledEmailSchemaType;
0 ...emplates/templates/voulenteer-request.tsx → ...l-templates/emails/voulenteer-request.tsx
View file
Open in desktop
File renamed without changes.
91 changes: 46 additions & 45 deletions programmerbar-email-templates/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
import js from '@eslint/js'
import tseslint from '@typescript-eslint/eslint-plugin'
import tsparser from '@typescript-eslint/parser'
import react from 'eslint-plugin-react'
import globals from 'globals'
import js from "@eslint/js";
import tseslint from "@typescript-eslint/eslint-plugin";
import tsparser from "@typescript-eslint/parser";
import react from "eslint-plugin-react";
import globals from "globals";

export default [
js.configs.recommended,
{
files: ['**/*.ts', '**/*.tsx'],
languageOptions: {
parser: tsparser,
parserOptions: {
ecmaVersion: 2022,
sourceType: 'module',
ecmaFeatures: {
jsx: true,
},
},
globals: {
...globals.node,
},
},
plugins: {
'@typescript-eslint': tseslint,
react: react,
},
rules: {
...tseslint.configs.recommended.rules,
...react.configs.recommended.rules,
'@typescript-eslint/no-unused-vars': 'error',
'@typescript-eslint/no-explicit-any': 'warn',
'prefer-const': 'error',
'no-var': 'error',
'react/react-in-jsx-scope': 'off',
'react/prop-types': 'off',
},
settings: {
react: {
version: '19.1.1',
},
},
},
{
ignores: ['node_modules/**', '.react-email/**'],
},
]
js.configs.recommended,
{
files: ["**/*.ts", "**/*.tsx"],
languageOptions: {
parser: tsparser,
parserOptions: {
ecmaVersion: 2022,
sourceType: "module",
ecmaFeatures: {
jsx: true
}
},
globals: {
...globals.node
}
},
plugins: {
"@typescript-eslint": tseslint,
react: react
},
rules: {
...tseslint.configs.recommended.rules,
...react.configs.recommended.rules,
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-explicit-any": "warn",
"prefer-const": "error",
"no-var": "error",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off"
},
settings: {
react: {
version: "19.1.1"
}
}
},
{
ignores: ["node_modules/**", ".react-email/**"]
}
];

72 changes: 36 additions & 36 deletions programmerbar-email-templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"name": "@programmerbar/email-templates",
"version": "0.0.1",
"private": true,
"exports": {
".": "./templates/index.ts"
},
"scripts": {
"build": "email build --dir templates",
"dev": "email dev --dir templates",
"export": "email export --dir templates",
"lint": "eslint templates --ext .ts,.tsx",
"lint:fix": "eslint templates --ext .ts,.tsx --fix",
"format": "prettier --write templates/**/*.{ts,tsx}",
"format:check": "prettier --check templates/**/*.{ts,tsx}"
},
"dependencies": {
"@react-email/components": "1.0.6",
"react": "19.2.3",
"react-dom": "19.2.3",
"react-email": "5.2.5",
"zod": "4.3.6"
},
"devDependencies": {
"@eslint/js": "^9.39.2",
"@react-email/preview-server": "5.2.5",
"@types/react": "19.2.9",
"@types/react-dom": "19.2.3",
"@typescript-eslint/eslint-plugin": "^8.53.1",
"@typescript-eslint/parser": "^8.53.1",
"eslint": "^9.39.2",
"eslint-plugin-react": "^7.37.2",
"globals": "^17.1.0",
"prettier": "^3.8.1",
"typescript": "5.9.3"
}
}
"name": "@programmerbar/email-templates",
"version": "0.0.1",
"private": true,
"exports": {
".": "./emails/index.ts"
},
"scripts": {
"build": "email build",
"dev": "email dev",
"export": "email export",
"lint": "eslint emails --ext .ts,.tsx",
"lint:fix": "eslint emails --ext .ts,.tsx --fix",
"format": "prettier --write emails/**/*.{ts,tsx}",
"format:check": "prettier --check emails/**/*.{ts,tsx}"
},
"dependencies": {
"@react-email/components": "1.0.9",
"react": "19.2.3",
"react-dom": "19.2.4",
"react-email": "5.2.9",
"zod": "4.3.6"
},
"devDependencies": {
"@eslint/js": "^9.39.2",
"@react-email/preview-server": "5.2.9",
"@types/react": "19.2.14",
"@types/react-dom": "19.2.3",
"@typescript-eslint/eslint-plugin": "^8.57.0",
"@typescript-eslint/parser": "^8.57.0",
"eslint": "^9.39.2",
"eslint-plugin-react": "^7.37.2",
"globals": "^17.4.0",
"prettier": "^3.8.1",
"typescript": "5.9.3"
}
}
2 changes: 1 addition & 1 deletion programmerbar-email-templates/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"allowSyntheticDefaultImports": true,
"jsx": "react-jsx"
},
"include": ["templates"],
"include": ["emails"],
"exclude": ["node_modules"]
}
56 changes: 28 additions & 28 deletions programmerbar-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,69 +23,69 @@
"db:migrate:local": "pnpm db:migrate -- --local"
},
"devDependencies": {
"@eslint/compat": "^2.0.1",
"@eslint/compat": "^2.0.3",
"@eslint/js": "^9.39.2",
"@faker-js/faker": "10.2.0",
"@playwright/test": "1.58.0",
"@faker-js/faker": "10.3.0",
"@playwright/test": "1.58.2",
"@programmerbar/cms": "workspace:*",
"@sveltejs/adapter-cloudflare": "7.2.6",
"@sveltejs/kit": "2.50.1",
"@sveltejs/adapter-cloudflare": "7.2.8",
"@sveltejs/kit": "2.54.0",
"@sveltejs/vite-plugin-svelte": "6.2.4",
"@tailwindcss/forms": "0.5.11",
"@tailwindcss/typography": "0.5.19",
"@tailwindcss/vite": "^4.1.18",
"@tailwindcss/vite": "^4.2.1",
"@types/eslint": "9.6.1",
"@types/node": "^24.10.1",
"@types/react": "19.2.9",
"@types/react": "19.2.14",
"@types/react-dom": "19.2.3",
"@types/web-push": "^3.6.4",
"drizzle-kit": "0.31.8",
"drizzle-kit": "0.31.9",
"drizzle-seed": "^0.3.1",
"eslint": "9.39.2",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-svelte": "3.14.0",
"globals": "17.1.0",
"eslint-plugin-svelte": "3.15.2",
"globals": "17.4.0",
"prettier": "3.8.1",
"prettier-plugin-svelte": "3.4.1",
"prettier-plugin-svelte": "3.5.1",
"prettier-plugin-tailwindcss": "0.7.2",
"svelte": "5.48.0",
"svelte-check": "4.3.5",
"tailwindcss": "4.1.18",
"svelte": "5.53.10",
"svelte-check": "4.4.5",
"tailwindcss": "4.2.1",
"tsx": "4.21.0",
"typescript": "5.9.3",
"typescript-eslint": "8.53.1",
"typescript-eslint": "8.57.0",
"vite": "7.3.1",
"vite-plugin-devtools-json": "^1.0.0",
"vite-plugin-mkcert": "^1.17.9",
"vite-plugin-mkcert": "^1.17.10",
"vitest": "4.0.18",
"wrangler": "4.60.0"
"wrangler": "4.72.0"
},
"dependencies": {
"@block65/webcrypto-web-push": "^1.0.2",
"@lucia-auth/adapter-drizzle": "1.1.0",
"@lucide/svelte": "^0.563.1",
"@lucide/svelte": "^0.577.0",
"@programmerbar/email-templates": "workspace:*",
"@react-email/render": "^2.0.4",
"@sanity/client": "7.14.0",
"@sanity/client": "7.17.0",
"@sanity/image-url": "2.0.3",
"@sentry/sveltekit": "^10.36.0",
"@sentry/sveltekit": "^10.43.0",
"arctic": "3.7.0",
"bits-ui": "2.15.4",
"bits-ui": "2.16.3",
"class-variance-authority": "0.7.1",
"clsx": "2.1.1",
"date-fns": "4.1.0",
"date-fns-tz": "^3.2.0",
"drizzle-orm": "0.45.1",
"groq": "5.6.0",
"groq": "5.14.1",
"lucia": "3.2.2",
"marked": "17.0.1",
"marked": "17.0.4",
"nanoid": "5.1.6",
"react": "19.2.3",
"react-dom": "19.2.3",
"resend": "6.8.0",
"svelte-sonner": "1.0.7",
"react": "19.2.4",
"react-dom": "19.2.4",
"resend": "6.9.3",
"svelte-sonner": "1.1.0",
"svelte-turnstile": "^0.11.0",
"tailwind-merge": "3.4.0",
"tailwind-merge": "3.5.0",
"web-push": "^3.6.7",
"zod": "4.3.6",
"zod-form-data": "3.0.1"
Expand Down
Loading
Loading