adjust rental post times for prod

carsonkk · carsonkk · commit bad75dab8aa2 · 2017-12-12T19:11:49.000-08:00
diff --git a/README.md b/README.md
@@ -120,8 +120,8 @@ heroku keys:add
 ```sh
 heroku create
 git push heroku master
-# If you are pushing a branch other than local master to heroku master, use:
-# git push heroku other-local-branch:master
+# If you are pushing a branch other than master to heroku master, use:
+# git push heroku other-branch:master
 ```
 
 5. Migrate/seed the database and precompile assets
@@ -143,9 +143,12 @@ heroku open
 
 6. In case you need to wipe out the existing database (if say you want to re-seed it differently):
 ```sh
+# Locally
 heroku pg:reset DATABASE_URL
-heroku run rails db:migrate
-heroku run rails db:seed
+
+# Remotely on Heroku, give it a minute to finish the previous command
+rails db:migrate
+rails db:seed
 ```
 
 ## Deploying to AWS Elastic Beanstalk
diff --git a/app/views/users/settings.html.erb b/app/views/users/settings.html.erb
@@ -87,17 +87,17 @@
         <hr>
         <p class="list-group-item">
           <%= icon('birthday-cake', class: 'fa-fw') %><%#
-          %>Created On:<%#
+          %>Created:<%#
           %><span><%= smart_datetime(@user.created_at) %></span>
         </p>
         <p class="list-group-item">
           <%= icon('refresh', class: 'fa-fw') %><%#
-          %>Last Updated On:<%#
+          %>Last Updated:<%#
           %><span><%= smart_datetime(@user.updated_at) %></span>
         </p>
         <p class="list-group-item">
           <%= icon('sign-in', class: 'fa-fw') %><%#
-          %>Last Signed In On:<%#
+          %>Last Signed In:<%#
           %><span><%= smart_datetime(@user.signed_in_at) %></span>
         </p>
       </div>
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -481,10 +481,10 @@ def dict_to_db_str(d,cols,delim)
 
       if direct_sql_inject
         d[:renter_id]       = d[:renter_id].nil?  ? "NULL_SHITTY_HACK" : d[:renter_id]
-        d[:created_at]      = NOW_STR
-        d[:updated_at]      = NOW_STR
-        d[:start_time]      = NOW_STR
-        d[:end_time]        = NOW_STR
+        d[:created_at]      = (tstart - 1.week).strftime("%FT%T")
+        d[:updated_at]      = (tstart - 1.week).strftime("%FT%T")
+        d[:start_time]      = tstart.strftime("%FT%T")
+        d[:end_time]        = tend.strftime("%FT%T")
         d[:renter_visible]  = d[:renter_visible]  ? "TRUE" : "FALSE"
         d[:skip_in_seed]    = d[:skip_in_seed]    ? "TRUE" : "FALSE"
         vals = dict_to_db_str(d,cols,val_delim)
