Bring back to Django (#16)

* Bring back to Django * Fix github tests * Ensure shell scripts always have LF line endings Signed-off-by: Nishant Nayak <[email protected]> * Made a few more changes to docker files * Added CONTRIBUTING guidelines --------- Signed-off-by: Nishant Nayak <[email protected]> Co-authored-by: Nishant Nayak <[email protected]>
IEEE-NITK · Aug 25, 2023 · 938bd47 · 938bd47
1 parent 7d22deb
commit 938bd47
Show file tree

Hide file tree

Showing 55 changed files with 104 additions and 16,043 deletions.
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/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,66 @@
+## Development Instructions
+
+Versions for all the languages used in the project can be found in the `.tool-versions` file. Support will be provided for all Unix (MacOS, Debian/Ubuntu) based systems. If you choose to develop on Windows, we cannot promise anything xD. We also will not be supporting RHEL-based operating systems.
+
+If you do not have access to a Unix machine, Docker is the recommended way for development.
+
+### Pre Commit Hooks
+
+We maintain code quality using pre-commit hooks (defined in [.pre-commit-config.yaml](.pre-commit-config.yaml)). All developers are requested to install all the pre-commit hooks before making any contributions to the codebase. Read more about pre-commit hooks [here](https://pre-commit.com/).
+
+To install pre-commit hooks, run the following commands:
+
+```shell
+# Install the pre-commit framework
+pip install pre-commit
+
+# Install the pre-commit hooks
+pre-commit install
+```
+
+### Docker Development
+
+This is the preferred way for development. All modern editors allow you to open code in Docker containers remotely. If that is not possible, all code is mounted to Docker containers, so you can make changes that can be checked live.
+
+For development, use the development Docker Compose file.
+
+```shell
+cp env.example .env
+
+# Make required changes to the .env file
+
+docker compose up --build
+```
+
+This Compose file will mount your codebase for dynamic updation.
+
+## Working on the Local System
+
+If you do not want to use Docker, you can do so by setting up the project locally. Ensure that you fetch the proper environment variables before doing so.
+
+```shell
+set -a
+source .env
+```
+
+Apart from this, you will also have to set the `ENVIRONMENT` variable, which can be set to `DEVELOPMENT`.
+
+Corpus depends on PostgreSQL. You might have it setup on your local system, or running it as a Docker container. Please make sure that you edit your environment variables accordingly so that proper configurations are set. You may also change the `ENVIRONMENT` to `DEVELOPMENT` to ensure that you have the Django debugging features available.
+
+The application is a Django app. The recommended approach is to create a Python virtual environment, and setup the project (if you are using `conda`, please refer to that documentation for instructions).
+
+```sh
+python -m venv venv
+source venv/bin/activate (on Windows: venv\Scripts\activate)
+pip install --upgrade pip
+pip install -r requirements.txt
+```
+
+After installing dependencies, you can setup the Django Project.
+
+```sh
+python manage.py makemigrations
+python manage.py migrate
+python manage.py createsuperuser
+python manage.py runserver
+```
diff --git a/README.md b/README.md
@@ -32,80 +32,14 @@ To remove all the previous data as well, you will have to remove the volumes too
 
 For more guidance, refer to the [Docker Compose](https://docs.docker.com/compose/) documentation.
 
-## Development Instructions
-
-Versions for all the languages used in the project can be found in the `.tool-versions` file. Support will be provided for all Unix (MacOS, Debian/Ubuntu) based systems. If you choose to develop on Windows, we cannot promise anything xD. We also will not be supporting RHEL-based operating systems.
-
-If you do not have access to a Unix machine, Docker is the recommended way for development.
-
-### Pre Commit Hooks
-
-We maintain code quality using pre-commit hooks (defined in [.pre-commit-config.yaml](.pre-commit-config.yaml)). All developers are requested to install all the pre-commit hooks before making any contributions to the codebase. Read more about pre-commit hooks [here](https://pre-commit.com/).
-
-To install pre-commit hooks, run the following commands:
-
-```shell
-# Install the pre-commit framework
-pip install pre-commit
-
-# Install the pre-commit hooks
-pre-commit install
-```
-
-### Docker Development
-
-This is the preferred way for development. All modern editors allow you to open code in Docker containers remotely. If that is not possible, all code is mounted to Docker containers, so you can make changes that can be checked live.
-
-For development, use the development Docker Compose file.
-
-```shell
-cp env.example .env
-
-# Make required changes to the .env file
-
-docker compose -f dev-docker-compose.yml up --build
-```
-
-This Compose file will mount your codebase and add automatic reloading to the frontend code.
-
-If you still choose to go ahead and work on development on individual folders, instructions are given below. However, before development, make sure you source the `.env` file so that all necessary environment variables are picked up.
-
-```shell
-set -a
-source .env
-```
-
-### Frontend
-
-To work on the frontend, make sure you have Nodejs installed on your system. Once you have done that, you can install dependencies and run the server.
-
-```sh
-npm install
-npm run dev
-```
-
-Make sure you properly mark any unnecessary and script generated files in `.gitignore` and `.dockerignore` files.
-
-### Backend
-
-The backend is a Django Rest Framework application. The recommended approach is to create a Python virtual environment, and setup the project.
-
-```sh
-python -m venv venv
-source venv/bin/activate (on Windows: venv\Scripts\activate)
-pip install --upgrade pip
-pip install -r requirements.txt
-```
-
-After installing dependencies, you can setup the Django Project.
+## Production Setup
+For production setup, use the production docker compose file.
 
 ```sh
-python manage.py makemigrations
-python manage.py migrate
-python manage.py createsuperuser
-python manage.py runserver
+docker compose -f prod-docker-compose.yml up --build
 ```
 
-Corpus depends on PostgreSQL. You might have it setup on your local system, or running it as a Docker container. Please make sure that you edit your environment variables accordingly so that proper configurations are set. You may also change the `ENVIRONMENT` to `DEVELOPMENT` to ensure that you have the Django debugging features available.
+## Contributing
+Refer to the [contribution](./CONTRIBUTING.md) guidelines for more information about how to set the project locally for development and contribution.
 
 _--- Made and maintained by the Corpus team, IEEE NITK ---_
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/docker-compose.yml b/docker-compose.yml
@@ -22,55 +22,33 @@ services:
   adminer:
     image: adminer
     restart: always
-    expose:
-      - ${ADMINER_PORT}
+    ports:
+      - "8080:8080"
     env_file:
       - .env
     networks:
       - corpus_network
 
-  backend:
-    build: backend
-    command: /corpus/start.sh
+  corpus:
+    build:
+      context: corpus
+      dockerfile: dev-Dockerfile
+    working_dir: /corpus
+    command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
     restart: always
-    expose:
-      - ${DJANGO_BACKEND_PORT}
+    ports:
+      - "8000:8000"
     networks:
       - corpus_network
     volumes:
-      - static_files:/corpus/static
+      - ./corpus:/corpus
     depends_on:
       postgres:
         condition: service_healthy
     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
-      - postgres
-    networks:
-      - corpus_network
-    ports:
-      - "80:80"
-    volumes:
-      - static_files:/etc/nginx/staticfiles
-    env_file:
-      - .env
+    environment:
+      - ENVIRONMENT=DEVELOPMENT
 
 networks:
   corpus_network:

diff --git a/env.example b/env.example
@@ -1,7 +1,6 @@
 # Django Environment Variables
 DJANGO_BACKEND_PORT="8000"
 SECRET_KEY="supersafesecretkey"
-ENVIRONMENT="PRODUCTION"
 
 # PostgrSQL Environment Variables
 POSTGRES_VERSION="alpine3.18"

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