fix

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: foodgram workflow
+name: cookingconnect workflow
 
 on: [push]
 
@@ -87,4 +87,4 @@ jobs:
         with:
           to: ${{ secrets.TELEGRAM_TO }}
           token: ${{ secrets.TELEGRAM_TOKEN }}
-          message: Деплой успешно выполнен!
+          message: Деплой успешно выполнен!

README.md

@@ -116,7 +116,7 @@ touch .env
 
 ```python
 DB_ENGINE='django.db.backends.postgresql'
-POSTGRES_DB='foodgram' # Задаем имя для БД.
+POSTGRES_DB='cookingconnect' # Задаем имя для БД.
 POSTGRES_USER='foodgram_u' # Задаем пользователя для БД.
 POSTGRES_PASSWORD='foodgram_u_pass' # Задаем пароль для БД.
 DB_HOST='db'
@@ -152,13 +152,18 @@ docker-compose down -v
 Для доступа к контейнеру backend и сборки финальной части выполняем следующие команды:
 
 ```bash
-docker-compose exec backend python manage.py makemigrations
+docker-compose exec backend python manage.py makemigrations users
+docker-compose exec backend python manage.py makemigrations recipes
+
 ```
 
 ```bash
 docker-compose exec backend python manage.py migrate --noinput
 ```
-
+```bash
+docker compose exec backend python manage.py load_tags
+docker compose exec backend python manage.py load_ingrs
+```
 ```bash
 docker-compose exec backend python manage.py createsuperuser
 ```

backend/Dockerfile

@@ -2,4 +2,4 @@ FROM python:3.7-slim
 WORKDIR /app
 COPY . .
 RUN pip3 install --upgrade pip && pip3 install -r ./requirements.txt --no-cache-dir
-CMD ["gunicorn", "foodgram.wsgi:application", "--bind", "0.0.0.0:8000"]
+CMD ["gunicorn", "cookingconnect.wsgi:application", "--bind", "0.0.0.0:8000"]

backend/api/urls.py

@@ -1,7 +1,7 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
-from .views import IngredientViewSet, RecipeViewSet, TagViewSet
+from api.views import IngredientViewSet, RecipeViewSet, TagViewSet
 from users.views import UserViewSet
 
 router = DefaultRouter()

backend/api/validators.py

@@ -2,7 +2,7 @@
 from rest_framework import serializers
 from webcolors import hex_to_name
 
-from foodgram.settings import INGREDIENT_MIN, INGREDIENT_MAX
+from cookingconnect.settings import INGREDIENT_MAX, INGREDIENT_MIN
 
 
 def validate_colorfield(value):

backend/api/views.py

@@ -10,7 +10,7 @@
 from recipes.models import (Favorite, Ingredient, Recipe, ShoppingCart, Tag)
 from .permissions import IsAuthorOrAdminOrReadOnly
 
-from .serializers import (
+from api.serializers import (
     FavoriteSerializer,
     IngredientSerializer,
     RecipeCreateSerializer,

backend/foodgram/asgi.py → backend/cookingconnect/asgi.py

@@ -2,6 +2,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'foodgram.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cookingconnect.settings')
 
 application = get_asgi_application()

backend/foodgram/settings.py → backend/cookingconnect/settings.py

@@ -46,7 +46,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'foodgram.urls'
+ROOT_URLCONF = 'cookingconnect.urls'
 
 TEMPLATES = [
     {
@@ -64,13 +64,13 @@
     },
 ]
 
-WSGI_APPLICATION = 'foodgram.wsgi.application'
+WSGI_APPLICATION = 'cookingconnect.wsgi.application'
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': os.getenv('POSTGRES_DB', 'foodgram'),
-        'USER': os.getenv('POSTGRES_USER', 'foodgram_user'),
+        'NAME': os.getenv('POSTGRES_DB', 'cookingconnect'),
+        'USER': os.getenv('POSTGRES_USER', 'cookingconnect_user'),
         'PASSWORD': os.getenv('POSTGRES_PASSWORD', ''),
         'HOST': os.getenv('DB_HOST', 'db'),
         'PORT': os.getenv('DB_PORT', 5432)

backend/foodgram/wsgi.py → backend/cookingconnect/wsgi.py

@@ -2,6 +2,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'foodgram.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cookingconnect.settings')
 
 application = get_wsgi_application()

backend/manage.py

@@ -6,7 +6,7 @@
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'foodgram.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cookingconnect.settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

infra/docker-compose.yml

@@ -26,7 +26,7 @@ services:
   nginx:
     image: nginx:1.21.3-alpine
     ports:
-      - "8000:80"
+      - "80:80"
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf
       - ./docs/:/usr/share/nginx/html/api/docs/
@@ -40,4 +40,4 @@ services:
 volumes:
   static_value:
   media_value:
-  frontend_value:
+  frontend_value:

infra/nginx.conf

@@ -1,7 +1,7 @@
 server {
 
     listen 80;
-    server_name foodgramfabilya.bounceme.net;
+    server_name localhost;
     client_max_body_size 20M;
 
     location /static/admin/ {
@@ -16,7 +16,6 @@ server {
 
     location /media/ {
         root /var/html/;
-        autoindex on;
     }
 
     location /api/ {