diff --git a/.gitignore b/.gitignore index 479306628..75414b053 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ redis-data redis_data .env .DS_Store -.pnpm-store/ \ No newline at end of file +.pnpm-store/ +docker-compose.source.yml +docker-compose.dev.yml \ No newline at end of file diff --git a/apps/frontend-snippet/Dockerfile b/apps/frontend-snippet/Dockerfile index 7542cb3f1..2b9629ddd 100644 --- a/apps/frontend-snippet/Dockerfile +++ b/apps/frontend-snippet/Dockerfile @@ -56,6 +56,8 @@ FROM nginx:stable-alpine as runner #ENV VITE_BACKEND_DOMAIN="$VITE_BACKEND_DOMAIN" #ENV VITE_FRONTEND_DOMAIN="$VITE_FRONTEND_DOMAIN" COPY --from=installer ./app/apps/frontend-snippet/dist/ /usr/share/nginx/html +COPY apps/frontend-snippet/nginx.conf /etc/nginx/conf.d/default.conf + EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/apps/frontend-snippet/nginx.conf b/apps/frontend-snippet/nginx.conf new file mode 100644 index 000000000..7ff442522 --- /dev/null +++ b/apps/frontend-snippet/nginx.conf @@ -0,0 +1,13 @@ +# This is an Nginx config file that gets imported inside the FrontEnd Snippet production Dockerfile + +server { + listen 80; + server_name localhost; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + + } +} diff --git a/apps/webapp/Dockerfile b/apps/webapp/Dockerfile index 4a0d3c9a8..4f22730e3 100644 --- a/apps/webapp/Dockerfile +++ b/apps/webapp/Dockerfile @@ -53,5 +53,11 @@ FROM nginx:stable-alpine as runner #ENV VITE_FRONTEND_DOMAIN="$VITE_FRONTEND_DOMAIN" COPY --from=installer ./app/apps/webapp/dist/ /usr/share/nginx/html +RUN echo "***********************" +RUN cat /etc/nginx/conf.d/default.conf +RUN echo "***********************" + +COPY apps/webapp/nginx.conf /etc/nginx/conf.d/default.conf + EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/apps/webapp/nginx.conf b/apps/webapp/nginx.conf new file mode 100644 index 000000000..a3a7d3e8a --- /dev/null +++ b/apps/webapp/nginx.conf @@ -0,0 +1,13 @@ +# This is an Nginx config file that gets imported inside the Webapp production Dockerfile + +server { + listen 80; + server_name localhost; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + + } +} diff --git a/docs/crm/deals/api/update.mdx b/docs/crm/deals/api/update.mdx index 5a9b79a29..854e3ce02 100644 --- a/docs/crm/deals/api/update.mdx +++ b/docs/crm/deals/api/update.mdx @@ -1,5 +1,5 @@ --- title: "Update a Deal" description: "Update a Deal in any CRM Platform using this endpoint" -openapi: "PATCH /crm/deals" ---- +openapi: "PATCH /crm/deals/{id}" +--- \ No newline at end of file diff --git a/docs/mint.json b/docs/mint.json index b263bcfaf..5f29c833f 100644 --- a/docs/mint.json +++ b/docs/mint.json @@ -92,7 +92,7 @@ }, { "group": "Notes", - "pages": [ "crm/notes/overview", "crm/notes/api/list", "crm/notes/api/get", "crm/notes/api/create", "crm/notes/api/update" ] + "pages": [ "crm/notes/overview", "crm/notes/api/list", "crm/notes/api/get", "crm/notes/api/create" ] }, { "group": "Engagements", diff --git a/docs/open-source/contributors.mdx b/docs/open-source/contributors.mdx index 2f7ffc5b0..d7bee3192 100644 --- a/docs/open-source/contributors.mdx +++ b/docs/open-source/contributors.mdx @@ -28,7 +28,7 @@ cp .env.example .env ```bash - rm -rf node_modules .pnpm_store ./packages/api/dist ./packages/api/node_modules ./apps/webapp/node_modules ./apps/frontend_snippet/node_modules + rm -rf node_modules .pnpm-store ./packages/api/dist ./packages/api/node_modules ./apps/webapp/node_modules ./apps/frontend_snippet/node_modules ``` diff --git a/packages/api/scripts/docker-compose-build-from-sources.yml b/packages/api/scripts/docker-compose-build-from-sources.yml index 17c3c8ec8..5b7649143 100644 --- a/packages/api/scripts/docker-compose-build-from-sources.yml +++ b/packages/api/scripts/docker-compose-build-from-sources.yml @@ -1,5 +1,5 @@ # this docker compose is for development purposes. -# use it to build locally instead of pulling pre-build images from cloud +# use it to build locally instead of pulling pre-build images from cloud name: panora version: '3.8' @@ -29,7 +29,7 @@ services: build: context: ./ dockerfile: ./packages/api/Dockerfile - environment: + environment: DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?ssl=false DISTRIBUTION: ${DISTRIBUTION} JWT_SECRET: ${JWT_SECRET} @@ -56,7 +56,7 @@ services: condition: service_healthy networks: - backend - + redis: image: "redis:7.2.3-alpine" container_name: "Redis" @@ -66,7 +66,7 @@ services: - ./redis-data:/data networks: - backend - + webapp: build: dockerfile: ./apps/webapp/Dockerfile @@ -83,7 +83,7 @@ services: networks: - backend - frontend - + magic-link-frontend: build: dockerfile: ./apps/frontend-snippet/Dockerfile @@ -97,7 +97,7 @@ services: networks: - backend - frontend - + panora-store: image: minio/minio container_name: panora-store @@ -134,7 +134,7 @@ services: echo "****3****" && mc admin policy attach panora-store readwrite --user ${BUCKET_TCG_ATTACHMENTS_USER} && echo "****4****" && - mc ls panora-store + mc ls panora-store " depends_on: - postgres @@ -146,4 +146,4 @@ networks: backend: volumes: - pnr-objstr: \ No newline at end of file + pnr-objstr: