From b82272d2cf7e7fe9dc4169c3f3f05ffd01d72b3d Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Tue, 7 Jul 2020 15:19:51 -0600 Subject: [PATCH 01/16] Updated file structures --- config/database.yml | 2 +- db/migrate/001_create_members | 0 db/migrate/002_create_gym_sessions | 0 db/migrate/003_create_workouts | 0 lib/models/gym_session.rb | 0 lib/models/member.rb | 0 lib/models/workout.rb | 0 7 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 db/migrate/001_create_members create mode 100644 db/migrate/002_create_gym_sessions create mode 100644 db/migrate/003_create_workouts create mode 100644 lib/models/gym_session.rb create mode 100644 lib/models/member.rb create mode 100644 lib/models/workout.rb diff --git a/config/database.yml b/config/database.yml index 7d4c3a6..463729e 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,3 +1,3 @@ development: adapter: sqlite3 - database: db/cats.sqlite3 \ No newline at end of file + database: db/GitFit_db.sqlite3 \ No newline at end of file diff --git a/db/migrate/001_create_members b/db/migrate/001_create_members new file mode 100644 index 0000000..e69de29 diff --git a/db/migrate/002_create_gym_sessions b/db/migrate/002_create_gym_sessions new file mode 100644 index 0000000..e69de29 diff --git a/db/migrate/003_create_workouts b/db/migrate/003_create_workouts new file mode 100644 index 0000000..e69de29 diff --git a/lib/models/gym_session.rb b/lib/models/gym_session.rb new file mode 100644 index 0000000..e69de29 diff --git a/lib/models/member.rb b/lib/models/member.rb new file mode 100644 index 0000000..e69de29 diff --git a/lib/models/workout.rb b/lib/models/workout.rb new file mode 100644 index 0000000..e69de29 From fb30191aaf8e9404c8dd6ff8f2c7e6a7db6c3e64 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Tue, 7 Jul 2020 16:32:39 -0600 Subject: [PATCH 02/16] Created class and migration files --- Rakefile | 7 +++++- config/environment.rb | 14 +++++++++++- db/migrate/001_create_members | 0 db/migrate/001_create_members.rb | 9 ++++++++ db/migrate/002_create_gym_sessions | 0 db/migrate/002_create_gym_sessions.rb | 10 +++++++++ db/migrate/003_create_workouts | 0 db/migrate/003_create_workouts.rb | 8 +++++++ db/schema.rb | 32 +++++++++++++++++++++++++++ db/seeds.rb | 28 +++++++++++++++++++++++ lib/models/cli.rb | 2 ++ lib/models/gym_session.rb | 4 ++++ lib/models/member.rb | 4 ++++ lib/models/workout.rb | 5 +++++ runner.rb | 7 +++--- 15 files changed, 125 insertions(+), 5 deletions(-) delete mode 100644 db/migrate/001_create_members create mode 100644 db/migrate/001_create_members.rb delete mode 100644 db/migrate/002_create_gym_sessions create mode 100644 db/migrate/002_create_gym_sessions.rb delete mode 100644 db/migrate/003_create_workouts create mode 100644 db/migrate/003_create_workouts.rb create mode 100644 db/schema.rb create mode 100644 lib/models/cli.rb diff --git a/Rakefile b/Rakefile index 4e65a4f..3d42102 100644 --- a/Rakefile +++ b/Rakefile @@ -1,2 +1,7 @@ require_relative 'config/environment' -require 'sinatra/activerecord/rake' \ No newline at end of file +require 'sinatra/activerecord/rake' + +desc "start console" +task :console do + Pry.start +end \ No newline at end of file diff --git a/config/environment.rb b/config/environment.rb index 23718ce..59fc523 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,4 +1,16 @@ require 'bundler/setup' Bundler.require -require_all 'lib' \ No newline at end of file +require 'active_record' +require_all 'lib' +require_relative '../db/seeds' + +# ENV["PLAYLISTER_ENV"] ||= "development" + +# ActiveRecord::Base.establish_connection(ENV["PLAYLISTER_ENV"].to_sym) + +# ActiveRecord::Base.logger = nil + +# if ENV["PLAYLISTER_ENV"] == "test" +# ActiveRecord::Migration.verbose = false +# end \ No newline at end of file diff --git a/db/migrate/001_create_members b/db/migrate/001_create_members deleted file mode 100644 index e69de29..0000000 diff --git a/db/migrate/001_create_members.rb b/db/migrate/001_create_members.rb new file mode 100644 index 0000000..d88f694 --- /dev/null +++ b/db/migrate/001_create_members.rb @@ -0,0 +1,9 @@ +class CreateMembers < ActiveRecord::Migration[6.0] + + def change + create_table :members do |t| + t.string :name + t.string :goal + end + end +end \ No newline at end of file diff --git a/db/migrate/002_create_gym_sessions b/db/migrate/002_create_gym_sessions deleted file mode 100644 index e69de29..0000000 diff --git a/db/migrate/002_create_gym_sessions.rb b/db/migrate/002_create_gym_sessions.rb new file mode 100644 index 0000000..8a81838 --- /dev/null +++ b/db/migrate/002_create_gym_sessions.rb @@ -0,0 +1,10 @@ +class CreateGymSessions < ActiveRecord::Migration[6.0] + + def change + create_table :gym_sessions do |t| + t.string :name + t.references :member + t.references :workout + end + end +end \ No newline at end of file diff --git a/db/migrate/003_create_workouts b/db/migrate/003_create_workouts deleted file mode 100644 index e69de29..0000000 diff --git a/db/migrate/003_create_workouts.rb b/db/migrate/003_create_workouts.rb new file mode 100644 index 0000000..64d94f9 --- /dev/null +++ b/db/migrate/003_create_workouts.rb @@ -0,0 +1,8 @@ +class CreateWorkouts < ActiveRecord::Migration[6.0] + + def change + create_table :workouts do |t| + t.string :body_part + end + end +end \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..43b7e3d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,32 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 3) do + + create_table "gym_sessions", force: :cascade do |t| + t.string "name" + t.integer "member_id" + t.integer "workout_id" + t.index ["member_id"], name: "index_gym_sessions_on_member_id" + t.index ["workout_id"], name: "index_gym_sessions_on_workout_id" + end + + create_table "members", force: :cascade do |t| + t.string "name" + t.string "goal" + end + + create_table "workouts", force: :cascade do |t| + t.string "body_part" + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index e69de29..a719425 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -0,0 +1,28 @@ +Workout.delete_all +Member.delete_all +GymSession.delete_all + +michael = Member.create(:name=>"Michael", :goal=>"strength") +derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") +gordo = Member.create(:name=>"Gordo", :goal=>"strength") + +chest_workout = Workout.create(:body_part=>"Chest") +back_workout = Workout.create(:body_part=>"back") +arms_workout = Workout.create(:body_part=>"arms") + +session1 = GymSession.create(:name=>"First of day") +session2 = GymSession.create(:name=>"2nd of day") +session3 = GymSession.create(:name=>"3rd of day") + +session1.member = michael +session2.member = derek +session3.member = gordo + +michael.gym_sessions << session1 +gordo.gym_sessions << session3 +derek.gym_sessions << session2 + +chest_workout.gym_sessions << session1 +back_workout.gym_sessions << session2 +arms_workout.gym_sessions << session3 + diff --git a/lib/models/cli.rb b/lib/models/cli.rb new file mode 100644 index 0000000..cae1d4f --- /dev/null +++ b/lib/models/cli.rb @@ -0,0 +1,2 @@ +class Cli < ActiveRecord::Base +end \ No newline at end of file diff --git a/lib/models/gym_session.rb b/lib/models/gym_session.rb index e69de29..523a276 100644 --- a/lib/models/gym_session.rb +++ b/lib/models/gym_session.rb @@ -0,0 +1,4 @@ +class GymSession < ActiveRecord::Base + belongs_to :member + belongs_to :workout +end \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index e69de29..ba9cbd6 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -0,0 +1,4 @@ +class Member < ActiveRecord::Base + has_many :gym_sessions + has_many :workouts, through: :gym_sessions +end \ No newline at end of file diff --git a/lib/models/workout.rb b/lib/models/workout.rb index e69de29..b00b640 100644 --- a/lib/models/workout.rb +++ b/lib/models/workout.rb @@ -0,0 +1,5 @@ +class Workout < ActiveRecord::Base + has_many :gym_sessions + has_many :members, through: :gym_sessions + +end \ No newline at end of file diff --git a/runner.rb b/runner.rb index fa3c59b..846a4ae 100644 --- a/runner.rb +++ b/runner.rb @@ -1,6 +1,7 @@ require_relative 'config/environment' - -Cli.new.start_game - +require 'pry' +# Cli.new +binding.pry +0 From 6395fbf99ff61eb5a00868fd1fcd4e5918191370 Mon Sep 17 00:00:00 2001 From: bgordon8 Date: Tue, 7 Jul 2020 18:30:41 -0600 Subject: [PATCH 03/16] added a new line on cli.rb --- lib/models/cli.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/models/cli.rb b/lib/models/cli.rb index cae1d4f..31aded6 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -1,2 +1,3 @@ class Cli < ActiveRecord::Base + end \ No newline at end of file From d5e1108369a93f4f2fefb081147e2b841c8c2eda Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Wed, 8 Jul 2020 09:22:21 -0600 Subject: [PATCH 04/16] MVP complete --- Gemfile | 1 + Gemfile.lock | 20 +++++++++++++++++++- db/seeds.rb | 42 +++++++++++++++++++++--------------------- lib/models/cli.rb | 40 +++++++++++++++++++++++++++++++++++++++- lib/models/member.rb | 4 ++++ runner.rb | 16 +++++++++++++--- 6 files changed, 97 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index 356e44a..83ba802 100644 --- a/Gemfile +++ b/Gemfile @@ -11,3 +11,4 @@ gem "sinatra-activerecord", "~> 2.0" gem "rake", "~> 13.0" gem "sqlite3", "~> 1.4" gem "require_all", "~> 3.0" +gem 'tty-prompt' diff --git a/Gemfile.lock b/Gemfile.lock index 2f1380f..ccda804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,11 +14,16 @@ GEM zeitwerk (~> 2.2) coderay (1.1.2) concurrent-ruby (1.1.5) + equatable (0.6.1) i18n (1.7.0) concurrent-ruby (~> 1.0) method_source (0.9.2) minitest (5.13.0) mustermann (1.0.3) + necromancer (0.5.1) + pastel (0.7.4) + equatable (~> 0.6) + tty-color (~> 0.5) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -38,8 +43,20 @@ GEM sqlite3 (1.4.1) thread_safe (0.3.6) tilt (2.0.10) + tty-color (0.5.1) + tty-cursor (0.7.1) + tty-prompt (0.21.0) + necromancer (~> 0.5.0) + pastel (~> 0.7.0) + tty-reader (~> 0.7.0) + tty-reader (0.7.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.7) + wisper (~> 2.0.0) + tty-screen (0.8.0) tzinfo (1.2.5) thread_safe (~> 0.1) + wisper (2.0.1) zeitwerk (2.2.2) PLATFORMS @@ -52,6 +69,7 @@ DEPENDENCIES require_all (~> 3.0) sinatra-activerecord (~> 2.0) sqlite3 (~> 1.4) + tty-prompt BUNDLED WITH - 2.0.2 + 2.1.4 diff --git a/db/seeds.rb b/db/seeds.rb index a719425..a38a274 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,28 +1,28 @@ -Workout.delete_all -Member.delete_all -GymSession.delete_all +Workout.destroy_all +Member.destroy_all +GymSession.destroy_all -michael = Member.create(:name=>"Michael", :goal=>"strength") -derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") -gordo = Member.create(:name=>"Gordo", :goal=>"strength") +# michael = Member.create(:name=>"Michael", :goal=>"strength") +# derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") +# gordo = Member.create(:name=>"Gordo", :goal=>"strength") -chest_workout = Workout.create(:body_part=>"Chest") -back_workout = Workout.create(:body_part=>"back") -arms_workout = Workout.create(:body_part=>"arms") +# chest_workout = Workout.create(:body_part=>"Chest") +# back_workout = Workout.create(:body_part=>"back") +# arms_workout = Workout.create(:body_part=>"arms") -session1 = GymSession.create(:name=>"First of day") -session2 = GymSession.create(:name=>"2nd of day") -session3 = GymSession.create(:name=>"3rd of day") +# session1 = GymSession.create(:name=>"First of day") +# session2 = GymSession.create(:name=>"2nd of day") +# session3 = GymSession.create(:name=>"3rd of day") -session1.member = michael -session2.member = derek -session3.member = gordo +# session1.member = michael +# session2.member = derek +# session3.member = gordo -michael.gym_sessions << session1 -gordo.gym_sessions << session3 -derek.gym_sessions << session2 +# michael.gym_sessions << session1 +# gordo.gym_sessions << session3 +# derek.gym_sessions << session2 -chest_workout.gym_sessions << session1 -back_workout.gym_sessions << session2 -arms_workout.gym_sessions << session3 +# chest_workout.gym_sessions << session1 +# back_workout.gym_sessions << session2 +# arms_workout.gym_sessions << session3 diff --git a/lib/models/cli.rb b/lib/models/cli.rb index cae1d4f..cb33b61 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -1,2 +1,40 @@ -class Cli < ActiveRecord::Base +require 'tty-prompt' +class Cli + + $prompt = TTY::Prompt.new + + def welcome + puts "Welcome to GitFit, your personal workout generator!" + end + + def new_user + Member.create_new + end + + def main_menu + main_menu = $prompt.select("Main Menu") do |menu| + menu.choice 'Build new profile' + menu.choice 'See user profile' + menu.choice 'Select your workout' + end + main_menu + # welcome if main_menu == 'Build new profile' + end + + # welcome if main_menu == 'Build new profile' + + + def select_type_of_workout + # prompt = TTY::Prompt.new + answer = $prompt.select("Choose your workout") do |menu| + menu.choice 'Full Body' + menu.choice 'Chest' + menu.choice 'Back' + menu.choice 'Legs' + menu.choice 'Arms' + end + puts "You have selected a #{answer} workout." + # puts "Please select 1 for an upper-body workout or 2 for a lower-body workout." + # user_input = gets.chomp + end end \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index ba9cbd6..9b54146 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -1,4 +1,8 @@ class Member < ActiveRecord::Base has_many :gym_sessions has_many :workouts, through: :gym_sessions + + def self.create_new + puts "You have created your profile" + end end \ No newline at end of file diff --git a/runner.rb b/runner.rb index 846a4ae..9d618ce 100644 --- a/runner.rb +++ b/runner.rb @@ -1,7 +1,17 @@ require_relative 'config/environment' require 'pry' -# Cli.new +require 'tty-prompt' +prompt = TTY::Prompt.new +app = Cli.new +app.welcome +# app.main_menu +if app.main_menu == 'Build new profile' + app.new_user +end +app.select_type_of_workout -binding.pry -0 + + +# binding.pry +# 0 From a7605be1c4fbb4acd858c6137d8aa20fa0333ab9 Mon Sep 17 00:00:00 2001 From: mnavoy4 <58039992+mnavoy4@users.noreply.github.com> Date: Wed, 8 Jul 2020 09:29:31 -0600 Subject: [PATCH 05/16] Revert "added a new line on cli.rb" --- lib/models/cli.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 31aded6..cae1d4f 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -1,3 +1,2 @@ class Cli < ActiveRecord::Base - end \ No newline at end of file From b99f90094e6fea8d60380db5919162bd866e6b52 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Wed, 8 Jul 2020 11:01:35 -0600 Subject: [PATCH 06/16] Basic Main Menu Complete --- Gemfile | 1 + Gemfile.lock | 8 ++++++++ lib/models/cli.rb | 27 +++++++++++++++++++++++---- lib/models/member.rb | 24 ++++++++++++++++++++++-- runner.rb | 27 ++++++++++++++++++++++----- 5 files changed, 76 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 83ba802..2ccb4bb 100644 --- a/Gemfile +++ b/Gemfile @@ -12,3 +12,4 @@ gem "rake", "~> 13.0" gem "sqlite3", "~> 1.4" gem "require_all", "~> 3.0" gem 'tty-prompt' +gem 'tty-progressbar' diff --git a/Gemfile.lock b/Gemfile.lock index ccda804..f3573fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,10 +41,16 @@ GEM activerecord (>= 3.2) sinatra (>= 1.0) sqlite3 (1.4.1) + strings-ansi (0.1.0) thread_safe (0.3.6) tilt (2.0.10) tty-color (0.5.1) tty-cursor (0.7.1) + tty-progressbar (0.17.0) + strings-ansi (~> 0.1.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.7) + unicode-display_width (~> 1.6) tty-prompt (0.21.0) necromancer (~> 0.5.0) pastel (~> 0.7.0) @@ -56,6 +62,7 @@ GEM tty-screen (0.8.0) tzinfo (1.2.5) thread_safe (~> 0.1) + unicode-display_width (1.7.0) wisper (2.0.1) zeitwerk (2.2.2) @@ -69,6 +76,7 @@ DEPENDENCIES require_all (~> 3.0) sinatra-activerecord (~> 2.0) sqlite3 (~> 1.4) + tty-progressbar tty-prompt BUNDLED WITH diff --git a/lib/models/cli.rb b/lib/models/cli.rb index cb33b61..24c5051 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -11,17 +11,38 @@ def new_user Member.create_new end + def see_user_profile + Member.see_user_profile + end + + def end_app + puts "See you next time!" + end + + def workout + bar = TTY::ProgressBar.new("Work out in progress [:bar]", total: 30) + 30.times do + sleep(0.1) + bar.advance(1) + end + puts "Great job! You finished your workout." + end + + # def completed_workout + # puts "Great job! You finished your workout." + # end + def main_menu main_menu = $prompt.select("Main Menu") do |menu| menu.choice 'Build new profile' menu.choice 'See user profile' menu.choice 'Select your workout' + menu.choice 'Exit GitFit' end main_menu - # welcome if main_menu == 'Build new profile' end - # welcome if main_menu == 'Build new profile' + def select_type_of_workout @@ -34,7 +55,5 @@ def select_type_of_workout menu.choice 'Arms' end puts "You have selected a #{answer} workout." - # puts "Please select 1 for an upper-body workout or 2 for a lower-body workout." - # user_input = gets.chomp end end \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index 9b54146..151f83e 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -1,8 +1,28 @@ +require 'tty-prompt' + class Member < ActiveRecord::Base + $prompt = TTY::Prompt.new has_many :gym_sessions has_many :workouts, through: :gym_sessions def self.create_new - puts "You have created your profile" + puts "What is your name" + name = gets.chomp + goal = $prompt.select("What is your goal") do |menu| + menu.choice 'Losing weight' + menu.choice 'Gaining strength' + end + new_user = Member.create(:name=>name, :goal=>goal) + new_user + puts "Nice to meet you #{name}! Let's start working towards #{goal}!" + puts "Please note your member ID: #{new_user.id}. You will need it to view your profile later!" + end + + def self.see_user_profile + puts "Please enter your member ID" + member_id = gets.chomp + found_user = self.find_by id: member_id + puts "Name: #{found_user[:name]}" + puts "Goal: #{found_user[:goal]}" end -end \ No newline at end of file +end diff --git a/runner.rb b/runner.rb index 9d618ce..a90cb2d 100644 --- a/runner.rb +++ b/runner.rb @@ -2,14 +2,31 @@ require 'pry' require 'tty-prompt' -prompt = TTY::Prompt.new + +# prompt = TTY::Prompt.new app = Cli.new app.welcome -# app.main_menu -if app.main_menu == 'Build new profile' - app.new_user +loop do + case app.main_menu + when 'Build new profile' + app.new_user + when 'Select your workout' + app.select_type_of_workout + app.workout + # bar = TTY::ProgressBar.new("Work out in progress [:bar]", total: 30) + # 30.times do + # sleep(0.1) + # bar.advance(1) + # end + # app.completed_workout + when 'See user profile' + app.see_user_profile + when 'Exit GitFit' + app.end_app + break + end end -app.select_type_of_workout + From b4f910951b2923f282c1255efbaa8a15cf131d17 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Wed, 8 Jul 2020 13:14:36 -0600 Subject: [PATCH 07/16] Connecting tables --- config/environment.rb | 10 -------- db/migrate/002_create_gym_sessions.rb | 1 - db/schema.rb | 1 - db/seeds.rb | 37 +++++++++++++-------------- lib/models/cli.rb | 4 --- lib/models/member.rb | 1 - runner.rb | 12 +-------- 7 files changed, 19 insertions(+), 47 deletions(-) diff --git a/config/environment.rb b/config/environment.rb index 59fc523..081063a 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -4,13 +4,3 @@ require 'active_record' require_all 'lib' require_relative '../db/seeds' - -# ENV["PLAYLISTER_ENV"] ||= "development" - -# ActiveRecord::Base.establish_connection(ENV["PLAYLISTER_ENV"].to_sym) - -# ActiveRecord::Base.logger = nil - -# if ENV["PLAYLISTER_ENV"] == "test" -# ActiveRecord::Migration.verbose = false -# end \ No newline at end of file diff --git a/db/migrate/002_create_gym_sessions.rb b/db/migrate/002_create_gym_sessions.rb index 8a81838..3a4648c 100644 --- a/db/migrate/002_create_gym_sessions.rb +++ b/db/migrate/002_create_gym_sessions.rb @@ -2,7 +2,6 @@ class CreateGymSessions < ActiveRecord::Migration[6.0] def change create_table :gym_sessions do |t| - t.string :name t.references :member t.references :workout end diff --git a/db/schema.rb b/db/schema.rb index 43b7e3d..05fd8e8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,7 +13,6 @@ ActiveRecord::Schema.define(version: 3) do create_table "gym_sessions", force: :cascade do |t| - t.string "name" t.integer "member_id" t.integer "workout_id" t.index ["member_id"], name: "index_gym_sessions_on_member_id" diff --git a/db/seeds.rb b/db/seeds.rb index a38a274..febd59c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,27 +2,26 @@ Member.destroy_all GymSession.destroy_all -# michael = Member.create(:name=>"Michael", :goal=>"strength") -# derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") -# gordo = Member.create(:name=>"Gordo", :goal=>"strength") +michael = Member.create(:name=>"Michael", :goal=>"strength") +derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") +gordo = Member.create(:name=>"Gordo", :goal=>"strength") -# chest_workout = Workout.create(:body_part=>"Chest") -# back_workout = Workout.create(:body_part=>"back") -# arms_workout = Workout.create(:body_part=>"arms") +chest_workout = Workout.create(:body_part=>"Chest") +back_workout = Workout.create(:body_part=>"back") +arms_workout = Workout.create(:body_part=>"arms") -# session1 = GymSession.create(:name=>"First of day") -# session2 = GymSession.create(:name=>"2nd of day") -# session3 = GymSession.create(:name=>"3rd of day") +session1 = GymSession.create() +session2 = GymSession.create() +session3 = GymSession.create() -# session1.member = michael -# session2.member = derek -# session3.member = gordo +session1.member = michael +session2.member = derek +session3.member = gordo -# michael.gym_sessions << session1 -# gordo.gym_sessions << session3 -# derek.gym_sessions << session2 - -# chest_workout.gym_sessions << session1 -# back_workout.gym_sessions << session2 -# arms_workout.gym_sessions << session3 +michael.gym_sessions << session1 +gordo.gym_sessions << session3 +derek.gym_sessions << session2 +chest_workout.gym_sessions << session1 +back_workout.gym_sessions << session2 +arms_workout.gym_sessions << session3 diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 24c5051..988c496 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -28,10 +28,6 @@ def workout puts "Great job! You finished your workout." end - # def completed_workout - # puts "Great job! You finished your workout." - # end - def main_menu main_menu = $prompt.select("Main Menu") do |menu| menu.choice 'Build new profile' diff --git a/lib/models/member.rb b/lib/models/member.rb index 151f83e..4d9de45 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -13,7 +13,6 @@ def self.create_new menu.choice 'Gaining strength' end new_user = Member.create(:name=>name, :goal=>goal) - new_user puts "Nice to meet you #{name}! Let's start working towards #{goal}!" puts "Please note your member ID: #{new_user.id}. You will need it to view your profile later!" end diff --git a/runner.rb b/runner.rb index a90cb2d..dc568b1 100644 --- a/runner.rb +++ b/runner.rb @@ -2,8 +2,6 @@ require 'pry' require 'tty-prompt' - -# prompt = TTY::Prompt.new app = Cli.new app.welcome loop do @@ -13,22 +11,14 @@ when 'Select your workout' app.select_type_of_workout app.workout - # bar = TTY::ProgressBar.new("Work out in progress [:bar]", total: 30) - # 30.times do - # sleep(0.1) - # bar.advance(1) - # end - # app.completed_workout when 'See user profile' app.see_user_profile when 'Exit GitFit' app.end_app + binding.pry break end end - - - # binding.pry # 0 From 306f72fae0f63f3b0597726d89bf6c652a6943b6 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Wed, 8 Jul 2020 15:01:31 -0600 Subject: [PATCH 08/16] Added funtionality in seeing user profile --- config/environment.rb | 1 + db/seeds.rb | 36 ++++++++++++++++++------------------ lib/models/cli.rb | 10 +++++++++- lib/models/member.rb | 29 +++++++++++++++++++++++++++-- runner.rb | 2 +- 5 files changed, 56 insertions(+), 22 deletions(-) diff --git a/config/environment.rb b/config/environment.rb index 081063a..0fa85f0 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -4,3 +4,4 @@ require 'active_record' require_all 'lib' require_relative '../db/seeds' +ActiveRecord::Base.logger = nil \ No newline at end of file diff --git a/db/seeds.rb b/db/seeds.rb index febd59c..94abc50 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,26 +2,26 @@ Member.destroy_all GymSession.destroy_all -michael = Member.create(:name=>"Michael", :goal=>"strength") -derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") -gordo = Member.create(:name=>"Gordo", :goal=>"strength") +# michael = Member.create(:name=>"Michael", :goal=>"strength") +# derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") +# gordo = Member.create(:name=>"Gordo", :goal=>"strength") -chest_workout = Workout.create(:body_part=>"Chest") -back_workout = Workout.create(:body_part=>"back") -arms_workout = Workout.create(:body_part=>"arms") +# chest_workout = Workout.create(:body_part=>"Chest") +# back_workout = Workout.create(:body_part=>"back") +# arms_workout = Workout.create(:body_part=>"arms") -session1 = GymSession.create() -session2 = GymSession.create() -session3 = GymSession.create() +# session1 = GymSession.create() +# session2 = GymSession.create() +# session3 = GymSession.create() -session1.member = michael -session2.member = derek -session3.member = gordo +# session1.member = michael +# session2.member = derek +# session3.member = gordo -michael.gym_sessions << session1 -gordo.gym_sessions << session3 -derek.gym_sessions << session2 +# michael.gym_sessions << session1 +# gordo.gym_sessions << session3 +# derek.gym_sessions << session2 -chest_workout.gym_sessions << session1 -back_workout.gym_sessions << session2 -arms_workout.gym_sessions << session3 +# chest_workout.gym_sessions << session1 +# back_workout.gym_sessions << session2 +# arms_workout.gym_sessions << session3 diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 988c496..463c5d1 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -15,6 +15,10 @@ def see_user_profile Member.see_user_profile end + def sign_in + Member.sign_in + end + def end_app puts "See you next time!" end @@ -41,7 +45,7 @@ def main_menu - def select_type_of_workout + def select_type_of_workout user # prompt = TTY::Prompt.new answer = $prompt.select("Choose your workout") do |menu| menu.choice 'Full Body' @@ -51,5 +55,9 @@ def select_type_of_workout menu.choice 'Arms' end puts "You have selected a #{answer} workout." + new_session = GymSession.create() + new_workout = Workout.find_or_create_by(:body_part=>answer) + new_workout.gym_sessions << new_session + user.gym_sessions << new_session end end \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index 4d9de45..42bf5f4 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -1,3 +1,4 @@ +require 'pry' require 'tty-prompt' class Member < ActiveRecord::Base @@ -18,10 +19,34 @@ def self.create_new end def self.see_user_profile + user = self.sign_in + puts "Name: #{user[:name]}" + puts "Goal: #{user[:goal]}" + # workout_array = user.workouts.map do |workout| + # workout.body_part + # end + # hash = {} + # workout_array.each do |value| + # hash[value] ? hash[value] += 1 : hash[value] = 1 + # end + puts "Workouts completed: #{self.get_user_workouts user}" + end + + def self.sign_in puts "Please enter your member ID" member_id = gets.chomp found_user = self.find_by id: member_id - puts "Name: #{found_user[:name]}" - puts "Goal: #{found_user[:goal]}" + found_user + end + + def self.get_user_workouts user + workout_array = user.workouts.map do |workout| + workout.body_part + end + hash = {} + workout_array.each do |value| + hash[value] ? hash[value] += 1 : hash[value] = 1 + end + hash end end diff --git a/runner.rb b/runner.rb index dc568b1..ae81027 100644 --- a/runner.rb +++ b/runner.rb @@ -9,7 +9,7 @@ when 'Build new profile' app.new_user when 'Select your workout' - app.select_type_of_workout + app.select_type_of_workout app.sign_in app.workout when 'See user profile' app.see_user_profile From 6b6876f2c9fed140ad639e20b9d8bb162667597b Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Thu, 9 Jul 2020 07:03:36 -0600 Subject: [PATCH 09/16] Changed user to member in all places --- db/seeds.rb | 6 +++--- lib/models/cli.rb | 9 ++++----- lib/models/member.rb | 33 +++++++++++++-------------------- runner.rb | 5 ++--- 4 files changed, 22 insertions(+), 31 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 94abc50..df82765 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,6 +1,6 @@ -Workout.destroy_all -Member.destroy_all -GymSession.destroy_all +# Workout.destroy_all +# Member.destroy_all +# GymSession.destroy_all # michael = Member.create(:name=>"Michael", :goal=>"strength") # derek = Member.create(:name=>"Derek", :goal=>"Weight Loss") diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 463c5d1..73b99e1 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -7,7 +7,7 @@ def welcome puts "Welcome to GitFit, your personal workout generator!" end - def new_user + def new_member Member.create_new end @@ -35,7 +35,7 @@ def workout def main_menu main_menu = $prompt.select("Main Menu") do |menu| menu.choice 'Build new profile' - menu.choice 'See user profile' + menu.choice 'See member profile' menu.choice 'Select your workout' menu.choice 'Exit GitFit' end @@ -45,8 +45,7 @@ def main_menu - def select_type_of_workout user - # prompt = TTY::Prompt.new + def select_type_of_workout member answer = $prompt.select("Choose your workout") do |menu| menu.choice 'Full Body' menu.choice 'Chest' @@ -58,6 +57,6 @@ def select_type_of_workout user new_session = GymSession.create() new_workout = Workout.find_or_create_by(:body_part=>answer) new_workout.gym_sessions << new_session - user.gym_sessions << new_session + member.gym_sessions << new_session end end \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index 42bf5f4..ed2b2b0 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -10,37 +10,30 @@ def self.create_new puts "What is your name" name = gets.chomp goal = $prompt.select("What is your goal") do |menu| - menu.choice 'Losing weight' - menu.choice 'Gaining strength' + menu.choice 'I want to lose weight' + menu.choice 'I want to gain strength' end - new_user = Member.create(:name=>name, :goal=>goal) - puts "Nice to meet you #{name}! Let's start working towards #{goal}!" - puts "Please note your member ID: #{new_user.id}. You will need it to view your profile later!" + new_member = Member.create(:name=>name, :goal=>goal) + puts "Nice to meet you #{name}! GitFit is here to help you #{goal.remove("I want to ")}!" + puts "Please note your member ID: #{new_member.id}. You will need it to view your profile and log workouts later!" end def self.see_user_profile - user = self.sign_in - puts "Name: #{user[:name]}" - puts "Goal: #{user[:goal]}" - # workout_array = user.workouts.map do |workout| - # workout.body_part - # end - # hash = {} - # workout_array.each do |value| - # hash[value] ? hash[value] += 1 : hash[value] = 1 - # end - puts "Workouts completed: #{self.get_user_workouts user}" + member = self.sign_in + puts "Name: #{member[:name]}" + puts "Goal: #{member[:goal]}" + puts "Workouts completed: #{self.get_user_workouts member}" end def self.sign_in puts "Please enter your member ID" member_id = gets.chomp - found_user = self.find_by id: member_id - found_user + found_member = self.find_by id: member_id + found_member end - def self.get_user_workouts user - workout_array = user.workouts.map do |workout| + def self.get_user_workouts member + workout_array = member.workouts.map do |workout| workout.body_part end hash = {} diff --git a/runner.rb b/runner.rb index ae81027..6ca6372 100644 --- a/runner.rb +++ b/runner.rb @@ -7,15 +7,14 @@ loop do case app.main_menu when 'Build new profile' - app.new_user + app.new_member when 'Select your workout' app.select_type_of_workout app.sign_in app.workout - when 'See user profile' + when 'See member profile' app.see_user_profile when 'Exit GitFit' app.end_app - binding.pry break end end From d30b9243e51abd4f6ac585918817e77ad17d4142 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Thu, 9 Jul 2020 07:16:33 -0600 Subject: [PATCH 10/16] Now changed user to member in all places --- lib/models/cli.rb | 4 ++-- lib/models/member.rb | 2 +- runner.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 73b99e1..c95073c 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -11,8 +11,8 @@ def new_member Member.create_new end - def see_user_profile - Member.see_user_profile + def see_member_profile + Member.see_member_profile end def sign_in diff --git a/lib/models/member.rb b/lib/models/member.rb index ed2b2b0..a843a73 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -18,7 +18,7 @@ def self.create_new puts "Please note your member ID: #{new_member.id}. You will need it to view your profile and log workouts later!" end - def self.see_user_profile + def self.see_member_profile member = self.sign_in puts "Name: #{member[:name]}" puts "Goal: #{member[:goal]}" diff --git a/runner.rb b/runner.rb index 6ca6372..26794eb 100644 --- a/runner.rb +++ b/runner.rb @@ -12,7 +12,7 @@ app.select_type_of_workout app.sign_in app.workout when 'See member profile' - app.see_user_profile + app.see_member_profile when 'Exit GitFit' app.end_app break From 9e57efbf205cacc2cd5bad30ef78b1d65aa892e3 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Thu, 9 Jul 2020 08:34:56 -0600 Subject: [PATCH 11/16] Refactored methods, added delete profile feature, added edit profile feature --- lib/models/cli.rb | 26 ++++++++++++++++++++++++- lib/models/member.rb | 46 +++++++++++++++++++++++++++----------------- runner.rb | 6 +++++- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/lib/models/cli.rb b/lib/models/cli.rb index c95073c..7e6f079 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -23,6 +23,27 @@ def end_app puts "See you next time!" end + def edit_member_profile + member = sign_in + menu = $prompt.select("What would you like to update?") do |menu| + menu.choice 'Name' + menu.choice 'Goal' + end + case menu + when 'Name' + new_name = Member.ask_for_name + member.update(:name=>new_name) + when 'Goal' + new_goal = Member.ask_for_goal + member.update(:goal=>new_goal) + end + end + + def delete_member_profile + member = sign_in + member.destroy + end + def workout bar = TTY::ProgressBar.new("Work out in progress [:bar]", total: 30) 30.times do @@ -36,7 +57,9 @@ def main_menu main_menu = $prompt.select("Main Menu") do |menu| menu.choice 'Build new profile' menu.choice 'See member profile' + menu.choice 'Edit member profile' menu.choice 'Select your workout' + menu.choice 'Delete member profile' menu.choice 'Exit GitFit' end main_menu @@ -45,7 +68,8 @@ def main_menu - def select_type_of_workout member + def select_type_of_workout + member = sign_in answer = $prompt.select("Choose your workout") do |menu| menu.choice 'Full Body' menu.choice 'Chest' diff --git a/lib/models/member.rb b/lib/models/member.rb index a843a73..858f1c8 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -7,39 +7,49 @@ class Member < ActiveRecord::Base has_many :workouts, through: :gym_sessions def self.create_new - puts "What is your name" - name = gets.chomp - goal = $prompt.select("What is your goal") do |menu| - menu.choice 'I want to lose weight' - menu.choice 'I want to gain strength' - end + name = self.ask_for_name + goal = self.ask_for_goal new_member = Member.create(:name=>name, :goal=>goal) puts "Nice to meet you #{name}! GitFit is here to help you #{goal.remove("I want to ")}!" puts "Please note your member ID: #{new_member.id}. You will need it to view your profile and log workouts later!" end + def self.ask_for_name + puts "What is your name?" + name = gets.chomp + name + end + + def self.ask_for_goal + goal = $prompt.select("What is your goal?") do |menu| + menu.choice 'I want to lose weight.' + menu.choice 'I want to gain strength.' + end + goal + end + def self.see_member_profile - member = self.sign_in - puts "Name: #{member[:name]}" - puts "Goal: #{member[:goal]}" - puts "Workouts completed: #{self.get_user_workouts member}" + if member = self.sign_in + puts "Name: #{member[:name]}" + puts "Goal: #{member[:goal]}" + puts "Workouts completed: #{self.get_member_workouts member}" + else + puts "This member ID does not exist." + self.see_member_profile + end end def self.sign_in - puts "Please enter your member ID" + puts "Please enter your member ID." member_id = gets.chomp found_member = self.find_by id: member_id found_member end - def self.get_user_workouts member - workout_array = member.workouts.map do |workout| - workout.body_part - end + def self.get_member_workouts member hash = {} - workout_array.each do |value| - hash[value] ? hash[value] += 1 : hash[value] = 1 - end + workout_array = member.workouts.map(&:body_part) + workout_array.each { |value| hash[value] ? hash[value] += 1 : hash[value] = 1 } hash end end diff --git a/runner.rb b/runner.rb index 26794eb..04ea6cf 100644 --- a/runner.rb +++ b/runner.rb @@ -9,10 +9,14 @@ when 'Build new profile' app.new_member when 'Select your workout' - app.select_type_of_workout app.sign_in + app.select_type_of_workout app.workout when 'See member profile' app.see_member_profile + when 'Edit member profile' + app.edit_member_profile + when 'Delete member profile' + app.delete_member_profile when 'Exit GitFit' app.end_app break From 7d7ae34146070856930077e25ae598b9e4b82e0a Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Thu, 9 Jul 2020 16:49:57 -0600 Subject: [PATCH 12/16] Refactoring and improvements after Ahmeds feedback --- Gemfile | 1 + Gemfile.lock | 12 +++++++ lib/models/cli.rb | 75 ++++++++++++++++++++++++++++++++------------ lib/models/member.rb | 34 +++++++++----------- runner.rb | 31 ++++++------------ 5 files changed, 92 insertions(+), 61 deletions(-) diff --git a/Gemfile b/Gemfile index 2ccb4bb..13cc04a 100644 --- a/Gemfile +++ b/Gemfile @@ -13,3 +13,4 @@ gem "sqlite3", "~> 1.4" gem "require_all", "~> 3.0" gem 'tty-prompt' gem 'tty-progressbar' +gem 'tty-table' diff --git a/Gemfile.lock b/Gemfile.lock index f3573fc..722935b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,6 +41,10 @@ GEM activerecord (>= 3.2) sinatra (>= 1.0) sqlite3 (1.4.1) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) strings-ansi (0.1.0) thread_safe (0.3.6) tilt (2.0.10) @@ -60,9 +64,16 @@ GEM tty-screen (~> 0.7) wisper (~> 2.0.0) tty-screen (0.8.0) + tty-table (0.11.0) + equatable (~> 0.6) + necromancer (~> 0.5) + pastel (~> 0.7.2) + strings (~> 0.1.5) + tty-screen (~> 0.7) tzinfo (1.2.5) thread_safe (~> 0.1) unicode-display_width (1.7.0) + unicode_utils (1.4.0) wisper (2.0.1) zeitwerk (2.2.2) @@ -78,6 +89,7 @@ DEPENDENCIES sqlite3 (~> 1.4) tty-progressbar tty-prompt + tty-table BUNDLED WITH 2.1.4 diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 7e6f079..9ce187b 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -1,30 +1,29 @@ +require 'pry' require 'tty-prompt' class Cli $prompt = TTY::Prompt.new def welcome - puts "Welcome to GitFit, your personal workout generator!" + puts "Welcome to GitFit, your personal workout tracking app!" end def new_member - Member.create_new + new_member = Member.create_new + puts "Nice to meet you #{new_member.name}! GitFit is here to help you #{new_member.goal.remove("I want to ")}" + puts "Please note your member ID: #{new_member.id}. You will need it to sign in later!" + sign_in end def see_member_profile Member.see_member_profile end - - def sign_in - Member.sign_in - end - + def end_app puts "See you next time!" end def edit_member_profile - member = sign_in menu = $prompt.select("What would you like to update?") do |menu| menu.choice 'Name' menu.choice 'Goal' @@ -32,16 +31,17 @@ def edit_member_profile case menu when 'Name' new_name = Member.ask_for_name - member.update(:name=>new_name) + $signed_in_member.update(:name=>new_name) when 'Goal' new_goal = Member.ask_for_goal - member.update(:goal=>new_goal) + $signed_in_member.update(:goal=>new_goal) end end def delete_member_profile - member = sign_in - member.destroy + $signed_in_member.destroy + puts "Your profile has been deleted" + end_app end def workout @@ -53,23 +53,47 @@ def workout puts "Great job! You finished your workout." end - def main_menu - main_menu = $prompt.select("Main Menu") do |menu| - menu.choice 'Build new profile' + def display_member_menu + member_menu = $prompt.select("Member Menu") do |menu| menu.choice 'See member profile' menu.choice 'Edit member profile' menu.choice 'Select your workout' menu.choice 'Delete member profile' menu.choice 'Exit GitFit' end - main_menu + member_menu end + def navigate_member_menu + loop do + case display_member_menu + when 'See member profile' + see_member_profile + when 'Edit member profile' + edit_member_profile + when 'Select your workout' + select_type_of_workout + workout + when 'Delete member profile' + delete_member_profile + break + when 'Exit GitFit' + end_app + break + end + end + end + def create_or_sign_in + menu = $prompt.select("Please sign in or create a new account.") do |menu| + menu.choice 'Build new profile' + menu.choice 'Sign in' + menu.choice 'Exit GitFit' + end + menu + end - - def select_type_of_workout - member = sign_in + def select_type_of_workout answer = $prompt.select("Choose your workout") do |menu| menu.choice 'Full Body' menu.choice 'Chest' @@ -81,6 +105,17 @@ def select_type_of_workout new_session = GymSession.create() new_workout = Workout.find_or_create_by(:body_part=>answer) new_workout.gym_sessions << new_session - member.gym_sessions << new_session + $signed_in_member.gym_sessions << new_session + end + + def sign_in + puts "Please enter your member ID." + member_id = gets.chomp + if Member.find_by id: member_id + $signed_in_member = Member.find_by id: member_id + else + puts "You have entered an incorrect member ID" + exit! if create_or_sign_in == "Exit GitFit" + end end end \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index 858f1c8..81adcce 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -9,15 +9,12 @@ class Member < ActiveRecord::Base def self.create_new name = self.ask_for_name goal = self.ask_for_goal - new_member = Member.create(:name=>name, :goal=>goal) - puts "Nice to meet you #{name}! GitFit is here to help you #{goal.remove("I want to ")}!" - puts "Please note your member ID: #{new_member.id}. You will need it to view your profile and log workouts later!" + Member.create(:name=>name, :goal=>goal) end def self.ask_for_name puts "What is your name?" - name = gets.chomp - name + gets.chomp end def self.ask_for_goal @@ -29,27 +26,26 @@ def self.ask_for_goal end def self.see_member_profile - if member = self.sign_in - puts "Name: #{member[:name]}" - puts "Goal: #{member[:goal]}" - puts "Workouts completed: #{self.get_member_workouts member}" + if $signed_in_member + $signed_in_member.reload + puts "Name: #{$signed_in_member[:name]}" + puts "Member ID: #{$signed_in_member[:id]}" + puts "Goal: #{$signed_in_member[:goal]}" + puts $signed_in_member.get_member_workouts else puts "This member ID does not exist." self.see_member_profile end end - def self.sign_in - puts "Please enter your member ID." - member_id = gets.chomp - found_member = self.find_by id: member_id - found_member - end - - def self.get_member_workouts member + def get_member_workouts + table = TTY::Table.new ['Body Part','Workouts Completed'], [['Full Body', ''], ['Chest', 'b2'],['Back', 'a2'], ['Legs', 'b2'], ['Arms', 'b2']] hash = {} - workout_array = member.workouts.map(&:body_part) + workout_array = self.workouts.map(&:body_part) workout_array.each { |value| hash[value] ? hash[value] += 1 : hash[value] = 1 } - hash + # hash + # binding.pry + table = TTY::Table.new ['Body Part','Workouts Completed'], hash.to_a + table.render(:ascii) end end diff --git a/runner.rb b/runner.rb index 04ea6cf..45a0d5d 100644 --- a/runner.rb +++ b/runner.rb @@ -1,27 +1,14 @@ require_relative 'config/environment' -require 'pry' -require 'tty-prompt' app = Cli.new app.welcome -loop do - case app.main_menu - when 'Build new profile' - app.new_member - when 'Select your workout' - app.select_type_of_workout - app.workout - when 'See member profile' - app.see_member_profile - when 'Edit member profile' - app.edit_member_profile - when 'Delete member profile' - app.delete_member_profile - when 'Exit GitFit' - app.end_app - break - end +case app.create_or_sign_in +when 'Build new profile' + app.new_member + app.navigate_member_menu +when 'Sign in' + app.sign_in + app.navigate_member_menu +when 'Exit GitFit' + app.end_app end - -# binding.pry -# 0 From 6eede71772d07b82c72678b2d6968e694d0a9101 Mon Sep 17 00:00:00 2001 From: mnavoy4 Date: Fri, 10 Jul 2020 09:40:02 -0600 Subject: [PATCH 13/16] Small touch ups --- lib/models/cli.rb | 3 ++- lib/models/member.rb | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 9ce187b..1b62c43 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -1,5 +1,6 @@ require 'pry' require 'tty-prompt' +ActiveRecord::Base.logger = nil class Cli $prompt = TTY::Prompt.new @@ -18,7 +19,7 @@ def new_member def see_member_profile Member.see_member_profile end - + def end_app puts "See you next time!" end diff --git a/lib/models/member.rb b/lib/models/member.rb index 81adcce..21b90b1 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -22,7 +22,6 @@ def self.ask_for_goal menu.choice 'I want to lose weight.' menu.choice 'I want to gain strength.' end - goal end def self.see_member_profile @@ -39,12 +38,9 @@ def self.see_member_profile end def get_member_workouts - table = TTY::Table.new ['Body Part','Workouts Completed'], [['Full Body', ''], ['Chest', 'b2'],['Back', 'a2'], ['Legs', 'b2'], ['Arms', 'b2']] hash = {} workout_array = self.workouts.map(&:body_part) workout_array.each { |value| hash[value] ? hash[value] += 1 : hash[value] = 1 } - # hash - # binding.pry table = TTY::Table.new ['Body Part','Workouts Completed'], hash.to_a table.render(:ascii) end From 2781e968447ce27b43b66c4f294fae49533ded77 Mon Sep 17 00:00:00 2001 From: Derek Turner Date: Fri, 10 Jul 2020 11:13:55 -0600 Subject: [PATCH 14/16] this updates the readme and adds a license doc --- License.txt | 674 +++++++++++++++++++++++++++++++++++++++++++ README.md | 143 +++++---- lib/models/member.rb | 4 +- 3 files changed, 764 insertions(+), 57 deletions(-) create mode 100644 License.txt diff --git a/License.txt b/License.txt new file mode 100644 index 0000000..e72bfdd --- /dev/null +++ b/License.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/README.md b/README.md index 75b5328..d7d4fc3 100644 --- a/README.md +++ b/README.md @@ -1,71 +1,104 @@ -# Mod 1 ActiveRecord Starter Repo +# GitFit Workout Tracker +___ +A great new workout tracking app. -In `config/database.yml`, you can change the name of the database from `db/cats.sqlite3` to whatever reflects your project. For example: `db/notes.sqlite3`. Doesn't really matter what you call the db. +Alt-H Guide +___ + 1. Basic Info + 2. Demo + 3. Supporting Technologies + 4. Install and Setup + 5. Features + 6. Status + 7. Contact + 8. License +### 1. Basic Info +___ +GitFit is a workout tracking app that helps you track your gym sessions and make progress toward your fitness goals. The app is simple and intuitive to help its users stay focused on getting fit. Each user has a unique profile where their gym sessions are logged and their fitness goals cab be updated as they are achieved. +### 2. Demo +___ +Here we can have a video if we make one and also we can just put like some pictures or something -## ActiveRecord Methods -These common ActiveRecord methods will help you interact with your database. Please refer to the ActiveRecord -docs for what they do and how to use them. (If the docs talk about Rails, that is ok! ActiveRecord works very - similar with or without Rails.) -``` - .create (.new, .save) - .all - .count - .find - .find_by - .where -``` +### 3. Supporting Technologies +___ -#### Notes +- Ruby -> 2.6.1 +- ActiveRecord -> 6.0 +- Sinatra-ActiveRecord -> 2.0 +- Rake -> 13.0 +- SQLite3 -> 1.4 +- tty-prompt +- tty-progressbar +- tty-table -*Remember*, any model that will have a corresponding table in the database needs to inherit from `ActiveRecord::Base` -ex: +### 4. Install and Setup +___ +To run GitFit clone it from the GitHub repository and install locally. + +Run command: ``` -class Cat < ActiveRecord::Base - # customer methods defined here -end +rake db:migrate ``` -- To view database, you can run `sqlite3 db/cats.db`, then can run `.schema` or `.tables` and can run any SQL commands. (Don't need to do this anymore though! ActiveRecord gives us a schema file!) - +### 5. Features +___ -### Steps to setup Ruby app with activerecord -(New for ActiveRecord 6.0) + - Create new Member Profile + - See Member Profile + - Edit Member Profile + - Select Workout + - Delete Member Profile + ___ + ``` + def self.create_new + name = self.ask_for_name + goal = self.ask_for_goal + Member.create(:name=>name, :goal=>goal) + end + ``` + ``` + def workout + bar = TTY::ProgressBar.new("Work out in progress [:bar]", total: 30) + 30.times do + sleep(0.1) + bar.advance(1) + end + puts "Great job! You finished your workout." + end + ``` + ``` +def display_member_workouts_table + hash = {} + workout_array = self.workouts.map(&:body_part) + workout_array.each { |value| hash[value] ? hash[value] += 1 : hash[value] = 1 } + table = TTY::Table.new ['Body Part','Workouts Completed'], hash.to_a + table.render(:ascii) + end + ``` + ___ -## The following steps are already done for you in this boiler plate repo. -## The steps below are provided to you as a reference only. -## You're not expected to memorize this (please don't). + ### 6. Status +___ + Current status: Functional MVP completed + + To-do's: -1. In root of project, run `bundle init` -1. Add gems: - `bundle add activerecord pry sinatra, sinatra-activerecord rake sqlite3 require_all` - run `bundle install` -1. mkdir config and lib -1. mkdir lib/models -1. touch config/environment.rb config/database.yml -1. Create your model files and models (make sure to have your models inherit from ActiveRecord::Base) -1. In config/environment.rb: -``` - require 'bundler/setup' - Bundler.require + - [x] fix member sign in + - [x] add styling + - [ ] complete documentation + - [ ] make demo video + - [ ] include descriptions of exercises (maybe with pictures or videos) + - require_all 'lib' -``` -1. In config/database.yml: - ``` - development: - adapter: sqlite3 - database: db/cats.sqlite3 - ``` -1. Touch Rakefile - require ‘config/environment.rb’ and require_relative ‘sinatra/activerecord/rake’ -1. Run rake -T to make sure we have access to raketasks -1. Run `rake db:create_migration NAME=create_cats_table` (will create the db folder if it doesn’t already exist) and will add the migration file to db/migration -1. Write migration file, then run `rake db:migrate` -1. Then can see schema in file structure, can also drop into sqlite3 cats.db to see the tables and schema, but don’t really need to do that anymore. *Review rollback here* -1. Create seeds in db/seeds.rb and run `rake db:seed` -1. Now can put a pry in environment.rb to run .all and see your seeds. -Make sure your models inherit from `ActiveRecord::Base` \ No newline at end of file + ### 7. Contact + ___ + GitFit was created by [Michael Navoy](https://www.linkedin.com/in/michael-navoy/), [Brian Gordon](https://github.com/bgordon8), and [Derek Turner](https://www.linkedin.com/in/derek-turner-1354b71b1/). + + ### 8. Lisence + ___ + [Click here to view](https://github.com/ChefBoyRT/TacoLandia/blob/master/License.txt) \ No newline at end of file diff --git a/lib/models/member.rb b/lib/models/member.rb index 21b90b1..a7b3576 100644 --- a/lib/models/member.rb +++ b/lib/models/member.rb @@ -30,14 +30,14 @@ def self.see_member_profile puts "Name: #{$signed_in_member[:name]}" puts "Member ID: #{$signed_in_member[:id]}" puts "Goal: #{$signed_in_member[:goal]}" - puts $signed_in_member.get_member_workouts + puts $signed_in_member.display_member_workouts_table else puts "This member ID does not exist." self.see_member_profile end end - def get_member_workouts + def display_member_workouts_table hash = {} workout_array = self.workouts.map(&:body_part) workout_array.each { |value| hash[value] ? hash[value] += 1 : hash[value] = 1 } From 59edb9f06aa890e66379f718b851ba6fd6280b06 Mon Sep 17 00:00:00 2001 From: Derek Turner Date: Fri, 10 Jul 2020 11:55:14 -0600 Subject: [PATCH 15/16] update license link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7d4fc3..af64328 100644 --- a/README.md +++ b/README.md @@ -101,4 +101,4 @@ ___ ### 8. Lisence ___ - [Click here to view](https://github.com/ChefBoyRT/TacoLandia/blob/master/License.txt) \ No newline at end of file + [Click here to view](https://github.com/mnavoy4/GitFit_CLI_app/blob/master/License.txt) \ No newline at end of file From f2f6c4d417c5280e817056aaefc34c502ffd99a1 Mon Sep 17 00:00:00 2001 From: Derek Turner Date: Fri, 10 Jul 2020 13:40:04 -0600 Subject: [PATCH 16/16] fixes to license link --- README.md | 26 +++++++++++++++----------- lib/models/cli.rb | 4 ++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index af64328..95f2ea6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ___ A great new workout tracking app. -Alt-H Guide +### Guide ___ 1. Basic Info 2. Demo @@ -15,11 +15,11 @@ ___ ### 1. Basic Info ___ -GitFit is a workout tracking app that helps you track your gym sessions and make progress toward your fitness goals. The app is simple and intuitive to help its users stay focused on getting fit. Each user has a unique profile where their gym sessions are logged and their fitness goals cab be updated as they are achieved. +GitFit is a workout tracking app that helps you track your gym sessions and make progress toward your fitness goals. The app is simple and intuitive to help its users stay focused on getting fit. Each user has a unique profile where their gym sessions are logged and their fitness goals can be updated as they are achieved. ### 2. Demo ___ -Here we can have a video if we make one and also we can just put like some pictures or something +Here's a video demo of [GitFit](https://www.youtube.com/watch?v=4XssJz04vVM&feature=youtu.be) on YouTube. ### 3. Supporting Technologies ___ @@ -30,6 +30,7 @@ ___ - Rake -> 13.0 - SQLite3 -> 1.4 - tty-prompt +- tty-font - tty-progressbar - tty-table @@ -37,9 +38,10 @@ ___ ___ To run GitFit clone it from the GitHub repository and install locally. -Run command: +Run commands: ``` rake db:migrate +bundle install ``` ### 5. Features @@ -60,24 +62,26 @@ ___ end ``` ``` - def workout - bar = TTY::ProgressBar.new("Work out in progress [:bar]", total: 30) + def workout + bar = TTY::ProgressBar.new($pastel.green("Work out in progress [:bar]"), total: 30) 30.times do sleep(0.1) bar.advance(1) end - puts "Great job! You finished your workout." + puts $pastel.green("Great job! You finished your workout.") end + ``` ``` -def display_member_workouts_table + def display_member_workouts_table hash = {} workout_array = self.workouts.map(&:body_part) workout_array.each { |value| hash[value] ? hash[value] += 1 : hash[value] = 1 } table = TTY::Table.new ['Body Part','Workouts Completed'], hash.to_a - table.render(:ascii) + $pastel.cyan.bold(table.render(:ascii)) end ``` + ___ ### 6. Status @@ -89,8 +93,8 @@ ___ - [x] fix member sign in - [x] add styling - - [ ] complete documentation - - [ ] make demo video + - [x] complete documentation + - [x] make demo video - [ ] include descriptions of exercises (maybe with pictures or videos) diff --git a/lib/models/cli.rb b/lib/models/cli.rb index 1b62c43..17ddaf5 100644 --- a/lib/models/cli.rb +++ b/lib/models/cli.rb @@ -69,9 +69,9 @@ def navigate_member_menu loop do case display_member_menu when 'See member profile' - see_member_profile + see_member_profile when 'Edit member profile' - edit_member_profile + edit_member_profile when 'Select your workout' select_type_of_workout workout