Cria app para home e adiciona ajustes gerais

brnocesar · Jan 29, 2021 · 58b7c1b · 58b7c1b
1 parent ac6a80f
commit 58b7c1b
Show file tree

Hide file tree

Showing 23 changed files with 113 additions and 34 deletions.
diff --git a/apps/home/__init__.py b/apps/home/__init__.py
diff --git a/apps/home/admin.py b/apps/home/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/apps/home/apps.py b/apps/home/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class HomeConfig(AppConfig):
+    name = 'home'
diff --git a/apps/home/migrations/__init__.py b/apps/home/migrations/__init__.py
diff --git a/apps/home/models.py b/apps/home/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/apps/home/tests.py b/apps/home/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/apps/home/urls.py b/apps/home/urls.py
@@ -0,0 +1,6 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    path('', views.index, name='home.index')
+]
diff --git a/apps/home/views.py b/apps/home/views.py
@@ -0,0 +1,4 @@
+from django.shortcuts import render
+
+def index(request):
+    return render(request, 'home/index.html')
diff --git a/apps/receitas/src/controller.py b/apps/receitas/src/controller.py
@@ -20,7 +20,7 @@ def index(request):
 def create(request):
     if not request.user.is_authenticated:
         messages.error(request, 'Realize login para cadastrar uma receita!')
-        return redirect('receita.index')
+        return redirect('receitas.index')
 
     if request.method == 'POST':
         nome          = request.POST['nome']
@@ -51,7 +51,7 @@ def create(request):
     return render(request, 'receitas/create.html')
 
 def show(request, receita_id):
-    return render(request, 'receitas/receita.html', {'receita': get_object_or_404(Receita, pk=receita_id)})
+    return render(request, 'receitas/show.html', {'receita': get_object_or_404(Receita, pk=receita_id)})
 
 def edit(request, receita_id):
     if request.method == 'POST':

diff --git a/apps/receitas/urls.py b/apps/receitas/urls.py
@@ -1,11 +1,12 @@
 from django.urls import path
 from .src.controller import *
+# from .src.controllers.ReceitaController import *
 
 urlpatterns = [
-    path('', index, name='receita.index'),
-    path('receitas/criar', create, name='receita.create'),
-    path('receitas/<int:receita_id>', show, name='receita.show'),
-    path('receitas/editar/<int:receita_id>', edit, name='receita.edit'),
-    path('receitas/deletar/<int:receita_id>', destroy, name='receita.destroy'),
+    path('', index, name='receitas.index'),
+    path('criar', create, name='receitas.create'),
+    path('<int:receita_id>', show, name='receitas.show'),
+    path('editar/<int:receita_id>', edit, name='receitas.edit'),
+    path('deletar/<int:receita_id>', destroy, name='receitas.destroy'),
     # rota para o campo de busca
 ]
diff --git a/apps/templates/_base.html b/apps/templates/_base.html
@@ -17,6 +17,7 @@
 
     <!-- Stylesheet -->
     <link rel="stylesheet" href="{% static 'site.css' %}">
+    <script src="https://kit.fontawesome.com/1514d311a0.js" crossorigin="anonymous"></script>
 
 </head>
 

diff --git a/apps/templates/home/index.html b/apps/templates/home/index.html
@@ -0,0 +1,22 @@
+{% extends '_base.html' %}
+{% load static %}
+{% block content %}
+
+    <!-- ##### Contact Form Area Start ##### -->
+    <div class="contact-area section-padding-0-80">
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <div class="section-heading">
+                        {% if user.is_authenticated %}
+                            <h3>Bem-vindo, {{ user.username }}!</h3>
+                        {% else %}
+                            <h3>Bem-vindo visitante!</h3>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/apps/templates/partials/_footer.html b/apps/templates/partials/_footer.html
@@ -10,7 +10,7 @@
                 </div>
                 <!-- Footer Logo -->
                 <div class="footer-logo">
-                    <a href="{% url 'receita.index' %}"><img src="{% static 'img/core-img/logo.png' %}" alt=""></a>
+                    <a href="{% url 'receitas.index' %}"><img src="{% static 'img/core-img/logo.png' %}" alt=""></a>
                 </div>
             </div>
         </div>

diff --git a/apps/templates/partials/_header.html b/apps/templates/partials/_header.html
@@ -40,7 +40,7 @@
                 <nav class="classy-navbar justify-content-between" id="deliciousNav">
 
                     <!-- Logo -->
-                    <a class="nav-brand" href="{% url 'receita.index' %}"><img src="{% static 'img/core-img/logo.png' %}" alt=""></a>
+                    <a class="nav-brand" href="{% url 'receitas.index' %}"><img src="{% static 'img/core-img/logo.png' %}" alt=""></a>
 
                     <!-- Navbar Toggler -->
                     <div class="classy-navbar-toggler">
@@ -51,27 +51,57 @@
                     <div class="classy-menu">
 
                         <!-- close btn -->
-                        <div clasimg/bg-img/
-                        img/bg-img/
-                        img/bg-img/s="classycloseIcon">
+                        <div class="classycloseIcon">
                             <div class="cross-wrap"><span class="top"></span><span class="bottom"></span></div>
                         </div>
 
                         <!-- Nav Start -->
                         <div class="classynav">
-                            <ul>
-                                {% if user.is_authenticated %}
-                                    <li><a href="{% url 'receita.index' %}">Home</a></li>
-                                    <li><a href="{% url 'usuarios.dashboard' %}">Minhas receitas</a></li>
-                                    <li><a href="{% url 'receita.create' %}">Nova Receita</a></li>
-                                    {% if user.is_superuser %}
-                                        <li><a href="{% url 'admin:index' %}">Admin</a></li>
+                            <a class="btn btn-success mr-3" href="{% url 'home.index' %}">
+                                <i class="fas fa-home"></i>&nbsp; Home
+                            </a>
+                            <div class="dropdown show mr-3">
+                                <a class="btn btn-success dropdown-toggle" href="#" role="button" id="dropdownMenuReceitas" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="fas fa-book-open"></i>&nbsp; Receitas
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="dropdownMenuReceitas">
+                                    <a class="dropdown-item" href="{% url 'receitas.index' %}"><i class="fas fa-book-open"></i>&nbsp; Receitas publicadas</a>
+                                    {% if user.is_authenticated %}
+                                        <a class="dropdown-item" href="{% url 'usuarios.dashboard' %}"><i class="fas fa-folder-open"></i>&nbsp; Minhas receitas</a></a>
+                                        <a class="dropdown-item" href="{% url 'receitas.create' %}"><i class="fas fa-plus"></i>&nbsp; Nova Receita</a></a>
                                     {% endif %}
-                                    <li><a href="{% url 'usuarios.logout' %}">Logout</a></li>
-                                {% else %}
-                                    <li><a href="{% url 'cadastro' %}">Cadastro</a></li>
-                                    <li><a href="{% url 'usuarios.login' %}">Login</a></li>
+                                </div>
+                            </div>
+                            {% if user.is_authenticated %}
+                                <div class="dropdown show mr-3">
+                                    <a class="btn btn-success dropdown-toggle" href="#" role="button" id="dropdownMenuReceitas2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        Usuários
+                                    </a>
+                                    <div class="dropdown-menu" aria-labelledby="dropdownMenuReceitas2">
+                                        <a class="dropdown-item" href="#"><i class="fas fa-book-open"></i>&nbsp; Ver todos</a>
+                                        <a class="dropdown-item" href="#"><i class="fas fa-folder-open"></i>&nbsp; Meus amigos</a></a>
+                                    </div>
+                                </div>
+                                {% if user.is_superuser %}
+                                    <a class="btn btn-success mr-3" href="{% url 'admin:index' %}">
+                                        <i class="fas fa-user-lock"></i>&nbsp; Admin
+                                    </a>
                                 {% endif %}
+                                <a class="btn btn-danger mr-3" href="{% url 'usuarios.logout' %}">
+                                    <i class="fas fa-sign-out-alt"></i>
+                                </a>
+                            {% else %}
+                                <a class="btn btn-success mr-3" href="{% url 'cadastro' %}">
+                                    <i class="fas fa-user-plus"></i>&nbsp; Cadastro
+                                </a>
+                                <a class="btn btn-success mr-3" href="{% url 'usuarios.login' %}">
+                                    <i class="fas fa-sign-in-alt"></i>
+                                </a>
+                            {% endif %}
+
+
+                            <ul>
+                                <li><a href="{% url 'home.index' %}">Home</a></li>
                             </ul>
 
                             <!-- Formulario de busca -->

diff --git a/apps/templates/partials/_search.html b/apps/templates/partials/_search.html
@@ -5,7 +5,7 @@
     <div class="container">
         <div class="row">
             <div class="col-12">
-                <form action="{% url 'receita.index' %}" method="GET">
+                <form action="{% url 'receitas.index' %}" method="GET">
                     <input type="search" name="procurar" placeholder="Uma receita especial...">
                     <button type="submit"><i class="fa fa-search" aria-hidden="true"></i></button>
                 </form>

diff --git a/apps/templates/receitas/create.html b/apps/templates/receitas/create.html
@@ -17,7 +17,7 @@ <h3>Crie sua receita, {{ user.username }} :)</h3>
                 <div class="col-12">
                 <p>Todos os campos são obrigatórios</p>
                     <div class="contact-form-area">
-                        <form action="{% url 'receita.create' %}" method="POST" enctype="multipart/form-data">
+                        <form action="{% url 'receitas.create' %}" method="POST" enctype="multipart/form-data">
                             {% csrf_token %}
                             <div class="row">
                                 <div class="col-12 col-lg-12">

diff --git a/apps/templates/receitas/edit.html b/apps/templates/receitas/edit.html
@@ -17,7 +17,7 @@ <h3>Edite sua receita, {{ user.username }} :)</h3>
                 <div class="col-12">
                 <p>Todos os campos são obrigatórios</p>
                     <div class="contact-form-area">
-                        <form action="{% url 'receita.edit' receita.id %}" method="POST" enctype="multipart/form-data">
+                        <form action="{% url 'receitas.edit' receita.id %}" method="POST" enctype="multipart/form-data">
                             {% csrf_token %}
                             <!-- <input type="text" id="receita_id" class="form-control" name="receita_id" value="{{receita.id}}" hidden> -->
                             <div class="row">

diff --git a/apps/templates/receitas/index.html b/apps/templates/receitas/index.html
@@ -16,7 +16,7 @@
                                     <img src="{{ receita.foto.url }}" alt="">
                                 {% endif %}
                                 <div class="receipe-content">
-                                    <a href="{% url 'receita.show' receita.id %}">
+                                    <a href="{% url 'receitas.show' receita.id %}">
                                         <h5>{{ receita }}</h5>
                                     </a>
                                 </div>

diff --git a/apps/templates/receitas/receita.html → apps/templates/receitas/show.html b/apps/templates/receitas/receita.html → apps/templates/receitas/show.html
diff --git a/apps/templates/usuarios/dashboard.html b/apps/templates/usuarios/dashboard.html
@@ -22,11 +22,11 @@ <h3>Olá {{ user.username }}</h3>
                                     <img src="{{ receita.foto.url }}" alt="">
                                 {% endif %}
                                 <div class="receipe-content">
-                                    <a href="{% url 'receita.show' receita.id %}">
+                                    <a href="{% url 'receitas.show' receita.id %}">
                                         <h5>{{ receita }}</h5>
                                     </a>
-                                    <a href="{% url 'receita.edit' receita.id %}" type="button" class="btn btn-info mr-2">Editar</a>
-                                    <a href="{% url 'receita.destroy' receita.id %}" type="button" class="btn btn-danger">Deletar</a>
+                                    <a href="{% url 'receitas.edit' receita.id %}" type="button" class="btn btn-info mr-2"><i class="fas fa-edit"></i></a>
+                                    <a href="{% url 'receitas.destroy' receita.id %}" type="button" class="btn btn-danger"><i class="fas fa-trash"></i></a>
                                 </div>
                             </div>
                         </div>

diff --git a/apps/usuarios/src/controller.py b/apps/usuarios/src/controller.py
@@ -61,7 +61,7 @@ def login(request):
 
 def dashboard(request):
     if not request.user.is_authenticated:
-        messages.error(request, 'Realize login para acessar a dashboard!')
+        messages.error(request, 'Realize login para acessar a página \'Minhas Receiats\'!')
         return redirect('login')
 
     receitas = Receita.objects.filter(pessoa=request.user.id).order_by('data_criacao')
@@ -70,4 +70,4 @@ def dashboard(request):
 
 def logout(request):
     auth.logout(request)
-    return redirect('receita.index')
+    return redirect('receitas.index')
diff --git a/apps/usuarios/urls.py b/apps/usuarios/urls.py
@@ -5,5 +5,5 @@
     path('login', login, name='usuarios.login'),
     path('logout', logout, name='usuarios.logout'),
     path('cadastro', create, name='cadastro'),
-    path('dashboard', dashboard, name='usuarios.dashboard'),
+    path('receitas', dashboard, name='usuarios.dashboard'),
 ]
diff --git a/djangoreceitas/urls.py b/djangoreceitas/urls.py
@@ -6,7 +6,8 @@
 print(include('apps.receitas.urls'))
 
 urlpatterns = [
-    path('', include('apps.receitas.urls')),
+    path('', include('apps.home.urls')),
+    path('receitas/', include('apps.receitas.urls')),
     path('usuarios/', include('apps.usuarios.urls')),
     path('admin/', admin.site.urls),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)