diff --git a/cursos/__pycache__/__init__.cpython-39.pyc b/cursos/__pycache__/__init__.cpython-39.pyc index e65f77c..586e987 100644 Binary files a/cursos/__pycache__/__init__.cpython-39.pyc and b/cursos/__pycache__/__init__.cpython-39.pyc differ diff --git a/cursos/__pycache__/admin.cpython-39.pyc b/cursos/__pycache__/admin.cpython-39.pyc index 7c47d73..58c424a 100644 Binary files a/cursos/__pycache__/admin.cpython-39.pyc and b/cursos/__pycache__/admin.cpython-39.pyc differ diff --git a/cursos/__pycache__/apps.cpython-39.pyc b/cursos/__pycache__/apps.cpython-39.pyc index 80e9f19..7911635 100644 Binary files a/cursos/__pycache__/apps.cpython-39.pyc and b/cursos/__pycache__/apps.cpython-39.pyc differ diff --git a/cursos/__pycache__/fields.cpython-39.pyc b/cursos/__pycache__/fields.cpython-39.pyc index bfbf17b..5dd6bf5 100644 Binary files a/cursos/__pycache__/fields.cpython-39.pyc and b/cursos/__pycache__/fields.cpython-39.pyc differ diff --git a/cursos/__pycache__/forms.cpython-39.pyc b/cursos/__pycache__/forms.cpython-39.pyc index 116ca61..0692160 100644 Binary files a/cursos/__pycache__/forms.cpython-39.pyc and b/cursos/__pycache__/forms.cpython-39.pyc differ diff --git a/cursos/__pycache__/models.cpython-39.pyc b/cursos/__pycache__/models.cpython-39.pyc index 508ab83..91e7c94 100644 Binary files a/cursos/__pycache__/models.cpython-39.pyc and b/cursos/__pycache__/models.cpython-39.pyc differ diff --git a/cursos/__pycache__/urls.cpython-39.pyc b/cursos/__pycache__/urls.cpython-39.pyc index 25ca636..e56cd32 100644 Binary files a/cursos/__pycache__/urls.cpython-39.pyc and b/cursos/__pycache__/urls.cpython-39.pyc differ diff --git a/cursos/__pycache__/views.cpython-39.pyc b/cursos/__pycache__/views.cpython-39.pyc index 96e666a..a87918f 100644 Binary files a/cursos/__pycache__/views.cpython-39.pyc and b/cursos/__pycache__/views.cpython-39.pyc differ diff --git a/cursos/migrations/__pycache__/0001_initial.cpython-39.pyc b/cursos/migrations/__pycache__/0001_initial.cpython-39.pyc index 646834e..5496945 100644 Binary files a/cursos/migrations/__pycache__/0001_initial.cpython-39.pyc and b/cursos/migrations/__pycache__/0001_initial.cpython-39.pyc differ diff --git a/cursos/migrations/__pycache__/0002_alter_activity_grade.cpython-39.pyc b/cursos/migrations/__pycache__/0002_alter_activity_grade.cpython-39.pyc index 605d669..e735168 100644 Binary files a/cursos/migrations/__pycache__/0002_alter_activity_grade.cpython-39.pyc and b/cursos/migrations/__pycache__/0002_alter_activity_grade.cpython-39.pyc differ diff --git a/cursos/migrations/__pycache__/__init__.cpython-39.pyc b/cursos/migrations/__pycache__/__init__.cpython-39.pyc index 6aaf376..7f80771 100644 Binary files a/cursos/migrations/__pycache__/__init__.cpython-39.pyc and b/cursos/migrations/__pycache__/__init__.cpython-39.pyc differ diff --git a/cursos/urls.py b/cursos/urls.py index bd9f32f..06db882 100644 --- a/cursos/urls.py +++ b/cursos/urls.py @@ -13,5 +13,5 @@ path('/modulos/',views.modulos, name='modulos'), path('//',views.exibir_modulo, name='exibir-modulo'), path('//criar-atividade/',views.criar_atividade, name='criar-atividade'), - # path('//criar-post/',views.criar_post, name='criar-post'), + path('//criar-post/',views.criar_post, name='criar-post'), ] \ No newline at end of file diff --git a/cursos/views.py b/cursos/views.py index 79dc809..5fd4abe 100644 --- a/cursos/views.py +++ b/cursos/views.py @@ -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): @@ -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('/') @@ -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 diff --git a/db.sqlite3 b/db.sqlite3 index 9a451fa..35071fc 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/genus/__pycache__/__init__.cpython-39.pyc b/genus/__pycache__/__init__.cpython-39.pyc index 1a4547b..e263b52 100644 Binary files a/genus/__pycache__/__init__.cpython-39.pyc and b/genus/__pycache__/__init__.cpython-39.pyc differ diff --git a/genus/__pycache__/settings.cpython-39.pyc b/genus/__pycache__/settings.cpython-39.pyc index d8c538d..c7fad04 100644 Binary files a/genus/__pycache__/settings.cpython-39.pyc and b/genus/__pycache__/settings.cpython-39.pyc differ diff --git a/genus/__pycache__/urls.cpython-39.pyc b/genus/__pycache__/urls.cpython-39.pyc index 0224a12..e690efe 100644 Binary files a/genus/__pycache__/urls.cpython-39.pyc and b/genus/__pycache__/urls.cpython-39.pyc differ diff --git a/genus/__pycache__/views.cpython-39.pyc b/genus/__pycache__/views.cpython-39.pyc index a2bfe8a..8f6d352 100644 Binary files a/genus/__pycache__/views.cpython-39.pyc and b/genus/__pycache__/views.cpython-39.pyc differ diff --git a/genus/__pycache__/wsgi.cpython-39.pyc b/genus/__pycache__/wsgi.cpython-39.pyc index 025d3dc..1a440a6 100644 Binary files a/genus/__pycache__/wsgi.cpython-39.pyc and b/genus/__pycache__/wsgi.cpython-39.pyc differ diff --git a/genus/settings.py b/genus/settings.py index c663d86..7996bc3 100644 --- a/genus/settings.py +++ b/genus/settings.py @@ -39,6 +39,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.contrib.humanize', ] MIDDLEWARE = [ diff --git a/registro/__pycache__/__init__.cpython-39.pyc b/registro/__pycache__/__init__.cpython-39.pyc index 1bac047..2936146 100644 Binary files a/registro/__pycache__/__init__.cpython-39.pyc and b/registro/__pycache__/__init__.cpython-39.pyc differ diff --git a/registro/__pycache__/admin.cpython-39.pyc b/registro/__pycache__/admin.cpython-39.pyc index f17bac5..4729c3a 100644 Binary files a/registro/__pycache__/admin.cpython-39.pyc and b/registro/__pycache__/admin.cpython-39.pyc differ diff --git a/registro/__pycache__/apps.cpython-39.pyc b/registro/__pycache__/apps.cpython-39.pyc index 6b00007..b106772 100644 Binary files a/registro/__pycache__/apps.cpython-39.pyc and b/registro/__pycache__/apps.cpython-39.pyc differ diff --git a/registro/__pycache__/forms.cpython-39.pyc b/registro/__pycache__/forms.cpython-39.pyc index fc964de..9324d41 100644 Binary files a/registro/__pycache__/forms.cpython-39.pyc and b/registro/__pycache__/forms.cpython-39.pyc differ diff --git a/registro/__pycache__/models.cpython-39.pyc b/registro/__pycache__/models.cpython-39.pyc index 9ff194e..091e883 100644 Binary files a/registro/__pycache__/models.cpython-39.pyc and b/registro/__pycache__/models.cpython-39.pyc differ diff --git a/registro/__pycache__/urls.cpython-39.pyc b/registro/__pycache__/urls.cpython-39.pyc index 14fb929..740d97a 100644 Binary files a/registro/__pycache__/urls.cpython-39.pyc and b/registro/__pycache__/urls.cpython-39.pyc differ diff --git a/registro/__pycache__/views.cpython-39.pyc b/registro/__pycache__/views.cpython-39.pyc index 2bcf66f..98855df 100644 Binary files a/registro/__pycache__/views.cpython-39.pyc and b/registro/__pycache__/views.cpython-39.pyc differ diff --git a/registro/migrations/__pycache__/__init__.cpython-39.pyc b/registro/migrations/__pycache__/__init__.cpython-39.pyc index dea4e26..34f14d0 100644 Binary files a/registro/migrations/__pycache__/__init__.cpython-39.pyc and b/registro/migrations/__pycache__/__init__.cpython-39.pyc differ diff --git a/templates/buscarCursos.html b/templates/buscarCursos.html index ff8e44c..ae1508b 100644 --- a/templates/buscarCursos.html +++ b/templates/buscarCursos.html @@ -1,16 +1,92 @@ +{% load static %} - Buscar + + Document + + + -

Cursos disponíveis

+ +
+
+

Buscar Cursos

+
+
+

Insira o nome do curso que você procura:

+ + +
+ +

Cursos disponíveis

    - {% for curso in cursos %} + {% for curso in paginas %}
  • {{curso.title}}
    • {% endfor %} +

+ +
+ +
+
\ No newline at end of file diff --git a/templates/createPost.html b/templates/createPost.html new file mode 100644 index 0000000..521242b --- /dev/null +++ b/templates/createPost.html @@ -0,0 +1,21 @@ + + + + + + Document + + + {% block content %} +

Criar postagem

+
+ {% csrf_token %} + {{ form.as_p }} + + +
+ {% endblock %} + + + + diff --git a/templates/modulo.html b/templates/modulo.html index 1608b48..ea47751 100644 --- a/templates/modulo.html +++ b/templates/modulo.html @@ -29,7 +29,7 @@

{{modulo.title}}

Atividade - Post + Post