Compare commits
9 Commits
1ff23af8bf
...
behruz
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51b3535a80 | ||
|
|
c88ea1aa77 | ||
|
|
581021cbb7 | ||
| 62f65385e1 | |||
|
|
76d2fe5090 | ||
| 92d23901a1 | |||
|
|
42987e4154 | ||
| 84b14da3f4 | |||
|
|
cb53924f9b |
@@ -23,7 +23,7 @@ DB_ENGINE=django.db.backends.postgresql_psycopg2
|
||||
DB_NAME=django
|
||||
DB_USER=postgres
|
||||
DB_PASSWORD=2309
|
||||
DB_HOST=db
|
||||
DB_HOST=postgres
|
||||
DB_PORT=5432
|
||||
|
||||
# Cache
|
||||
|
||||
7
.github/workflows/deploy.yaml
vendored
7
.github/workflows/deploy.yaml
vendored
@@ -151,6 +151,11 @@ jobs:
|
||||
git fetch origin main
|
||||
git reset --hard origin/main
|
||||
|
||||
cp .env.example .env
|
||||
if [ ! -f .env ]; then
|
||||
cp .env.example .env
|
||||
echo ".env yaratildi, production qiymatlarini kiriting!"
|
||||
fi
|
||||
|
||||
export PORT=8085
|
||||
docker pull ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT_NAME }}:${{ github.run_number }}
|
||||
docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth
|
||||
|
||||
@@ -13,7 +13,7 @@ from config.env import env
|
||||
|
||||
|
||||
def home(request):
|
||||
return HttpResponse("OK: #65ab51e65224a92a4b6d488d3e8f9b21d3256876")
|
||||
return HttpResponse("OK: #62f65385e1dada519459965e9e24cfdd20a41e26")
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
|
||||
@@ -87,14 +87,8 @@ class DeleteAdminUserApiView(APIView):
|
||||
permission_classes = [IsAuthenticated]
|
||||
|
||||
def delete(self, request, pk):
|
||||
if request.user.role != RoleChoice.SUPERUSER:
|
||||
return Response({'detail': 'Forbidden'}, status=403)
|
||||
|
||||
user = get_object_or_404(User, pk=pk)
|
||||
if user.role != RoleChoice.ADMIN:
|
||||
return Response({'detail': 'This user is not an admin'}, status=400)
|
||||
user.delete()
|
||||
|
||||
return Response(status=204)
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ from rest_framework import serializers
|
||||
|
||||
from core.apps.tasks.serializers.comment import CommentSerializer
|
||||
from core.apps.tasks.serializers.task import TaskSerializer
|
||||
from core.apps.tasks.models import Column, Task
|
||||
from core.apps.tasks.models import Column
|
||||
|
||||
|
||||
class BoardTaskSerializer(TaskSerializer):
|
||||
|
||||
@@ -5,6 +5,8 @@ from core.apps.tasks.serializers.board import BoardSerializer
|
||||
from core.apps.tasks.models import Column
|
||||
|
||||
|
||||
#test commit
|
||||
|
||||
class BoardListView(generics.ListAPIView):
|
||||
queryset = Column.objects.order_by('id')
|
||||
serializer_class = BoardSerializer
|
||||
|
||||
@@ -84,7 +84,7 @@ services:
|
||||
max-file: "5"
|
||||
|
||||
web:
|
||||
image: husanjon/sifatbaho:147
|
||||
image: husanjon/sifatbaho:150
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
@@ -129,7 +129,7 @@ services:
|
||||
max-file: "5"
|
||||
|
||||
celery:
|
||||
image: husanjon/sifatbaho:147
|
||||
image: husanjon/sifatbaho:150
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
|
||||
Reference in New Issue
Block a user