Add Asset table, extend schema for related entities, and update .env setup
- Create `Asset` table with relevant columns and constraints. - Extend `Organization`, `Building`, `Floor`, `Space`, and `User` tables with new fields referencing `Asset`. - Add `Reservation` table with foreign key constraints for users and spaces. - Introduce `.env.example` for environment variable management. - Update `DOCKER_SETUP.md` with initialization and environment configuration instructions.main
parent
07e647b582
commit
94709d86d7
|
|
@ -4,9 +4,7 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="6c8b3c54-eabb-40e5-967f-c7b594c750bc" name="Changes" comment="Migrate Prisma seed configuration to `prisma.config.ts` and update API Dockerfile - Move `prisma.seed` from `package.json` to new `prisma.config.ts`. - Modify API Dockerfile to include `prisma.config.ts` in the build process.">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
</list>
|
||||
<list default="true" id="6c8b3c54-eabb-40e5-967f-c7b594c750bc" name="Changes" comment="Add Asset table, extend schema for related entities, and update .env setup - Create `Asset` table with relevant columns and constraints. - Extend `Organization`, `Building`, `Floor`, `Space`, and `User` tables with new fields referencing `Asset`. - Add `Reservation` table with foreign key constraints for users and spaces. - Introduce `.env.example` for environment variable management. - Update `DOCKER_SETUP.md` with initialization and environment configuration instructions." />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
|
|
@ -127,7 +125,7 @@
|
|||
<updated>1774643312599</updated>
|
||||
<workItem from="1774643313611" duration="74000" />
|
||||
<workItem from="1774643422240" duration="5278000" />
|
||||
<workItem from="1774706361502" duration="15401000" />
|
||||
<workItem from="1774706361502" duration="15706000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Initialize Hot Desking app with web and API services - Set up SvelteKit for the web interface with Tailwind CSS. - Build the API using NestJS with Prisma ORM for database interaction. - Add environment variable management and docker-compose for PostgreSQL and PgAdmin instances. - Create shared data models for consistent typing across services. - Establish basic routing and layouts for web and API services.">
|
||||
<option name="closed" value="true" />
|
||||
|
|
@ -409,7 +407,15 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1774721058640</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="36" />
|
||||
<task id="LOCAL-00036" summary="Add Asset table, extend schema for related entities, and update .env setup - Create `Asset` table with relevant columns and constraints. - Extend `Organization`, `Building`, `Floor`, `Space`, and `User` tables with new fields referencing `Asset`. - Add `Reservation` table with foreign key constraints for users and spaces. - Introduce `.env.example` for environment variable management. - Update `DOCKER_SETUP.md` with initialization and environment configuration instructions.">
|
||||
<option name="closed" value="true" />
|
||||
<created>1774722075446</created>
|
||||
<option name="number" value="00036" />
|
||||
<option name="presentableId" value="LOCAL-00036" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1774722075446</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="37" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
@ -427,7 +433,6 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="Enhance real-time space status updates and handling - Improve WebSocket connection reliability with updated transport options. - Introduce logic to prioritize real-time updates over initial data for live views. - Add logging for better debugging of WebSocket events and data propagation. - Update UI components (`SpaceCard`, `FloorplanViewer`) to avoid overwrites from stale data. - Refactor date handling for consistent behavior across components." />
|
||||
<MESSAGE value="Fix ownership checks and improve delete booking button UI - Update `isOwner` logic to account for nested user objects in reservation data. - Enhance delete button styling for better visibility and usability." />
|
||||
<MESSAGE value="Add organization management with logo support - Introduce `OrganizationsModule` with related logic in `AppModule`. - Update Prisma schema to include `logoUrl` field for organizations. - Enhance seeds to include default organization logo. - Update layout to dynamically display organization details, including logo and name. - Add UI support for organization-based navigation in admin routes." />
|
||||
<MESSAGE value="Add organization management with logo support - Implement organization settings page (`+page.svelte`) for updating organization name and logo. - Create backend APIs for retrieving and updating organization details with role-based access control. - Add `OrganizationsModule`, `OrganizationsService`, and DTOs for input validation in NestJS. - Update Prisma schema to include `logoUrl` field for organizations. - Enhance navigation to dynamically display organization logo and name." />
|
||||
|
|
@ -452,6 +457,7 @@
|
|||
<MESSAGE value="Add health checks for dependent services and automate DB migrations in API Dockerfile - Configure `healthcheck` for the PostgreSQL service in `docker-compose.yml`. - Update service dependencies to use `condition: service_healthy` for PostgreSQL. - Modify API Dockerfile to run `npx prisma migrate deploy` before starting the application." />
|
||||
<MESSAGE value="Add organization details to schema and update PostgreSQL health check - Add `language`, `logoId`, and `logoUrl` columns to the `Organization` table with relevant constraints and indexes. - Update `docker-compose.yml` to support dynamic environment variables in PostgreSQL health check." />
|
||||
<MESSAGE value="Migrate Prisma seed configuration to `prisma.config.ts` and update API Dockerfile - Move `prisma.seed` from `package.json` to new `prisma.config.ts`. - Modify API Dockerfile to include `prisma.config.ts` in the build process." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Migrate Prisma seed configuration to `prisma.config.ts` and update API Dockerfile - Move `prisma.seed` from `package.json` to new `prisma.config.ts`. - Modify API Dockerfile to include `prisma.config.ts` in the build process." />
|
||||
<MESSAGE value="Add Asset table, extend schema for related entities, and update .env setup - Create `Asset` table with relevant columns and constraints. - Extend `Organization`, `Building`, `Floor`, `Space`, and `User` tables with new fields referencing `Asset`. - Add `Reservation` table with foreign key constraints for users and spaces. - Introduce `.env.example` for environment variable management. - Update `DOCKER_SETUP.md` with initialization and environment configuration instructions." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Add Asset table, extend schema for related entities, and update .env setup - Create `Asset` table with relevant columns and constraints. - Extend `Organization`, `Building`, `Floor`, `Space`, and `User` tables with new fields referencing `Asset`. - Add `Reservation` table with foreign key constraints for users and spaces. - Introduce `.env.example` for environment variable management. - Update `DOCKER_SETUP.md` with initialization and environment configuration instructions." />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -20,9 +20,10 @@ COPY shared ./shared
|
|||
|
||||
# Build the app
|
||||
WORKDIR /app/apps/web
|
||||
# We need VITE_API_BASE_URL at build time for SvelteKit static replacements if any,
|
||||
# but usually it's better to use dynamic env vars if possible.
|
||||
# For now, let's assume it can be provided during build or we use the default.
|
||||
ARG VITE_API_BASE_URL
|
||||
ARG ORIGIN
|
||||
ENV VITE_API_BASE_URL=$VITE_API_BASE_URL
|
||||
ENV ORIGIN=$ORIGIN
|
||||
RUN npm run build
|
||||
|
||||
# ---
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ services:
|
|||
build:
|
||||
context: .
|
||||
dockerfile: apps/web/Dockerfile
|
||||
args:
|
||||
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-http://localhost:3000}
|
||||
ORIGIN: ${WEB_ORIGIN:-http://localhost:5173}
|
||||
container_name: hotdesking_web
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
|
|
|
|||
Loading…
Reference in New Issue