diff --git a/.workflows/build/compose.start.yml b/.workflows/build/compose.start.yml index 16f9469f..644cce6d 100644 --- a/.workflows/build/compose.start.yml +++ b/.workflows/build/compose.start.yml @@ -130,7 +130,7 @@ services: container_name: arrhes-prod-website image: arrhes-website:${ARRHES_VERSION:-dev} ports: - - "5173:3101" + - "5173:80" worker: container_name: arrhes-prod-worker diff --git a/.workflows/build/packages/website/Dockerfile b/.workflows/build/packages/website/Dockerfile index 7e5e1ea1..5e9ef167 100644 --- a/.workflows/build/packages/website/Dockerfile +++ b/.workflows/build/packages/website/Dockerfile @@ -28,5 +28,5 @@ WORKDIR / COPY .workflows/build/packages/website/nginx/default.conf /etc/nginx/nginx.conf RUN rm -rf /usr/share/nginx/html/* COPY --from=build /root/packages/website/build /usr/share/nginx/html -EXPOSE 3101 +EXPOSE 80 CMD ["nginx"] diff --git a/VERSION b/VERSION index 1b0c03e2..2f933838 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.3.3 \ No newline at end of file +v1.3.4 \ No newline at end of file diff --git a/packages/api/src/routes/auth/settings/updateUser.ts b/packages/api/src/routes/auth/settings/updateUser.ts index 0329124d..14982382 100644 --- a/packages/api/src/routes/auth/settings/updateUser.ts +++ b/packages/api/src/routes/auth/settings/updateUser.ts @@ -20,7 +20,6 @@ export const updateUserRoute = registerRoute(updateUserRouteDefinition, async (c table: models.user, data: { alias: body.alias, - dashboardMode: body.dashboardMode, lastUpdatedAt: new Date().toISOString(), }, where: (table) => eq(table.id, user.id), diff --git a/packages/metadata/src/models/user.ts b/packages/metadata/src/models/user.ts index 22d692a8..38303394 100644 --- a/packages/metadata/src/models/user.ts +++ b/packages/metadata/src/models/user.ts @@ -23,12 +23,6 @@ export const userModel = pgTable( passwordSalt: text("password_salt").notNull(), createdAt: dateTimeColumn("created_at").notNull(), lastUpdatedAt: dateTimeColumn("last_updated_at"), - dashboardMode: varchar("dashboard_mode", { - length: 16, - }) - .notNull() - .default("tabs") - .$type<"tabs" | "classic">(), }, (t) => [ index().on(t.emailToken), diff --git a/packages/metadata/src/routes/dashboard/auth/settings/updateUser.ts b/packages/metadata/src/routes/dashboard/auth/settings/updateUser.ts index 06822c12..6ad357df 100644 --- a/packages/metadata/src/routes/dashboard/auth/settings/updateUser.ts +++ b/packages/metadata/src/routes/dashboard/auth/settings/updateUser.ts @@ -10,7 +10,6 @@ export const updateUserRouteDefinition = routeDefinition({ schemas: { body: v.object({ alias: v.optional(userSchema.entries.alias), - dashboardMode: v.optional(userSchema.entries.dashboardMode), }), return: userSchemaReturn, }, diff --git a/packages/metadata/src/schemas/user.ts b/packages/metadata/src/schemas/user.ts index c8c11022..8d5b5a5b 100644 --- a/packages/metadata/src/schemas/user.ts +++ b/packages/metadata/src/schemas/user.ts @@ -22,13 +22,6 @@ export const userSchema = v.object({ passwordSalt: v.nonNullable(stringSchema, "Ce champ est requis"), createdAt: v.nonNullable(dateTimeSchema, "Ce champ est requis"), lastUpdatedAt: v.nullable(dateTimeSchema), - dashboardMode: v.nonNullable( - v.picklist([ - "tabs", - "classic", - ]), - "Ce champ est requis", - ), }) satisfies v.GenericSchema export const userSchemaReturn = v.pick(userSchema, [ @@ -45,5 +38,4 @@ export const userSchemaReturn = v.pick(userSchema, [ "passwordSalt", "createdAt", "lastUpdatedAt", - "dashboardMode", ]) diff --git a/packages/tools/drizzle/0025_add_user_dashboard_mode.sql b/packages/tools/drizzle/0025_add_user_dashboard_mode.sql deleted file mode 100644 index ba7cc659..00000000 --- a/packages/tools/drizzle/0025_add_user_dashboard_mode.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE "table_user" ADD COLUMN "dashboard_mode" varchar(16) DEFAULT 'tabs' NOT NULL;