From fa11563c30edf529bbd4bae77e5f5e1cf4a69920 Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Sun, 13 Dec 2020 14:41:40 -0500 Subject: [PATCH] added whitenoise --- app/.gitignore | 6 +++++ app/Pipfile | 55 ++++++++++++++++++++++++++++++++++++++++ app/requirements.txt | Bin 1808 -> 785 bytes site/Pipfile | 3 ++- site/config/settings.py | 31 ++++++++++------------ 5 files changed, 77 insertions(+), 18 deletions(-) create mode 100644 app/.gitignore create mode 100644 app/Pipfile diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..10280638 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,6 @@ +.vscode/ +.idea/ +venv/ +.venv/ +env/ +.env/ diff --git a/app/Pipfile b/app/Pipfile new file mode 100644 index 00000000..ad883055 --- /dev/null +++ b/app/Pipfile @@ -0,0 +1,55 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +altgraph = "==0.17" +beautifulsoup4 = "==4.9.3" +cachetools = "==4.2.0" +certifi = "==2020.12.5" +chardet = "==3.0.4" +comtypes = "==1.1.7" +fbs = "==0.9.0" +future = "==0.18.2" +google = "==3.0.0" +google-api-core = "==1.23.0" +google-auth = "==1.24.0" +google-cloud = "==0.34.0" +google-cloud-speech = "==2.0.1" +googleapis-common-protos = "==1.52.0" +grpcio = "==1.34.0" +idna = "==2.10" +keyring = "==21.5.0" +libcst = "==0.3.15" +macholib = "==1.14" +mypy-extensions = "==0.4.3" +pefile = "==2019.4.18" +proto-plus = "==1.13.0" +protobuf = "==3.14.0" +pyasn1 = "==0.4.8" +pyasn1-modules = "==0.2.8" +pyinstaller = "==3.4" +pyinstaller-hooks-contrib = "==2020.10" +pytz = "==2020.4" +pyuic5-tool = "==0.0.1" +pywin32 = "==300" +pywin32-ctypes = "==0.2.0" +pywinauto = "==0.6.8" +requests = "==2.25.0" +rsa = "==4.6" +six = "==1.15.0" +soupsieve = "==2.1" +typing-extensions = "==3.7.4.3" +typing-inspect = "==0.6.0" +urllib3 = "==1.26.2" +PyQt5 = "==5.15.2" +PyAudio = "*" +PyQt5-sip = "==12.8.1" +PyQtWebEngine = "==5.15.2" +PyYAML = "==5.3.1" + +[requires] +python_version = "3.6" diff --git a/app/requirements.txt b/app/requirements.txt index effbe9b11c4ab6c677f0870434dd9082f69f9cf8..a4404d1108d3bb09bdee6b769a80e519533217a0 100644 GIT binary patch literal 785 zcmZ8f%Wm5+5WMqWNRX6dCkGvJ$e}s#FteDutugvSh!&C=o6+XxSxXI~785h~C0}iw z=Rrs@G84DDCkuuWN}Sp4g1-`SlHFQu+4hMKLbEl-)uSYyJSx5<$4#UzB{aVL!CS?y zz{bCr@v&V=ZulSMC0T1gz|KM)8jvo~-nJNc%CW}2<3zUBoQ#X4-=*9&EW}lkz1Tgw zu%c38LZ^2ZQ(zWDg__uggd(u+c4XV0c5Yv*4aLRKjgQDN*_$J$TB=7e3iZJHe4c!J z%ZZG3=+bT!h$2I2UrJCkY7}7fif{4SJf$mfj|cX7e`;43@%tf^x_ECh@kg|~cYxnx zd?DwdX4>@abP}8|b(-f1K5&g*@!}G!KpCkK^3`6R!|DQ-Kl;*Me;pb$r8zTkdLpzD zWu5k)E({u5NV3oiZjL8GOCKoS8v>W&)Lndg`t*@Tz&gwJd$Xm&qZXPn&jr^Q#fcU7 t+Jh#L9%^y+2gM2!2H;HpWIu>Ak{jMXA&+EDKivuZmObt^ke)ul|8F)(?P34` literal 1808 zcmaJ?(T>tk6g50ZW9*7blYah@1!uV<)m@m%7@18xPr&KAx`p4>S`;G?zzC#=D9 zfSPhRDRqv~pneJcQb2C%lmd3rV|CaUJD#GRIdkReE9h4}oU7fZ)x>?PEpau0k1Dc3 zEtOvG;OX*ONc!_P?g9$v_Ts2AcQ5~sP0%wPDSZ~~Pu|nrOEsK&4ZQTP;b&_b{A&wu zTBvMKd>s!w;^=@Wu(x$>?Bi5h4b2;P6HZTu{_dgb0PY&qYN&GW_~<}`+8oR~oE~OF z|I;BA>mg%I7m>t}Aste&_BfsGjo_`V+WbdqOyg zXZ8v!bo0Wl{PV{6>kIbt-tF+abNwrHePwU4Zx1a@+6+@;{hT#{Bf7sS6f-GXcsD)! zwFlS6zJXy4j)|vqkBm3&9{Jw;9C{!c@1{F?quWeZ$icZsOaczRB=`7#Wpsl&^P|b1 zz8tz0JnJ(sW9MhCn4EC4W0kk0MkmUT93_@h45+VgY;NzMs&Z|54K6vUytkju6!pZe z9xsKYKOY^fTR~Q#!`}=dO8bEoIOVtc rVfPhW`q#as!dt9(chC1JJ-p9!D0s}SrGoE0v&Zb@N1d7bqIdrf@`DL~ diff --git a/site/Pipfile b/site/Pipfile index 5efcec5c..6a314f95 100644 --- a/site/Pipfile +++ b/site/Pipfile @@ -10,7 +10,8 @@ django-cockroachdb = "*" psycopg2 = "*" pillow = "*" django-crispy-forms = "*" -djoser = "*" +whitenoise = "*" +gunicorn = "*" [dev-packages] isort = "*" diff --git a/site/config/settings.py b/site/config/settings.py index a52cacf3..30765b5c 100644 --- a/site/config/settings.py +++ b/site/config/settings.py @@ -55,6 +55,7 @@ REST_FRAMEWORK = { MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", + 'whitenoise.middleware.WhiteNoiseMiddleware', "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", @@ -94,16 +95,16 @@ DATABASES = { } } -# DATABASES = { -# 'default': { -# 'ENGINE' : 'django_cockroachdb', -# 'NAME' : 'spaceout', -# 'USER' : 'spaceout', -# 'PASSWORD': r"eVYfYQ`W.`y3AW%'[hdyVR.cn,_[mP5h,$~.7#(8SM8@Z8=T:(", -# 'HOST' : 'spaceout-86g.gcp-us-east4.cockroachlabs.cloud', -# 'PORT' : 26257, -# } -# } +#DATABASES = { +# 'default': { +# 'ENGINE' : 'django_cockroachdb', +# 'NAME' : 'spaceout', +# 'USER' : 'spaceout', +# 'PASSWORD': r"eVYfYQ`W.`y3AW%'[hdyVR.cn,_[mP5h,$~.7#(8SM8@Z8=T:(", +# 'HOST' : 'spaceout-86g.gcp-us-east4.cockroachlabs.cloud', +# 'PORT' : 26257, +# } +#} # Password validation @@ -141,13 +142,9 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.1/howto/static-files/ - -STATIC_URL = "/static/" - -## Custom -STATICFILES_DIRS = [ - BASE_DIR / "static", -] +import os +STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, 'static/') LOGIN_REDIRECT_URL = "landing_page" LOGIN_URL = "login"