Skip to content

Improving the backend. development 1.1 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Mahmoud-Emad wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Improving the backend. development 1.1 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff58a1c
Improving the backend.
Mahmoud-Emad Mar 5, 2024
394c2fb
Updated the project strcture, changes the behavior of the docker.
Mahmoud-Emad Mar 5, 2024
3ce6c47
Updated the project strcture, changes the behavior of the docker.
Mahmoud-Emad Mar 5, 2024
426c886
Updated the project strcture, changes the behavior of the docker.
Mahmoud-Emad Mar 5, 2024
d9ac12e
Updated the project strcture, changes the behavior of the docker.
Mahmoud-Emad Mar 5, 2024
c7bb0f9
fix: Added the prod.conf file and fix docker error with copy more tha…
Mahmoud-Emad Jul 29, 2024
8e8a297
feat: Support change password endpoint:
Mahmoud-Emad Aug 11, 2024
52d1d33
Merge pull request #47 from codescalersinternships/development_1.1_ch…
Mahmoud-Emad Aug 11, 2024
2a11606
fix: Fix creating new user without hashing the password.
Mahmoud-Emad Aug 15, 2024
a7288fb
Merge pull request #53 from codescalersinternships/development_1.1_ha…
zaelgohary Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/django.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ jobs:
echo DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }} >> .env
echo DJANGO_DEBUG=${{ secrets.DJANGO_DEBUG }} >> .env
echo EMAIL=${{ secrets.EMAIL }} >> .env
echo EPASSWORD=${{ secrets.EPASSWORD }} >> .env
echo EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }} >> .env
echo EMAIL_HOST=${{ secrets.EMAIL_HOST }} >> .env
echo ENV=${{ secrets.EMAIL_HOST }} >> .env
echo SERVER_DOMAIN_NAME=${{ secrets.SERVER_DOMAIN_NAME }} >> .env
echo CLIENT_DOMAIN_NAME=${{ secrets.CLIENT_DOMAIN_NAME }} >> .env

cat .env
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
Expand All @@ -33,7 +37,4 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install poetry
poetry install
- name: Run Tests
run: |
poetry run python manage.py test
cd server && poetry install
36 changes: 0 additions & 36 deletions Dockerfile
View file
Open in desktop

This file was deleted.

72 changes: 56 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,64 @@

CMD:=poetry run
client=cd client
up:
docker-compose up --build -d
client:=cd client
server:=cd server

help:
@echo "\n- Docker: To build and run a specific service, you can do that by executing 'make docker-up service=<service_name>'."
@echo "\n- To run a the backend project, you can do that by executing 'make runserver'."
@echo "\n- To run a the backend client, you can do that by executing 'make runclient'."

docker-up:
ifeq ($(service), frontend)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env up frontend --build -d
else ifeq ($(service), backend)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env up backend --build -d
else ifeq ($(service), postgres)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env up postgres --build -d
else
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env up --build -d
endif

docker-down:
ifeq ($(service), frontend)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env down frontend
else ifeq ($(service), backend)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env down backend
else ifeq ($(service), postgres)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env down postgres
else
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env down
endif

docker-logs:
ifeq ($(service), frontend)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env logs -f frontend
else ifeq ($(service), backend)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env logs -f backend
else ifeq ($(service), postgres)
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env logs -f postgres
else
docker compose -f ./docker/docker-compose.yml --env-file=./config/.env logs -f
endif

install:
curl -sSL https://install.python-poetry.org | python3 -
poetry install
poetry check
$(server) && poetry install
$(server) && poetry check
$(client) && yarn
runserver:
$(CMD) python3 manage.py runserver
$(server) && $(CMD) python3 manage.py runserver
runclient:
$(client) && npm install && npm run dev
$(client) && yarn && yarn dev
test:
$(CMD) python3 manage.py test
$(server) && $(CMD) python3 manage.py test
lint:
$(CMD) black .
$(CMD) flake8 . --exclude=__init__.py
$(server) && $(CMD) black . --exclude=__init__.py
$(server) && $(CMD) flake8 . --exclude=__init__.py
$(client) && yarn lint
migrate:
$(CMD) python3 manage.py migrate
migrations:
$(CMD) python3 manage.py makemigrations
$(server) && $(CMD) python3 manage.py makemigrations
$(server) && $(CMD) python3 manage.py migrate
user:
$(CMD) python3 manage.py createsuperuser
$(CMD) python3 manage.py sqlmigrate test_tracker 0006
$(server) && $(CMD) python3 manage.py createsuperuser
data:
$(server) && $(CMD) python3 manage.py create locations users
Loading