Skip to content

Commit

Permalink
Added support for dotenv
Browse files Browse the repository at this point in the history
  • Loading branch information
zcmander committed Aug 25, 2019
1 parent 291bedf commit a65ea11
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var mlist = {

movie_title_typeahead: function (term, typeahead) {
var searchData = null;
$.getJSON("http://www.omdbapi.com/?callback=?&s=" + term + "&apikey=da2a56d7",
$.getJSON("ajax/movies?s=" + term,
function(data) {
var result = [];
var movie;
Expand Down
3 changes: 3 additions & 0 deletions manage.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import os
import sys

from dotenv import load_dotenv
load_dotenv()

if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mlistsite.settings")

Expand Down
3 changes: 2 additions & 1 deletion mlist/models.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
from django.db import models
from django.contrib import admin
from django.contrib.auth.models import User
from django.conf import settings

from taggit.managers import TaggableManager

from mlist.omdbapi import BackendOMDB

from .tmdb import configure, Core, Movies, config

configure("492ffa13c4f4eedb4599ee3a803487de")
configure(settings.TMDB_APIKEY)

core = Core()
core.update_configuration()
Expand Down
14 changes: 14 additions & 0 deletions mlist/views/movie_create.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import json
import requests

from django.conf import settings
from django.urls import reverse
from django.views.generic import FormView
from django.contrib import messages
Expand Down Expand Up @@ -130,3 +132,15 @@ def ajax_taglist_view(request):
for tag in MovieInCollection.tags.all():
tags.append(str(tag))
return HttpResponse(json.dumps(tags), content_type="application/json")


@login_required()
def ajax_movie_list(request):
response = requests.get(
'http://www.omdbapi.com/',
params={
's': request.GET['s'],
'apikey': settings.OMDB_APIKEY
})

return HttpResponse(response.text, content_type="application/json")
3 changes: 3 additions & 0 deletions mlistsite/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
import os
from django.contrib.messages import constants as messages

OMDB_APIKEY = os.getenv("OMDB_APIKEY")
TMDB_APIKEY = os.getenv("TMDB_APIKEY")

DEBUG = True # False

ADMINS = (
Expand Down
3 changes: 2 additions & 1 deletion mlistsite/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from mlist.views.settings import settings_view, merge_movie_view
from mlist.views.statistics import statistics_view
from mlist.views.movie_utils import fetch_imdb_view, fetch_tmdb_view
from mlist.views.movie_create import ajax_taglist_view
from mlist.views.movie_create import ajax_taglist_view, ajax_movie_list

from mlist.forms import MovieSearchForm

Expand Down Expand Up @@ -60,6 +60,7 @@
url(r'^fetch-imdb/(?P<pk>\d+)/$', fetch_imdb_view, name="fetch-imdb"),
url(r'^fetch-tmdb/(?P<pk>\d+)/$', fetch_tmdb_view, name="fetch-tmdb"),
url(r'^ajax/tag-list$', ajax_taglist_view, name="ajax_taglist"),
url(r'^ajax/movies$', ajax_movie_list, name="ajax_movie_list"),
]

# Haystack
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ django-tastypie
django-taggit
django-debug-toolbar
django-haystack
python-dotenv
requests
Whoosh
mimeparse
Expand Down

0 comments on commit a65ea11

Please sign in to comment.