Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Danielle Cardona #617

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
981e75d
Initial commit
dcardona23 Aug 21, 2024
0b20b6a
Initial commit
dcardona23 Aug 21, 2024
05bd52e
Initial commit
dcardona23 Aug 21, 2024
b7474bb
Initial commit
dcardona23 Aug 21, 2024
8ecb4df
Initial commit
dcardona23 Aug 21, 2024
ea6b586
Initial commit
dcardona23 Aug 21, 2024
497788c
Initial commit
dcardona23 Aug 21, 2024
ba11aea
initialize class to make it 'exists' do test pass
dcardona23 Aug 21, 2024
0751c58
add attr_reader and modify code to make first 4 tests pass
dcardona23 Aug 21, 2024
d245019
create initial rspec tests
dcardona23 Aug 22, 2024
b88b258
update rspec tests
dcardona23 Aug 22, 2024
c266b20
update code so all rspec tests pass
dcardona23 Aug 22, 2024
39f0eb8
update code to remove require
dcardona23 Aug 22, 2024
aef0be9
update code to remove require
dcardona23 Aug 22, 2024
bcd78ca
add first passing test
dcardona23 Aug 22, 2024
676ab50
initialize class
dcardona23 Aug 22, 2024
e04eb3a
initialize class
dcardona23 Aug 22, 2024
8f48cbe
require card.rb
dcardona23 Aug 22, 2024
3d19645
add cards variable to make first 2 tests pass
dcardona23 Aug 22, 2024
9e3bd06
simplified code
dcardona23 Aug 22, 2024
92b57a9
delete unnecessary code
dcardona23 Aug 22, 2024
abee39b
modify code to make first 4 tests pass
dcardona23 Aug 23, 2024
7eee7da
add count and cards_in_category methods
dcardona23 Aug 23, 2024
2c9c837
add first two tests
dcardona23 Aug 23, 2024
0fcf665
initialize class and define turns method
dcardona23 Aug 23, 2024
731f954
add tests 3 and 4
dcardona23 Aug 23, 2024
756f2b6
accidental push - minor formatting changes
dcardona23 Aug 23, 2024
0a6712c
add passing currernt_card method
dcardona23 Aug 23, 2024
fc5b7c5
Merge branch 'main' of github.com:dcardona23/flash_cards
dcardona23 Aug 23, 2024
ace5fdc
add successful test 4
dcardona23 Aug 23, 2024
c9143af
add 3 new tests
dcardona23 Aug 24, 2024
9734697
modify take_turn method
dcardona23 Aug 24, 2024
82affc8
change category test name
dcardona23 Aug 24, 2024
28fc424
modify take turn test according to interaction pattern
dcardona23 Aug 24, 2024
6bfaced
modify take_turn method according to interaction pattern
dcardona23 Aug 24, 2024
9f1b06b
modify correct? and feedback code to account for case errors in user …
dcardona23 Aug 24, 2024
1fec09a
add before(:each) do to streamline tests
dcardona23 Aug 24, 2024
25cdd1b
add before(:each) do to streamline tests
dcardona23 Aug 24, 2024
2563d5b
modify correct? test to pass
dcardona23 Aug 25, 2024
1c84955
add potential test to add cards to deck
dcardona23 Aug 25, 2024
7a9a9d4
modify take_turn method to pass tests
dcardona23 Aug 25, 2024
500feb0
add == method to resolve testing issue
dcardona23 Aug 25, 2024
43f2bf9
add require relative to pull in card.rb for add card method
dcardona23 Aug 25, 2024
af23606
Initial commit
dcardona23 Aug 25, 2024
172104f
add require relative and number correct by category method
dcardona23 Aug 25, 2024
c896643
add number correct by category test
dcardona23 Aug 25, 2024
e38c0f2
delete unnecessary instance variables
dcardona23 Aug 25, 2024
4dda6f8
delete unnecessary game class and add start method
dcardona23 Aug 25, 2024
2f9711b
add number and percent correct by category methods
dcardona23 Aug 25, 2024
a533769
fix bugs in take turn method
dcardona23 Aug 26, 2024
6a1bb36
fix method order in take turn method
dcardona23 Aug 26, 2024
dc38256
fix bugs in correct? and feedback methods
dcardona23 Aug 26, 2024
0532586
add new turn method and game play enumerable
dcardona23 Aug 26, 2024
a139e1a
fix bug in add new card feature
dcardona23 Aug 26, 2024
9bc87c4
add before each method
dcardona23 Aug 26, 2024
f0ca9fb
feat: add new cards to deck
dcardona23 Aug 26, 2024
b9648ec
fix bugs in number and percent correct by category code
dcardona23 Aug 27, 2024
bbb2395
correct test for adds to number correct by category
dcardona23 Aug 27, 2024
4dc194d
add initial code for percent correct by category results
dcardona23 Aug 27, 2024
c6888ef
fix return percent correct by category method
dcardona23 Aug 27, 2024
2e5e567
fix return percent by category method and delete unnecessary line 66 …
dcardona23 Aug 27, 2024
83e43ed
Merge pull request #1 from dcardona23/return_percent_correct_by_category
ejdesh Aug 27, 2024
06a380b
cleaned up formatting for final submission
dcardona23 Aug 27, 2024
13ba6c8
cleaned up formatting for final submission
dcardona23 Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add require relative to pull in card.rb for add card method
dcardona23 committed Aug 25, 2024
commit 43f2bf974ba9898f1458a243bbef3deac27a5bc1
7 changes: 7 additions & 0 deletions lib/deck.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# require_relative './card.rb' (may need to add to make method to add cards work)

class Deck
attr_reader :cards

def initialize(cards)
@cards = cards

end
# require 'pry'; binding.pry
def count
@@ -15,4 +17,9 @@ def cards_in_category(category)
category == card.category
end
end

# def add_card(new_card)
# @cards.push(Card.new(question, answer, category))
# end

end