diff --git a/src/classroom/admin.py b/src/classroom/admin.py index 8c38f3f..a535de0 100644 --- a/src/classroom/admin.py +++ b/src/classroom/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin - +from .models import Classroom # Register your models here. + +admin.site.register(Classroom) diff --git a/src/classroom/migrations/0002_classroom_users.py b/src/classroom/migrations/0002_classroom_users.py new file mode 100644 index 0000000..5f9cd87 --- /dev/null +++ b/src/classroom/migrations/0002_classroom_users.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2020-11-10 13:03 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('classroom', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='classroom', + name='users', + field=models.ManyToManyField(related_name='users', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/src/classroom/models.py b/src/classroom/models.py index 680dc8d..6c1993f 100644 --- a/src/classroom/models.py +++ b/src/classroom/models.py @@ -9,6 +9,12 @@ class Classroom(models.Model): description = models.TextField(max_length=300) created_by = models.ForeignKey(User, on_delete=models.PROTECT) created_at = models.DateTimeField(default=timezone.now) + users = models.ManyToManyField(User,related_name='users') + + def __str__(self): + return f'{self.name}' + + diff --git a/src/classroom/templates/classroom/home.html b/src/classroom/templates/classroom/home.html new file mode 100644 index 0000000..f5b9227 --- /dev/null +++ b/src/classroom/templates/classroom/home.html @@ -0,0 +1,37 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %} Home {% endblock title %} + +{% block content %} + +

Classrooms

+ +
+ + {% for classroom in classrooms %} +
+ + + +
+ + {% endfor %} +
+ + +{% endblock content %} \ No newline at end of file diff --git a/src/classroom/urls.py b/src/classroom/urls.py index fca7675..ee80002 100644 --- a/src/classroom/urls.py +++ b/src/classroom/urls.py @@ -4,5 +4,6 @@ from . import views app_name = 'classroom' urlpatterns = [ - path('home/', views.home, name='home'), + path('', views.home, name='home'), + path('create/', views.create_classroom, name = 'create_classroom'), ] \ No newline at end of file diff --git a/src/classroom/views.py b/src/classroom/views.py index 5831035..5cbc82a 100644 --- a/src/classroom/views.py +++ b/src/classroom/views.py @@ -1,9 +1,39 @@ from django.shortcuts import render +from .models import Classroom +from django.contrib.auth.models import User def home(requests): + classrooms = requests.user.classroom_set.all() + print(classrooms) + context = { + 'classrooms' : classrooms, + } + return render(requests, 'classroom/home.html', context) + +def create_classroom(requests): context = { 'title' : 'Classroom', } return render(requests, 'base.html', context) +def join_classroom(requests): + context = { + 'title' : 'Classroom', + } + return render(requests, 'base.html', context) + +def open_classroom(requests): + context = { + 'title' : 'Classroom', + } + return render(requests, 'base.html', context) + +def delete_classroom(requests): + context = { + 'title' : 'Classroom', + } + return render(requests, 'base.html', context) + + + diff --git a/src/core/templates/base.html b/src/core/templates/base.html index 99d1052..ada26d6 100644 --- a/src/core/templates/base.html +++ b/src/core/templates/base.html @@ -11,7 +11,9 @@ - OpenClassroom | {{ title }} + + OpenClassroom | {% block title %}{% endblock %} + @@ -38,9 +40,8 @@
- -

Hello World

+ {% block content %} + {% endblock content %}
diff --git a/src/users/models.py b/src/users/models.py index c91dede..512931c 100644 --- a/src/users/models.py +++ b/src/users/models.py @@ -1,5 +1,6 @@ from django.db import models from django.contrib.auth.models import User +from classroom.models import Classroom from PIL import Image # Create your models here.