Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 4 additions & 7 deletions .github/workflows/admin.checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@ on:
branches:
- dev
paths:
- apps/admin/**
- libs/**
- .dockerignore
- .eslintignore
- .eslintrc.json
- .github/workflows/admin.checks.yml
- .gitignore
- .prettierignore
- .prettierrc.json
- apps/admin/**
- libs/**
- eslint.config.js
- package.json
- pnpm-lock.yaml
- pnpm-workspace.yaml
- tsconfig.base.json
- tsconfig.libs.json
- prettier.config.js

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/admin.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@ on:
- main
- dev
paths:
- apps/admin/**
- libs/**
- .dockerignore
- .eslintignore
- .eslintrc.json
- .github/workflows/admin.deploy.yml
- .gitignore
- .prettierignore
- .prettierrc.json
- apps/admin/**
- libs/**
- eslint.config.js
- package.json
- pnpm-lock.yaml
- pnpm-workspace.yaml
- tsconfig.base.json
- tsconfig.libs.json
- prettier.config.js

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -42,7 +39,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 22.11
node-version: 22.12
cache: "pnpm"

- name: 📥 Download deps
Expand Down Expand Up @@ -142,7 +139,7 @@ jobs:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

- name: 🚀 Deploy Staging
if: ${{ github.ref == 'refs/heads/dev' }}
if: ${{ github.ref != 'refs/heads/main' }}
uses: superfly/flyctl-actions@1.4
with:
args:
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/show.checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@ on:
branches:
- dev
paths:
- apps/show/**
- libs/**
- .dockerignore
- .eslintignore
- .eslintrc.json
- .github/workflows/show.checks.yml
- .gitignore
- .prettierignore
- .prettierrc.json
- apps/show/**
- libs/**
- eslint.config.js
- package.json
- pnpm-lock.yaml
- pnpm-workspace.yaml
- tsconfig.base.json
- tsconfig.libs.json
- prettier.config.js

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/show.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@ on:
- main
- dev
paths:
- apps/show/**
- libs/**
- .dockerignore
- .eslintignore
- .eslintrc.json
- .github/workflows/show.deploy.yml
- .gitignore
- .prettierignore
- .prettierrc.json
- apps/show/**
- libs/**
- eslint.config.js
- package.json
- pnpm-lock.yaml
- pnpm-workspace.yaml
- tsconfig.base.json
- tsconfig.libs.json
- prettier.config.js

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -42,7 +39,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 22.11
node-version: 22.12
cache: "pnpm"

- name: 📥 Download deps
Expand Down Expand Up @@ -142,7 +139,7 @@ jobs:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

- name: 🚀 Deploy Staging
if: ${{ github.ref == 'refs/heads/dev' }}
if: ${{ github.ref != 'refs/heads/main' }}
uses: superfly/flyctl-actions@1.4
with:
args:
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/website.checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@ on:
branches:
- dev
paths:
- apps/website/**
- libs/**
- .dockerignore
- .eslintignore
- .eslintrc.json
- .github/workflows/website.checks.yml
- .gitignore
- .prettierignore
- .prettierrc.json
- apps/website/**
- libs/**
- eslint.config.js
- package.json
- pnpm-lock.yaml
- pnpm-workspace.yaml
- tsconfig.base.json
- tsconfig.libs.json
- prettier.config.js

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/website.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@ on:
- main
- dev
paths:
- apps/website/**
- libs/**
- .dockerignore
- .eslintignore
- .eslintrc.json
- .github/workflows/website.deploy.yml
- .gitignore
- .prettierignore
- .prettierrc.json
- apps/website/**
- libs/**
- eslint.config.js
- package.json
- pnpm-lock.yaml
- pnpm-workspace.yaml
- tsconfig.base.json
- tsconfig.libs.json
- prettier.config.js

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -42,7 +39,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 22.11
node-version: 22.12
cache: "pnpm"

- name: 📥 Download deps
Expand Down Expand Up @@ -142,7 +139,7 @@ jobs:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

- name: 🚀 Deploy Staging
if: ${{ github.ref == 'refs/heads/dev' }}
if: ${{ github.ref != 'refs/heads/main' }}
uses: superfly/flyctl-actions@1.4
with:
args:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workspace.checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 22.11
node-version: 22.12
cache: "pnpm"

- name: 📥 Download deps
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.11
22.12
9 changes: 1 addition & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,7 @@
"search.exclude": {
"**/build": true
},
"tailwindCSS.experimental.classRegex": [
[
// Container: `cn([...])`
"cn\\(([^)]*)\\)",
// Class lists: `"[...]"`
"(?:'|\"|`)([^']*)(?:'|\"|`)"
]
],
"tailwindCSS.classFunctions": ["cn"],
"tailwindCSS.experimental.configFile": {
"apps/admin/tailwind.config.ts": "apps/admin/**",
"apps/website/tailwind.config.ts": "apps/website/**",
Expand Down
6 changes: 4 additions & 2 deletions apps/admin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base stage for all subsequent stages.
FROM node:22.11-bullseye-slim AS base
FROM node:22.12-bullseye-slim AS base

# Needed for Prisma generation and runtime.
RUN apt-get update && apt-get install -y openssl
Expand Down Expand Up @@ -33,6 +33,7 @@ FROM base AS packages-json

COPY package.json ./
COPY libs/core/package.json libs/core/
COPY libs/dev-tools/package.json libs/dev-tools/
COPY libs/file-storage/package.json libs/file-storage/
COPY libs/form-data/package.json libs/form-data/
COPY libs/password/package.json libs/password/
Expand All @@ -52,8 +53,8 @@ COPY --from=packages-json /workspace ./

RUN pnpm install --frozen-lockfile --offline

COPY tsconfig.base.json tsconfig.libs.json ./
COPY libs/core libs/core
COPY libs/dev-tools libs/dev-tools
COPY libs/file-storage libs/file-storage
COPY libs/form-data libs/form-data
COPY libs/password libs/password
Expand Down Expand Up @@ -95,6 +96,7 @@ RUN pnpm install --prod --frozen-lockfile --offline

COPY --from=build /workspace ./
COPY libs/prisma/migrations libs/prisma/migrations
COPY libs/prisma/prisma.config.ts libs/prisma/prisma.config.ts
COPY libs/prisma/schema.prisma libs/prisma/schema.prisma

CMD ["pnpm", "--filter", "admin", "start"]
1 change: 0 additions & 1 deletion apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
"@faker-js/faker": "catalog:",
"@remix-run/dev": "catalog:",
"@tailwindcss/container-queries": "catalog:",
"@total-typescript/ts-reset": "catalog:",
"@types/autosize": "catalog:",
"@types/cookie-signature": "catalog:",
"@types/d3-dsv": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/scripts/generate-icon-sprite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { fileURLToPath } from "node:url"
import { watch } from "chokidar"
import { parse } from "node-html-parser"

import { relativeToCwd, safelyReadFile } from "./shared"
import { relativeToCwd, safelyReadFile } from "./shared.js"

const FILENAME = fileURLToPath(import.meta.url)
const DIRNAME = dirname(FILENAME)
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/scripts/generate-theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { mkdir, writeFile } from "node:fs/promises"
import { dirname, resolve } from "node:path"
import { fileURLToPath } from "node:url"

import { colors, screens, spacing } from "../tailwind.config"
import { relativeToCwd, safelyReadFile } from "./shared"
import { colors, screens, spacing } from "../tailwind.config.js"
import { relativeToCwd, safelyReadFile } from "./shared.js"

const FILENAME = fileURLToPath(import.meta.url)
const DIRNAME = dirname(FILENAME)
Expand Down
8 changes: 4 additions & 4 deletions apps/admin/src/activity/db.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import isEqual from "lodash.isequal"
import pick from "lodash.pick"
import { promiseHash } from "remix-utils/promise"

import { ActivityAction } from "#i/activity/action"
import { ActivityActorType } from "#i/activity/actor-type"
import { ActivityResource } from "#i/activity/resource"
import type { ActivitySearchParams } from "#i/activity/search-params"
import { ActivityAction } from "#i/activity/action.js"
import { ActivityActorType } from "#i/activity/actor-type.js"
import { ActivityResource } from "#i/activity/resource.js"
import type { ActivitySearchParams } from "#i/activity/search-params.js"
import { prisma } from "#i/core/prisma.server.js"
import { notFound } from "#i/core/response.server.js"

Expand Down
24 changes: 12 additions & 12 deletions apps/admin/src/activity/filter-form.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import type { User } from "@animeaux/prisma"
import { useOptimisticSearchParams } from "@animeaux/search-params-io"

import { ActivityAction } from "#i/activity/action"
import { ActivityResource } from "#i/activity/resource"
import { ActivitySearchParams } from "#i/activity/search-params"
import { Action } from "#i/core/actions"
import { BaseLink } from "#i/core/base-link"
import { Filters } from "#i/core/controllers/filters"
import { toIsoDateValue } from "#i/core/dates"
import { ControlledInput } from "#i/core/form-elements/controlled-input"
import { Form } from "#i/core/form-elements/form"
import { ActivityAction } from "#i/activity/action.js"
import { ActivityResource } from "#i/activity/resource.js"
import { ActivitySearchParams } from "#i/activity/search-params.js"
import { Action } from "#i/core/actions.js"
import { BaseLink } from "#i/core/base-link.js"
import { Filters } from "#i/core/controllers/filters.js"
import { toIsoDateValue } from "#i/core/dates.js"
import { ControlledInput } from "#i/core/form-elements/controlled-input.js"
import { Form } from "#i/core/form-elements/form.js"
import {
ToggleInput,
ToggleInputList,
} from "#i/core/form-elements/toggle-input"
import { Icon } from "#i/generated/icon"
import { UserAvatar } from "#i/users/avatar"
} from "#i/core/form-elements/toggle-input.js"
import { Icon } from "#i/generated/icon.js"
import { UserAvatar } from "#i/users/avatar.js"

export function ActivityFilters({
users,
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/src/activity/search-params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { SearchParamsIO } from "@animeaux/search-params-io"
import { zu } from "@animeaux/zod-utils"
import { DateTime } from "luxon"

import { ActivityAction } from "#i/activity/action"
import { ActivityResource } from "#i/activity/resource"
import { ActivityAction } from "#i/activity/action.js"
import { ActivityResource } from "#i/activity/resource.js"
import { endOfDay } from "#i/core/dates.js"

export namespace ActivitySearchParams {
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/src/animals/adoption.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AdoptionOption } from "@animeaux/prisma"
import orderBy from "lodash.orderby"

import type { IconName } from "#i/generated/icon"
import type { IconName } from "#i/generated/icon.js"

export const ADOPTION_OPTION_TRANSLATION: Record<AdoptionOption, string> = {
[AdoptionOption.WITH_STERILIZATION]: "Avec stérilisation",
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/src/animals/age.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AnimalAge } from "@animeaux/core"
import orderBy from "lodash.orderby"

import type { IconName } from "#i/generated/icon"
import type { IconName } from "#i/generated/icon.js"

export const SORTED_AGES = orderBy(Object.values(AnimalAge), (age) =>
age === AnimalAge.JUNIOR ? 0 : age === AnimalAge.ADULT ? 1 : 2,
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/src/animals/agreements.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { cn } from "@animeaux/core"

import type { IconName } from "#i/generated/icon"
import { Icon } from "#i/generated/icon"
import type { IconName } from "#i/generated/icon.js"
import { Icon } from "#i/generated/icon.js"

export enum AgreementValue {
TRUE = "TRUE",
Expand Down
8 changes: 4 additions & 4 deletions apps/admin/src/animals/avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { Animal } from "@animeaux/prisma"
import type { Except } from "type-fest"

import type { AvatarSize } from "#i/core/data-display/avatar"
import { Avatar } from "#i/core/data-display/avatar"
import type { DynamicImageProps } from "#i/core/data-display/image"
import { DynamicImage } from "#i/core/data-display/image"
import type { AvatarSize } from "#i/core/data-display/avatar.js"
import { Avatar } from "#i/core/data-display/avatar.js"
import type { DynamicImageProps } from "#i/core/data-display/image.js"
import { DynamicImage } from "#i/core/data-display/image.js"

export function AnimalAvatar({
animal,
Expand Down
Loading
Loading