diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd8c7899..828a8f03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 24 - name: Set up pnpm uses: pnpm/action-setup@v4 diff --git a/Dockerfile b/Dockerfile index 878daf39..594915b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # ----------------------------------------------- # Base Image with Doppler # ----------------------------------------------- -FROM node:22-alpine AS doppler +FROM node:24-alpine AS doppler # Install Doppler CLI RUN wget -q -t3 'https://packages.doppler.com/public/cli/rsa.8004D9FF50437357.key' -O /etc/apk/keys/cli@doppler-8004D9FF50437357.rsa.pub && \ @@ -52,9 +52,12 @@ RUN pnpm run build:${PROJECT_NAME} # ----------------------------------------------- FROM doppler AS runtime +# Install native build tools needed by sharp, gifsicle, mozjpeg, etc. +RUN apk add --no-cache python3 make g++ autoconf automake libtool nasm + # Install the prod dependencies WORKDIR /build -COPY apps/backend/package.json . +COPY ./apps/backend/package.json ./ COPY pnpm-lock.yaml ./ COPY pnpm-workspace.yaml ./ COPY apps/backend/package.json ./apps/backend/package.json diff --git a/apps/backend/src/utils/initDb.ts b/apps/backend/src/utils/initDb.ts index 8e55add6..dcf07c34 100644 --- a/apps/backend/src/utils/initDb.ts +++ b/apps/backend/src/utils/initDb.ts @@ -158,6 +158,7 @@ export const generateFieldSchema = (field: Field): SchemaDefinitionProperty | nu return getDateSchema() case FieldType.PHONE: return getStringSchema() + case FieldType.DROPDOWN: case FieldType.RADIO_BUTTON: return getRadioButtonSchema(field) case FieldType.FILE: diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 0a97b4ef..c8e21982 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -15,14 +15,16 @@ }, "dependencies": { "@3dp4me/types": "workspace:*", + "@emotion/react": "^11.14.0", + "@emotion/styled": "^11.14.1", "@mui/icons-material": "^6.4.5", "@mui/material": "^6.4.5", "@sweetalert/with-react": "^0.1.1", "@tanstack/react-query": "^5.17.19", "@vis.gl/react-google-maps": "^1.4.2", + "Chip": "link:@mui/material/Chip", "aws-amplify": "4.2.11", "axios": "^1.6.0", - "Chip": "link:@mui/material/Chip", "date-fns": "^3.3.0", "js-file-download": "^0.4.12", "lodash": "^4.17.21", diff --git a/apps/frontend/src/components/CreateFieldModal/CreateFieldModal.tsx b/apps/frontend/src/components/CreateFieldModal/CreateFieldModal.tsx index 2303c4b9..3b308b73 100644 --- a/apps/frontend/src/components/CreateFieldModal/CreateFieldModal.tsx +++ b/apps/frontend/src/components/CreateFieldModal/CreateFieldModal.tsx @@ -165,6 +165,7 @@ const CreateFieldModal = ({ /> ) + case FieldType.DROPDOWN: case FieldType.RADIO_BUTTON: return (