diff --git a/keymedia/__pycache__/settings.cpython-37.pyc b/keymedia/__pycache__/settings.cpython-37.pyc index 700968e..ab8611b 100644 Binary files a/keymedia/__pycache__/settings.cpython-37.pyc and b/keymedia/__pycache__/settings.cpython-37.pyc differ diff --git a/keymedia/__pycache__/urls.cpython-37.pyc b/keymedia/__pycache__/urls.cpython-37.pyc index 0b7c1a6..f302c62 100644 Binary files a/keymedia/__pycache__/urls.cpython-37.pyc and b/keymedia/__pycache__/urls.cpython-37.pyc differ diff --git a/keymedia/settings.py b/keymedia/settings.py index 32a4c9d..f550bcb 100644 --- a/keymedia/settings.py +++ b/keymedia/settings.py @@ -54,7 +54,7 @@ ROOT_URLCONF = 'keymedia.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [os.path.join(BASE_DIR, "templates")], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/keymedia/urls.py b/keymedia/urls.py index 0a1eef7..07b7c2a 100644 --- a/keymedia/urls.py +++ b/keymedia/urls.py @@ -3,6 +3,5 @@ from django.urls import include,path urlpatterns = [ path('admin/', admin.site.urls), - path('managemedia/', include('managemedia.urls',)), - path('profile/', include('listmedia.urls')), + path('manage/', include('managemedia.urls',)), ] diff --git a/managemedia/__pycache__/urls.cpython-37.pyc b/managemedia/__pycache__/urls.cpython-37.pyc index 0e104ba..c783c7c 100644 Binary files a/managemedia/__pycache__/urls.cpython-37.pyc and b/managemedia/__pycache__/urls.cpython-37.pyc differ diff --git a/managemedia/__pycache__/views.cpython-37.pyc b/managemedia/__pycache__/views.cpython-37.pyc index 14f7062..b328466 100644 Binary files a/managemedia/__pycache__/views.cpython-37.pyc and b/managemedia/__pycache__/views.cpython-37.pyc differ diff --git a/managemedia/models/__init__.py b/managemedia/models/__init__.py index e69de29..e24d874 100644 --- a/managemedia/models/__init__.py +++ b/managemedia/models/__init__.py @@ -0,0 +1,5 @@ +from .books import * +from .common import * +from .movies import * +from .tv import * +from .vgames import * diff --git a/managemedia/models/common.py b/managemedia/models/common.py index 9d88a6b..54300fe 100644 --- a/managemedia/models/common.py +++ b/managemedia/models/common.py @@ -24,7 +24,7 @@ class CommonMediaFields(models.Model): original_language = models.CharField('Original Language', blank=True) class Meta: abstract = True - + ### VideoFields is for movies and tv shows class VideoFields(CommonFields): tmdb_id = models.PositiveIntegerField('TheMovieDB ID', blank=True) diff --git a/managemedia/models/models.py b/managemedia/models/models.py deleted file mode 100644 index a795340..0000000 --- a/managemedia/models/models.py +++ /dev/null @@ -1,60 +0,0 @@ -from django.db import models - -class MediaTypes(models.Model): - name = models.CharField('Title') - -class CommonMediaFields(models.Model): - name = models.CharField('Title', maxlength=256) - summary = models.TextField('Summary') - release_date = models.DateField('Release Date') - creation_date = models.DateTimeField('Added Date', auto_now_add=True) - updated_date = models.DateTimeField('Updated Date', auto_now=True) - original_language = models.CharField('Original Language') - class Meta: - abstract = True - -class VideoFields(CommonFields): - tmdb_id = models.PositiveIntegerField('TheMovieDB ID') - imdb_id = models.PositiveIntegerField('IMDB ID') - tmdb_rating = models.PositiveIntegerField('TheMovieDB rating', max_value=100) - mc_rating = models.PositiveIntegerFrield('MetaCritic Rating', max_value=100) - class Meta: - abstract = True - -class Genres(models.Model): - media = models.ForeignKey('MediaTypes') - genre = models.CharFields('Genre') - -class MediaStatus(models.Model): - media = models.ForeignKey('MediaTypes') - status = models.CharFields('Status') - -class Film(VideoFields): - original_title = models.CharField('Original Title', maxlength=256) - tagline = modelx.CharField('Tagline') - runtime = models.PositiveIntegerField('Total Runtime') - cover = models.ImageField('Cover Image') - backdrop = models.ImageField('Backdrop Image') - rt_rating = models.PositiveIntegerField('Rotten Tomatoes Rating', max_value=100) - am_rating = models.DecimalField('AllMovie Rating', max_digits=3, decimal_places=1) - -class FilmAltTitles(models.Model): - film = models.ForeignKey('Film', on_delete=models.CASCADE) - title = models.CharField('Title') - country = models.CharField('Country') - type = models.CharField('Type') - -class FilmGenres(models.Model): - film = models.ForeignKey('Film', on_delete=models.CASCADE) - genre = models.ForeignKey('Genres', on_delete=models.CASCADE) - -class VGames(CommonMediaFields) - tgdb_id = models.PositiveIntegerField('TheGamesDB ID') - platform = models.ForeignKey('Platform') - developer = models.CharField('Developers') - publisher = models.CharField('Publishers') - cover = models.ImageField('Cover Image') - players = models.PositiveIntegerField('Players') - coop = models.BooleanField('Co-Op') - - diff --git a/managemedia/models/movies.py b/managemedia/models/movies.py index 64306ae..45cf781 100644 --- a/managemedia/models/movies.py +++ b/managemedia/models/movies.py @@ -1,19 +1,19 @@ from django.db import models -class Film(VideoFields): +class Movies(VideoFields): original_title = models.CharField('Original Title', maxlength=256, blank=True) tagline = models.CharField('Tagline', blank=True) runtime = models.PositiveIntegerField('Total Runtime', blank=True) rt_rating = models.PositiveIntegerField('Rotten Tomatoes Rating', max_value=100, blank=True) am_rating = models.DecimalField('AllMovie Rating', max_digits=3, decimal_places=1, blank=True) -class FilmAltTitles(models.Model): - film = models.ForeignKey('Film', on_delete=models.CASCADE) +class MovieAltTitles(models.Model): + film = models.ForeignKey('Movies', on_delete=models.CASCADE) title = models.CharField('Title') country = models.CharField('Country') title_type = models.CharField('Type', blank=True) -class FilmGenres(models.Model): - film = models.ForeignKey('Film', on_delete=models.CASCADE) +class MovieGenres(models.Model): + movie = models.ForeignKey('Movies', on_delete=models.CASCADE) genre = models.ForeignKey('Genres', on_delete=models.CASCADE) diff --git a/managemedia/views.py b/managemedia/views.py index f435754..36cd60e 100644 --- a/managemedia/views.py +++ b/managemedia/views.py @@ -2,3 +2,7 @@ from django.http import HttpResponse def index(request): return HttpResponse("Hello, ur at managemedia") + +def view_movie(request, movie_id): + response = "You're looking at movie ID %s." + return HttpResponse(response % movie_id) diff --git a/requirements.txt b/requirements.txt index cba02d5..4071cb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ django-mysql +django-postgresql pillow