diff --git a/.gitignore b/.gitignore index d993153..3288161 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ __pycache__/ local_settings.py db.sqlite3 db.sqlite3-journal +static/ # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/ diff --git a/Pipfile b/Pipfile index e3227e9..9d2a25a 100644 --- a/Pipfile +++ b/Pipfile @@ -8,6 +8,7 @@ django = "*" pillow = "*" django-allauth = "*" facebook-sdk = "*" +gunicorn = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 58b0d15..61fa365 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1ea640c108a29904e710b20e7c66f511409eec3593b72556010dec2156cd8afe" + "sha256": "ebb9ed5721e8e2d2fbedddc2e1e637945ba2a445f8bb3979c1674736f4f4c1c4" }, "pipfile-spec": 6, "requires": { @@ -21,6 +21,7 @@ "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9", "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214" ], + "markers": "python_version >= '3.6'", "version": "==3.4.1" }, "certifi": { @@ -117,6 +118,7 @@ "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==0.7.1" }, "django": { @@ -142,6 +144,14 @@ "index": "pypi", "version": "==3.1.0" }, + "gunicorn": { + "hashes": [ + "sha256:9dcc4547dbb1cb284accfb15ab5667a0e5d1881cc443e0677b4882a4067a807e", + "sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8" + ], + "index": "pypi", + "version": "==20.1.0" + }, "idna": { "hashes": [ "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a", @@ -155,6 +165,7 @@ "sha256:42bf6354c2ed8c6acb54d971fce6f88193d97297e18602a3a886603f9d7730cc", "sha256:8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3" ], + "markers": "python_version >= '3.6'", "version": "==3.1.1" }, "pillow": { @@ -221,13 +232,18 @@ "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.20" }, "pyjwt": { + "extras": [ + "crypto" + ], "hashes": [ "sha256:934d73fbba91b0483d3857d1aff50e96b2a892384ee2c17417ed3203f173fca1", "sha256:fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130" ], + "markers": "python_version >= '3.6'", "version": "==2.1.0" }, "python3-openid": { @@ -249,6 +265,7 @@ "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24", "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==2.26.0" }, "requests-oauthlib": { @@ -264,6 +281,7 @@ "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae", "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d" ], + "markers": "python_version >= '3.5'", "version": "==0.4.2" }, "urllib3": { @@ -271,6 +289,7 @@ "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece", "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.7" } }, diff --git a/config/settings.py b/config/settings.py index e5f8317..6be125b 100644 --- a/config/settings.py +++ b/config/settings.py @@ -142,4 +142,5 @@ SITE_ID = 1 LOGIN_REDIRECT_URL = 'redirect' MEDIA_ROOT = os.path.join(BASE_DIR, 'media') -MEDIA_URL = '/media/' \ No newline at end of file +STATIC_ROOT = os.path.join(BASE_DIR, 'static') +MEDIA_URL = '/media/' diff --git a/frame/templates/frame/redirect.html b/frame/templates/frame/redirect.html index c2b5fdf..3bdb1bf 100644 --- a/frame/templates/frame/redirect.html +++ b/frame/templates/frame/redirect.html @@ -5,6 +5,6 @@ {% block content %}