From 7f8637c497e685f3235313c1e988a748dd55b7f8 Mon Sep 17 00:00:00 2001 From: Harsha Murthy Date: Mon, 22 Jan 2018 13:42:47 -0600 Subject: [PATCH] Launching 2.0 --- .env.sample | 2 +- .erdconfig | 4 + .torus.json | 1 + CONDUCT.md | 73 ++++ Gemfile | 6 +- Gemfile.lock | 327 +++++++++--------- LICENSE => LICENSE.md | 6 +- README.md | 130 +------ SELFHOST.md | 19 + app.json | 13 +- app/assets/images/paid.png | Bin 0 -> 49543 bytes app/assets/javascripts/application.js | 1 + app/assets/javascripts/password.js | 29 +- app/assets/javascripts/payment.js | 30 +- app/assets/javascripts/settings.js | 42 +++ app/assets/javascripts/week_plan.js | 1 + .../stylesheets/application/dashboard.scss | 18 +- .../stylesheets/application/general.scss | 45 ++- .../stylesheets/application/marketing.scss | 5 +- .../stylesheets/application/payments.scss | 9 + .../stylesheets/application/reflections.scss | 29 +- .../stylesheets/application/settings.scss | 94 ++++- .../stylesheets/application/week_plan.scss | 27 +- .../stylesheets/application/welcome.scss | 5 - app/assets/stylesheets/base/_buttons.scss | 45 ++- app/assets/stylesheets/base/_variables.scss | 4 +- app/controllers/application_controller.rb | 2 +- app/controllers/dashboard_controller.rb | 9 +- app/controllers/days_controller.rb | 4 +- app/controllers/gifts_controller.rb | 54 +++ app/controllers/passwords_controller.rb | 56 +++ app/controllers/payments_controller.rb | 71 +++- app/controllers/preferences_controller.rb | 56 +++ app/controllers/reflections_controller.rb | 45 ++- app/controllers/subscriptions_controller.rb | 11 + app/controllers/today_controller.rb | 31 +- app/controllers/todos_controller.rb | 13 + app/controllers/tomorrow_controller.rb | 14 +- app/controllers/users_controller.rb | 31 +- app/controllers/week_plan_controller.rb | 52 ++- app/forms/registration.rb | 21 ++ app/helpers/application_helper.rb | 13 - app/jobs/create_daily_snapshots_job.rb | 10 + .../create_stripe_gift_subscription_job.rb | 33 ++ app/jobs/email_reminders_job.rb | 11 - app/jobs/sms_reminders_job.rb | 20 -- app/mailers/gifts_mailer.rb | 13 + app/mailers/passwords_mailer.rb | 8 + app/mailers/payments_mailer.rb | 18 +- app/mailers/reminders_mailer.rb | 11 - app/mailers/weekly_summary_mailer.rb | 46 +-- app/models/concerns/data_struct.rb | 9 + app/models/daily_snapshot.rb | 44 +++ app/models/gift.rb | 16 + app/models/null_subscription.rb | 9 + app/models/subscription_plan.rb | 7 + app/models/todo.rb | 19 +- app/models/todo_list.rb | 27 +- app/models/user.rb | 73 +++- app/models/weekly_summary.rb | 57 +++ app/serializers/data_struct_serializer.rb | 10 + app/services/payment_service.rb | 22 -- app/views/dashboard/show.html.erb | 30 +- app/views/days/show.html.erb | 17 +- app/views/gifts/new.html.erb | 42 +++ .../gifts_mailer/gift_notification.text.erb | 9 + app/views/layouts/_navigation.html.erb | 6 +- app/views/marketing/_heroku_button.html.erb | 2 +- app/views/marketing/home.html.erb | 12 +- app/views/marketing/philosophy.html.erb | 6 +- app/views/marketing/running_costs.html.erb | 3 +- app/views/pages/welcome.html.erb | 2 +- .../create.html.erb} | 0 app/views/passwords/edit.html.erb | 24 ++ app/views/passwords/new.html.erb | 16 + .../passwords_mailer/change_password.text.erb | 6 + app/views/payments/edit.html.erb | 21 ++ app/views/payments/new.html.erb | 10 +- .../payments_mailer/invoice_upcoming.text.erb | 5 + .../referral_activated.text.erb | 7 + .../send_trial_ending_to.html.erb | 82 ----- app/views/reflections/new.html.erb | 37 +- .../send_reminder_to.html.erb | 82 ----- .../send_reminder_to.text.erb | 8 - app/views/sessions/_google_sign_in.html.erb | 11 +- app/views/sessions/new.html.erb | 10 +- app/views/today/new.html.erb | 8 +- app/views/today/show.html.erb | 87 +++-- app/views/tomorrow/new.html.erb | 8 +- app/views/users/edit.html.erb | 246 ++++++++----- app/views/users/new.html.erb | 14 +- app/views/week_plan/_delete_button.html.erb | 1 + app/views/week_plan/_move_button.html.erb | 1 + app/views/week_plan/_weekly_todos.html.erb | 15 +- app/views/week_plan/add_todo.js.erb | 2 +- app/views/week_plan/move_todo.js.erb | 2 + app/views/week_plan/remove_todo.js.erb | 2 +- app/views/week_plan/show.html.erb | 30 +- .../weekly_summary.html.erb | 4 +- config/application.rb | 1 + config/environments/production.rb | 1 - config/initializers/payola.rb | 41 +++ config/initializers/session_store.rb | 4 +- config/initializers/stripe.rb | 28 -- config/locales/en.yml | 2 + config/routes.rb | 61 ++-- config/sidekiq.yml | 4 +- .../20171105225459_change_todo_list_ids.rb | 9 + .../20171105230702_create_daily_snapshots.rb | 10 + .../20171105231403_create_weekly_summaries.rb | 11 + ...119174313_change_foreign_key_to_integer.rb | 5 + ...171125190051_add_date_to_daily_snapshot.rb | 5 + ...120183158_add_user_id_to_weekly_summary.rb | 6 + ...71724_remove_reminder_columns_from_user.rb | 7 + ...195629_add_password_reset_token_to_user.rb | 6 + ...0180129193245_create_subscription_plans.rb | 12 + ...0180130205631_add_referral_code_to_user.rb | 5 + .../20180130211252_add_referred_by_to_user.rb | 6 + db/migrate/20180201210624_create_gifts.rb | 16 + db/schema.rb | 158 ++++++++- db/seeds.rb | 4 +- erd.pdf | Bin 0 -> 33985 bytes lib/tasks/create_daily_snapshots.rake | 5 + lib/tasks/send_reminders.rake | 6 - test/fixtures/daily_snapshots.yml | 11 + test/fixtures/gifts.yml | 2 + test/fixtures/subscription_plans.yml | 13 + test/fixtures/todos.yml | 2 +- test/fixtures/weekly_summaries.yml | 11 + test/helpers/application_helper_test.rb | 26 +- .../create_daily_snapshots_job_test.rb} | 2 +- test/mailers/.keep | 0 .../previews/payments_mailer_preview.rb | 4 - .../previews/reminders_mailer_preview.rb | 5 - .../previews/weekly_summary_mailer_preview.rb | 4 - test/models/daily_snapshot_test.rb | 54 +++ .../gift_test.rb} | 2 +- .../subscription_plan_test.rb} | 2 +- test/models/user_test.rb | 46 --- test/models/weekly_summary_test.rb | 16 + test/services/payment_service_test.rb | 34 -- test/test_helper.rb | 6 + 142 files changed, 2326 insertions(+), 1106 deletions(-) create mode 100644 .erdconfig create mode 100644 .torus.json create mode 100644 CONDUCT.md rename LICENSE => LICENSE.md (52%) create mode 100644 SELFHOST.md create mode 100644 app/assets/images/paid.png create mode 100644 app/assets/javascripts/settings.js create mode 100644 app/controllers/gifts_controller.rb create mode 100644 app/controllers/passwords_controller.rb create mode 100644 app/controllers/preferences_controller.rb create mode 100644 app/controllers/subscriptions_controller.rb create mode 100644 app/jobs/create_daily_snapshots_job.rb create mode 100644 app/jobs/create_stripe_gift_subscription_job.rb delete mode 100644 app/jobs/email_reminders_job.rb delete mode 100644 app/jobs/sms_reminders_job.rb create mode 100644 app/mailers/gifts_mailer.rb create mode 100644 app/mailers/passwords_mailer.rb delete mode 100644 app/mailers/reminders_mailer.rb create mode 100644 app/models/concerns/data_struct.rb create mode 100644 app/models/daily_snapshot.rb create mode 100644 app/models/gift.rb create mode 100644 app/models/null_subscription.rb create mode 100644 app/models/subscription_plan.rb create mode 100644 app/models/weekly_summary.rb create mode 100644 app/serializers/data_struct_serializer.rb delete mode 100644 app/services/payment_service.rb create mode 100644 app/views/gifts/new.html.erb create mode 100644 app/views/gifts_mailer/gift_notification.text.erb rename app/views/{payments_mailer/send_trial_ending_to.text.erb => passwords/create.html.erb} (100%) create mode 100644 app/views/passwords/edit.html.erb create mode 100644 app/views/passwords/new.html.erb create mode 100644 app/views/passwords_mailer/change_password.text.erb create mode 100644 app/views/payments/edit.html.erb create mode 100644 app/views/payments_mailer/invoice_upcoming.text.erb create mode 100644 app/views/payments_mailer/referral_activated.text.erb delete mode 100644 app/views/payments_mailer/send_trial_ending_to.html.erb delete mode 100644 app/views/reminders_mailer/send_reminder_to.html.erb delete mode 100644 app/views/reminders_mailer/send_reminder_to.text.erb create mode 100644 app/views/week_plan/_delete_button.html.erb create mode 100644 app/views/week_plan/_move_button.html.erb create mode 100644 app/views/week_plan/move_todo.js.erb create mode 100644 config/initializers/payola.rb create mode 100644 db/migrate/20171105225459_change_todo_list_ids.rb create mode 100644 db/migrate/20171105230702_create_daily_snapshots.rb create mode 100644 db/migrate/20171105231403_create_weekly_summaries.rb create mode 100644 db/migrate/20171119174313_change_foreign_key_to_integer.rb create mode 100644 db/migrate/20171125190051_add_date_to_daily_snapshot.rb create mode 100644 db/migrate/20180120183158_add_user_id_to_weekly_summary.rb create mode 100644 db/migrate/20180123171724_remove_reminder_columns_from_user.rb create mode 100644 db/migrate/20180128195629_add_password_reset_token_to_user.rb create mode 100644 db/migrate/20180129193245_create_subscription_plans.rb create mode 100644 db/migrate/20180130205631_add_referral_code_to_user.rb create mode 100644 db/migrate/20180130211252_add_referred_by_to_user.rb create mode 100644 db/migrate/20180201210624_create_gifts.rb create mode 100644 erd.pdf create mode 100644 lib/tasks/create_daily_snapshots.rake delete mode 100644 lib/tasks/send_reminders.rake create mode 100644 test/fixtures/daily_snapshots.yml create mode 100644 test/fixtures/gifts.yml create mode 100644 test/fixtures/subscription_plans.yml create mode 100644 test/fixtures/weekly_summaries.yml rename test/{controllers/payments_controller_test.rb => jobs/create_daily_snapshots_job_test.rb} (55%) delete mode 100644 test/mailers/.keep delete mode 100644 test/mailers/previews/payments_mailer_preview.rb delete mode 100644 test/mailers/previews/reminders_mailer_preview.rb delete mode 100644 test/mailers/previews/weekly_summary_mailer_preview.rb create mode 100644 test/models/daily_snapshot_test.rb rename test/{mailers/payments_mailer_test.rb => models/gift_test.rb} (60%) rename test/{mailers/weekly_summary_mailer_test.rb => models/subscription_plan_test.rb} (58%) create mode 100644 test/models/weekly_summary_test.rb delete mode 100644 test/services/payment_service_test.rb diff --git a/.env.sample b/.env.sample index fbd9811..e42052b 100644 --- a/.env.sample +++ b/.env.sample @@ -14,4 +14,4 @@ TWILIO_SID=none TWILIO_AUTH_TOKEN=none TWILIO_SENDER_PHONE_NUMBER=none SELF_HOSTED=true -LINK_TO_GITHUB_REPO=https://github.com/garrettqmartin8/volition +LINK_TO_GITHUB_REPO=https://github.com/usevolition/volition diff --git a/.erdconfig b/.erdconfig new file mode 100644 index 0000000..10543ad --- /dev/null +++ b/.erdconfig @@ -0,0 +1,4 @@ +attributes: + - content + - foreign_key + - inheritance diff --git a/.torus.json b/.torus.json new file mode 100644 index 0000000..5db27df --- /dev/null +++ b/.torus.json @@ -0,0 +1 @@ +{"org":"garrettqmartin","project":"volition"} diff --git a/CONDUCT.md b/CONDUCT.md new file mode 100644 index 0000000..7f72b35 --- /dev/null +++ b/CONDUCT.md @@ -0,0 +1,73 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +education, socio-economic status, nationality, personal appearance, race, +religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at . All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org diff --git a/Gemfile b/Gemfile index 60782e9..a045a26 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem "jquery-rails" gem "appsignal" gem "sidekiq" gem "normalize-rails", "~> 3.0.0" -gem "pg" +gem "pg", "0.21.0" gem 'turbolinks' gem "puma" gem "rails", "~> 5.1.0" @@ -23,7 +23,7 @@ gem "jbuilder" gem "listen" gem "spring" gem 'letter_opener' -gem 'react-rails' +gem 'react-rails', "2.2.0" gem 'bcrypt' gem 'will_paginate', '~> 3.1.0' gem 'twilio-ruby' @@ -40,6 +40,8 @@ gem 'google-id-token', git: 'https://github.com/google/google-id-token.git' gem 'enumerize' gem "gibbon" gem 'premailer-rails' +gem 'rails-erd' +gem "payola-payments", git: "https://github.com/payolapayments/payola.git", branch: "master" group :development, :test do gem "awesome_print" diff --git a/Gemfile.lock b/Gemfile.lock index c3f30e8..66ffda0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,72 +1,84 @@ GIT remote: https://github.com/google/google-id-token.git - revision: 4d0f02d70f6d5bef4f6759ccf18bf4e76bc60803 + revision: 858acae389fdaf75f0c0ab3199487b22c29687e6 specs: - google-id-token (1.3.1) + google-id-token (1.4.2) jwt (>= 1) - multi_json + +GIT + remote: https://github.com/payolapayments/payola.git + revision: 08bd7bc31aa3be431e36ea73e594613a7042816f + branch: master + specs: + payola-payments (1.5.1) + aasm (>= 4.0.7) + jquery-rails + rails (>= 4.1) + stripe (>= 2.8) + stripe_event (>= 2.0.0) GIT remote: https://github.com/rebelidealist/stripe-ruby-mock.git - revision: 310fdab94df322a36d4ed2764b3c49356e253829 + revision: 665f2088a71ed810e20ef362fbd435ce5b78fc6b branch: master specs: - stripe-ruby-mock (2.4.1) + stripe-ruby-mock (2.5.1) dante (>= 0.2.0) multi_json (~> 1.0) - stripe (>= 1.31.0, <= 1.58.0) + stripe (>= 2.0.3) GEM remote: https://rubygems.org/ specs: - actioncable (5.1.1) - actionpack (= 5.1.1) + aasm (4.12.3) + concurrent-ruby (~> 1.0) + actioncable (5.1.4) + actionpack (= 5.1.4) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.1) - actionview (= 5.1.1) - activesupport (= 5.1.1) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.1) - activesupport (= 5.1.1) + actionview (5.1.4) + activesupport (= 5.1.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.1) - activesupport (= 5.1.1) + activejob (5.1.4) + activesupport (= 5.1.4) globalid (>= 0.3.6) - activemodel (5.1.1) - activesupport (= 5.1.1) - activerecord (5.1.1) - activemodel (= 5.1.1) - activesupport (= 5.1.1) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) arel (~> 8.0) - activesupport (5.1.1) + activesupport (5.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) ansi (1.5.0) - appsignal (2.2.1) + appsignal (2.4.3) rack - thread_safe arel (8.0.0) - ast (2.3.0) - autoprefixer-rails (7.1.1) + ast (2.4.0) + autoprefixer-rails (7.2.5) execjs - awesome_print (1.7.0) + awesome_print (1.8.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -77,24 +89,25 @@ GEM execjs (~> 2.0) bcrypt (3.1.11) builder (3.2.3) - bullet (5.5.1) + bullet (5.7.2) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) + uniform_notifier (~> 1.11.0) + bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.6) - capybara (2.14.0) + byebug (9.1.0) + capybara (2.17.0) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) + choice (0.2.0) climate_control (0.2.0) - codeclimate-engine-rb (0.4.0) + codeclimate-engine-rb (0.4.1) virtus (~> 1.0) - coderay (1.1.1) + coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) concurrent-ruby (1.0.5) @@ -102,29 +115,27 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.3) - css_parser (1.5.0) + css_parser (1.6.0) addressable dante (0.2.0) - database_cleaner (1.6.1) + database_cleaner (1.6.2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) docile (1.1.5) - domain_name (0.5.20170404) - unf (>= 0.0.5, < 1.0.0) dotenv (2.2.1) dotenv-rails (2.2.1) dotenv (= 2.2.1) railties (>= 3.2, < 5.2) - enumerize (2.1.0) + enumerize (2.1.2) activesupport (>= 3.2) equalizer (0.0.11) erubi (1.7.0) erubis (2.7.0) execjs (2.7.0) - faraday (0.13.1) + faraday (0.14.0) multipart-post (>= 1.2, < 3) ffi (1.9.18) - flay (2.9.0) + flay (2.10.0) erubis (~> 2.7.0) path_expander (~> 1.0) ruby_parser (~> 3.0) @@ -134,31 +145,28 @@ GEM ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) flutie (2.0.0) - font-awesome-rails (4.7.0.2) + font-awesome-rails (4.7.0.3) railties (>= 3.2, < 5.2) formulaic (0.4.0) activesupport capybara i18n - gibbon (3.1.0) + gibbon (3.2.0) faraday (>= 0.9.1) multi_json (>= 1.11.0) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) - gon (6.1.0) + gon (6.2.0) actionpack (>= 3.0) - json multi_json request_store (>= 1.0) - google_sign_in (0.1) + google_sign_in (0.1.4) activesupport (>= 5.1) - google-id-token (>= 1.3.1) - hashdiff (0.3.4) + google-id-token (>= 1.4.0) + hashdiff (0.3.7) high_voltage (3.0.0) htmlentities (4.3.4) - http-cookie (1.0.3) - domain_name (~> 0.5) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jbuilder (2.7.0) @@ -169,10 +177,10 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.4.1) + letter_opener (1.6.0) launchy (~> 2.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -181,73 +189,74 @@ GEM loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.5) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) - minitest-reporters (1.1.14) + minitest (5.11.3) + minitest-reporters (1.1.19) ansi builder minitest (>= 5.0) ruby-progressbar - minitest-stub_any_instance (1.0.1) - multi_json (1.12.1) + minitest-stub_any_instance (1.0.2) + multi_json (1.13.1) multipart-post (2.0.0) - netrc (0.11.0) - nio4r (2.1.0) - nokogiri (1.8.1) + nio4r (2.2.0) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) normalize-rails (3.0.3) - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) path_expander (1.0.2) - pg (0.20.0) - premailer (1.10.4) + pg (0.21.0) + premailer (1.11.1) addressable - css_parser (>= 1.4.10) + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) - premailer-rails (1.9.6) + premailer-rails (1.10.1) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - pry (0.10.4) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (2.0.5) - puma (3.9.1) - rack (2.0.3) - rack-cors (0.4.1) - rack-mini-profiler (0.10.5) + public_suffix (3.0.1) + puma (3.11.2) + rack (2.0.4) + rack-cors (1.0.2) + rack-mini-profiler (0.10.7) rack (>= 1.2.0) rack-protection (2.0.0) rack - rack-test (0.6.3) - rack (>= 1.0) + rack-test (0.8.2) + rack (>= 1.0, < 3) rack-timeout (0.4.2) - rails (5.1.1) - actioncable (= 5.1.1) - actionmailer (= 5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) - activemodel (= 5.1.1) - activerecord (= 5.1.1) - activesupport (= 5.1.1) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.1) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) + rails-erd (1.5.2) + activerecord (>= 3.2) + activesupport (>= 3.2) + choice (~> 0.2.0) + ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails_12factor (0.0.3) @@ -255,18 +264,18 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.1.1) - actionpack (= 5.1.1) - activesupport (= 5.1.1) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (12.0.0) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) + rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) react-rails (2.2.0) babel-transpiler (>= 0.7.0) connection_pool @@ -275,7 +284,7 @@ GEM tilt recipient_interceptor (0.1.2) mail - redis (3.3.5) + redis (4.0.1) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -292,20 +301,18 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.4.1) redis (>= 2.2, < 5) - reek (4.7.0) + reek (4.7.3) codeclimate-engine-rb (~> 0.4.0) parser (>= 2.4.0.0, < 2.5) rainbow (~> 2.0) - request_store (1.3.2) - rest-client (2.0.2) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - ruby-progressbar (1.8.1) + request_store (1.4.0) + rack (>= 1.4) + ruby-graphviz (1.2.3) + ruby-progressbar (1.9.0) ruby_dep (1.5.0) - ruby_parser (3.9.0) - sexp_processor (~> 4.1) - rubycritic (3.2.3) + ruby_parser (3.10.1) + sexp_processor (~> 4.9) + rubycritic (3.3.0) flay (~> 2.8) flog (~> 4.4) launchy (= 2.4.3) @@ -313,29 +320,33 @@ GEM rainbow (~> 2.1) reek (~> 4.4) ruby_parser (~> 3.8) + tty-which (~> 0.3.0) virtus (~> 1.0) safe_yaml (1.0.4) - sass (3.4.24) - sass-rails (5.0.6) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sexp_processor (4.9.0) - shoulda-matchers (3.1.1) + sexp_processor (4.10.0) + shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.2) + sidekiq (5.0.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.3, >= 3.3.3) - simplecov (0.14.1) + redis (>= 3.3.4, < 5) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) - slop (3.6.0) + simplecov-html (0.10.2) spring (2.0.2) activesupport (>= 4.2) sprockets (3.7.1) @@ -345,52 +356,50 @@ GEM babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - stripe (1.58.0) - rest-client (>= 1.4, < 4.0) - stripe_event (1.6.0) + stripe (3.9.1) + faraday (~> 0.10) + stripe_event (2.1.1) activesupport (>= 3.1) - stripe (>= 1.6, < 3.0) - thor (0.19.4) + stripe (>= 2.8, < 4.0) + thor (0.20.0) thread_safe (0.3.6) - tilt (2.0.7) - timecop (0.8.1) + tilt (2.0.8) + timecop (0.9.1) title (0.0.7) i18n rails (>= 3.1) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - twilio-ruby (4.13.0) - builder (>= 2.1.2) - jwt (~> 1.0) - multi_json (>= 1.3.0) + tty-which (0.3.0) + turbolinks (5.1.0) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + twilio-ruby (5.6.2) + faraday (~> 0.9) + jwt (>= 1.5, <= 2.5) + nokogiri (>= 1.6, < 2.0) tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.5) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.4) - uniform_notifier (1.10.0) + uniform_notifier (1.11.0) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - webmock (3.0.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - will_paginate (3.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + will_paginate (3.1.6) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -422,7 +431,8 @@ DEPENDENCIES minitest-reporters minitest-stub_any_instance normalize-rails (~> 3.0.0) - pg + payola-payments! + pg (= 0.21.0) premailer-rails pry-byebug pry-rails @@ -431,9 +441,10 @@ DEPENDENCIES rack-mini-profiler rack-timeout rails (~> 5.1.0) + rails-erd rails_12factor rails_stdout_logging - react-rails + react-rails (= 2.2.0) recipient_interceptor redis-rails rubycritic diff --git a/LICENSE b/LICENSE.md similarity index 52% rename from LICENSE rename to LICENSE.md index 38f0d81..549f03e 100644 --- a/LICENSE +++ b/LICENSE.md @@ -1,7 +1,9 @@ -Copyright 2018 Volition +# MIT License + +Copyright © 2018 Volition Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The Software is provided "as is," without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the Software. diff --git a/README.md b/README.md index 1206b3c..ef0b011 100644 --- a/README.md +++ b/README.md @@ -1,126 +1,18 @@ -# Volition +Volition -Build status: [![CircleCI](https://circleci.com/gh/garrettqmartin8/volition.svg?style=svg&circle-token=f883f7406ee9df386967c67b4a6f5a330083fe29)](https://circleci.com/gh/garrettqmartin8/volition) +### The power of using one's will. -## Self hosting HEROKU -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/garrettqmartin8/volition) +[![CircleCI](https://circleci.com/gh/usevolition/volition/tree/master.svg?style=shield)](https://circleci.com/gh/usevolition/volition/tree/master) -Volition is designed with self hosting in mind. By using “Deploy to Heroku” button above, you can be up and running in a few minutes! +--- -To update your deployed app with the lastest changes: +Volition is more than a todo list. It’s a framework for becoming more effective. It encourages you to be intentional in planning your day and reflecting on the decisions you've made. Read about [the philosophy behind Volition](https://usevolition.com/philosophy "Philosophy behind Volition") to learn more. -1. Clone this repo: `git clone git@github.com:garrettqmartin8/volition.git` -2. Run `bin/update_heroku` from the command line. -3. Enjoy your updated app! +## Self-Hosting Volition +#### We believe users should control their own data +New web applications and software products seem to be more ephemeral than ever. This is the reason Volition's users have the option to self-host our software. If Volition helps you as much as it has helped us, we want you to rest easy knowing you'll have it forever. Refer to our [self-hosting guidelines](SELFHOST.md "Volition self hosting guidelines") for more details on deploying and keeping your application updated. -## Self hosting Ubuntu - -Volition runs great on Ubuntu Server. Tested on Ubuntu 14.04 (YMMV) - -### Prerequisites for Ubuntu install: - -1. Ruby 2.4.0 (install using rvm) -- _make sure rvm installed:_ -- `sudo apt-get install libgdbm-dev libncurses5-dev automake libtool bison libffi-dev` -- `gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB` -- `\curl -sSL https://get.rvm.io | bash -s stable` -- `source ~/.rvm/scripts/rvm` -- _then install pre-stuff for ruby:_ -- `sudo apt-add-repository ppa:brightbox/ruby-ng` -- `sudo apt-get update` -- `sudo apt-get install libpq-dev git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev python-software-properties libffi-dev nodejs` -- `rvm install 2.4.0` -- `rvm use 2.4.0 --default` -- `ruby -v`_should be 2.4.0_ - -2. PostgreSQL -- `sudo apt-get update` -- `sudo apt-get install postgresql postgresql-contrib` -- edit the postgres config to trust local user connections by default -- `sudo nano /etc/postgresql/9.3/main/pg_hba.conf` -- edit the lines for local to be trust instead of peer or md5: -``` -# Database administrative login by Unix domain socket -local all postgres trust - -# TYPE DATABASE USER ADDRESS METHOD - -# "local" is for Unix domain socket connections only -local all all trust -``` -### Post setup of Ruby & Postgres on Ubuntu Server - -You can try just running ./bin/setup at this point as mentioned at the bottom of this readme, but I found I had to work through the following three gotchas before anything worked. - -1. Edit config/database.yml and add in `username: postgres` and `password:` fields for development and production sections -2. install bundler gem: `gem install bundler` -3. config bundler to get `pg` to install properly: `bundle config build.pg --with-pg-lib="/var/lib/postgresql/9.3/main"` - -### Run on local port 3000 on Ubuntu - -Simply `rails -s` - -You can run this in `tmux` or daemonize this process using `passenger` or `systemd` - -### setup with NGINX reverse proxy - -create a new NGINX vhost file in /etc/nginx/sites-available/, for example /etc/nginx/sites-available/volition - -here is example volition file: - -``` -server { - server_name do.jamescampbell.us; - listen 80; - - access_log /var/log/nginx/do-access.log; - error_log /var/log/nginx/do-error.log; - - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $host; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_cache_bypass $http_upgrade; - proxy_pass http://127.0.0.1:3000; - } - -} -``` - -and go to what you set in your server\_name field and it should just work - - -### Setting up reminders -To take advantage of the daily reflection reminders, you may need to do some extra setup: - -#### SMS reminders -You’ll need to create a Twilio account and set three environment variables in the `.env` file: -- `TWILIO_SID` -- `TWILIO_AUTH_TOKEN` -- `TWILIO_SENDER_PHONE_NUMBER` - -#### Email reminders -You’ll need to set some SMTP environment variables in the `.env` file: -- `SMTP_ADDRESS` -- `SMTP_DOMAIN` -- `SMTP_PASSWORD` -- `SMTP_USERNAME` - -## Contributing - -After you have cloned this repo, run this setup script to set up your machine -with the necessary dependencies to run and test this app: - - % ./bin/setup - -It assumes you have a machine equipped with Ruby, Postgres, etc. If not, set up -your machine with [this script]. - -[this script]: https://github.com/thoughtbot/laptop - -PRs are welcome! - -MIT License +## Contributing to Volition +Volition will always be [MIT-licened](LICENSE.md "Volition MIT-License") open source software. We welcome all contributions. If you find a bug, feel free to fork Volition and submit a PR. We expect all Volition contributors to abide by the terms of our [code of conduct](CONDUCT.md "Volition code of conduct"). +#### © 2018 Volition diff --git a/SELFHOST.md b/SELFHOST.md new file mode 100644 index 0000000..cb951d9 --- /dev/null +++ b/SELFHOST.md @@ -0,0 +1,19 @@ +# Self-Hosting Volition + +Volition is designed with self hosting in mind. Follow the steps below and you'll be up and running in no time. + +## Deploying to Heroku + +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/usevolition/volition) + +1. command + click the button above to open your "Create New App" Heroku dashboard in a new tab. + +2. Name your Heroku application whatever you want in the "App name" input box at the top of the "Create New App" form. + +3. Click "Deploy app" at the bottom of the page. Heroku will provide a checklist of steps that it needs to complete. + +4. Once Heroku has completed all the steps necessary for deployment, you'll have the options to "Manage app" or "View". Click "View" to see your self-hosted instance of Volition. + +5. You're ready to start using your self-hosted instance of Volition! + +#### Note: Using this method to deploy means that your instance of Volition will always be the version it is when you deploy. We plan to add detailed instructions on forking/cloning the code base and deploying from that fork or clone in the near future. This will allow you to keep your instance up to date with the production version of Volition. diff --git a/app.json b/app.json index f72ae1e..e419b7e 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "name": "Volition", - "description": "Work in progress.", - "repository": "https://github.com/garrettqmartin8/volition", + "description": "Your Volition Instance", + "repository": "https://github.com/usevolition/volition", "scripts": { "postdeploy": "bundle exec rake db:migrate" }, @@ -18,15 +18,6 @@ "SMTP_USERNAME": { "value": "You can add this later." }, - "TWILIO_SID": { - "value": "Optional" - }, - "TWILIO_AUTH_TOKEN": { - "value": "Optional" - }, - "TWILIO_SENDER_PHONE_NUMBER": { - "value": "Optional" - }, "SELF_HOSTED": { "value": "true" } diff --git a/app/assets/images/paid.png b/app/assets/images/paid.png new file mode 100644 index 0000000000000000000000000000000000000000..20a8cec2cadafdbc00bb577b3b9135a15f1b4b18 GIT binary patch literal 49543 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 z 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 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 731ce71..5fd62ca 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,7 @@ // about supported directives. // //= require jquery +//= require payola //= require jquery_ujs //= require turbolinks //= require react diff --git a/app/assets/javascripts/password.js b/app/assets/javascripts/password.js index b60ae0b..1f29bfa 100644 --- a/app/assets/javascripts/password.js +++ b/app/assets/javascripts/password.js @@ -1,13 +1,14 @@ $(document).on('turbolinks:load', function() { - if ($('body').hasClass('users-new')) { - $('#registration_password').focus(function(e) { + if ($('body').hasClass('users-new') || $('body').hasClass('passwords-edit')) { + $('#registration_password, #reset_password').focus(function(e) { $('.passwordRules').removeClass('hidden') }) - $('#registration_password').keyup(function(e) { + $('#registration_password, #reset_password').keyup(function(e) { var password = e.target.value + var rules = e.target.dataset.rules.split(",") - var passedRules = checkPasswordRules(password) + var passedRules = checkPasswordRules(password, rules) console.log(passedRules) var allRulesPassed = markPassedRules(passedRules) @@ -33,14 +34,12 @@ $(document).on('turbolinks:load', function() { } } - function checkPasswordRules(password) { - rules = [ - checkLength, - checkTop100, - ensureDoesntMatchEmail - ] + function checkPasswordRules(password, rules) { + var activeRules = rules.map(function(rule) { + return window[rule] + }) - return rules.map(function(rule, index) { + return activeRules.map(function(rule, index) { result = rule(password) if (result == true) { @@ -49,11 +48,11 @@ $(document).on('turbolinks:load', function() { }) } - function checkLength(password) { + window.checkLength = function(password) { return password.length >= 10 } - function checkTop100(password) { + window.checkTop100 = function(password) { if (!window.top100) { getTop100().then(function() { return !window.top100.includes(password) @@ -72,8 +71,8 @@ $(document).on('turbolinks:load', function() { }) } - function ensureDoesntMatchEmail(password) { - return $('#user_email').val() != password + window.ensureDoesntMatchEmail = function(password) { + return $('#registration_email').val() != password } } }) diff --git a/app/assets/javascripts/payment.js b/app/assets/javascripts/payment.js index 444c294..569dcc5 100644 --- a/app/assets/javascripts/payment.js +++ b/app/assets/javascripts/payment.js @@ -1,9 +1,31 @@ $(document).on('turbolinks:load', function() { - if ($('body').hasClass('payments-new')) { + if ($('body').hasClass('payments') || $('body').hasClass('gifts')) { var initializeStripe = (function(e) { - var stripe = Stripe(gon.stripe_public_key); - var elements = stripe.elements(); - var form = document.getElementById('payment-form') + var stripe = Stripe(gon.stripe_public_key); + var elements = stripe.elements(); + var form = document.getElementById('payment-form') + var planIdInput = document.getElementById('plan_id') + var monthlyPlanButton = document.getElementById("js--monthlyPlan") + var yearlyPlanButton = document.getElementById("js--yearlyPlan") + var selectedPlan = document.getElementById("selectedPlan") + + if ($('body').hasClass('payments-new')) { + planIdInput.value = gon.monthly_plan_id + + monthlyPlanButton.addEventListener('click', function(e) { + planIdInput.value = gon.monthly_plan_id + selectedPlan.innerHTML = "Monthly ($5.00)" + monthlyPlanButton.className = "" + yearlyPlanButton.className = "update" + }) + + yearlyPlanButton.addEventListener('click', function(e) { + planIdInput.value = gon.yearly_plan_id + selectedPlan.innerHTML = "Yearly ($50.00)" + yearlyPlanButton.className = "" + monthlyPlanButton.className = "update" + }) + } var style = { base: { diff --git a/app/assets/javascripts/settings.js b/app/assets/javascripts/settings.js new file mode 100644 index 0000000..6254828 --- /dev/null +++ b/app/assets/javascripts/settings.js @@ -0,0 +1,42 @@ +$(document).on('turbolinks:load', function() { + if ($('body').hasClass('users-edit')) { + var referralLink = document.getElementById("referral_link") + var copyButton = document.querySelector(".copyButton") + + referralLink.addEventListener("click", function(e) { + expandLink() + this.setSelectionRange(0, this.value.length) + + setTimeout(reset, 3000) + }) + + copyButton.addEventListener("click", function(e) { + expandLink() + referralLink.select() + + try { + var successful = document.execCommand('copy'); + + if (successful) { + copyButton.disabled = true + copyButton.innerHTML = "Copied!" + + setTimeout(reset, 3000) + } + } catch (err) { + console.log('Oops, unable to copy'); + } + }) + + var reset = function() { + copyButton.disabled = false + copyButton.innerHTML = "Copy and send link!" + referralLink.value = referralLink.dataset.referralCode + } + + var expandLink = function() { + referralLink.value = referralLink.dataset.referralLink + } + } +}) + diff --git a/app/assets/javascripts/week_plan.js b/app/assets/javascripts/week_plan.js index 01f7a48..a9f677f 100644 --- a/app/assets/javascripts/week_plan.js +++ b/app/assets/javascripts/week_plan.js @@ -1,6 +1,7 @@ $(document).on('click', '.js--toggleWeekPlan', function() { $('.addWeeklyTodos').toggleClass('hidden') $('.showWeekPlan').toggleClass('hidden') + $('.lastWeek').toggleClass('hidden') }) $(document).on('click', '.js--addWeeklyTodo', function() { diff --git a/app/assets/stylesheets/application/dashboard.scss b/app/assets/stylesheets/application/dashboard.scss index 097fee9..fbe0408 100644 --- a/app/assets/stylesheets/application/dashboard.scss +++ b/app/assets/stylesheets/application/dashboard.scss @@ -32,7 +32,7 @@ height: 100%; height: 100%; width: 75px; - padding: 20px 0; + padding: 20px; } .todayLink { @@ -42,10 +42,17 @@ .dashboardTodoList { font-size: 16px; @include flex(1); - padding-left: 50px; + padding-left: 20px; + width: 85%; } .dashboardTodo { + list-style-position:inside; + width: 80%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + .complete { text-decoration: line-through; } @@ -62,7 +69,12 @@ } .time { - display: inline-block; + display: none; + + @include MQ(M) { + display: inline-block; + } + opacity: 0; transition: opacity 150ms; margin-left: 10px; diff --git a/app/assets/stylesheets/application/general.scss b/app/assets/stylesheets/application/general.scss index f39475a..1f3cacb 100644 --- a/app/assets/stylesheets/application/general.scss +++ b/app/assets/stylesheets/application/general.scss @@ -6,15 +6,26 @@ margin-bottom: 4rem; h1 { - font-size: 30px; + font-size: 2rem; color: $dark-gray; margin: 0; } h2 { - font-size: 20px; + font-size: 1.5rem; color: $green; } + + h3 { + font-size: 1.25rem; + color: $dark-gray; + font-weight: bold; + } + + h4 { + font-size: 1.1rem; + font-weight: bold; + } } blockquote { @@ -104,3 +115,33 @@ footer { color: $dark-heroku-purple; } } + +.flexTable { + display: flex; + flex-wrap: wrap; + margin: 0 0 3em 0; + padding: 0; + font-size: 1rem; +} +.flexTable-cell { + box-sizing: border-box; + flex-grow: 1; + width: 100%; // Default to full width + padding-right: 1.5em; + overflow: hidden; // Or flex might break + text-overflow: ellipsis; + list-style: none; + > h1, > h2, > h3, > h4, > h5, > h6 { margin: 0; } + + &.right { + text-align: right; + } +} + +/* Table column sizing +================================== */ +.flexTable--2cols > .flexTable-cell { width: 50%; } +.flexTable--3cols > .flexTable-cell { width: 33.33%; } +.flexTable--4cols > .flexTable-cell { width: 25%; } +.flexTable--5cols > .flexTable-cell { width: 20%; } +.flexTable--6cols > .flexTable-cell { width: 16.6%; } diff --git a/app/assets/stylesheets/application/marketing.scss b/app/assets/stylesheets/application/marketing.scss index 759a78c..c602b20 100644 --- a/app/assets/stylesheets/application/marketing.scss +++ b/app/assets/stylesheets/application/marketing.scss @@ -184,7 +184,10 @@ .hosted { background: $green; color: $white; - border-radius: $base-border-radius; + } + + .selfHosted { + background: lighten($heroku-purple, 35%); } .price { diff --git a/app/assets/stylesheets/application/payments.scss b/app/assets/stylesheets/application/payments.scss index 0297729..3fc131b 100644 --- a/app/assets/stylesheets/application/payments.scss +++ b/app/assets/stylesheets/application/payments.scss @@ -5,3 +5,12 @@ width: 40%; } } + +.planOptions { + @include display-flex; + @include justify-content(space-between); + + width: 225px; + margin-bottom: 40px; +} + diff --git a/app/assets/stylesheets/application/reflections.scss b/app/assets/stylesheets/application/reflections.scss index 764703e..8596dff 100644 --- a/app/assets/stylesheets/application/reflections.scss +++ b/app/assets/stylesheets/application/reflections.scss @@ -31,15 +31,16 @@ width: 90%; @include MQ(M) { - width: initial; + width: 500px; } - .error { - padding: 10px; - border: 2px solid $red; - border-radius: $base-border-radius; - color: $red; - } +} + +.error { + padding: 10px; + border: 2px solid $red; + border-radius: $base-border-radius; + color: $red; } .reflectionDaySummary { @@ -54,3 +55,17 @@ font-size: 20px; } } + +.addToWeeklyPlan { + // background-color: $lightest-blue; +} + +.incompleteTodos { + font-size: 1rem; + padding: 0; + + li { + margin: 10px 0; + @include display-flex; + } +} diff --git a/app/assets/stylesheets/application/settings.scss b/app/assets/stylesheets/application/settings.scss index 9def10d..91b83fc 100644 --- a/app/assets/stylesheets/application/settings.scss +++ b/app/assets/stylesheets/application/settings.scss @@ -17,18 +17,70 @@ } } +.settingsWrapper { + width: 90%; + margin-top: 20px; + + @include MQ(M) { + width: 50%; + } +} + .settingsSection { width: 100%; margin-bottom: 60px; - &.dangerZone { - border: 2px solid $red; - } + .subscriptionCard { + width: 100%; + font-family: courier; + padding: 30px; + margin-bottom: 15px; + border-radius: $base-border-radius; + transform: rotate(-1deg); + box-shadow: 1px 1px $light-gray; + background-color: #ffeaa7; + // background-color: lighten($green, 40%); + + img { + display: none; + width: 20%; + vertical-align: top; + margin-right: 10px; + + @include MQ(S) { + display: inline-block; + } + } + + .headerText { + h4 { margin: 0; } + display: inline-block; + } + + hr { + border-bottom: 1px solid $base-font-color; + margin: 10px 0 10px 0; + } + + .cancelLink { + text-align: right; + color: $red; + font-size: .9rem; + text-decoration: underline; + text-decoration-skip: ink; + + &:hover, + &:active { + color: $dark-red; + } + } - .dangerZoneContent { - padding: 10px; } + hr { margin: 30px 0 20px 0; } + + .dangerZone { h2 { color: $red; } } + &.hostedFeature { padding: 40px 10px; border: 2px dashed $medium-gray; @@ -72,7 +124,7 @@ } .settingsInput { - margin-bottom: 40px; + margin-bottom: 15px; } .StripeElement { @@ -98,3 +150,33 @@ height: 175px !important; margin-right: 20px; } + +.referralWidget { + position: relative; + margin: 40px 0; + + .copyButton { + font-size: 14px; + position: absolute; + top: -15px; + left: 50%; + -webkit-transform: translateX(-50%); + transform: translateX(-50%) + } + + input { + padding: 30px 0; + background: lighten($green, 40%); + text-align: center; + font-family: courier; + font-size: 1rem; + border: 2px solid $green; + } +} + +.referredUsers { + .checkMark { + margin-left: 0; + margin-right: 10px; + } +} diff --git a/app/assets/stylesheets/application/week_plan.scss b/app/assets/stylesheets/application/week_plan.scss index 5efa602..fd65634 100644 --- a/app/assets/stylesheets/application/week_plan.scss +++ b/app/assets/stylesheets/application/week_plan.scss @@ -5,7 +5,7 @@ border-radius: $base-border-radius; color: $white; font-size: 1rem; - margin: 40px 0; + margin-top: 40px; height: 300px; .weeklyTodosScrollable { @@ -65,6 +65,7 @@ .weeklyTodosSection { font-size: 1rem; + margin-bottom: 20px; width: 100%; @extend %weeklyTodos; @@ -89,19 +90,8 @@ cursor: default; transition: background 400ms; - .deleteTodoButton { - width: 20px; - height: 20px; - background: $white; - border-radius: $base-border-radius; - cursor: pointer; - @include display-flex; - @include align-items(center); - @include justify-content(center); - - i { - color: $red; - } + .button { + @include align-self(flex-start); } &.new { @@ -119,3 +109,12 @@ margin-right: 10px; } } + +div.showWeekPlan { + width: 100%; + text-align: center; + + .arrowDown { + font-size: 10px; + } +} diff --git a/app/assets/stylesheets/application/welcome.scss b/app/assets/stylesheets/application/welcome.scss index 73d8535..7a5ccbe 100644 --- a/app/assets/stylesheets/application/welcome.scss +++ b/app/assets/stylesheets/application/welcome.scss @@ -3,10 +3,6 @@ width: 600px; } -.welcomeUser { - color: $green; -} - .philosophy { font-size: 16px; list-style: disc; @@ -19,4 +15,3 @@ .garrett { width: 100px; } - diff --git a/app/assets/stylesheets/base/_buttons.scss b/app/assets/stylesheets/base/_buttons.scss index fed7381..8d83aa0 100644 --- a/app/assets/stylesheets/base/_buttons.scss +++ b/app/assets/stylesheets/base/_buttons.scss @@ -16,7 +16,7 @@ button, .button, input[type="submit"] { text-decoration: none; transition: background-color $base-duration $base-timing, border $base-duration $base-timing; user-select: none; - vertical-align: middle; + // vertical-align: middle; white-space: nowrap; // text-shadow: 1px 1px 1px #666; @@ -28,7 +28,7 @@ button, .button, input[type="submit"] { &:focus { background-color: $dark-red; border: 2px solid $dark-red; - color: #fff; + color: $white; } } @@ -47,6 +47,7 @@ button, .button, input[type="submit"] { &.small { font-size: 1rem; + padding: 0.4em 0.5em !important; } &.extraSmall { @@ -68,13 +69,37 @@ button, .button, input[type="submit"] { background-color: transparent; border: 2px solid $green; padding: 0.6em $base-spacing; - color: $dark-gray; + color: $green; + + &:hover, + &:focus { + border: 2px solid $dark-green; + color: $dark-green; + } } &.light { background-color: $white; border: 2px solid $white; color: $green; + + &:hover, + &:focus { + background-color: darken(#fff, 10%); + border: 2px solid darken(#fff, 10%); + } + } + + &.danger { + border: 2px solid $red; + color: $red; + + &:hover, + &:active { + background: transparent; + border: 2px solid $dark-red; + color: $dark-red; + } } &.image { @@ -98,6 +123,20 @@ button, .button, input[type="submit"] { color: #fff; } } + + &.delete { + background-color: $red; + border: 2px solid $red; + padding: 0.6em $base-spacing; + color: $white; + + &:hover, + &:focus { + background-color: $dark-red; + border: 2px solid $dark-red; + color: $white; + } + } } div.sliderButtons { diff --git a/app/assets/stylesheets/base/_variables.scss b/app/assets/stylesheets/base/_variables.scss index 5c137e8..7a95aa6 100644 --- a/app/assets/stylesheets/base/_variables.scss +++ b/app/assets/stylesheets/base/_variables.scss @@ -11,7 +11,7 @@ $base-line-height: 1.5; $heading-line-height: 1.2; // Other Sizes -$base-border-radius: 2px; +$base-border-radius: 3px; $base-spacing: $base-line-height * 1em; $small-spacing: $base-spacing / 2; $base-z-index: 0; @@ -20,7 +20,7 @@ $base-z-index: 0; $dark-gray: #555; $medium-gray: #999; $light-gray: #ddd; -$red: #f44336; +$red: #e74c3c; $dark-red: darken($red, 10%); $green: #49be5a; $dark-green: darken($green, 10%); diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1a9a86d..bf65179 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -36,7 +36,7 @@ def authenticate_user! end def ensure_user_paid! - unless self_hosted? || current_user.paid? || current_user.trialing? + unless self_hosted? || current_user.active? || current_user.trialing? redirect_to new_payment_path end end diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 3e4d98d..f66f365 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -5,10 +5,13 @@ def show end unless params[:page] - @tomorrows_todo_list = TodoList.includes(:todos).tomorrow(current_user) + @tomorrows_todo_list = TodoList.includes(:daily_todos).tomorrow(current_user) end - @todays_todo_list = TodoList.includes(:todos, :user).today(current_user) - @past_todo_lists = TodoList.includes(:todos, :user).past(current_user).daily.paginate(page: params[:page]) + @todays_todo_list = TodoList.today(current_user)&.daily_snapshot || + TodoList.includes(:daily_todos, :user).today(current_user) + + @past_todo_lists = current_user.daily_snapshots.order(date: :desc) + .paginate(page: params[:page]) end end diff --git a/app/controllers/days_controller.rb b/app/controllers/days_controller.rb index 1dd36f5..a9b2593 100644 --- a/app/controllers/days_controller.rb +++ b/app/controllers/days_controller.rb @@ -1,6 +1,6 @@ class DaysController < AuthenticatedController def show - @todo_list = current_user.todo_lists.find_by(id: params[:id]) - @reflection = @todo_list.reflection + @daily_snapshot = current_user.daily_snapshots.find_by(date: params[:date]) + @reflection = @daily_snapshot.reflection end end diff --git a/app/controllers/gifts_controller.rb b/app/controllers/gifts_controller.rb new file mode 100644 index 0000000..f4343d0 --- /dev/null +++ b/app/controllers/gifts_controller.rb @@ -0,0 +1,54 @@ +class GiftsController < ApplicationController + def new + @gift = Gift.new + gon.stripe_public_key = ENV['STRIPE_PUBLIC_KEY'] + end + + def create + @gift = Gift.new(gift_params) + @gift.sender = current_user + + unless @gift.save + gon.stripe_public_key = ENV['STRIPE_PUBLIC_KEY'] + return render :new + end + + begin + charge_args = { + amount: 5_000, + currency: "usd", + description: "Gift Yearly Subscription from #{current_user.email}" + } + + payment_method = if current_user.active? + { + customer: current_user.subscription + .stripe_customer_id + } + else + { source: params[:stripeToken] } + end + + charge_args.merge!(payment_method) + + charge = Stripe::Charge.create(charge_args) + rescue => e + @gift.destroy + flash.now[:error] = "Something went wrong. Please check you card details and try again." + return render :new + end + + @gift.update(stripe_charge_id: charge.id) + + GiftsMailer.gift_notification(@gift).deliver_later + + flash[:success] = "You sent #{@gift.recipient_name} a yearly subscription!" + redirect_to settings_path + end + + private + + def gift_params + params.require(:gift).permit(:recipient_email, :recipient_name, :message) + end +end diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb new file mode 100644 index 0000000..4a840aa --- /dev/null +++ b/app/controllers/passwords_controller.rb @@ -0,0 +1,56 @@ +class PasswordsController < ApplicationController + def new + end + + def create + if user = User.find_by(email: params[:email]) + user.forgot_password! + deliver_email(user) + end + + flash[:success] = "You will be sent a password recovery email shortly." + redirect_to login_path + end + + def edit + password_reset_token = if params[:token] + params[:token] + else + session[:password_reset_token] + end + + @user = User.find_by( + id: params[:id], + password_reset_token: password_reset_token + ) + + if @user && @user.eligible_for_password_reset + session[:password_reset_token] = params[:token] + else + flash[:error] = "Either that user doesn't exist or your token has expired." + redirect_to login_path + end + end + + def update + @user = User.find_by(password_reset_token: session[:password_reset_token]) + @user.password = params[:password] + + if @user.save + flash[:success] = "Password successfully reset. Please log in to continue." + redirect_to login_path + else + render :edit + end + end + + private + + def deliver_email(user) + PasswordsMailer.change_password(user).deliver_later + end + + def password_reset_params + + end +end diff --git a/app/controllers/payments_controller.rb b/app/controllers/payments_controller.rb index 2e96a34..0d23f1b 100644 --- a/app/controllers/payments_controller.rb +++ b/app/controllers/payments_controller.rb @@ -1,30 +1,87 @@ class PaymentsController < ApplicationController - before_action :ensure_not_paid! + before_action :ensure_not_paid!, only: [:new, :create] def new + @monthly_plan = SubscriptionPlan.find_by(name: "Monthly") + @yearly_plan = SubscriptionPlan.find_by(name: "Yearly") + @subscription = current_user.subscription + gon.stripe_public_key = ENV['STRIPE_PUBLIC_KEY'] + gon.monthly_plan_id = @monthly_plan.id + gon.yearly_plan_id = @yearly_plan.id end def create - valid = PaymentService.charge_card( - token: params[:stripeToken], - user: current_user + plan = SubscriptionPlan.find_by(id: params[:plan_id]) + + subscription = Payola::Subscription.create( + plan: plan, + email: current_user.email, + stripe_token: params[:stripeToken], + currency: "usd", + owner: current_user, + amount: plan.amount ) - if valid + subscription.process! + + if subscription.active? + activate_referral if current_user.referrer.present? redirect_to thank_you_path else flash[:error] = %( - Something went wrong. Please check you card details and try again + Something went wrong. Please check your card details and try again ) + subscription.destroy + redirect_to new_payment_path end end + def edit + gon.stripe_public_key = ENV['STRIPE_PUBLIC_KEY'] + @subscription = current_user.subscription + end + + def update + @subscription = current_user.subscription + @customer = Stripe::Customer.retrieve(@subscription.stripe_customer_id) + @customer.source = params[:stripeToken] + + @customer.save + + source = @customer.sources.first + + @subscription.update( + stripe_token: params[:stripeToken], + card_last4: source.last4, + card_expiration: Date.new(source.exp_year, source.exp_month, 1) + ) + + flash[:success] = "Updated billing info" + redirect_to settings_path + end + private + def activate_referral + referrer = current_user.referrer + subscription_id = referrer.subscription.stripe_id + coupon_name = if referrer.subscription.name == "Monthly" + "referral_credit_monthly" + else + "referral_credit_yearly" + end + + stripe_subscription = Stripe::Subscription.retrieve(subscription_id) + stripe_subscription.coupon = coupon_name + stripe_subscription.save + + PaymentsMailer.referral_activated(current_user).deliver_later + end + def ensure_not_paid! - redirect_to settings_path if current_user.paid? + redirect_to settings_path if current_user.active? end end diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb new file mode 100644 index 0000000..d6149f3 --- /dev/null +++ b/app/controllers/preferences_controller.rb @@ -0,0 +1,56 @@ +class PreferencesController < ApplicationController + before_action :set_user + + def update + @user.skip_password_validation = true + @user.assign_attributes({ + track_weekends: params[:track_weekends], + weekly_summary: params[:weekly_summary] + }) + + if @user.save + flash[:success] = "Preferences saved!" + else + flash[:error] = "Something went wrong. Please try again." + end + + redirect_to settings_path + end + + def update_email + authenticate_with(params[:password]) + + if @user.update(email: params[:email]) + flash[:success] = "Email updated!" + else + flash[:error] = "Something went wrong. Please try again." + end + + redirect_to settings_path + end + + def update_password + authenticate_with(params[:current_password]) + + if @user.update(password: params[:new_password]) + flash[:success] = "Password updated!" + else + flash[:error] = "Something went wrong. Please try again." + end + + redirect_to settings_path + end + + private + + def authenticate_with(password) + unless @user.authenticate(password) + flash[:error] = "Incorrect password" + redirect_to settings_path + end + end + + def set_user + @user = current_user + end +end diff --git a/app/controllers/reflections_controller.rb b/app/controllers/reflections_controller.rb index 0cf3ba1..6d0ec1c 100644 --- a/app/controllers/reflections_controller.rb +++ b/app/controllers/reflections_controller.rb @@ -2,27 +2,46 @@ class ReflectionsController < AuthenticatedController include ApplicationHelper def new - if Reflection.today(current_user).present? + @reflection = Reflection.new + @todo_list = current_user.todo_lists.daily.find_by(date: params[:date]) || + TodoList.today(current_user) + + @daily_snapshot = @todo_list.daily_snapshot + @reflecting_on_today = @todo_list == TodoList.today(current_user) + @link_text, @link_url = if @reflecting_on_today + ["Go back to today's tasks", today_path] + else + ["Go back", day_path(@daily_snapshot.date)] + end + + if Reflection.today(current_user).present? && @reflecting_on_today flash[:error] = 'You already wrote your reflection for today.' redirect_to dashboard_path - elsif TodoList.today(current_user).blank? + elsif TodoList.today(current_user).blank? && @reflecting_on_today flash[:error] = 'You must start your tasks for today before writing a reflection.' redirect_to dashboard_path end - - @reflection = Reflection.new - @todo_list = TodoList.today(current_user) end def create @reflection = Reflection.new(reflection_params) @reflection.user = current_user - @reflection.date = Date.current + + @todo_list = current_user.todo_lists.daily.find_by(date: reflection_params[:date]) + @todo_list.daily_snapshot&.destroy if @reflection.save + @daily_snapshot = DailySnapshot.create_from_todo_list(@todo_list) + + Todo.where(id: params[:add_to_week]).each do |todo| + todo.update( + weekly_todo_list_id: current_week_plan.id, + daily_todo_list_id: nil + ) + end + redirect_to after_create_path else - @todo_list = TodoList.today(current_user) render :new end end @@ -30,7 +49,9 @@ def create private def after_create_path - if tomorrow_is_trackable? + if @reflection.date != Date.current + day_path(@daily_snapshot.date) + elsif tomorrow_is_trackable? tomorrow_path else flash[:success] = 'Nice job today! Get some rest.' @@ -39,6 +60,12 @@ def after_create_path end def reflection_params - params.require(:reflection).permit(:rating, :positive, :negative, :undone) + params.require(:reflection).permit( + :rating, + :positive, + :negative, + :undone, + :date + ) end end diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb new file mode 100644 index 0000000..18473cc --- /dev/null +++ b/app/controllers/subscriptions_controller.rb @@ -0,0 +1,11 @@ +class SubscriptionsController < AuthenticatedController + def destroy + @subscription = current_user.subscription + @subscription.cancel! + + Stripe::Subscription.retrieve(@subscription.stripe_id).delete + @subscription.destroy + + redirect_to edit_user_path(current_user) + end +end diff --git a/app/controllers/today_controller.rb b/app/controllers/today_controller.rb index 4ff2547..550584c 100644 --- a/app/controllers/today_controller.rb +++ b/app/controllers/today_controller.rb @@ -6,15 +6,18 @@ def show @week_plan = current_week_plan @reflection = Reflection.today(current_user) @todo_list = TodoList.today(@user) - @button_text, @button_path = if Reflection.today(current_user).present? - ["Plan for tomorrow", tomorrow_path] - else - ["Reflect on your day", reflect_path] - end if @todo_list.blank? redirect_to new_today_path else + @button_text, @button_path = if Reflection.today(current_user).present? + ["Plan for tomorrow", tomorrow_path] + else + [ + "Reflect on your day", + reflect_path(@todo_list.date), + ] + end @todos = @todo_list.todos.frontend_info end end @@ -24,10 +27,10 @@ def new redirect_to today_path end - @week_plan = current_week_plan @todo_list = TodoList.new + @week_plan = current_week_plan 5.times do - @todo_list.todos.build + @todo_list.daily_todos.new end end @@ -36,14 +39,16 @@ def create date: Date.current, user: @user, list_type: 'daily', - week_plan: current_week_plan + week_plan: current_week_plan, ) - if @todo_list.save - @todo_list.update(todos_attributes: todo_list_params[:todos_attributes]) + @todo_list.update(daily_todos_attributes: daily_todo_list_params[:daily_todos_attributes]) + overlapping_todo_content = @todo_list.todos.pluck(:content) & current_week_plan.todos.pluck(:content) + if overlapping_todo_content.size > 0 + current_week_plan.todos.where(content: overlapping_todo_content).destroy_all + end redirect_to today_path end - end private @@ -59,7 +64,7 @@ def set_user end end - def todo_list_params - params.require(:todo_list).permit(todos_attributes: [:content, :estimated_time_blocks]) + def daily_todo_list_params + params.require(:todo_list).permit(daily_todos_attributes: [:content, :estimated_time_blocks]) end end diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 1c4bd2a..fd7a7a9 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -6,6 +6,19 @@ def update begin @todo.update!(todo_params) + + todo_list = @todo.daily_todo_list + todo_in_week_plan = current_week_plan.todos.find_by(content: @todo.content) + + if todo_in_week_plan.present? + todo_in_week_plan.destroy + end + + if todo_list.daily_snapshot.present? + todo_list.daily_snapshot.destroy + DailySnapshot.create_from_todo_list(todo_list) + end + render json: { saved: true } rescue => e puts e diff --git a/app/controllers/tomorrow_controller.rb b/app/controllers/tomorrow_controller.rb index b67a565..66bcde5 100644 --- a/app/controllers/tomorrow_controller.rb +++ b/app/controllers/tomorrow_controller.rb @@ -5,7 +5,7 @@ def new message = "You already planned tomorrow\'s tasks. You can change them when you start your day." dashboard_path else - message = "You must write a reflection for today before planning tomorrow\'s tasks." + message = "You must write a reflection for today before planning tomorrow\'s tasks." reflect_path end @@ -19,7 +19,7 @@ def new @todo_list = TodoList.new @week_plan = current_week_plan 5.times do - @todo_list.todos.build + @todo_list.daily_todos.new end end @@ -30,7 +30,11 @@ def create ) if @todo_list.save - @todo_list.update(todos_attributes: todo_list_params[:todos_attributes]) + @todo_list.update(daily_todos_attributes: daily_todo_list_params[:daily_todos_attributes]) + overlapping_todo_content = @todo_list.todos.pluck(:content) & current_week_plan.todos.pluck(:content) + if overlapping_todo_content.size > 0 + current_week_plan.todos.where(content: overlapping_todo_content).destroy_all + end redirect_to after_create_path end @@ -57,7 +61,7 @@ def after_create_path end end - def todo_list_params - params.require(:todo_list).permit(todos_attributes: [:content, :estimated_time_blocks]) + def daily_todo_list_params + params.require(:todo_list).permit(daily_todos_attributes: [:content, :estimated_time_blocks]) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d344070..f9fb4d7 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,6 +5,14 @@ class UsersController < AuthenticatedController before_action :set_user def new + if params[:referral_code] && user_with_referral_code_exists?(params[:referral_code]) + flash.now[:success] = "You got a referral credit! Enjoy one month of Volition, on us." + session[:referral_code] = params[:referral_code] + elsif params[:gift_token] && gift_with_token_exists?(params[:gift_token]) + flash.now[:success] = "You have redeemed your free 1-year subscription! Create your account to begin using Volition." + session[:gift_token] = params[:gift_token] + end + if current_user.present? && !current_user.guest? redirect_to dashboard_path end @@ -13,7 +21,13 @@ def new def create valid_params = params[:google_id_token].present? ? params : registration_params - @registration = Registration.new(valid_params, current_user || User.new) + valid_params.merge!({ + referral_code: session[:referral_code], + gift_token: session[:gift_token] + }) + + @registration = Registration.new(valid_params, + current_user || User.new) if @registration.save login(@registration.user) @@ -25,6 +39,7 @@ def create end def edit + @subscription = current_user.subscription end def update @@ -58,6 +73,14 @@ def destroy private + def user_with_referral_code_exists?(referral_code) + User.find_by(referral_code: referral_code).present? + end + + def gift_with_token_exists?(gift_token) + Gift.find_by(unique_token: gift_token, recipient_id: nil).present? + end + def add_card_to_user @payment_service = PaymentService.new({ stripe_customer_id: @user.stripe_customer_id }) @@ -76,9 +99,6 @@ def registration_params params.require(:registration).permit( :name, :email, - :phone, - :email_reminders, - :sms_reminders, :track_weekends, :password, :google_id @@ -89,9 +109,6 @@ def user_params params.require(:user).permit( :name, :email, - :phone, - :email_reminders, - :sms_reminders, :track_weekends, :password, :google_id, diff --git a/app/controllers/week_plan_controller.rb b/app/controllers/week_plan_controller.rb index 801419b..a8e102e 100644 --- a/app/controllers/week_plan_controller.rb +++ b/app/controllers/week_plan_controller.rb @@ -1,13 +1,14 @@ class WeekPlanController < AuthenticatedController def show - @week_plan = current_week_plan + @last_week = get_last_week + @week_plan = get_current_or_upcoming_week end def add_todo - @week_plan = current_week_plan - @todo = Todo.create( + @week_plan = get_current_or_upcoming_week + @todo = Todo.create!( content: params[:content], - todo_list: @week_plan + weekly_todo_list: @week_plan ) respond_to do |format| @@ -16,7 +17,7 @@ def add_todo end def remove_todo - @week_plan = current_week_plan + @week_plan = get_current_or_upcoming_week @todo = @week_plan.todos.find_by(id: params[:id]) if @todo @@ -27,4 +28,45 @@ def remove_todo format.js end end + + def move_todo + @last_week = get_last_week + @week_plan = get_current_or_upcoming_week + @todo = @last_week.todos.find_by(id: params[:id]) + + if @todo + @todo.update( + weekly_todo_list_id: @week_plan.id, + daily_todo_list: nil + ) + end + + respond_to do |format| + format.js + end + end + + private + + def get_last_week + if Date.current.sunday? + current_week_plan + else + beginning_of_last_week = Date.current.last_week + current_user.todo_lists + .weekly + .find_by(date: beginning_of_last_week) + end + end + + def get_current_or_upcoming_week + if Date.current.sunday? + current_user.todo_lists.find_or_create_by( + list_type: "weekly", + date: ((@last_week&.date || Date.current) + 1.week).beginning_of_week + ) + else + current_week_plan + end + end end diff --git a/app/forms/registration.rb b/app/forms/registration.rb index b7c841d..5a9385d 100644 --- a/app/forms/registration.rb +++ b/app/forms/registration.rb @@ -18,6 +18,9 @@ def initialize(params = {}, user = User.new) end def save + referral_code = @params.delete(:referral_code) + gift_token = @params.delete(:gift_token) + if signing_up_with_google? @user.skip_password_validation = true google_identity = GoogleSignIn::Identity.new(params[:google_id_token]) @@ -38,11 +41,29 @@ def save @user.timezone = Time.zone.tzinfo.name add_to_mailchimp_newsletter + note_referral(referral_code) + redeem_gift(gift_token) @user.save end private + def note_referral(referral_code) + referrer = User.find_by(referral_code: referral_code) + return unless referrer + @user.referred_by = referrer.id + end + + def redeem_gift(gift_token) + gift = Gift.find_by(unique_token: gift_token) + + return unless gift + + gift.update(recipient: @user) + + CreateStripeGiftSubscriptionJob.perform_later(gift) + end + def add_to_mailchimp_newsletter return nil if self_hosted? || @user.guest? || Rails.env.development? || Rails.env.test? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 66f4f40..9cbdde8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -23,14 +23,6 @@ def tomorrow_is_trackable? end end - def truncate(string, user_agent: :desktop) - if user_agent == :desktop - string.truncate(40) - else - string.truncate(25) - end - end - def self_hosted? ENV['SELF_HOSTED'] == 'true' end @@ -38,9 +30,4 @@ def self_hosted? def on_home_page? controller.action_name == 'home' end - - def eligible_for_daily_reminders? - ENV["SMTP_ADDRESS"] != "You can add this later." && - ENV["TWILIO_SID"] != "Optional" - end end diff --git a/app/jobs/create_daily_snapshots_job.rb b/app/jobs/create_daily_snapshots_job.rb new file mode 100644 index 0000000..c1db33d --- /dev/null +++ b/app/jobs/create_daily_snapshots_job.rb @@ -0,0 +1,10 @@ +class CreateDailySnapshotsJob < ApplicationJob + queue_as :daily_snapshots + + def perform + TodoList.where(user_id: User.finishing_their_day.pluck(:id)) + .missing_snapshot.find_each do |todo_list| + DailySnapshot.create_from_todo_list(todo_list) + end + end +end diff --git a/app/jobs/create_stripe_gift_subscription_job.rb b/app/jobs/create_stripe_gift_subscription_job.rb new file mode 100644 index 0000000..e8ca07c --- /dev/null +++ b/app/jobs/create_stripe_gift_subscription_job.rb @@ -0,0 +1,33 @@ +class CreateStripeGiftSubscriptionJob < ApplicationJob + queue_as :create_gift_subscription + + def perform(gift) + recipient = gift.recipient + + stripe_customer = Stripe::Customer.create( + { email: recipient.email }, + # { idempotency_key: gift.unique_token } + ) + + plan = SubscriptionPlan.find_by(name: "Yearly") + + stripe_subscription = Stripe::Subscription.create( + customer: stripe_customer.id, + items: [{ plan: "yearly" }], + coupon: "gift_yearly" + ) + + payola_subscription = Payola::Subscription.create!( + plan: plan, + email: recipient.email, + currency: "usd", + owner: recipient, + coupon: "gift_yearly", + stripe_customer_id: stripe_customer.id, + stripe_id: stripe_subscription.id + ) + + payola_subscription.sync_with!(stripe_subscription) + payola_subscription.update(state: "active", coupon: "gift_yearly") + end +end diff --git a/app/jobs/email_reminders_job.rb b/app/jobs/email_reminders_job.rb deleted file mode 100644 index 8a0dd2d..0000000 --- a/app/jobs/email_reminders_job.rb +++ /dev/null @@ -1,11 +0,0 @@ -class EmailRemindersJob < ApplicationJob - queue_as :email_reminders - - def perform - User.want_email_reminders.finishing_their_day.each do |user| - RemindersMailer.send_reminder_to(user).deliver - end - rescue => e - Rails.logger.error(e) - end -end diff --git a/app/jobs/sms_reminders_job.rb b/app/jobs/sms_reminders_job.rb deleted file mode 100644 index 5b5d65b..0000000 --- a/app/jobs/sms_reminders_job.rb +++ /dev/null @@ -1,20 +0,0 @@ -class SmsRemindersJob < ApplicationJob - queue_as :sms_reminders - - def perform - twilio_client = Twilio::REST::Client.new( - ENV['TWILIO_SID'], - ENV['TWILIO_AUTH_TOKEN'] - ) - - User.want_sms_reminders.finishing_their_day.each do |user| - twilio_client.account.messages.create({ - from: ENV['TWILIO_SENDER_PHONE_NUMBER'], - to: user.phone, - body: 'Here\'s a reminder from Volition to reflect on your day.' - }) - end - rescue => e - Rails.logger.error(e) - end -end diff --git a/app/mailers/gifts_mailer.rb b/app/mailers/gifts_mailer.rb new file mode 100644 index 0000000..fd9aa2b --- /dev/null +++ b/app/mailers/gifts_mailer.rb @@ -0,0 +1,13 @@ +class GiftsMailer < ApplicationMailer + default from: "gifts@usevolition.com" + + def gift_notification(gift) + @gift = gift + @sender = @gift.sender + + mail( + to: @gift.recipient_email, + subject: "[Volition] You have received a gift from #{@sender.name}" + ) + end +end diff --git a/app/mailers/passwords_mailer.rb b/app/mailers/passwords_mailer.rb new file mode 100644 index 0000000..ac943ab --- /dev/null +++ b/app/mailers/passwords_mailer.rb @@ -0,0 +1,8 @@ +class PasswordsMailer < ApplicationMailer + default from: 'passwords@usevolition.com' + def change_password(user) + @user = user + + mail(to: user.email, subject: "[Volition] Password reset") + end +end diff --git a/app/mailers/payments_mailer.rb b/app/mailers/payments_mailer.rb index b46bdf7..8842109 100644 --- a/app/mailers/payments_mailer.rb +++ b/app/mailers/payments_mailer.rb @@ -1,13 +1,23 @@ class PaymentsMailer < ApplicationMailer default from: 'payments@usevolition.com' - def send_trial_ending_to(user) - @user = user - @subscription_end_date = Date.strptime(user.stripe_subscription.trial_end.to_s, '%s') + def invoice_upcoming(subscription) + @subscription = subscription + @user = @subscription.owner mail( to: @user.email, - subject: '[Volition] Your trial is ending soon!' + subject: "[Volition] You card will be charged soon" + ) + end + + def referral_activated(referred_user) + @referred_user = referred_user + @referrer = referred_user.referrer + + mail( + to: @referrer.email, + subject: "[Volition] Someone used your referral link!" ) end end diff --git a/app/mailers/reminders_mailer.rb b/app/mailers/reminders_mailer.rb deleted file mode 100644 index 1d4c631..0000000 --- a/app/mailers/reminders_mailer.rb +++ /dev/null @@ -1,11 +0,0 @@ -class RemindersMailer < ApplicationMailer - default from: 'reminders@usevolition.com' - - def send_reminder_to(user) - @user = user - mail( - to: @user.email, - subject: '[Volition] Reminder to reflect' - ) - end -end diff --git a/app/mailers/weekly_summary_mailer.rb b/app/mailers/weekly_summary_mailer.rb index 0904658..871138d 100644 --- a/app/mailers/weekly_summary_mailer.rb +++ b/app/mailers/weekly_summary_mailer.rb @@ -2,42 +2,24 @@ class WeeklySummaryMailer < ApplicationMailer default from: "summary@usevolition.com" def weekly_summary(user) + from = 6.days.ago + to = Date.current.end_of_day @user = user - date_args_last_week = { from: 12.days.ago, to: 6.days.ago } - date_args_this_week = { from: 6.days.ago, to: Date.current.end_of_day } - @completion_percentage = user.completion_percentage(**date_args_this_week) - @average_rating = user.average_rating(**date_args_this_week) - @completion_percentage_last_week = user.completion_percentage(**date_args_last_week) - @average_rating_last_week = user.average_rating(**date_args_last_week) - @completion_percentage_arrow, @completion_percentage_class = if @completion_percentage > @completion_percentage_last_week - ["▲", "better"] - elsif @completion_percentage < @completion_percentage_last_week - ["▼", "worse"] - else - "−" - end + @weekly_summary = user.weekly_summaries.find_or_create_by(created_at: Date.current.beginning_of_day..Time.current) + @weekly_summary.update( + todo_list_ids: user.todo_lists.where(created_at: from..to).pluck(:id) + ) + @weekly_summary.generate_stats - @average_rating_arrow, @average_rating_class = if @average_rating > @average_rating_last_week - ["▲", "better"] - elsif @average_rating < @average_rating_last_week - ["▼", "worse"] - else - "−" - end + @completion_percentage_arrow, @completion_percentage_class = @weekly_summary.arrow_and_class(:completion_percentage) - @recommendation = if @completion_percentage < 70 && @average_rating < 7 - "It looks like you didn't get everything done this past week and that reflected on how productive you thought your days were. Try being more deliberate in planning your tasks this coming week in order to build momentum." - elsif @completion_percentage >= 70 && @average_rating < 7 - "You did well completing your tasks this week, but felt you could have been more productive. You only have five tasks to plan in Volition for a day. Make sure these tasks are the ones that will make you feel like you're making the most progress in your work and life." - elsif @completion_percentage < 70 && @average_rating >= 7 - "It seems like you felt productive this week, but you didn't complete all the tasks you planned to. Try to break your tasks into smaller pieces this upcoming week." - elsif @completion_percentage >= 70 && @average_rating >= 7 - "Great job! You made a solid plan and you stuck to it. Keep up the good work!" - end + @average_rating_arrow, @average_rating_class = @weekly_summary.arrow_and_class(:weekly_rating) - reflections = user.reflections.where(created_at: date_args_this_week[:from]..date_args_this_week[:to]) - @negative = reflections.pluck(:negative) - @positive = reflections.pluck(:positive) + @recommendation = @weekly_summary.recommendation + + reflections = @weekly_summary.reflections + @negative = reflections.map(&:negative).uniq + @positive = reflections.map(&:positive).uniq mail(to: @user.email, subject: "[Volition] Your weekly summary") end diff --git a/app/models/concerns/data_struct.rb b/app/models/concerns/data_struct.rb new file mode 100644 index 0000000..8497667 --- /dev/null +++ b/app/models/concerns/data_struct.rb @@ -0,0 +1,9 @@ +class DataStruct < OpenStruct + def method_missing(method_name, *arguments, &block) + if @table[:table].respond_to?(method_name) + @table[:table].send(method_name) + else + super + end + end +end diff --git a/app/models/daily_snapshot.rb b/app/models/daily_snapshot.rb new file mode 100644 index 0000000..158243d --- /dev/null +++ b/app/models/daily_snapshot.rb @@ -0,0 +1,44 @@ +class DailySnapshot < ApplicationRecord + belongs_to :todo_list + + serialize :data, DataStructSerializer + + delegate :reflection, to: :todo_list + + validates :todo_list, uniqueness: true + + scope :today, -> { where(date: Date.current.beginning_of_day..Time.current) } + + def todos + data.todos + end + + def self.create_from_todo_list(todo_list) + unless todo_list.daily? + raise StandardError, I18n.t("daily_snapshot.weekly_todo_list_error_message") + end + + columns_to_select = %w( + content + estimated_time_blocks + actual_time_blocks + complete + ) + + create!( + todo_list_id: todo_list.id, + date: todo_list.date, + data: { todos: Todo.select(columns_to_select) + .where(daily_todo_list_id: todo_list.id) + .as_json(except: :id) } + ) + end + + def completion_percentage + return 0 unless todos.present? + todos_filled_out = todos.select { |todo| todo.content.present? } + return 0 unless todos_filled_out.present? + + (todos_filled_out.select { |todo| todo.complete }.count / todos_filled_out.count.to_f) * 100 + end +end diff --git a/app/models/gift.rb b/app/models/gift.rb new file mode 100644 index 0000000..0670269 --- /dev/null +++ b/app/models/gift.rb @@ -0,0 +1,16 @@ +# Purchased and sent to someone that doesn't currently subscribed to Volition +# When a user signs up through the unique gift link, a discounted Stripe +# subscription is created. + +class Gift < ApplicationRecord + with_options class_name: "User" do + belongs_to :recipient, required: false + belongs_to :sender + end + + has_secure_token :unique_token + + validates :recipient_email, presence: true + validates :recipient_name, presence: true + validates :message, presence: true +end diff --git a/app/models/null_subscription.rb b/app/models/null_subscription.rb new file mode 100644 index 0000000..39ed933 --- /dev/null +++ b/app/models/null_subscription.rb @@ -0,0 +1,9 @@ +class NullSubscription + def active? + false + end + + def stripe_id + nil + end +end diff --git a/app/models/subscription_plan.rb b/app/models/subscription_plan.rb new file mode 100644 index 0000000..9882def --- /dev/null +++ b/app/models/subscription_plan.rb @@ -0,0 +1,7 @@ +class SubscriptionPlan < ApplicationRecord + include Payola::Plan + + def redirect_path(subscription) + "/settings" + end +end diff --git a/app/models/todo.rb b/app/models/todo.rb index 5bc5c7b..5c036ef 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -1,11 +1,25 @@ class Todo < ApplicationRecord - belongs_to :todo_list + with_options class_name: 'TodoList', required: false do |options| + options.belongs_to :daily_todo_list, foreign_key: 'daily_todo_list_id' + options.belongs_to :weekly_todo_list, foreign_key: 'weekly_todo_list_id' + end default_scope { order(id: :asc) } - validates :content, presence: true, if: -> { todo_list.weekly? } + validates :content, presence: true, if: -> { weekly_todo_list.present? } scope :complete, -> { where(complete: true) } + scope :incomplete, -> { where(complete: false).where.not(content: "") } + scope :for_todo_list, -> (todo_list_id) { + ids = find_by_sql %( + select id from todos + where daily_todo_list_id = #{todo_list_id} + or weekly_todo_list_id = #{todo_list_id}; + ).squish + + where(id: ids) + } + scope :frontend_info, -> { select(:actual_time_blocks, :estimated_time_blocks, @@ -13,4 +27,5 @@ class Todo < ApplicationRecord :content, :id) } + end diff --git a/app/models/todo_list.rb b/app/models/todo_list.rb index d28b66c..f5e611a 100644 --- a/app/models/todo_list.rb +++ b/app/models/todo_list.rb @@ -1,20 +1,43 @@ class TodoList < ApplicationRecord extend Enumerize - has_many :todos, dependent: :delete_all + before_destroy :delete_todos + + with_options class_name: 'Todo', dependent: :destroy do |options| + options.has_many :daily_todos, foreign_key: :daily_todo_list_id + options.has_many :weekly_todos, foreign_key: :weekly_todo_list_id + end + + def todos + daily_todos.or(weekly_todos) + end belongs_to :user belongs_to :week_plan, class_name: 'TodoList', required: false - accepts_nested_attributes_for :todos, + has_one :daily_snapshot, dependent: :destroy + + accepts_nested_attributes_for :daily_todos, reject_if: :all_blank + accepts_nested_attributes_for :weekly_todos, + reject_if: :all_blank + + self.per_page = 5 enumerize :list_type, in: %w(daily weekly) scope :weekly, -> { where(list_type: 'weekly') } scope :daily, -> { where(list_type: 'daily') } + scope :missing_snapshot, -> { + daily.left_outer_joins(:daily_snapshot) + .where(daily_snapshots: { id: nil }) + } + + def delete_todos + todos.delete_all + end def weekly? list_type == 'weekly' diff --git a/app/models/user.rb b/app/models/user.rb index 2272d7c..256cfad 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,20 +1,39 @@ class User < ApplicationRecord + include Rails.application.routes.url_helpers + has_many :reflections, dependent: :destroy has_many :todo_lists, dependent: :destroy - has_many :todos, through: :todo_lists + has_many :daily_todos, through: :todo_lists + has_many :weekly_todos, through: :todo_lists + has_many :daily_snapshots, -> { where.not(date: Date.current) }, through: :todo_lists + has_many :weekly_summaries + + with_options class_name: "User", foreign_key: :referred_by do + has_many :referred_users + + belongs_to :referrer, optional: true + end + + has_one :subscription, + foreign_key: "owner_id", + class_name: "Payola::Subscription" + + delegate :active?, to: :subscription + + def subscription + super || NullSubscription.new + end has_secure_password validations: false + has_secure_token :referral_code - scope :want_sms_reminders, -> { where(sms_reminders: true) } - scope :want_email_reminders, -> { where(email_reminders: true) } - scope :want_weekly_summaries, -> { where(weekly_summary: true) } - scope :paid, -> { where(paid: true) } + scope :want_weekly_summaries, -> { where(weekly_summary: true) } + scope :paid, -> { where(paid: true) } - validates :phone, presence: true, if: -> { self.sms_reminders? } validates :email, presence: true, unless: -> { self.guest? } validates :email, uniqueness: true, unless: -> { self.guest? } validates :password_digest, presence: true, unless: :skip_password_validation - validate :validate_password + # validate :validate_password attr_accessor :skip_password_validation @@ -49,22 +68,46 @@ def recently_signed_up? end def trialing? - reflections.count < 2 + reflections.count < 2 || in_referral_month? + end + + def in_referral_month? + return false unless referred_by.present? + + Date.current < (created_at + 1.month) end def completion_percentage(from:, to:) - list_ids = todo_lists.daily.where(created_at: from..to).pluck(:id) - all_todos = todos.where(todo_list_id: list_ids) - complete_todos = all_todos.merge(Todo.complete) + snapshots = DailySnapshot.where( + created_at: from..to, + todo_list_id: todo_lists.pluck(:id), + ) - if all_todos.count == 0 && complete_todos.count == 0 - return 0 - end + return 0 if snapshots.blank? - ((complete_todos.count.to_f / all_todos.count) * 100).round(2) + snapshots.reduce(0) do |sum, snapshot| + next sum unless snapshot.completion_percentage.is_a?(Integer) + sum += snapshot.completion_percentage + sum + end / snapshots.size end def average_rating(from:, to:) (reflections.where(created_at: from..to).average(:rating) || 0).to_i end + + def forgot_password! + update( + password_reset_token: SecureRandom.hex, + password_reset_token_expiration: Time.current + 2.hours + ) + end + + def eligible_for_password_reset + password_reset_token_expiration > Time.current + end + + def referral_link + new_user_url(referral_code: referral_code, host: ENV["APPLICATION_HOST"]) + end end diff --git a/app/models/weekly_summary.rb b/app/models/weekly_summary.rb new file mode 100644 index 0000000..93f2dfa --- /dev/null +++ b/app/models/weekly_summary.rb @@ -0,0 +1,57 @@ +class WeeklySummary < ApplicationRecord + belongs_to :user + + def todo_lists + TodoList.where(id: todo_list_ids) + end + + def daily_snapshots + DailySnapshot.where(todo_list_id: todo_list_ids) + end + + def reflections + todo_lists.map(&:reflection).compact + end + + def previous_weekly_summary + (user.weekly_summaries.where.not(id: id)).last + end + + def generate_stats + weekly_todos = daily_snapshots.flat_map(&:todos) + complete_todos = weekly_todos.select(&:complete) + self.completion_percentage = (complete_todos.count / weekly_todos.count.to_f) * 100 + + if reflections.present? + self.weekly_rating = reflections.map(&:rating).reduce(0, :+) / reflections.count + else + self.weekly_rating = 0 + end + end + + def arrow_and_class(sym) + begin + if send(sym) > previous_weekly_summary.send(sym) + ["▲", "better"] + elsif send(sym) < previous_weekly_summary.send(sym) + ["▼", "worse"] + else + ["−", ""] + end + rescue + ["−", ""] + end + end + + def recommendation + if completion_percentage < 70 && weekly_rating < 7 + "It looks like you didn't get everything done this past week and that reflected on how productive you thought your days were. Try being more deliberate in planning your tasks this coming week in order to build momentum." + elsif completion_percentage >= 70 && weekly_rating < 7 + "You did well completing your tasks this week, but felt you could have been more productive. You only have five tasks to plan in Volition for a day. Make sure these tasks are the ones that will make you feel like you're making the most progress in your work and life." + elsif completion_percentage < 70 && weekly_rating >= 7 + "It seems like you felt productive this week, but you didn't complete all the tasks you planned to. Try to break your tasks into smaller pieces this upcoming week." + elsif completion_percentage >= 70 && weekly_rating >= 7 + "Great job! You made a solid plan and you stuck to it. Keep up the good work!" + end + end +end diff --git a/app/serializers/data_struct_serializer.rb b/app/serializers/data_struct_serializer.rb new file mode 100644 index 0000000..f502dec --- /dev/null +++ b/app/serializers/data_struct_serializer.rb @@ -0,0 +1,10 @@ +class DataStructSerializer + def self.dump(hash) + hash.to_json + end + + def self.load(hash) + return unless hash + JSON.parse(hash, object_class: DataStruct) + end +end diff --git a/app/services/payment_service.rb b/app/services/payment_service.rb deleted file mode 100644 index b6d4312..0000000 --- a/app/services/payment_service.rb +++ /dev/null @@ -1,22 +0,0 @@ -module PaymentService - def self.charge_card(token:, user:) - begin - charge = Stripe::Charge.create( - amount: 1200, - currency: "usd", - source: token, - description: "Full access, forever.", - receipt_email: user.email - ) - if charge.status == "succeeded" - user.skip_password_validation = true - user.update!( - paid: true, - stripe_charge_id: charge.id - ) - end - rescue Stripe::CardError - false - end - end -end diff --git a/app/views/dashboard/show.html.erb b/app/views/dashboard/show.html.erb index 7afc8bd..73a4e9b 100644 --- a/app/views/dashboard/show.html.erb +++ b/app/views/dashboard/show.html.erb @@ -19,13 +19,13 @@
    <% @tomorrows_todo_list.todos.each do |todo| %>
  1. - <% if todo.complete? %> + <% if todo.complete %> - <%= truncate(todo.content, user_agent: @user_agent) %> + <%= todo.content %> <% else %> - <%= truncate(todo.content, user_agent: @user_agent) %> + <%= todo.content %> <% end %>
    2. <% end %> @@ -50,13 +50,13 @@
      <% @todays_todo_list.todos.each do |todo| %>
    1. - <% if todo.complete? %> + <% if todo.complete %> - <%= truncate(todo.content, user_agent: @user_agent) %> + <%= todo.content %> <% else %> - <%= truncate(todo.content, user_agent: @user_agent) %> + <%= todo.content %> <% end %> <% if todo.content.present? %> @@ -78,27 +78,27 @@ <% end %> <% if @past_todo_lists.present? %> - <% @past_todo_lists.each do |todo_list| %> - <%= link_to day_path(todo_list), class: 'noTextStyle' do %> + <% @past_todo_lists.each do |snapshot| %> + <%= link_to day_path(snapshot.date), class: 'noTextStyle' do %>
    2. -
      <%= todo_list.date.strftime('%B') %>
      -
      <%= todo_list.date.strftime('%e') %>
      +
      <%= snapshot.date.strftime('%B') %>
      +
      <%= snapshot.date.strftime('%e') %>
      - <%= todo_list.reflection.try(:rating) || "?" %> + <%= snapshot.reflection.try(:rating) || "?" %>
        - <% todo_list.todos.each do |todo| %> + <% snapshot.todos.each do |todo| %>
      1. - <% if todo.complete? %> + <% if todo.complete %> - <%= truncate(todo.content, user_agent: @user_agent) %> + <%= todo.content %> <% else %> - <%= truncate(todo.content, user_agent: @user_agent) %> + <%= todo.content %> <% end %> <% if todo.content.present? %> diff --git a/app/views/days/show.html.erb b/app/views/days/show.html.erb index ca9dbac..aa94d1e 100644 --- a/app/views/days/show.html.erb +++ b/app/views/days/show.html.erb @@ -1,24 +1,24 @@
        -

        <%= @todo_list.date.strftime('%B %e') %>

        +

        <%= @daily_snapshot.date.strftime('%B %e') %>

        -
        <%= @todo_list.date.strftime('%B') %>
        -
        <%= @todo_list.date.strftime('%e') %>
        +
        <%= @daily_snapshot.date.strftime('%B') %>
        +
        <%= @daily_snapshot.date.strftime('%e') %>
          - <% @todo_list.todos.each do |todo| %> + <% @daily_snapshot.todos.each do |todo| %>
        1. - <% if todo.complete? %> + <% if todo.complete %> - <%= todo.content.truncate(40) %> + <%= todo.content %> <% else %> - <%= todo.content.truncate(40) %> + <%= todo.content %> <% end %> <% if todo.content.present? %> @@ -36,5 +36,8 @@ locals: { reflection: @reflection } %> <% else %>

          No reflection for this day.

          + <% if @daily_snapshot.date == Date.yesterday %> + <%= link_to "Reflect", reflect_path(@daily_snapshot.date), class: "button" %> + <% end %> <% end %>
        diff --git a/app/views/gifts/new.html.erb b/app/views/gifts/new.html.erb new file mode 100644 index 0000000..b403e00 --- /dev/null +++ b/app/views/gifts/new.html.erb @@ -0,0 +1,42 @@ +
        +

        🎁 Give the gift of Volition 🎁

        + +

        + +

        + + <%= form_with model: @gift, local: true, id: "payment-form" do |f| %> + <% if @gift.errors.any? %> +

        You must fill out all fields.

        + <% end %> + +
        + <%= f.label :recipient_name, "Their name" %> + <%= f.text_field :recipient_name %> +
        + +
        + <%= f.label :recipient_email, "Their email" %> + <%= f.text_field :recipient_email %> +
        + +
        + <%= f.label :message %> + <%= f.text_area :message %> +
        + +
        +
        + +
        +
        + + +
        + <% end %> +
        diff --git a/app/views/gifts_mailer/gift_notification.text.erb b/app/views/gifts_mailer/gift_notification.text.erb new file mode 100644 index 0000000..159a7a1 --- /dev/null +++ b/app/views/gifts_mailer/gift_notification.text.erb @@ -0,0 +1,9 @@ +Hi, <%= @gift.recipient_name %>! + +<%= @sender.name %> has sent you a 1-year gift subscription to Volition! They sent the following message with this gift: + +<%= @gift.message %> + +To learn more about Volition, visit <%= root_url %>. + +To sign up and activate your subscription, visit <%= new_user_url(gift_token: @gift.unique_token) %> diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb index 4a02428..ea5b333 100644 --- a/app/views/layouts/_navigation.html.erb +++ b/app/views/layouts/_navigation.html.erb @@ -6,10 +6,10 @@ <%= link_to logo_path, class: 'logo large' do %> <%= image_tag 'logo' %> <% end %> - <%= link_to 'Your week', week_plan_path, class: 'js--closeMenu' %> <%= link_to 'Today', today_path, class: 'js--closeMenu' %> + <%= link_to 'Weekly Plan', week_plan_path, class: 'js--closeMenu' %> <%= link_to 'Settings', settings_path, class: 'js--closeMenu' %> - <%= link_to 'Log out', logout_path, method: :delete, class: 'js--closeMenu' %> + <%= link_to 'Log Out', logout_path, method: :delete, class: 'js--closeMenu' %>
        @@ -24,7 +24,7 @@
        <% if current_user %> <% if current_user.guest? %> - <%= link_to 'Sign up', new_user_path(guest: true), class: 'navLink' %> + <%= link_to 'Sign up', new_user_path(guest: true), class: 'button' %> <% else %> <% end %> diff --git a/app/views/marketing/_heroku_button.html.erb b/app/views/marketing/_heroku_button.html.erb index 666aaa3..6b69b9d 100644 --- a/app/views/marketing/_heroku_button.html.erb +++ b/app/views/marketing/_heroku_button.html.erb @@ -1 +1 @@ -<%= link_to "Self host with Heroku", ENV["HEROKU_URL"], class: "button heroku #{local_assigns[:expanding] ? "expanding" : ""}" %> +<%= link_to "Self host with Heroku", "https://github.com/usevolition/volition/blob/master/SELFHOST.md", target: "_blank", class: "button heroku #{local_assigns[:expanding] ? "expanding" : ""}" %> diff --git a/app/views/marketing/home.html.erb b/app/views/marketing/home.html.erb index 2b1dcc6..869c4cb 100644 --- a/app/views/marketing/home.html.erb +++ b/app/views/marketing/home.html.erb @@ -3,7 +3,7 @@
        -

        Be less busy and more productive.

        +

        The faculty or power of using one's will.

        Volition is more than a todo list. It’s a framework for becoming more effective. It encourages you to be intentional in planning your day and reflecting on the decisions you made. Read about <%= link_to "the philosophy behind Volition", philosophy_path %> or see how much it <%= link_to 'costs to run', running_costs_path %>.

        @@ -19,7 +19,7 @@

        A day with Volition

        - Volition facilitates the use of the Pomodoro technique - breaking down tasks into twenty-five-minute chunks of work, with five-minute breaks in between - to boost productivity and encourage self-reflection. + Volition facilitates the use of <%= link_to "the Pomodoro technique".html_safe, "https://cirillocompany.de/pages/pomodoro-technique", target: "_blank" %> - breaking down tasks into twenty-five-minute chunks of work, with five-minute breaks in between - to boost productivity and encourage self-reflection.

        @@ -46,7 +46,7 @@

        Reflect on your day

        - Here is where Volition becomes a powerful tool. At the end of each day, Volition gives you space to reflect on what you think you did wrong, what you did right, and what was left undone. By examining your behavior and how you use your time, it will be easier for you to make positive adjustments. What gets measured gets managed. What gets managed can be improved! + At the end of each day, Volition gives you space to reflect on what you think you did wrong, what you did right, and what was left undone. By examining your behavior and how you use your time, it will be easier for you to make positive adjustments. What gets measured gets managed. What gets managed can be improved!

        @@ -67,9 +67,9 @@

        Hosted

        -

        $12

        +

        $5/month

        - Pay once and use Volition forever. For those of you that just want to sign up and get going with Volition, this option is for you. You can try it for 48 hours before you pay! + For those of you that just want to sign up and get going with Volition, this option is for you. You can try it for 48 hours before you pay! And, of course, cancel any time.

        <%= link_to 'Sign up', new_user_path, class: 'button light expanding' %>
        @@ -78,7 +78,7 @@

        Self-hosted

        Free

        - If you have technical chops and don't want to pay to support Volition's maintenance costs, self-hosting is for you! Check Volition out on <%= link_to 'Github', ENV['LINK_TO_GITHUB_REPO'] %> or use the deploy button below. + If you have technical chops and don't want to pay monthly to support Volition's maintenance costs, self-hosting is for you! Check Volition out on <%= link_to 'Github', ENV['LINK_TO_GITHUB_REPO'], target: "_blank" %> or use the deploy button below.

        <%= render partial: "marketing/heroku_button", locals: { expanding: true } %> diff --git a/app/views/marketing/philosophy.html.erb b/app/views/marketing/philosophy.html.erb index e05ee9e..7d6e500 100644 --- a/app/views/marketing/philosophy.html.erb +++ b/app/views/marketing/philosophy.html.erb @@ -18,10 +18,10 @@

        Without reflection, we don't become better people

        - In that past, I have often ignored my mistakes to avoid reliving those moments. That approach has been wrong for me, and I regret it. Having the courage to face my mistakes allows me to make corrections and improve. That's intuitive, but most of us rarely do it. + In that past, I often supressed reflecting on my mistakes to avoid reliving those moments. That approach has been wrong for me, and I regret it. Having the courage to face my mistakes allows me to make corrections and improve. It sounds simple, but most of us rarely do it.

        - Epictetus, a first-century Greek philosopher, was well aware of people's' aversion to acknowledging failure and analyzing what they have done wrong. He asks us in his Discourses to overcome that aversion: + Epictetus, a first-century Greek philosopher, was well aware of people's' aversion to acknowledging failure and analyzing what they have done wrong. He asks us in his <%= link_to "Discourses".html_safe, "http://classics.mit.edu/Epictetus/discourses.html", target: "_blank" %> to overcome that aversion:

        Let sleep not come upon thy languid eyes Before each daily action thou hast scann'd; @@ -35,7 +35,7 @@

        Users should control their own data

        - New web applications and software products seem to be more ephemeral than ever. This is the reason I wanted Volition's users to have the option to self-host the product. If Volition helps you as much as it has helped me, I want you to rest easy knowing you'll have it forever. + New web applications and software products seem to be more ephemeral than ever. This is the reason Volition's users have the option to self-host the product. If Volition helps you as much as it has helped me, I want you to rest easy knowing you'll have it forever.

        diff --git a/app/views/marketing/running_costs.html.erb b/app/views/marketing/running_costs.html.erb index 68de927..4a4b50f 100644 --- a/app/views/marketing/running_costs.html.erb +++ b/app/views/marketing/running_costs.html.erb @@ -1,7 +1,7 @@

        Running costs

        -

        It's not free to keep Volition up and running. Every paid subscription gets me a bit closer to breaking even. Here's the breakdown of what I pay for every month:

        +

        As awesome as it would be if it was the case, Volition isn't free to keep up and running. Every subscription allows us to improve the software. Here's a monthly cost breakdown:

        @@ -29,4 +29,3 @@
        - diff --git a/app/views/pages/welcome.html.erb b/app/views/pages/welcome.html.erb index d7bd327..cc96b1e 100644 --- a/app/views/pages/welcome.html.erb +++ b/app/views/pages/welcome.html.erb @@ -1,6 +1,6 @@
        -

        Welcome <%= current_user.name %>!

        +

        Welcome, <%= current_user.name %>!

        You have taken an important step towards becoming more productive.

        diff --git a/app/views/payments_mailer/send_trial_ending_to.text.erb b/app/views/passwords/create.html.erb similarity index 100% rename from app/views/payments_mailer/send_trial_ending_to.text.erb rename to app/views/passwords/create.html.erb diff --git a/app/views/passwords/edit.html.erb b/app/views/passwords/edit.html.erb new file mode 100644 index 0000000..8281ff8 --- /dev/null +++ b/app/views/passwords/edit.html.erb @@ -0,0 +1,24 @@ +<%= render partial: 'disable_turbolinks' %> + +
        +

        Choose a new password

        +
        + <%= form_with url: password_path(@user), method: :patch, local: true do |f| %> +
        + <%= label_tag :password %> +
        +

        We know password rules are annoying, but there are some easy ways to ensure your account remains secure. For more info on why we use these password constraints, check out <%= link_to 'Password Rules Are Bullshit', 'https://blog.codinghorror.com/password-rules-are-bullshit/', target: '_blank' %> on the Coding Horror blog.

        +
          +
        1. Minimum length of 10 characters
          2. +
        2. Isn't in the <%= link_to 'top 100', 'https://raw.githubusercontent.com/danielmiessler/SecLists/master/Passwords/10_million_password_list_top_100.txt'%> most common passwords
          3. +
        +
        + <%= password_field_tag :password, nil, id: "reset_password", data: { rules: "checkLength,checkTop100" } %> +
        + +
        + <%= submit_tag "Reset password", class: "button secondary", disabled: true %> +
        + <% end %> +
        +
        diff --git a/app/views/passwords/new.html.erb b/app/views/passwords/new.html.erb new file mode 100644 index 0000000..afd28b3 --- /dev/null +++ b/app/views/passwords/new.html.erb @@ -0,0 +1,16 @@ +<%= render partial: 'disable_turbolinks' %> + +
        +

        Forgot password

        +
        + <%= form_with url: passwords_path, local: true do %> +
        + <%= label_tag :email %> + <%= text_field_tag :email %> +
        +
        + <%= submit_tag "Send recovery email", class: "button" %> +
        + <% end %> +
        +
        diff --git a/app/views/passwords_mailer/change_password.text.erb b/app/views/passwords_mailer/change_password.text.erb new file mode 100644 index 0000000..79fb803 --- /dev/null +++ b/app/views/passwords_mailer/change_password.text.erb @@ -0,0 +1,6 @@ +Hi, <%= @user.name %>. + +You're receiving this email because someone requested to reset your password on Volition. If that wasn't you, ignore this email. To reset your password, follow the link below: + +<%= edit_password_url(@user.id, token: @user.password_reset_token) %> + diff --git a/app/views/payments/edit.html.erb b/app/views/payments/edit.html.erb new file mode 100644 index 0000000..3bfc672 --- /dev/null +++ b/app/views/payments/edit.html.erb @@ -0,0 +1,21 @@ +
        +

        Update billing info

        + +

        Your new card will be charged on <%= @subscription.current_period_end.strftime("%B %e, %Y") %>.

        + + <%= form_with url: payment_path(current_user.id), local: true, method: :patch, id: "payment-form" do %> + +
        + +
        +
        + + +
        + <% end %> +
        diff --git a/app/views/payments/new.html.erb b/app/views/payments/new.html.erb index 6461a32..433cbe6 100644 --- a/app/views/payments/new.html.erb +++ b/app/views/payments/new.html.erb @@ -1,8 +1,16 @@

        Payment

        -

        You've had a chance to try Volition. If you found it useful, you can pay $12 to use it forever! If you don't want to pay and you have some technical chops, you can also <%= link_to "self-host with Heroku", ENV["HEROKU_URL"], class: "herokuLink", target: "_blank" %>.

        +

        You've had a chance to try Volition. If you found it useful, you can keep using it for $5 per month, or get two free months if you purchase a yearly subscription. If you don't want to pay and you have some technical chops, you can also <%= link_to "self-host with Heroku", ENV["HEROKU_URL"], class: "herokuLink", target: "_blank" %>.

        +

        Selected plan: <%= @monthly_plan.name %> (<%= number_to_currency(@monthly_plan.amount/100) %>)

        + +
        + + +
        + <%= form_with url: payments_path, local: true, id: "payment-form" do %> + <%= hidden_field_tag :plan_id, value: @monthly_plan.id %>
        diff --git a/app/views/payments_mailer/invoice_upcoming.text.erb b/app/views/payments_mailer/invoice_upcoming.text.erb new file mode 100644 index 0000000..12027c2 --- /dev/null +++ b/app/views/payments_mailer/invoice_upcoming.text.erb @@ -0,0 +1,5 @@ +Hi, <%= @user.name %> + +This is a reminder that you're card ending in <%= @subscription.card_last4 %> will be charged soon. To change your billing information, log in below: + +<%= login_url %> diff --git a/app/views/payments_mailer/referral_activated.text.erb b/app/views/payments_mailer/referral_activated.text.erb new file mode 100644 index 0000000..4bb017f --- /dev/null +++ b/app/views/payments_mailer/referral_activated.text.erb @@ -0,0 +1,7 @@ +Hi, <%= @referrer.name %> + +We're reaching out to let you know that <%= @referred_user.name %> (<%= @referred_user.email %>) just paid for Volition using your unique referral link. This means that when your Volition subscription renews on <%= @referrer.subscription.current_period_end.strftime("%B %e, %Y") %>, you will receive one free month. + +Thanks for spreading the word! + +- The Volition Team diff --git a/app/views/payments_mailer/send_trial_ending_to.html.erb b/app/views/payments_mailer/send_trial_ending_to.html.erb deleted file mode 100644 index c92d9ce..0000000 --- a/app/views/payments_mailer/send_trial_ending_to.html.erb +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - -
        - - - - - - - -
        - - - - - - - - - - - -
        - - <%= email_image_tag 'logo.png', class: 'imgClass', width: 280, style: 'margin:0;margin-top: 40px; padding:0; border:none; display:block;', alt: "logo" %> -
        -
        - -         		- - - - - - - - - - - - - - - - - - - - - -
        - Hi <%= @user.name %>! -
        - Your 30 day trial for Volition will end on <%= @subscription_end_date %>. If you found Volition useful and want to continue, please log in and add your credit card info. It's only $1 per month! If not, we would love to hear your feedback on why Volition didn't work out for you. Email us at <%= mail_to ENV['FEEDBACK_EMAIL_ADDRESS'], nil, subject: "Feedback from #{@user.name}" %> to give us your thoughts. -
        - - - - - - -
        - Log in -
        - - -
        - - -
        - - -
        - diff --git a/app/views/reflections/new.html.erb b/app/views/reflections/new.html.erb index 3d4647f..c7c82ab 100644 --- a/app/views/reflections/new.html.erb +++ b/app/views/reflections/new.html.erb @@ -1,6 +1,6 @@

        Daily reflection

        - <%= link_to "Go back to today's tasks".html_safe, today_path %> + <%= link_to @link_text.html_safe, @link_url %>
        @@ -11,21 +11,16 @@
          - <% @todo_list.todos.each do |todo| %> + <% list = @daily_snapshot.present? ? @daily_snapshot : @todo_list %> + <% list.todos.each do |todo| %>
        1. - <% if todo.complete? %> + <% if todo.complete %> - <%= todo.content.truncate(40) %> + <%= todo.content %> <% else %> - <%= todo.content.truncate(40) %> - <% end %> - <% if todo.content.present? %> - - - <%= todo.actual_time_blocks %>/<%= todo.estimated_time_blocks %> - + <%= todo.content %> <% end %>
          2. <% end %> @@ -37,6 +32,8 @@

          You must fill out all fields.

          <% end %> + <%= f.hidden_field :date, value: @todo_list.date %> +
          <%= f.label :rating, 'How would you rate your day?' %>
          @@ -64,6 +61,24 @@ <%= f.text_area :positive %>
          + <% if @todo_list.todos.incomplete.present? %> +
          + +
            + <% @todo_list.todos.incomplete.each do |todo| %> +
          • +
            + <%= check_box_tag "add_to_week[]", todo.id, false, class: "completeInput", id: "add_to_week_#{todo.id}" %> + <%= label_tag "add_to_week_#{todo.id}" do %> + <% end %> +
            + <%= todo.content %> +
            • + <% end %> +
          +
          + <% end %> +
          <%= f.submit 'Save' %>
          diff --git a/app/views/reminders_mailer/send_reminder_to.html.erb b/app/views/reminders_mailer/send_reminder_to.html.erb deleted file mode 100644 index 10d3595..0000000 --- a/app/views/reminders_mailer/send_reminder_to.html.erb +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - -
          - - - - - - - -
          - - - - - - - - - - - -
          - - <%= email_image_tag 'logo.png', class: 'imgClass', width: 280, style: 'margin:0;margin-top: 40px; padding:0; border:none; display:block;', alt: "logo" %> -
          -
          - -           		- - - - - - - - - - - - - - - - - - - - - -
          - Happy <%= Date::DAYNAMES[Time.now.wday] %>! -
          - Here's a reminder from Volition to reflect on your day. It's important to look back and think about what went wrong, what went right, and what wasn't finished. -
          - - - - - - -
          - Log in -
          - - -
          - - -
          - - -
          - diff --git a/app/views/reminders_mailer/send_reminder_to.text.erb b/app/views/reminders_mailer/send_reminder_to.text.erb deleted file mode 100644 index 6ed03d0..0000000 --- a/app/views/reminders_mailer/send_reminder_to.text.erb +++ /dev/null @@ -1,8 +0,0 @@ -Hi <%= @user.name %> - -This is a reminder from Volition to reflect on your day. - -<%= root_url %> - -Enjoy your evening! -Garrett Martin diff --git a/app/views/sessions/_google_sign_in.html.erb b/app/views/sessions/_google_sign_in.html.erb index f3ed9f9..1912246 100644 --- a/app/views/sessions/_google_sign_in.html.erb +++ b/app/views/sessions/_google_sign_in.html.erb @@ -1,5 +1,10 @@
          -
          - or + +<% if user_logged_in? %>
          -
          +<% else %> +
          + or +
          +
          +<% end %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index cd362a8..8cafffb 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -3,10 +3,13 @@

          Log in

          - <%= render partial: "google_sign_in" %> - <%= form_with url: '/login', id: 'google_signin', html: { style: 'display: none' } do |form| %> - <%= form.hidden_field :google_id_token, id: 'google_id_token' %> + <% unless self_hosted? %> + <%= render partial: "google_sign_in" %> + + <%= form_with url: '/login', id: 'google_signin', html: { style: 'display: none' } do |form| %> + <%= form.hidden_field :google_id_token, id: 'google_id_token' %> + <% end %> <% end %> <%= form_tag '/login' do |f| %> @@ -22,6 +25,7 @@
          <%= submit_tag 'Log in', class: "button secondary" %> + <%= link_to "Forgot your password?", new_password_path %>
          <% end %>
          diff --git a/app/views/today/new.html.erb b/app/views/today/new.html.erb index 67e409f..0fead71 100644 --- a/app/views/today/new.html.erb +++ b/app/views/today/new.html.erb @@ -11,16 +11,16 @@

          Let's plan tasks for today. In the "estimate" column, enter your guess for how many 25 minute blocks it will take to finish each task. If you think it will take more than five, break it down into smaller tasks.

          <% if current_week_plan.todos.present? %> - + -
        - <%= f.password_field :password %> + <%= f.password_field :password, data: { rules: "checkLength,checkTop100,ensureDoesntMatchEmail" } %>
        diff --git a/app/views/week_plan/_delete_button.html.erb b/app/views/week_plan/_delete_button.html.erb new file mode 100644 index 0000000..226d787 --- /dev/null +++ b/app/views/week_plan/_delete_button.html.erb @@ -0,0 +1 @@ +<%= link_to "Remove", remove_weekly_todo_path(id: todo.id), remote: true, method: :delete, class: "button delete small" %> diff --git a/app/views/week_plan/_move_button.html.erb b/app/views/week_plan/_move_button.html.erb new file mode 100644 index 0000000..12c59af --- /dev/null +++ b/app/views/week_plan/_move_button.html.erb @@ -0,0 +1 @@ +<%= link_to "Move", move_weekly_todo_path(id: todo.id), method: :post, class: "button small", remote: true %> diff --git a/app/views/week_plan/_weekly_todos.html.erb b/app/views/week_plan/_weekly_todos.html.erb index cd63815..d299375 100644 --- a/app/views/week_plan/_weekly_todos.html.erb +++ b/app/views/week_plan/_weekly_todos.html.erb @@ -1,19 +1,20 @@ +<% if local_assigns.fetch(:closeable, false) %> +
        + close +
        +<% end %> + <% if week_plan.todos.present? %>
          <% week_plan.todos.reverse.each do |todo| %>
        • <%= todo.content %> - <%= form_with url: remove_weekly_todo_path, method: :delete do |f| %> - <%= f.hidden_field :id, value: todo.id %> -
          - -
          - <% end %> + <%= render partial: button_partial_name, locals: { todo: todo } %>
          • <% end %>
        <% else %> -

        No tasks yet.

        +

        <%= local_assigns.fetch(:blank_slate_text, "No tasks yet.") %>

        <% end %> diff --git a/app/views/week_plan/add_todo.js.erb b/app/views/week_plan/add_todo.js.erb index 76b00bf..c1c607b 100644 --- a/app/views/week_plan/add_todo.js.erb +++ b/app/views/week_plan/add_todo.js.erb @@ -1,2 +1,2 @@ -$('section.weeklyTodosSection').html("<%= j render partial: 'weekly_todos', locals: { week_plan: @week_plan } %>") +$('section.weeklyTodosSection.current').html("<%= j render partial: 'weekly_todos', locals: { week_plan: @week_plan, button_partial_name: "delete_button" } %>") $('.weeklyTodoForm')[0].reset() diff --git a/app/views/week_plan/move_todo.js.erb b/app/views/week_plan/move_todo.js.erb new file mode 100644 index 0000000..fe1ddb1 --- /dev/null +++ b/app/views/week_plan/move_todo.js.erb @@ -0,0 +1,2 @@ +$('section.weeklyTodosSection.current').html("<%= j render partial: 'weekly_todos', locals: { week_plan: @week_plan, button_partial_name: "delete_button" } %>") +$("section.weeklyTodosSection").not(".current").html("<%= j render partial: 'weekly_todos', locals: { week_plan: @last_week, button_partial_name: "move_button", closeable: true } %>") diff --git a/app/views/week_plan/remove_todo.js.erb b/app/views/week_plan/remove_todo.js.erb index d220f1c..1ef21e9 100644 --- a/app/views/week_plan/remove_todo.js.erb +++ b/app/views/week_plan/remove_todo.js.erb @@ -1 +1 @@ -$('section.weeklyTodosSection').html("<%= j render partial: 'weekly_todos', locals: { week_plan: @week_plan } %>") +$('section.weeklyTodosSection.current').html("<%= j render partial: 'weekly_todos', locals: { week_plan: @week_plan, button_partial_name: "delete_button" } %>") diff --git a/app/views/week_plan/show.html.erb b/app/views/week_plan/show.html.erb index c4be7d5..9e90524 100644 --- a/app/views/week_plan/show.html.erb +++ b/app/views/week_plan/show.html.erb @@ -1,5 +1,5 @@
        -

        Your Week

        +

        Weekly Plan

        @@ -17,15 +17,33 @@ <%= link_to "Go back to dashboard".html_safe, dashboard_path %> -

        Use this area as a brain dump. Add as many tasks as you need. You can always come back and add more throughout the week.

        +

        + Use this area as a brain dump. Add as many tasks as you need. You can always come back and add more throughout the week. +

        + +
        + <%= render partial: 'weekly_todos', locals: { + week_plan: @week_plan, + button_partial_name: "delete_button", + blank_slate_text: "No tasks yet." + } %> +
        <%= form_with url: add_weekly_todo_path, class: 'weeklyTodoForm breatheTop' do |f| %> <%= f.text_field :content %> - <%= f.submit "Add", class: 'button blue' %> + <%= f.submit "Add a task", class: 'button green' %> <% end %> -
        - <%= render partial: 'weekly_todos', locals: { week_plan: @week_plan } %> -
        + <% if @last_week.present? %> +
        Last week's plan ▼
        + + <% end %>
        diff --git a/app/views/weekly_summary_mailer/weekly_summary.html.erb b/app/views/weekly_summary_mailer/weekly_summary.html.erb index 68ac0d5..3761f3b 100644 --- a/app/views/weekly_summary_mailer/weekly_summary.html.erb +++ b/app/views/weekly_summary_mailer/weekly_summary.html.erb @@ -86,7 +86,7 @@ li {

        - <%= @completion_percentage %>% + <%= @weekly_summary.completion_percentage %>% <%= @completion_percentage_arrow.try(:html_safe) %>

        @@ -96,7 +96,7 @@ li {

        - <%= @average_rating %> + <%= @weekly_summary.weekly_rating %> <%= @average_rating_arrow.try(:html_safe) %>

        Weekly rating

        diff --git a/config/application.rb b/config/application.rb index 936828a..19f1d9c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -14,6 +14,7 @@ class Application < Rails::Application generate.view_specs false end config.action_controller.action_on_unpermitted_parameters = :raise + config.middleware.insert_after ActionDispatch::Static, Rack::Deflater config.active_job.queue_adapter = :sidekiq config.react.addons = true config.autoload_paths += Dir[Rails.root.join('app', 'models', '{*/}')] diff --git a/config/environments/production.rb b/config/environments/production.rb index 366355e..6192d68 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -26,7 +26,6 @@ config.logger = ActiveSupport::TaggedLogging.new(logger) end config.active_record.dump_schema_after_migration = false - config.middleware.use Rack::Deflater config.static_cache_control = "public, max-age=31557600" config.action_mailer.default_url_options = { host: ENV["APPLICATION_HOST"] } end diff --git a/config/initializers/payola.rb b/config/initializers/payola.rb new file mode 100644 index 0000000..446617b --- /dev/null +++ b/config/initializers/payola.rb @@ -0,0 +1,41 @@ +StripeEvent.signing_secret = ENV['STRIPE_WEBHOOK_SECRET'] + +Payola.configure do |config| + # Example subscription: + # + # config.subscribe 'payola.package.sale.finished' do |sale| + # EmailSender.send_an_email(sale.email) + # end + # + # In addition to any event that Stripe sends, you can subscribe + # to the following special payola events: + # + # - payola..sale.finished + # - payola..sale.refunded + # - payola..sale.failed + # + # These events consume a Payola::Sale, not a Stripe::Event + # + # Example charge verifier: + # + # config.charge_verifier = lambda do |sale| + # raise "Nope!" if sale.email.includes?('yahoo.com') + # end + + # Keep this subscription unless you want to disable refund handling + config.subscribe "invoice.payment_failed" do |event| + @subscription = Subscription.find_by(stripe_customer_id: event.data.customer_id) + + if @subscription + @subscription.cancel! + end + end + + config.subscribe "invoice.upcoming" do |event| + @subscription = Subscription.find_by(stripe_customer_id: event.data.customer_id) + + if @subscription + PaymentsMailer.invoice_upcoming(@subscription) + end + end +end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 31b181e..8f92d70 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,5 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_volition_session' +Rails.application.config.session_store :cookie_store, + key: '_volition_session', + expire_after: 2.months diff --git a/config/initializers/stripe.rb b/config/initializers/stripe.rb index d003593..3b55563 100644 --- a/config/initializers/stripe.rb +++ b/config/initializers/stripe.rb @@ -1,30 +1,2 @@ Stripe.api_key = ENV['STRIPE_SECRET_KEY'] -StripeEvent.authentication_secret = ENV['STRIPE_WEBHOOK_SECRET'] -StripeEvent.configure do |events| - events.all do |event| - Rails.logger.info event.data - end - - events.subscribe 'customer.subscription.trial_will_end' do |event| - user = User.find_by(stripe_customer_id: event.data.object.customer) - - PaymentsMailer.send_trial_ending_to(user) - end - - events.subscribe 'charge.succeeded' do |event| - user = User.find_by(stripe_customer_id: event.data.object.source.customer) - - if user - user.update(paid: true) - end - end - - events.subscribe 'charge.failed' do |event| - user = User.find_by(stripe_customer_id: event.data.object.source.customer) - - if user - user.update(paid: false) - end - end -end diff --git a/config/locales/en.yml b/config/locales/en.yml index fedcc0d..9a45260 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -22,3 +22,5 @@ en: positive: "What did you do well?" negative: "What could you have done better?" + daily_snapshot: + weekly_todo_list_error_message: "You can only create a daily snapshot from daily todo lists" diff --git a/config/routes.rb b/config/routes.rb index 4396fba..2c7dee6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,35 +1,46 @@ Rails.application.routes.draw do + mount Payola::Engine => '/payola', as: :payola root 'marketing#home' - get '/nice_job' => 'pages#nice_job', as: :nice_job - get '/welcome' => 'pages#welcome', as: :welcome - get '/thank_you' => 'pages#thank_you', as: :thank_you - get '/privacy' => 'marketing#privacy', as: :privacy - get '/running_costs' => 'marketing#running_costs', as: :running_costs - get '/philosophy' => 'marketing#philosophy', as: :philosophy + get '/nice_job' => 'pages#nice_job', as: :nice_job + get '/welcome' => 'pages#welcome', as: :welcome + get '/thank_you' => 'pages#thank_you', as: :thank_you + get '/privacy' => 'marketing#privacy', as: :privacy + get '/running_costs' => 'marketing#running_costs', as: :running_costs + get '/philosophy' => 'marketing#philosophy', as: :philosophy - get '/dashboard' => 'dashboard#show', as: :dashboard - get '/today' => 'today#show', as: :today - get '/today/new' => 'today#new', as: :new_today - post '/today' => 'today#create' - get '/tomorrow' => 'tomorrow#new', as: :tomorrow - post '/tomorrow' => 'tomorrow#create' - get '/reflect' => 'reflections#new', as: :reflect - get '/login' => 'sessions#new', as: :login - post '/login' => 'sessions#create' - get '/get_google_sign_in_iframe' => 'sessions#get_google_sign_in_iframe' - delete '/logout' => 'sessions#destroy', as: :logout - get '/settings' => 'users#edit', as: :settings - get '/add_google_sign_in' => 'users#add_google_sign_in', as: :add_google_sign_in - get '/this_week' => 'week_plan#show', as: :week_plan - post '/add_weekly_todo' => 'week_plan#add_todo', as: :add_weekly_todo - delete '/remove_weekly_todo' => 'week_plan#remove_todo', as: :remove_weekly_todo + get '/dashboard' => 'dashboard#show', as: :dashboard + get '/today' => 'today#show', as: :today + get '/today/new' => 'today#new', as: :new_today + post '/today' => 'today#create' + get '/tomorrow' => 'tomorrow#new', as: :tomorrow + post '/tomorrow' => 'tomorrow#create' + get '/reflect/:date' => 'reflections#new', as: :reflect + get '/login' => 'sessions#new', as: :login + post '/login' => 'sessions#create' + get '/get_google_sign_in_iframe' => 'sessions#get_google_sign_in_iframe' + delete '/logout' => 'sessions#destroy', as: :logout + get '/settings' => 'users#edit', as: :settings + get '/add_google_sign_in' => 'users#add_google_sign_in', as: :add_google_sign_in + get '/this_week' => 'week_plan#show', as: :week_plan + post '/add_weekly_todo' => 'week_plan#add_todo', as: :add_weekly_todo + post '/move_weekly_todo' => 'week_plan#move_todo', as: :move_weekly_todo + delete '/remove_weekly_todo' => 'week_plan#remove_todo', as: :remove_weekly_todo - resources :todos, only: [:update] - resources :days, only: [:show] + resources :todos, only: [:update] + resources :days, only: [:show], param: :date resources :reflections, only: [:create] - resources :payments, only: [:new, :create] + resources :payments resources :users + resources :passwords + resources :subscriptions, only: [:destroy] + resources :gifts + resources :preferences, only: [:update] do + member do + patch "update_email" + patch "update_password" + end + end require 'sidekiq/web' mount Sidekiq::Web, at: '/sidekiq' diff --git a/config/sidekiq.yml b/config/sidekiq.yml index e62d775..e8acc9a 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -2,7 +2,7 @@ :concurrency: 3 :queues: - default - - sms_reminders - - email_reminders - destroy_guest_users - mailers + - daily_snapshots + - create_gift_subscription diff --git a/db/migrate/20171105225459_change_todo_list_ids.rb b/db/migrate/20171105225459_change_todo_list_ids.rb new file mode 100644 index 0000000..8bb0bb4 --- /dev/null +++ b/db/migrate/20171105225459_change_todo_list_ids.rb @@ -0,0 +1,9 @@ +class ChangeTodoListIds < ActiveRecord::Migration[5.1] + def change + add_column :todos, :weekly_todo_list_id, :integer + add_index :todos, :weekly_todo_list_id + add_foreign_key "todos", "todo_lists", column: "weekly_todo_list_id" + + rename_column :todos, :todo_list_id, :daily_todo_list_id + end +end diff --git a/db/migrate/20171105230702_create_daily_snapshots.rb b/db/migrate/20171105230702_create_daily_snapshots.rb new file mode 100644 index 0000000..6d0f8fe --- /dev/null +++ b/db/migrate/20171105230702_create_daily_snapshots.rb @@ -0,0 +1,10 @@ +class CreateDailySnapshots < ActiveRecord::Migration[5.1] + def change + create_table :daily_snapshots do |t| + t.jsonb :data, default: "{}" + t.references :todo_list, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20171105231403_create_weekly_summaries.rb b/db/migrate/20171105231403_create_weekly_summaries.rb new file mode 100644 index 0000000..5b3b9cb --- /dev/null +++ b/db/migrate/20171105231403_create_weekly_summaries.rb @@ -0,0 +1,11 @@ +class CreateWeeklySummaries < ActiveRecord::Migration[5.1] + def change + create_table :weekly_summaries do |t| + t.integer :completion_percentage, default: 0 + t.integer :weekly_rating, default: 0 + t.text :todo_list_ids, array: true, default: [] + + t.timestamps + end + end +end diff --git a/db/migrate/20171119174313_change_foreign_key_to_integer.rb b/db/migrate/20171119174313_change_foreign_key_to_integer.rb new file mode 100644 index 0000000..f59adab --- /dev/null +++ b/db/migrate/20171119174313_change_foreign_key_to_integer.rb @@ -0,0 +1,5 @@ +class ChangeForeignKeyToInteger < ActiveRecord::Migration[5.1] + def change + change_column :daily_snapshots, :todo_list_id, :integer + end +end diff --git a/db/migrate/20171125190051_add_date_to_daily_snapshot.rb b/db/migrate/20171125190051_add_date_to_daily_snapshot.rb new file mode 100644 index 0000000..18e95f1 --- /dev/null +++ b/db/migrate/20171125190051_add_date_to_daily_snapshot.rb @@ -0,0 +1,5 @@ +class AddDateToDailySnapshot < ActiveRecord::Migration[5.1] + def change + add_column :daily_snapshots, :date, :date + end +end diff --git a/db/migrate/20180120183158_add_user_id_to_weekly_summary.rb b/db/migrate/20180120183158_add_user_id_to_weekly_summary.rb new file mode 100644 index 0000000..30d6c3c --- /dev/null +++ b/db/migrate/20180120183158_add_user_id_to_weekly_summary.rb @@ -0,0 +1,6 @@ +class AddUserIdToWeeklySummary < ActiveRecord::Migration[5.1] + def change + add_column :weekly_summaries, :user_id, :integer + add_index :weekly_summaries, :user_id + end +end diff --git a/db/migrate/20180123171724_remove_reminder_columns_from_user.rb b/db/migrate/20180123171724_remove_reminder_columns_from_user.rb new file mode 100644 index 0000000..5016713 --- /dev/null +++ b/db/migrate/20180123171724_remove_reminder_columns_from_user.rb @@ -0,0 +1,7 @@ +class RemoveReminderColumnsFromUser < ActiveRecord::Migration[5.1] + def change + remove_column :users, :email_reminders, :boolean + remove_column :users, :sms_reminders, :boolean + remove_column :users, :phone, :string + end +end diff --git a/db/migrate/20180128195629_add_password_reset_token_to_user.rb b/db/migrate/20180128195629_add_password_reset_token_to_user.rb new file mode 100644 index 0000000..0a2ead6 --- /dev/null +++ b/db/migrate/20180128195629_add_password_reset_token_to_user.rb @@ -0,0 +1,6 @@ +class AddPasswordResetTokenToUser < ActiveRecord::Migration[5.1] + def change + add_column :users, :password_reset_token, :string + add_column :users, :password_reset_token_expiration, :datetime + end +end diff --git a/db/migrate/20180129193245_create_subscription_plans.rb b/db/migrate/20180129193245_create_subscription_plans.rb new file mode 100644 index 0000000..8d008e2 --- /dev/null +++ b/db/migrate/20180129193245_create_subscription_plans.rb @@ -0,0 +1,12 @@ +class CreateSubscriptionPlans < ActiveRecord::Migration[5.1] + def change + create_table :subscription_plans do |t| + t.integer :amount + t.string :interval + t.string :stripe_id + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20180130205631_add_referral_code_to_user.rb b/db/migrate/20180130205631_add_referral_code_to_user.rb new file mode 100644 index 0000000..2f78e3a --- /dev/null +++ b/db/migrate/20180130205631_add_referral_code_to_user.rb @@ -0,0 +1,5 @@ +class AddReferralCodeToUser < ActiveRecord::Migration[5.1] + def change + add_column :users, :referral_code, :string + end +end diff --git a/db/migrate/20180130211252_add_referred_by_to_user.rb b/db/migrate/20180130211252_add_referred_by_to_user.rb new file mode 100644 index 0000000..d37f33a --- /dev/null +++ b/db/migrate/20180130211252_add_referred_by_to_user.rb @@ -0,0 +1,6 @@ +class AddReferredByToUser < ActiveRecord::Migration[5.1] + def change + add_column :users, :referred_by, :integer + add_index :users, :referred_by + end +end diff --git a/db/migrate/20180201210624_create_gifts.rb b/db/migrate/20180201210624_create_gifts.rb new file mode 100644 index 0000000..be7c3ea --- /dev/null +++ b/db/migrate/20180201210624_create_gifts.rb @@ -0,0 +1,16 @@ +class CreateGifts < ActiveRecord::Migration[5.1] + def change + create_table :gifts do |t| + t.integer :recipient_id + t.integer :sender_id + t.string :unique_token + t.string :stripe_charge_id + t.string :recipient_email + t.text :message + t.string :recipient_name + + t.timestamps + end + add_index :gifts, :unique_token, unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 66a053d..d6d785e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,130 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171029194215) do +ActiveRecord::Schema.define(version: 20180201210624) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "daily_snapshots", force: :cascade do |t| + t.jsonb "data", default: "{}" + t.integer "todo_list_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.date "date" + t.index ["todo_list_id"], name: "index_daily_snapshots_on_todo_list_id" + end + + create_table "gifts", force: :cascade do |t| + t.integer "recipient_id" + t.integer "sender_id" + t.string "unique_token" + t.string "stripe_charge_id" + t.string "recipient_email" + t.text "message" + t.string "recipient_name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["unique_token"], name: "index_gifts_on_unique_token", unique: true + end + + create_table "payola_affiliates", id: :serial, force: :cascade do |t| + t.string "code" + t.string "email" + t.integer "percent" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "payola_coupons", id: :serial, force: :cascade do |t| + t.string "code" + t.integer "percent_off" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "active", default: true + end + + create_table "payola_sales", id: :serial, force: :cascade do |t| + t.string "email", limit: 191 + t.string "guid", limit: 191 + t.integer "product_id" + t.string "product_type", limit: 100 + t.datetime "created_at" + t.datetime "updated_at" + t.string "state" + t.string "stripe_id" + t.string "stripe_token" + t.string "card_last4" + t.date "card_expiration" + t.string "card_type" + t.text "error" + t.integer "amount" + t.integer "fee_amount" + t.integer "coupon_id" + t.boolean "opt_in" + t.integer "download_count" + t.integer "affiliate_id" + t.text "customer_address" + t.text "business_address" + t.string "stripe_customer_id", limit: 191 + t.string "currency" + t.text "signed_custom_fields" + t.integer "owner_id" + t.string "owner_type", limit: 100 + t.index ["coupon_id"], name: "index_payola_sales_on_coupon_id" + t.index ["email"], name: "index_payola_sales_on_email" + t.index ["guid"], name: "index_payola_sales_on_guid" + t.index ["owner_id", "owner_type"], name: "index_payola_sales_on_owner_id_and_owner_type" + t.index ["product_id", "product_type"], name: "index_payola_sales_on_product" + t.index ["stripe_customer_id"], name: "index_payola_sales_on_stripe_customer_id" + end + + create_table "payola_stripe_webhooks", id: :serial, force: :cascade do |t| + t.string "stripe_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "payola_subscriptions", id: :serial, force: :cascade do |t| + t.string "plan_type" + t.integer "plan_id" + t.datetime "start" + t.string "status" + t.string "owner_type" + t.integer "owner_id" + t.string "stripe_customer_id" + t.boolean "cancel_at_period_end" + t.datetime "current_period_start" + t.datetime "current_period_end" + t.datetime "ended_at" + t.datetime "trial_start" + t.datetime "trial_end" + t.datetime "canceled_at" + t.integer "quantity" + t.string "stripe_id" + t.string "stripe_token" + t.string "card_last4" + t.date "card_expiration" + t.string "card_type" + t.text "error" + t.string "state" + t.string "email" + t.datetime "created_at" + t.datetime "updated_at" + t.string "currency" + t.integer "amount" + t.string "guid", limit: 191 + t.string "stripe_status" + t.integer "affiliate_id" + t.string "coupon" + t.text "signed_custom_fields" + t.text "customer_address" + t.text "business_address" + t.integer "setup_fee" + t.decimal "tax_percent", precision: 4, scale: 2 + t.index ["guid"], name: "index_payola_subscriptions_on_guid" + end + create_table "reflections", id: :serial, force: :cascade do |t| t.integer "rating" t.text "negative" @@ -26,6 +145,15 @@ t.index ["user_id"], name: "index_reflections_on_user_id" end + create_table "subscription_plans", force: :cascade do |t| + t.integer "amount" + t.string "interval" + t.string "stripe_id" + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "todo_lists", id: :serial, force: :cascade do |t| t.integer "user_id" t.date "date" @@ -43,8 +171,10 @@ t.integer "actual_time_blocks", default: 0 t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "todo_list_id" - t.index ["todo_list_id"], name: "index_todos_on_todo_list_id" + t.integer "daily_todo_list_id" + t.integer "weekly_todo_list_id" + t.index ["daily_todo_list_id"], name: "index_todos_on_daily_todo_list_id" + t.index ["weekly_todo_list_id"], name: "index_todos_on_weekly_todo_list_id" end create_table "users", id: :serial, force: :cascade do |t| @@ -53,9 +183,6 @@ t.string "password_digest" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.string "phone" - t.boolean "email_reminders", default: false - t.boolean "sms_reminders", default: false t.boolean "track_weekends", default: true t.string "timezone" t.boolean "paid", default: false, null: false @@ -63,10 +190,27 @@ t.string "google_id" t.string "stripe_charge_id" t.boolean "weekly_summary", default: false + t.string "password_reset_token" + t.datetime "password_reset_token_expiration" + t.string "referral_code" + t.integer "referred_by" t.index ["email"], name: "index_users_on_email", unique: true + t.index ["referred_by"], name: "index_users_on_referred_by" + end + + create_table "weekly_summaries", force: :cascade do |t| + t.integer "completion_percentage", default: 0 + t.integer "weekly_rating", default: 0 + t.text "todo_list_ids", default: [], array: true + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" + t.index ["user_id"], name: "index_weekly_summaries_on_user_id" end + add_foreign_key "daily_snapshots", "todo_lists" add_foreign_key "reflections", "users" add_foreign_key "todo_lists", "users" - add_foreign_key "todos", "todo_lists" + add_foreign_key "todos", "todo_lists", column: "daily_todo_list_id" + add_foreign_key "todos", "todo_lists", column: "weekly_todo_list_id" end diff --git a/db/seeds.rb b/db/seeds.rb index 9e0f211..d242c53 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -26,7 +26,7 @@ content: 'Read a book.', estimated_time_blocks: 5, actual_time_blocks: 4, - todo_list: list_1, + daily_todo_list: list_1, complete: false ) end @@ -36,7 +36,7 @@ content: 'Follow up with client', estimated_time_blocks: 3, actual_time_blocks: 4, - todo_list: list_2, + daily_todo_list: list_2, complete: true ) end diff --git a/erd.pdf b/erd.pdf new file mode 100644 index 0000000000000000000000000000000000000000..a35835bffce0b1ebc8e8355ea11c7630edbf76bb GIT binary patch literal 33985 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ⅇ9>Jz@cPz%&gaNu`xnp4@lsV+D1@!3 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 { + DailySnapshot.create_from_todo_list(@weekly_todo_list) + }.must_raise(StandardError) + + error.message.must_match(I18n.t("daily_snapshot.weekly_todo_list_error_message")) + end + + it "#completion_percentage" do + daily_snapshot = DailySnapshot.create_from_todo_list(@daily_todo_list) + + assert_equal(100, daily_snapshot.completion_percentage) + + Todo.last.update!(complete: false) + + DailySnapshot.destroy_all + new_daily_snapshot = DailySnapshot.create_from_todo_list(@daily_todo_list) + + assert_equal(80, new_daily_snapshot.completion_percentage) + + Todo.last.update!(content: "") + + DailySnapshot.destroy_all + another_daily_snapshot = DailySnapshot.create_from_todo_list(@daily_todo_list) + + assert_equal(100, another_daily_snapshot.completion_percentage) + end +end diff --git a/test/mailers/payments_mailer_test.rb b/test/models/gift_test.rb similarity index 60% rename from test/mailers/payments_mailer_test.rb rename to test/models/gift_test.rb index 465f7fe..dbdf9e8 100644 --- a/test/mailers/payments_mailer_test.rb +++ b/test/models/gift_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class PaymentsMailerTest < ActionMailer::TestCase +class GiftTest < ActiveSupport::TestCase # test "the truth" do # assert true # end diff --git a/test/mailers/weekly_summary_mailer_test.rb b/test/models/subscription_plan_test.rb similarity index 58% rename from test/mailers/weekly_summary_mailer_test.rb rename to test/models/subscription_plan_test.rb index 76da1fb..e07968c 100644 --- a/test/mailers/weekly_summary_mailer_test.rb +++ b/test/models/subscription_plan_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class WeeklySummaryMailerTest < ActionMailer::TestCase +class SubscriptionPlanTest < ActiveSupport::TestCase # test "the truth" do # assert true # end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 9f29dd5..cdab33b 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -39,30 +39,6 @@ class UserTest < ActiveSupport::TestCase assert(@user.recently_signed_up? == true) end - test '.want_sms_reminders' do - @user.update(sms_reminders: true, phone: '9144825484') - new_user = User.create( - email: 'new@example.com', - password: 'password', - password_confirmation: 'password' - ) - - assert_includes(User.want_sms_reminders, @user) - refute_includes(User.want_sms_reminders, new_user) - end - - test '.want_email_reminders' do - @user.update(email_reminders: true) - new_user = User.create( - email: 'new@example.com', - password: 'password', - password_confirmation: 'password' - ) - - assert_includes(User.want_email_reminders, @user) - refute_includes(User.want_email_reminders, new_user) - end - test '.finishing_their_day' do chicago_time_zone = ActiveSupport::TimeZone.all.find {|zone| zone.tzinfo.name == 'America/Chicago'} @@ -82,14 +58,6 @@ class UserTest < ActiveSupport::TestCase end end - test 'validation phone number is present when sms_reminders is true' do - @user.sms_reminders = true - - @user.save - - assert_not_nil(@user.errors.full_messages) - end - test '#trialing?' do assert(@user.trialing?) @@ -102,20 +70,6 @@ class UserTest < ActiveSupport::TestCase refute(@user.trialing?) end - test "#completion_percentage" do - @user.todo_lists.first.todos.create - - assert_equal(0, @user.completion_percentage(from: 6.days.ago, to: Date.current.end_of_day)) - - @user.todos.first.update(complete: true) - - assert_equal(50, @user.completion_percentage(from: 6.days.ago, to: Date.current.end_of_day)) - - @user.todos.last.update(complete: true) - - assert_equal(100, @user.completion_percentage(from: 6.days.ago, to: Date.current.end_of_day)) - end - test '#average_rating' do assert_equal(0, @user.average_rating(from: 6.days.ago, to: Date.current.end_of_day)) diff --git a/test/models/weekly_summary_test.rb b/test/models/weekly_summary_test.rb new file mode 100644 index 0000000..b66899f --- /dev/null +++ b/test/models/weekly_summary_test.rb @@ -0,0 +1,16 @@ +require 'test_helper' + +class WeeklySummaryTest < ActiveSupport::TestCase + test "#generate_stats" do + weekly_summary = WeeklySummary.create(todo_list_ids: TodoList.pluck(:id)) + TodoList.first.todos.create(content: "Homework", complete: true) + + TodoList.all.each do |todo_list| + DailySnapshot.create_from_todo_list(todo_list) + end + + weekly_summary.generate_stats + + assert_equal(50, weekly_summary.completion_percentage) + end +end diff --git a/test/services/payment_service_test.rb b/test/services/payment_service_test.rb deleted file mode 100644 index b18b7a5..0000000 --- a/test/services/payment_service_test.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'test_helper' - -class PaymentServiceTest < ActiveSupport::TestCase - setup do - @user = users(:garrett) - @stripe_helper = StripeMock.create_test_helper - - StripeMock.start - end - - teardown do - StripeMock.stop - end - - test "#charge_card success" do - PaymentService.charge_card( - token: @stripe_helper.generate_card_token, - user: @user - ) - - assert(@user.paid) - end - - test "#charge_card failure with card error from Stripe" do - StripeMock.prepare_card_error(:card_declined, :new_charge) - - PaymentService.charge_card( - token: @stripe_helper.generate_card_token, - user: @user - ) - - refute(@user.paid) - end -end diff --git a/test/test_helper.rb b/test/test_helper.rb index 6784f06..c178895 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,6 +3,7 @@ require 'rails/test_help' require 'minitest/reporters' require 'minitest/mock' +require 'minitest/spec' require 'webmock/minitest' require 'minitest/stub_any_instance' Dir["#{Rails.root}/test/support/*.rb"].each {|file| require file } @@ -12,6 +13,11 @@ class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all + extend Minitest::Spec::DSL + + register_spec_type(self) do |desc| + desc < ActiveRecord::Base if desc.is_a?(Class) + end def login_as(user) post '/login', params: {