Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified cursos/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/admin.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/apps.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/fields.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/forms.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/models.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/urls.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/__pycache__/views.cpython-39.pyc
Binary file not shown.
Binary file modified cursos/migrations/__pycache__/0001_initial.cpython-39.pyc
Binary file not shown.
Binary file not shown.
Binary file modified cursos/migrations/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion cursos/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
path('<str:curso_slug>/modulos/',views.modulos, name='modulos'),
path('<str:curso_slug>/<int:modulo_id>/',views.exibir_modulo, name='exibir-modulo'),
path('<str:curso_slug>/<int:modulo_id>/criar-atividade/',views.criar_atividade, name='criar-atividade'),
# path('<str:curso_slug>/<int:modulo_id>/criar-post/',views.criar_post, name='criar-post'),
path('<str:curso_slug>/<int:modulo_id>/criar-post/',views.criar_post, name='criar-post'),
]
59 changes: 57 additions & 2 deletions cursos/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
from django.forms.models import modelform_factory
from django.apps import apps
from django.db.models import Q
from django.utils.text import slugify
from django.core.paginator import Paginator
from django.views.generic import ListView

from .forms import CreateCourseForm, CreateActivityForm, CreateModuleForm, AddFileForm, AddImageForm, Escolha, AddTextForm, AddVideoForm
from .models import Course, Module, Content, Activity, Post



def inicio(request):
Expand Down Expand Up @@ -42,8 +49,15 @@ def criar(request):

def buscar_cursos(request):
if request.user.is_authenticated:
cursos = Course.objects.all
cursos_dict = {'cursos': cursos}
cursos = Course.objects.all()
cursos_paginator = Paginator(cursos, 1)
num_pagina = request.GET.get('paginas')
paginas = cursos_paginator.get_page(num_pagina)
cursos_dict = {
'cursos': cursos,
'paginas': paginas,
}

return render(request, 'buscarCursos.html', cursos_dict)
else:
return redirect('/')
Expand Down Expand Up @@ -187,6 +201,47 @@ def criar_atividade(request, curso_slug, modulo_id):
else:
return redirect('/')

def criar_post(request, curso_slug, modulo_id):
dono=False
try:
c= Course.objects.get(slug=curso_slug)
m= Module.objects.get(pk=modulo_id)
except Course.DoesNotExist:
raise Http404("Ops, esse curso não existe")
except Course.DoesNotExist:
raise Http404("Ops, esse módulo não existe")
if(request.user==c.owner):
dono=True
if request.user.is_authenticated:
if dono:
if request.method == 'POST':
form = CreateActivityForm(request.POST)
if form.is_valid():
record = form.save(commit=False)
record.course=c
record.module=m
form.save()
# owner = request.user
# subject = form.cleaned_data.get('subject')
# title = form.cleaned_data.get('title')
# overview = form.cleaned_data.get('overview')
# slug = slugify(form.cleaned_data.get('title'))

# curso = Course(owner=owner, subject=subject, title=title, overview=overview, slug=slug)
# curso.save()

return redirect('/genus/'+curso_slug+'/'+str(modulo_id)+'/')
else:

form = CreateActivityForm()
return render(request, 'createPost.html', {'form': form})
else:
print("opaopa")
return redirect('/genus/inicio/')
else:
return redirect('/')


# def criar_post(request, curso_slug, modulo_id):
# if request.user.is_authenticated:
# dono=False
Expand Down
Binary file modified db.sqlite3
Binary file not shown.
Binary file modified genus/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
Binary file modified genus/__pycache__/settings.cpython-39.pyc
Binary file not shown.
Binary file modified genus/__pycache__/urls.cpython-39.pyc
Binary file not shown.
Binary file modified genus/__pycache__/views.cpython-39.pyc
Binary file not shown.
Binary file modified genus/__pycache__/wsgi.cpython-39.pyc
Binary file not shown.
1 change: 1 addition & 0 deletions genus/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.humanize',
]

MIDDLEWARE = [
Expand Down
Binary file modified registro/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
Binary file modified registro/__pycache__/admin.cpython-39.pyc
Binary file not shown.
Binary file modified registro/__pycache__/apps.cpython-39.pyc
Binary file not shown.
Binary file modified registro/__pycache__/forms.cpython-39.pyc
Binary file not shown.
Binary file modified registro/__pycache__/models.cpython-39.pyc
Binary file not shown.
Binary file modified registro/__pycache__/urls.cpython-39.pyc
Binary file not shown.
Binary file modified registro/__pycache__/views.cpython-39.pyc
Binary file not shown.
Binary file modified registro/migrations/__pycache__/__init__.cpython-39.pyc
Binary file not shown.
82 changes: 79 additions & 3 deletions templates/buscarCursos.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,92 @@
<!DOCTYPE html>
{% load static %}
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Buscar</title>
<link rel="stylesheet" href="{% static 'css/buscarcursostyle.css' %}">
<title>Document</title>
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
<script src="https://kit.fontawesome.com/168c8af039.js" crossorigin="anonymous"></script>
</head>
<body>
<h1>Cursos disponíveis</h1>
<nav>
<img src="../static/images/logo.svg" alt="Genus Logo">
<ul>
<li><i class="far fa-user-circle"></i><a href="#">Perfil</a> </li>
<li><i class="fas fa-cog"></i><a href=""> Configurações</a></li>
</ul>
<button class="exit-btn">SAIR</button>
<div class="dropdown">
<button class="dropbtn"><i class="fas fa-bars"></i></button>
<div class="dropdown-content">
<a href="#"><i class="far fa-user-circle"></i>Perfil</a>
<a href="#"><i class="fas fa-cog"></i>Configurações</a>
<a href="#"><i class="fas fa-sign-out-alt"></i>Sair</a>
</div>
</div>

</nav>
<div class="content">
<header>
<h1>Buscar Cursos</h1>
</header>
<section>
<p>Insira o nome do curso que você procura:</p>
<input type="text">
<button><i class="fas fa-search"></i>BUSCAR</button>
</section>
<!--seção páginas de cursos na base de dados, um curso por pagina para teste-->
<h1>Cursos disponíveis</h1>
<ul class="cursos-query">
{% for curso in cursos %}
{% for curso in paginas %}
<li><a href="{% url 'cursos:resumo' curso.slug %}">{{curso.title}}</a></li>
{% endfor %}
<br><br><div class="pagination">
<span class="step-links">
{% if paginas.has_previous %}
<a href="?paginas=1">&laquo; primeira</a>
<a href="?paginas={{ page_obj.previous_page_number }}">anterior</a>
{% endif %}

<span class="current">
{% load humanize %}
Página {{ paginas.number|apnumber}} de {{ paginas.paginator.num_pages|apnumber }}.
</span>

{% if paginas.has_next %}
<a href="?paginas={{ paginas.next_page_number }}">próxima</a>
<a href="?paginas={{ paginas.next_page_number }}">última &raquo;</a>
{% endif %}
</span>
</div>
</ul>
<!-- fim da seção de páginas de cursos
nao quis deletar seu codigo, amigo-->
<section class="course-list">
<ul>
<li>
<a href="">
<h2>Sistemas Distribuidos</h2>
<p>Prof. Jairson</p>
</a>
</li>
<li>
<a href="">
<h2>Cálculo</h2>
<p>Prof. Lino</p>
</a>

</li>
<li>
<a href="">
<h2>Historia</h2>
<p>Nome</p>
</a>
</li>
</ul>
</section>
</div>
</body>
</html>
21 changes: 21 additions & 0 deletions templates/createPost.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<body>
{% block content %}
<h2>Criar postagem</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="hidden" name="next" value="{{ redirect }}">
<button type="submit">Criar</button>
</form>
{% endblock %}

</body>
</html>

2 changes: 1 addition & 1 deletion templates/modulo.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1>{{modulo.title}}</h1>
<button class="dropbtn">Adicionar conteúdo</button>
<div class="dropdown-content">
<a href="{% url 'cursos:criar-atividade' curso.slug modulo.id %}">Atividade</a>
<a href="#">Post</a>
<a href="{% url 'cursos:criar-post' curso.slug modulo.id %}">Post</a>
</div>
</div>
<hr>
Expand Down