Skip to content

Commit

Permalink
Feat: Autentificação de Usuário #76
Browse files Browse the repository at this point in the history
  • Loading branch information
dudubarbaro committed Aug 24, 2023
1 parent 297486c commit e9d2377
Show file tree
Hide file tree
Showing 46 changed files with 126 additions and 56 deletions.
13 changes: 5 additions & 8 deletions config/routers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@

from core.views import (
CategoryViewSet,
CommentsViewSet,
FavoritesViewSet,
FeelingViewSet,
NewsViewSet,
HelpViewSet,
NewsFeelViewSet,
SaveToReadViewSet,
CommentsViewSet,
NewsViewSet,
ReactionViewSet,
HelpViewSet,
)

from user.views import (
UserProjectFollowViewSet,
SaveToReadViewSet,
)
from user.views import UserProjectFollowViewSet

router = DefaultRouter()
router.register(r"newsfeel", NewsFeelViewSet)
Expand Down
29 changes: 20 additions & 9 deletions config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""
import os
from pathlib import Path

import environ

# Build paths inside the project like this: BASE_DIR / 'subdir'.
Expand All @@ -26,15 +27,15 @@
# SECURITY WARNING: don't run with debug turned on in production!
# DEBUG = True

# ALLOWED_HOSTS = []
ALLOWED_HOSTS = []

env = environ.Env()
environ.Env.read_env((os.path.join(BASE_DIR, ".env")))

SECRET_KEY = env("SECRET_KEY")
DEBUG = env("DEBUG")
ALLOWED_HOSTS = env("ALLOWED_HOSTS").split(",")
DATABASES = {"default": env.db()}
# ALLOWED_HOSTS = env("ALLOWED_HOSTS").split(",")
# DATABASES = {"default": env.db()}

# Application definition

Expand Down Expand Up @@ -81,18 +82,28 @@
},
]

REST_FRAMEWORK = {
"DEFAULT_PERMISSION_CLASSES": [
"rest_framework.permissions.IsAuthenticated",
"rest_framework_simplejwt.authentication.JWTAuthentication",
],
"DEFAULT_AUTHENTICATION_CLASSES": [
"rest_framework_simplejwt.authentication.JWTAuthentication",
],
}

WSGI_APPLICATION = "config.wsgi.application"


# Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases

# DATABASES = {
# "default": {
# "ENGINE": "django.db.backends.sqlite3",
# "NAME": BASE_DIR / "db.sqlite3",
# }
# }
DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": BASE_DIR / "db.sqlite3",
}
}


# Password validation
Expand Down
1 change: 1 addition & 0 deletions config/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib import admin
from django.urls import include, path

from .routers import router

urlpatterns = [
Expand Down
20 changes: 6 additions & 14 deletions core/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,17 @@

from core.models import (
Category,
Feeling,
NewsFeel,
Comments,
News,
Favorites,
Feeling,
Help,
News,
NewsFeel,
Reaction,
SaveToRead,
Help,
)

from user.models import (
User,
UserInteractions,
UserProjectFollow,
)

from project.models import (
Project,
)
from project.models import Project
from user.models import User, UserInteractions, UserProjectFollow

admin.site.register(Category)
admin.site.register(Feeling)
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0004_alter_category_description_news.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-04-17 17:34

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0005_comments_newsfeel_delete_news.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-04-17 18:34

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0006_news.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-04-17 18:38

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0007_userinteractions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-04-17 19:01

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0008_favorites.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-04-17 19:05

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-04-24 12:56

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0011_reaction.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2 on 2023-05-02 17:09

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2.1 on 2023-05-05 16:26

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2.2 on 2023-06-22 17:26

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/migrations/0017_alter_news_project_delete_project.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2.2 on 2023-06-29 11:13

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion core/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from .comments import Comments
from .favorites import Favorites
from .feeling import Feeling
from .help import Help
from .news import News
from .newsFeel import NewsFeel
from .reaction import Reaction
from .saveToRead import SaveToRead
from .help import Help
2 changes: 2 additions & 0 deletions core/models/comments.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from django.db import models

from user.models.user import User

from .news import News


Expand Down
2 changes: 2 additions & 0 deletions core/models/favorites.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from django.db import models

from user.models import User

from .news import News


Expand Down
4 changes: 3 additions & 1 deletion core/models/news.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from django.db import models
from .category import Category

from project.models.project import Project
from user.models import User

from .category import Category


class News(models.Model):
category = models.ForeignKey(
Expand Down
4 changes: 3 additions & 1 deletion core/models/newsFeel.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from django.db import models

from user.models import User
from .news import News

from .feeling import Feeling
from .news import News


class NewsFeel(models.Model):
Expand Down
2 changes: 2 additions & 0 deletions core/models/reaction.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from django.db import models

from user.models import User

from .news import News


Expand Down
2 changes: 2 additions & 0 deletions core/models/saveToRead.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from django.db import models

from user.models import User

from .news import News


Expand Down
8 changes: 4 additions & 4 deletions core/serializers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from .comments import CommentsSerializer
from .reaction import ReactionSerializer
from .saveToRead import SaveToReadSerializer
from .categories import CategorySerializer
from .comments import CommentsSerializer
from .favorite import FavoritesSerializer
from .feeling import FeelingSerializer
from .help import HelpSerializer
from .news import NewsSerializer
from .newsFeel import NewsFeelSerializer
from .help import HelpSerializer
from .reaction import ReactionSerializer
from .saveToRead import SaveToReadSerializer
1 change: 1 addition & 0 deletions core/serializers/categories.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import Category


Expand Down
1 change: 1 addition & 0 deletions core/serializers/favorite.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import Favorites


Expand Down
1 change: 1 addition & 0 deletions core/serializers/feeling.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import Feeling


Expand Down
1 change: 1 addition & 0 deletions core/serializers/help.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import Help


Expand Down
1 change: 1 addition & 0 deletions core/serializers/news.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import News


Expand Down
1 change: 1 addition & 0 deletions core/serializers/newsFeel.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import NewsFeel


Expand Down
1 change: 1 addition & 0 deletions core/serializers/saveToRead.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.serializers import ModelSerializer

from core.models import SaveToRead


Expand Down
4 changes: 2 additions & 2 deletions core/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from .comments import CommentsViewSet
from .categories import CategoryViewSet
from .comments import CommentsViewSet
from .favorite import FavoritesViewSet
from .feeling import FeelingViewSet
from .help import HelpViewSet
from .news import NewsViewSet
from .newsFeel import NewsFeelViewSet
from .reaction import ReactionViewSet
from .saveToRead import SaveToReadViewSet
from .help import HelpViewSet
1 change: 1 addition & 0 deletions core/views/categories.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.viewsets import ModelViewSet

from core.models import Category
from core.serializers import CategorySerializer

Expand Down
1 change: 1 addition & 0 deletions core/views/favorite.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.viewsets import ModelViewSet

from core.models import Favorites
from core.serializers import FavoritesSerializer

Expand Down
1 change: 1 addition & 0 deletions core/views/feeling.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.viewsets import ModelViewSet

from core.models import Feeling
from core.serializers import FeelingSerializer

Expand Down
1 change: 1 addition & 0 deletions core/views/help.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.viewsets import ModelViewSet

from core.models import Help
from core.serializers import HelpSerializer

Expand Down
1 change: 1 addition & 0 deletions core/views/news.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.viewsets import ModelViewSet

from core.models import News
from core.serializers import NewsSerializer

Expand Down
1 change: 1 addition & 0 deletions core/views/saveToRead.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework.viewsets import ModelViewSet

from core.models import SaveToRead
from core.serializers import SaveToReadSerializer

Expand Down
Loading

0 comments on commit e9d2377

Please sign in to comment.