IEEE-NITK · nishant-nayak · Aug 25, 2023 · Aug 24, 2023 · Aug 24, 2023 · Aug 24, 2023
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf
diff --git a/.github/workflows/django_tests.yml b/.github/workflows/django_tests.yml
@@ -16,7 +16,7 @@ jobs:
         run: docker compose -f "docker-compose.yml" up -d --build
 
       - name: Run Tests
-        run: docker compose exec backend python manage.py test
+        run: docker compose exec corpus python manage.py test
 
       - name: Stop Containers
         if: always()

diff --git a/.gitignore b/.gitignore
@@ -176,8 +176,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 
-# End of https://www.toptal.com/developers/gitignore/api/django
-
-# Node Modules
-node_modules/
-.svelte-kit/
+# End of https://www.toptal.com/developers/gitignore/api/django
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1 @@
 python 3.11.1
-nodejs 18.16.0
diff --git a/backend/corpus/base_url.py b/backend/corpus/base_url.py
diff --git a/backend/requirements.txt b/backend/requirements.txt
diff --git a/backend/Dockerfile → corpus/Dockerfile b/backend/Dockerfile → corpus/Dockerfile
diff --git a/backend/corpus/__init__.py → corpus/corpus/__init__.py b/backend/corpus/__init__.py → corpus/corpus/__init__.py
diff --git a/backend/corpus/asgi.py → corpus/corpus/asgi.py b/backend/corpus/asgi.py → corpus/corpus/asgi.py
diff --git a/backend/corpus/settings.py → corpus/corpus/settings.py b/backend/corpus/settings.py → corpus/corpus/settings.py
@@ -39,7 +39,6 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "rest_framework",
 ]
 
 MIDDLEWARE = [
@@ -52,7 +51,7 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "corpus.base_url"
+ROOT_URLCONF = "corpus.urls"
 
 TEMPLATES = [
     {

diff --git a/backend/corpus/urls.py → corpus/corpus/urls.py b/backend/corpus/urls.py → corpus/corpus/urls.py
@@ -20,5 +20,4 @@
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("api-auth/", include("rest_framework.urls")),
 ]
diff --git a/backend/corpus/wsgi.py → corpus/corpus/wsgi.py b/backend/corpus/wsgi.py → corpus/corpus/wsgi.py
diff --git a/backend/dev-Dockerfile → corpus/dev-Dockerfile b/backend/dev-Dockerfile → corpus/dev-Dockerfile
diff --git a/backend/manage.py → corpus/manage.py b/backend/manage.py → corpus/manage.py
diff --git a/corpus/requirements.txt b/corpus/requirements.txt
@@ -0,0 +1,6 @@
+asgiref==3.7.2
+Django==4.2.4
+gunicorn==21.2.0
+packaging==23.1
+psycopg2==2.9.7
+sqlparse==0.4.4
diff --git a/backend/start.sh → corpus/start.sh b/backend/start.sh → corpus/start.sh
diff --git a/dev-docker-compose.yml b/dev-docker-compose.yml
@@ -29,9 +29,9 @@ services:
     networks:
       - corpus_network
 
-  backend:
+  corpus:
     build:
-      context: backend
+      context: corpus
       dockerfile: dev-Dockerfile
     working_dir: /corpus
     command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
@@ -41,48 +41,18 @@ services:
     networks:
       - corpus_network
     volumes:
-      - ./backend:/corpus
+      - ./corpus:/corpus
     depends_on:
       postgres:
         condition: service_healthy
     env_file:
       - .env
 
-  frontend:
-    image: node:18.16.0-alpine
-    working_dir: /app
-    restart: always
-    command: sh -c "npm install && npm run dev -- --port 3000"
-    networks:
-      - corpus_network
-    volumes:
-      - ./frontend:/app
-    depends_on:
-      postgres:
-        condition: service_healthy
-    expose:
-      - "3000"
-
-  storybook:
-    image: node:18.16.0-alpine
-    working_dir: /app
-    restart: always
-    command: sh -c "npm install && npm run storybook"
-    networks:
-      - corpus_network
-    volumes:
-      - ./frontend:/app
-    depends_on:
-      postgres:
-        condition: service_healthy
-    ports:
-      - "6006:6006"
-
   nginx:
     build: nginx
     restart: always
     depends_on:
-      - backend
+      - corpus
       - postgres
     networks:
       - corpus_network

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,8 +29,8 @@ services:
     networks:
       - corpus_network
 
-  backend:
-    build: backend
+  corpus:
+    build: corpus
     command: /corpus/start.sh
     restart: always
     expose:
@@ -45,23 +45,11 @@ services:
     env_file:
       - .env
 
-  frontend:
-    build: frontend
-    restart: always
-    command: node build
-    networks:
-      - corpus_network
-    depends_on:
-      postgres:
-        condition: service_healthy
-    expose:
-      - "3000"
-
   nginx:
     build: nginx
     restart: always
     depends_on:
-      - backend
+      - corpus
       - postgres
     networks:
       - corpus_network

diff --git a/frontend/.dockerignore b/frontend/.dockerignore
diff --git a/frontend/.eslintignore b/frontend/.eslintignore
diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs
diff --git a/frontend/.gitignore b/frontend/.gitignore
diff --git a/frontend/.npmrc b/frontend/.npmrc
diff --git a/frontend/.prettierignore b/frontend/.prettierignore
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
diff --git a/frontend/.storybook/main.ts b/frontend/.storybook/main.ts
diff --git a/frontend/.storybook/preview.ts b/frontend/.storybook/preview.ts
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
diff --git a/frontend/README.md b/frontend/README.md