dhcrain · dhcrain · Sep 8, 2017 · Sep 8, 2017 · Sep 8, 2017 · Sep 8, 2017
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,20 @@
 venv
+.envrc
 *.pyc
-staticfiles
 .DS_Store
 .idea/
 __pycache__/
 db.sqlite3
 fm_images/
+staticfiles
 vendor_images/
 status_images/
-.envrc
 profile_images/
 
 scraper/mi_images/
-
 scraper/gvl_mainst_vendors\.csv
-
 *.csv
-
 scraper/test\.py
+\.vscode/
 
 \.vscode/
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: gunicorn fm_proj.wsgi --log-file - --workers=2
+web: gunicorn fm_proj.wsgi --log-file - --workers=1
diff --git a/fm_images/Davis.jpg b/fm_images/Davis.jpg
diff --git a/fm_images/Davis_U844J2W.jpg b/fm_images/Davis_U844J2W.jpg
diff --git a/fm_images/Davis_rErxtqp.jpg b/fm_images/Davis_rErxtqp.jpg
diff --git a/fm_images/MothersDay.jpg b/fm_images/MothersDay.jpg
diff --git a/fm_images/MothersDay_e8DzOge.jpg b/fm_images/MothersDay_e8DzOge.jpg
diff --git a/fm_images/MothersDay_hsP6Fzt.jpg b/fm_images/MothersDay_hsP6Fzt.jpg
diff --git a/fm_images/TRFM-banner.jpg b/fm_images/TRFM-banner.jpg
diff --git a/fm_images/TRFM-banner.png b/fm_images/TRFM-banner.png
diff --git a/fm_images/TRFM-logo.png b/fm_images/TRFM-logo.png
diff --git a/fm_images/TRFM-logo_3MooI5J.png b/fm_images/TRFM-logo_3MooI5J.png
diff --git a/fm_images/TRFM-logo_61MJLz8.png b/fm_images/TRFM-logo_61MJLz8.png
diff --git a/fm_images/The_Crains_Merry_Christmas_2016.jpg b/fm_images/The_Crains_Merry_Christmas_2016.jpg
diff --git a/fm_images/aiken_b.jpg b/fm_images/aiken_b.jpg
diff --git a/fm_images/aiken_p.jpg b/fm_images/aiken_p.jpg
diff --git a/fm_images/banner-imgTEMP.jpg b/fm_images/banner-imgTEMP.jpg
diff --git a/fm_images/buckwalter_b.jpg b/fm_images/buckwalter_b.jpg
diff --git a/fm_images/buckwalter_p.jpg b/fm_images/buckwalter_p.jpg
diff --git a/fm_images/charleston_b.jpg b/fm_images/charleston_b.jpg
diff --git a/fm_images/charleston_p.jpg b/fm_images/charleston_p.jpg
diff --git a/fm_images/chillwagon.jpg b/fm_images/chillwagon.jpg
diff --git a/fm_images/chillwagon_893ov40.jpg b/fm_images/chillwagon_893ov40.jpg
diff --git a/fm_images/chillwagon_cASqc0o.jpg b/fm_images/chillwagon_cASqc0o.jpg
diff --git a/fm_images/fm_awesome.jpg b/fm_images/fm_awesome.jpg
diff --git a/fm_images/jasper.jpg b/fm_images/jasper.jpg
diff --git a/fm_images/jasper_b.jpg b/fm_images/jasper_b.jpg
diff --git a/fm_images/monk_b.JPG b/fm_images/monk_b.JPG
diff --git a/fm_images/monk_p.png b/fm_images/monk_p.png
diff --git a/fm_images/portroyal.jpg b/fm_images/portroyal.jpg
diff --git a/fm_images/portroyal_p.jpg b/fm_images/portroyal_p.jpg
diff --git a/fm_images/site-logo.gif b/fm_images/site-logo.gif
diff --git a/fm_images/site-logo_2dyKOCV.gif b/fm_images/site-logo_2dyKOCV.gif
diff --git a/fm_images/td-mrkt.png b/fm_images/td-mrkt.png
diff --git a/fm_images/td_banner.jpeg b/fm_images/td_banner.jpeg
diff --git a/fm_images/uptown_p.png b/fm_images/uptown_p.png
diff --git a/fm_proj/settings.py b/fm_proj/settings.py
@@ -21,13 +21,55 @@
 # See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '%q=x!-%^j&_=^u=wc4cv=cpaa^)3u^&i*vgl&k2%)^bx=o)1by'
+SECRET_KEY = os.environ.get('secret_key')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
+if os.environ.get('debug') == 'True':
+    DEBUG = True
+else:
+    DEBUG = False
+
+ALLOWED_HOSTS = [
+    'fm-review-stage.herokuapp.com',
+    'fathen.co',
+    'www.fathen.co',
+    '127.0.0.1',
+    '127.0.0.1:8000',
+    'fathen.dhcrain.com'
+]
 
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': ('%(asctime)s [%(process)d] [%(levelname)s] ' +
+                       'pathname=%(pathname)s lineno=%(lineno)s ' +
+                       'funcname=%(funcName)s %(message)s'),
+            'datefmt': '%Y-%m-%d %H:%M:%S'
+        },
+        'simple': {
+            'format': '%(levelname)s %(message)s'
+        }
+    },
+    'handlers': {
+        'null': {
+            'level': 'DEBUG',
+            'class': 'logging.NullHandler',
+        },
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'formatter': 'verbose'
+        }
+    },
+    'loggers': {
+        'testlogger': {
+            'handlers': ['console'],
+            'level': 'INFO',
+        }
+    }
+}
 
 # Application definition
 
@@ -57,6 +99,7 @@
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
 ]
 
 ROOT_URLCONF = 'fm_proj.urls'
@@ -155,21 +198,18 @@
     'Cache-Control': 'max-age=94608000',
     }
 
-aws_bucket_name = os.environ.get('aws_bucket_name')
-aws_access_key_id = os.environ['aws_access_key_id']
-aws_secret_access_key = os.environ['aws_secret_access_key']
-
-AWS_STORAGE_BUCKET_NAME = aws_bucket_name
-AWS_ACCESS_KEY_ID = aws_access_key_id
-AWS_SECRET_ACCESS_KEY = aws_secret_access_key
+# AWS_STORAGE_BUCKET_NAME = os.environ.get('aws_bucket_name')
+AWS_STORAGE_BUCKET_NAME = os.environ.get('NOTHING_HERE')
+AWS_ACCESS_KEY_ID = os.environ['aws_access_key_id']
+AWS_SECRET_ACCESS_KEY = os.environ['aws_secret_access_key']
 
 # Tell django-storages that when coming up with the URL for an item in S3 storage, keep
 # it simple - just use this domain plus the path. (If this isn't set, things get complicated).
 # This controls how the `static` template tag from `staticfiles` gets expanded, if you're using it.
 # We also use it in the next setting.
-AWS_S3_CUSTOM_DOMAIN = '{}.s3.amazonaws.com'.format(aws_bucket_name)
+AWS_S3_CUSTOM_DOMAIN = '{}.s3.amazonaws.com'.format(AWS_STORAGE_BUCKET_NAME)
 
-if aws_bucket_name:
+if AWS_STORAGE_BUCKET_NAME:
     # This is used by the `static` template tag from `static`, if you're using that. Or if anything else
     # refers directly to STATIC_URL. So it's safest to always set it.
     # STATIC_URL = 'https://{}/'.format(AWS_S3_CUSTOM_DOMAIN)
@@ -185,6 +225,7 @@
 
     STATICFILES_LOCATION = 'static'
 
+
 # For django-review
 # this would use a RadioSelect instead of the default Select
 REVIEW_FORM_CHOICE_WIDGET = 'django.forms.widgets.RadioSelect'

diff --git a/fm_proj/static/lol.txt → fm_proj/static/.keep b/fm_proj/static/lol.txt → fm_proj/static/.keep
diff --git a/profile_images/Davis.jpg b/profile_images/Davis.jpg
diff --git a/profile_images/IMG_2072.JPG b/profile_images/IMG_2072.JPG
diff --git a/profile_images/dhcrain-headshot-sm.jpg b/profile_images/dhcrain-headshot-sm.jpg
diff --git a/profile_images/profile_mug.jpeg b/profile_images/profile_mug.jpeg
diff --git a/review_app/forms.py b/review_app/forms.py
@@ -24,15 +24,17 @@ class Meta:
 
 class ContactForm(forms.Form):
     required_css_class = 'required'
+    captcha = ReCaptchaField()
     name = forms.CharField(required=True)
     email = forms.EmailField(required=True)
     subject = forms.CharField(required=True)
     message = forms.CharField(widget=forms.Textarea)
-    captcha = ReCaptchaField()
 
 
 # https://djangosnippets.org/snippets/3043/
 class UserCreationEmailForm(UserCreationForm):
+    required_css_class = 'required'
+    captcha = ReCaptchaField()
     # we are using email as username so override label and validators
     username = forms.CharField(
         label="Email:",

diff --git a/review_app/migrations/0012_auto_20170907_2154.py b/review_app/migrations/0012_auto_20170907_2154.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-09-07 21:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import localflavor.us.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('review_app', '0011_auto_20160731_1737'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='profile_fm_like',
+            field=models.ManyToManyField(blank=True, related_name='fm_likes', to='review_app.FarmersMarket'),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='profile_vendor_like',
+            field=models.ManyToManyField(blank=True, related_name='vendor_likes', to='review_app.Vendor'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='at_farmers_market',
+            field=models.ManyToManyField(to='review_app.FarmersMarket', verbose_name='Located here'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_banner_picture',
+            field=models.ImageField(blank=True, upload_to='vendor_images', verbose_name='Banner Picture'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_contact_email',
+            field=models.EmailField(max_length=254, verbose_name='Email'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_contact_name',
+            field=models.CharField(max_length=50, verbose_name='Contact Name'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_description',
+            field=models.TextField(blank=True, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_name',
+            field=models.CharField(max_length=100, verbose_name='Vendor Name'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_phone',
+            field=localflavor.us.models.PhoneNumberField(blank=True, verbose_name='Phone'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_picture',
+            field=models.ImageField(blank=True, upload_to='vendor_images', verbose_name='Profile Picture'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='review_app.VendorType', verbose_name='Catergory'),
+        ),
+        migrations.AlterField(
+            model_name='vendor',
+            name='vendor_website',
+            field=models.URLField(blank=True, verbose_name='Website'),
+        ),
+    ]
diff --git a/review_app/models.py b/review_app/models.py
@@ -55,14 +55,16 @@ def fm_picture_url(self):
         if self.fm_picture:
             return self.fm_picture.url
         else:
-            return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/farmersmarket-icon.png"
+            # return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/farmersmarket-icon.png"
+            return "../../static/review_app/img/farmersmarket-icon.png"
 
     @property
     def fm_banner_picture_url(self):
         if self.fm_banner_picture:
             return self.fm_banner_picture.url
         else:
-            return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/greens.jpg"
+            # return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/greens.jpg"
+            return "../../static/review_app/img/greens.jpg"
 
     def get_absolute_url(self):
         return reverse('farmers_market_detail_view', kwargs={'fm_slug': self.fm_slug})
@@ -107,14 +109,16 @@ def vendor_picture_url(self):
         if self.vendor_picture:
             return self.vendor_picture.url
         else:
-            return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/vendor_icon.png"
+            # return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/vendor_icon.png"
+            return "../../static/review_app/img/vendor_icon.png"
 
     @property
     def vendor_banner_picture_url(self):
         if self.vendor_banner_picture:
             return self.vendor_banner_picture.url
         else:
-            return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/pea.jpg"
+            # return "https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/pea.jpg"
+            return "../../static/review_app/img/pea.jpg"
 
     def get_absolute_url(self):
         return reverse('vendor_detail_view', kwargs={'vendor_slug': self.vendor_slug})

diff --git a/review_app/static/review_app/css/app.css b/review_app/static/review_app/css/app.css
@@ -125,7 +125,8 @@ input.secondary.hollow.button {
     padding-top: 1.75em;
 }
 .home-hero {
-    background: url("https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/fathen.jpg");
+    /* background: url("https://s3-us-west-2.amazonaws.com/frmrsmrkt/review_app/img/fathen.jpg"); */
+    background: url("../img/fathen.jpg");
     height: 100%;
     background-repeat:no-repeat;
     -webkit-background-size:cover;

diff --git a/review_app/views.py b/review_app/views.py
@@ -23,7 +23,6 @@
 from review_app.forms import StatusCreateForm, ContactForm, UserCreationEmailForm
 from review.templatetags.review_tags import total_review_average
 from review.forms import ReviewForm
-# Create your views here.
 
 
 class IndexView(ListView):
@@ -78,8 +77,9 @@ def get_context_data(self, **kwargs):
         api_key = os.environ['forecast_api']
         url = "https://api.forecast.io/forecast/{}/{},{}".format(api_key, location.fm_lat, location.fm_long)
         response = requests.get(url).json()
-        context['forecast_summary'] = response['daily']['summary']  # weekly summary
-        context['forecast_iframe_url'] = "http://forecast.io/embed/#lat={}&lon={}&name={}".format(location.fm_lat, location.fm_long, location.fm_name)
+        if (location.fm_lat is not None or location.fm_long is not None):
+            context['forecast_summary'] = response['daily']['summary']  # weekly summary
+            context['forecast_iframe_url'] = "https://forecast.io/embed/#lat={}&lon={}&name={}".format(location.fm_lat, location.fm_long, location.fm_name)
         if sort:
             context['vendor_list'] = Vendor.objects.filter(at_farmers_market__fm_slug=fm_slug).order_by(sort)
         elif rated:

diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.7.0
+python-3.7.11
diff --git a/status_images/12593598_1242299105821911_6177272515894744617_o.jpg b/status_images/12593598_1242299105821911_6177272515894744617_o.jpg
diff --git a/status_images/13872869_1738586039742654_6190219639973554060_n.jpg b/status_images/13872869_1738586039742654_6190219639973554060_n.jpg
diff --git a/status_images/13900169_1237627482925668_9218049346994104636_n.jpg b/status_images/13900169_1237627482925668_9218049346994104636_n.jpg
diff --git a/status_images/13914134_593069907520972_4728020283867293557_o.jpg b/status_images/13914134_593069907520972_4728020283867293557_o.jpg
diff --git a/status_images/13925129_659531087529694_7485574885916399868_n.jpg b/status_images/13925129_659531087529694_7485574885916399868_n.jpg
diff --git a/status_images/13925129_659531087529694_7485574885916399868_n_A0TiYzw.jpg b/status_images/13925129_659531087529694_7485574885916399868_n_A0TiYzw.jpg
diff --git a/status_images/Blaine_Owens_Photography_2016-08-04_14-45-00.png b/status_images/Blaine_Owens_Photography_2016-08-04_14-45-00.png
diff --git a/status_images/bananamama_status.jpg b/status_images/bananamama_status.jpg
diff --git a/status_images/bioway-staus.jpg b/status_images/bioway-staus.jpg
diff --git a/status_images/black-hen-hi.png b/status_images/black-hen-hi.png
diff --git a/status_images/chillwagon.jpg b/status_images/chillwagon.jpg
diff --git a/status_images/cup.jpg b/status_images/cup.jpg
diff --git a/status_images/fm_awesome.jpg b/status_images/fm_awesome.jpg
diff --git a/status_images/gentry.jpg b/status_images/gentry.jpg
diff --git a/status_images/no_evil.jpg b/status_images/no_evil.jpg
diff --git a/status_images/okra.jpg b/status_images/okra.jpg
diff --git a/status_images/td-mrkt.png b/status_images/td-mrkt.png
diff --git a/status_images/west_s.jpg b/status_images/west_s.jpg
diff --git a/status_images/yello_peppers.jpg b/status_images/yello_peppers.jpg
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: gunicorn fm_proj.wsgi --log-file - --workers=2
		web: gunicorn fm_proj.wsgi --log-file - --workers=1