Merge pull request #5 from TheWitcher1991/develop

Develop

.gitignore

@@ -4,7 +4,7 @@
 /.fleet/
 /venv/
 /media/
-/frontend/node_modules
-/backend/crud.txt
+/node_modules/
 *.sqlite3
-/frontend-old
+/old
+/old/

cluster/.dockerignore

@@ -0,0 +1,10 @@
+__pycache__
+venv
+.venv
+.git
+.gitattributes
+.github
+.idea
+docs
+scripts
+bin

docker-compose.yml → cluster/docker-compose.yml

@@ -1,4 +1,4 @@
-name: hospital-prod
+name: hospital-cluster
 
 services:
   nginx:
@@ -17,61 +17,61 @@ services:
 
   postgres:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: postgres
     env_file:
-      - ./backend/.env.prod
+      - ../backend/.env.prod
 
   redis:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: redis
     command:
       - /bin/sh
       - -c
       - redis-server --requirepass "$${REDIS_PASSWORD:?REDIS_PASSWORD variable is not set}"
     env_file:
-      - ./backend/.env.prod
+      - ../backend/.env.prod
 
   rabbitmq:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: rabbitmq
     env_file:
-      - ./backend/.env.prod
+      - ../backend/.env.prod
 
   zookeeper:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: zookeeper
     env_file:
-      - ./backend/.env.kafka
+      - ../backend/.env.kafka
 
   kafka:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: kafka
     depends_on:
       - zookeeper:
           condition: service_started
     env_file:
-      - ./backend/.env.kafka
+      - ../backend/.env.kafka
 
   kafka_ui:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: kafka_ui
     depends_on:
       - kafka:
           condition: service_started
 
   backend:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: backend
     build:
-      context: ./backend
-      dockerfile: ./Dockerfile
+      context: ../backend
+      dockerfile: ../backend/Dockerfile
     depends_on:
       postgres:
         condition: service_healthy
@@ -84,24 +84,24 @@ services:
 
   frontend:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: frontend
     build:
-      context: ./frontend
-      dockerfile: ./Dockerfile
+      context: microfrontends/frontend
+      dockerfile: microfrontends/frontend/Dockerfile
     depends_on:
       backend:
         condition: service_started
 
   redisinsight:
     extends:
-      file: ./docker-compose.base.yml
+      file: docker-compose.base.yml
       service: redisinsight
     depends_on:
       redis:
         condition: service_healthy
     env_file:
-      - ./backend/.env.prod
+      - ../backend/.env.prod
 
   pgadmin:
     image: dpage/pgadmin4:8.11.0
@@ -110,7 +110,7 @@ services:
       postgres:
         condition: service_healthy
     env_file:
-      - backend/.env.prod
+      - ../backend/.env.prod
     networks:
       - default-network
     restart: on-failure

frontend/.gitignore → cluster/microfrontends/hospital-patient/.gitignore

@@ -33,4 +33,4 @@ yarn-error.log*
 
 # typescript
 *.tsbuildinfo
-next-env.d.ts
+../../../old/414/next-env.d.ts

cluster/microfrontends/hospital-patient/.nvmrc

@@ -0,0 +1 @@
+v20.11.1

cluster/microfrontends/hospital-patient/Dockerfile

@@ -0,0 +1,55 @@
+# Dockerfile for production mode
+
+#
+# ---------------------------------------------------------
+#
+FROM node:20-alpine AS deps
+
+RUN apk add --no-cache libc6-compat
+
+WORKDIR /app
+
+COPY package.json yarn.lock ./
+RUN  yarn install
+
+#
+# ---------------------------------------------------------
+#
+FROM node:20-alpine AS builder
+
+WORKDIR /app
+
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN yarn build
+
+#
+# ---------------------------------------------------------
+#
+FROM node:20-alpine AS runner
+
+WORKDIR /app
+
+ENV NODE_ENV production
+ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/next.config.ts ./next.config.ts
+
+USER nextjs
+
+EXPOSE 3000
+
+ENV PORT 3000
+
+ENV HOSTNAME "0.0.0.0"
+
+CMD ["yarn", "start"]

cluster/microfrontends/hospital-patient/README.md

@@ -0,0 +1,36 @@
+This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.

cluster/microfrontends/hospital-patient/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

cluster/microfrontends/hospital-patient/next.config.ts

@@ -0,0 +1,38 @@
+import type { NextConfig } from 'next'
+
+const nextConfig: NextConfig = {
+	reactStrictMode: true,
+	swcMinify: true,
+	poweredByHeader: false,
+	output: 'standalone',
+	env: {
+		API_URL: process.env.API_URL,
+		API_VERSION: process.env.API_VERSION,
+		WS_URL: process.env.WS_URL,
+	},
+	images: {
+		domains: ['https://www.minobrnauki.gov.ru/', 'localhost'],
+	},
+	async rewrites() {
+		return [
+			{
+				source: '/api/core/:path*',
+				destination: 'http://localhost:8000/api/:path*',
+			},
+			{
+				source: '/api/patient/:path*',
+				destination: 'http://localhost:8001/api/:path*',
+			},
+			{
+				source: '/api/employee/:path*',
+				destination: 'http://localhost:8002/api/:path*',
+			},
+			{
+				source: '/api/business/:path*',
+				destination: 'http://localhost:8003/api/:path*',
+			},
+		]
+	},
+}
+
+export default nextConfig