Final PR to main branch

.dockerignore

@@ -0,0 +1,52 @@
+# Dev Tools & Repositories
+.git/
+.github/
+.cursor/
+.vscode/
+.idea/
+
+# Node/Frontend Dependencies (Internal catchalls)
+node_modules/
+**/node_modules/
+frontend/node_modules/
+frontend/dist/
+
+# Python Runtime Artifacts
+__pycache__/
+**/__pycache__/
+*.pyc
+*.pyo
+*.pyd
+
+# Testing & Linting Caches
+.pytest_cache/
+.mypy_cache/
+.coverage
+
+# Python Virtual Environments
+.venv/
+.venv-check/
+venv/
+ENV/
+
+# Production Build Targets
+dist/
+build/
+
+# Local Database Files
+*.sqlite3
+*.db
+
+# Crucial Safety Additions: Environmental Secrets & Infrastructure
+.env
+.env.*
+
+# Crucial Space Additions: Local Data Volumes & Generated Assets
+volumes/
+postgres_data*/
+media/
+backend/file_storage/
+frontend/
+osdagclient/
+*.log
+logs/

.env

@@ -0,0 +1,16 @@
+DEBUG=True
+SECRET_KEY=dev-secret-key
+ALLOWED_HOSTS=localhost,127.0.0.1,backend
+
+DATABASE_NAME=postgres_Intg_osdag
+DATABASE_USER=osdagdeveloper
+DATABASE_PASSWORD=password
+DATABASE_HOST=db
+DATABASE_PORT=5432
+
+REDIS_URL=redis://redis:6379/0
+CELERY_BROKER_URL=redis://redis:6379/0
+CELERY_RESULT_BACKEND=redis://redis:6379/0
+USE_REDIS_CACHE=false
+
+VITE_API_URL=http://localhost:8000

.github/workflows/cd.yml

@@ -0,0 +1,60 @@
+name: CD
+
+on:
+  workflow_run:
+    workflows: ["CI"]
+    types: [completed]
+    branches: [main]
+
+jobs:
+  build-and-push:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push backend
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}/backend:latest
+            ghcr.io/${{ github.repository }}/backend:${{ github.sha }}
+
+      - name: Build and push frontend
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          file: ./frontend/Dockerfile.prod
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}/frontend:latest
+            ghcr.io/${{ github.repository }}/frontend:${{ github.sha }}
+
+  deploy:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to server
+        uses: appleboy/ssh-action@v1
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SERVER_SSH_KEY }}
+          script: |
+            cd /opt/osdag-web
+            docker compose -f docker-compose.prod.yml pull
+            docker compose -f docker-compose.prod.yml up -d --remove-orphans

.github/workflows/ci.yml

@@ -0,0 +1,103 @@
+name: CI
+
+on:
+  push:
+    branches: ["**"]
+  pull_request:
+    branches: [main]
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  frontend-qa:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./frontend
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Install
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+      - name: Build
+        run: npm run build
+
+  backend-qa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create dummy Firebase config
+        run: |
+          mkdir -p backend
+          echo '{}' > backend/firebase-service-account.json
+
+      - name: Start DB and Redis
+        run: docker compose up -d db redis
+
+      - name: Wait for Database
+        run: |
+          python -c "
+          import socket, time
+          for i in range(15):
+              try:
+                  with socket.create_connection(('localhost', 5433), timeout=1):
+                      print('Database is ready!')
+                      break
+              except socket.error:
+                  print('Waiting for database...')
+                  time.sleep(1)
+          "
+
+      - name: Cache pip dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          activate-environment: osdag_env
+          python-version: "3.11"
+          channels: conda-forge
+          channel-priority: strict
+          miniforge-version: "latest"
+          use-mamba: true
+          cache-downloads: true
+          cache-downloads-key: ${{ runner.os }}-conda-${{ hashFiles('.github/workflows/ci.yml') }}
+
+      - name: Install dependencies
+        shell: bash -l {0}
+        run: |
+          mamba install pythonocc-core cairo pip -y
+          python -m pip install -r requirements.txt pytest pytest-django
+
+      - name: Run tests
+        shell: bash -l {0}
+        env:
+          DATABASE_HOST: localhost
+          DATABASE_PORT: 5433
+          DATABASE_NAME: postgres_Intg_osdag
+          DATABASE_USER: osdagdeveloper
+          DATABASE_PASSWORD: password
+          REDIS_URL: redis://localhost:6379/0
+        run: |
+          cd backend
+          xvfb-run python -m pytest --ds=config.settings
+
+      - name: Teardown
+        if: always()
+        run: docker compose down

.gitignore

@@ -6,11 +6,12 @@
 **/*.pyc
 *.xml
 **/*.txt
+!**/requirements.txt
 **/.idea/
 *~
 .vscode
-*.sqlite
-**/*.sqlite
+#*.sqlite
+#**/*.sqlite
 *.log
 *.bak
 *.pdf
@@ -35,3 +36,58 @@ ResourceFiles/Osi_Files/*
 *.xlsx
 ResourceFiles/last_designs/*
 ResourceFiles/html_page/*
+#osdag_web/secret_key.py
+db.sqlite3
+frontend/node_modules
+osdag/migrations
+node_modules
+frontend/public/output-obj.obj
+file_storage/design_report/*.pdf
+file_storage/design_report/*.log
+file_storage/design_report/*.tex
+file_storage/design_report/*.aux
+
+# ignore the brep fles 
+file_storage/cad_models/*.brep
+
+# ignore companylogo images 
+file_storage/company_logo/*.png
+
+# ignore the input values files 
+file_storage/input_values_files/*.osi
+conda_packages
+
+# ignore the brep files
+file_storage/cad_models/*.brep
+file_storage/cad_models/*.obj
+file_storage/cad_models/*.iges
+file_storage/cad_models/*.step
+file_storage/cad_models/*.stp
+file_storage/cad_models/*.glb
+file_storage/osdag_web/firebase-service-account.json
+key
+
+backend/file_storage/cad_models/*.brep
+backend/file_storage/cad_models/*.obj
+backend/file_storage/cad_models/*.iges
+backend/file_storage/cad_models/*.step
+backend/file_storage/cad_models/*.stp
+backend/file_storage/cad_models/*.glb
+backend/file_storage/cad_models/*.parts.json
+backend/file_storage/cad_models/*.stl
+backend/file_storage/cad_models/*.stp
+backend/file_storage/cad_models/*.glb
+backend/file_storage/cad_models/*.parts.json
+backend/file_storage/cad_models/*.aux
+
+backend/firebase-service-account.json
+file_storage
+
+# Ignore local database folder
+pgdata/
+
+.env
+
+*.osi
+
+**/.venv