Merge pull request #18 from ituacm/main

sync dev

Author: rojenarda

.github/workflows/main.yml

@@ -13,5 +13,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - run: docker compose -f docker-compose.yml build
+      - run: cp /home/hasan/ituacm_website_backend/.env ./
+      - run: docker compose -f docker-compose.yml build --no-cache
       - run: docker compose -f docker-compose.yml up -d

backend/Dockerfile

@@ -25,4 +25,4 @@ COPY ./prestart.sh /app/
 
 COPY ./tests-start.sh /app/
 
-COPY ./app /app/app
+COPY ./app /app/app

backend/app/main.py

@@ -22,6 +22,18 @@ def custom_generate_unique_id(route: APIRoute) -> str:
 
 # Set all CORS enabled origins
 if settings.BACKEND_CORS_ORIGINS:
+    settings.BACKEND_CORS_ORIGINS = [
+        'http://localhost',
+        'http://localhost:5173',
+        'https://localhost',
+        'https://localhost:5173',
+        'https://ituacm.com',
+        'https://api.ituacm.com',
+        'https://adminer.ituacm.com',
+        'https://admin.ituacm.com',
+        'http://admin.ituacm.com'
+    ]
+    print(settings.BACKEND_CORS_ORIGINS)
     app.add_middleware(
         CORSMiddleware,
         allow_origins=[