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

Madeline Mauser and Michael Marchand #186

Open
wants to merge 129 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
a42a05c
Configures rspec and adds Shoulda Matchers
MarchandMD Nov 29, 2022
8ed5882
Ignores simplecov output
MarchandMD Nov 29, 2022
db8c6eb
Adds and tests models; setups up schema
MarchandMD Nov 29, 2022
6cf6c8a
Adds bootstrap
MarchandMD Nov 29, 2022
81d2b23
Tests validations for user
MarchandMD Nov 29, 2022
6d170ff
Removes certain files from SimpleCov test monitoring
MarchandMD Nov 29, 2022
5188b6a
Adds views for index and partials for navbar
MarchandMD Nov 29, 2022
3c42c7f
Adds route for root path
MarchandMD Nov 29, 2022
492fe20
Adds additional files from scaffolding of welcome controller
MarchandMD Nov 29, 2022
915e65e
Co-authored-by: Madeline Mauser <106927896+MadelineMauser@users.norep…
MarchandMD Nov 29, 2022
80799a1
Co-authored-by: Madeline Mauser <106927896+MadelineMauser@users.norep…
MarchandMD Nov 29, 2022
85cb403
Merge pull request #2 from MarchandMD/feat/landing_page
MadelineMauser Nov 29, 2022
ee33feb
Updates .gitignore
MarchandMD Nov 29, 2022
ce43e6f
Updates routes
MarchandMD Nov 29, 2022
b83c787
Adds Users controller, begins testing
MarchandMD Nov 29, 2022
a0020c3
Adds Faker Gem for testing and seed data
MarchandMD Nov 29, 2022
29d506a
Adds seed data
MarchandMD Nov 29, 2022
1e94683
Begins to develop Users Model, controller and views
MarchandMD Nov 29, 2022
fbb5f86
Applies partial for users index and welcome index
MarchandMD Nov 29, 2022
472baab
Merge pull request #3 from MarchandMD/feat/users_controller_index_and…
MadelineMauser Nov 29, 2022
93c9803
Adds discover resource and corrects navbar link
MarchandMD Nov 29, 2022
d15176b
Add user list heading to welcome index
MadelineMauser Nov 29, 2022
823f3ad
Tests link for discover movies on user dashboard
MarchandMD Nov 29, 2022
a12a5ad
Adds Discover controller and view
MarchandMD Nov 29, 2022
82043c6
Merge branch 'main' of github.com:MarchandMD/viewing_party_lite into …
MarchandMD Nov 29, 2022
29b740c
Tests and adds features to the discover page
MarchandMD Nov 29, 2022
f12e7f4
Adds Movies resources to routes and controllers
MarchandMD Nov 29, 2022
d330777
Tests features for discover#index to link to movies
MarchandMD Nov 29, 2022
7399613
Redirects links from discover to movies; pending testing
MarchandMD Nov 29, 2022
ae7e02d
Add tests for register page
MadelineMauser Nov 30, 2022
cadede8
Add register controller
MadelineMauser Nov 30, 2022
bfeb2d5
Add user create route
MadelineMauser Nov 30, 2022
07735ef
Add user registration form
MadelineMauser Nov 30, 2022
624b90d
Add user controller create action
MadelineMauser Nov 30, 2022
f6e104c
Fix register controller and form
MadelineMauser Nov 30, 2022
1eefb3e
Fix "emails" in register index test
MadelineMauser Nov 30, 2022
1cf7d90
Change faker data type to "safe_email" in register index test
MadelineMauser Nov 30, 2022
8f0a3fc
Merge pull request #4 from MarchandMD/feat/discover_movies
MadelineMauser Nov 30, 2022
5632665
Resolve conflicts
MadelineMauser Nov 30, 2022
e5c01bb
Merge pull request #5 from MarchandMD/feat/user-registration
MarchandMD Nov 30, 2022
cba31d5
Adds test to link to new user registration
MarchandMD Nov 30, 2022
e55393d
Updates welcome#index to link to user registration
MarchandMD Nov 30, 2022
609283f
Applies small formatting changes
MarchandMD Nov 30, 2022
0ceb7b8
Adds figaro
MarchandMD Nov 30, 2022
0c3e478
Adds httparty and webmock gems
MarchandMD Nov 30, 2022
41186a2
Ignores .rubocop yaml
MarchandMD Nov 30, 2022
5f54cbf
Establishes connection to API via services
MarchandMD Nov 30, 2022
1348c08
Merge pull request #6 from MarchandMD/hotfix/welcome#index
MadelineMauser Nov 30, 2022
e4dd464
Merge pull request #7 from MarchandMD/feat/movie_results
MadelineMauser Nov 30, 2022
2b68716
Fix the new user form location
MadelineMauser Nov 30, 2022
0354a54
Merge pull request #8 from MarchandMD/fix/user-registration
MarchandMD Nov 30, 2022
956841e
Begins Testing API service
MarchandMD Nov 30, 2022
9c883ff
Begins to integrate API data into controllers/views
MarchandMD Nov 30, 2022
fd0ad69
Resolves merge conflict
MarchandMD Nov 30, 2022
f252273
Removes binding.pry
MarchandMD Nov 30, 2022
8fa1220
Begins to stub the API calls for testing with webmock
MarchandMD Nov 30, 2022
8391b2c
Merge pull request #9 from MarchandMD/feat/movie_results
MadelineMauser Nov 30, 2022
d02999b
Begins build of top_rated movie results
MarchandMD Nov 30, 2022
b286720
Add empty tests for dashboard parties section
MadelineMauser Nov 30, 2022
9d5da45
Adds Endpoint to get a single movie
MarchandMD Dec 1, 2022
3d01cdf
Merge branch 'main' of github.com:MarchandMD/viewing_party_lite into …
MarchandMD Dec 1, 2022
f9870e7
Add test setup
MadelineMauser Dec 1, 2022
2c50d39
Applies testing and functionality for searching
MarchandMD Dec 1, 2022
ec9e0c1
Applies sad path testing to Movie Results
MarchandMD Dec 1, 2022
993e336
Flesh out tests for user dashboard parties
MadelineMauser Dec 1, 2022
46c8b89
Merge pull request #10 from MarchandMD/feat/movie_results
MadelineMauser Dec 1, 2022
a122b13
Merge main into feat/dashboard-viewing-parties
MadelineMauser Dec 1, 2022
34d8189
Add tests for user .parties_invited_to and .parties_hosting
MadelineMauser Dec 1, 2022
2645b58
Add tests for party .invited_users and .host
MadelineMauser Dec 1, 2022
f5e0724
Add .invited_users to party
MadelineMauser Dec 1, 2022
4dfd518
Add .host to party
MadelineMauser Dec 1, 2022
e0b24b2
Add .parties_invited_to to user
MadelineMauser Dec 1, 2022
9fa7237
Add .parties_hosting to user
MadelineMauser Dec 1, 2022
18258cf
Add stub requests to user show spec
MadelineMauser Dec 1, 2022
371d7af
Adds movie details show page with api calls
MarchandMD Dec 1, 2022
9986083
Add .retrieve_movie_by_name to movie search
MadelineMauser Dec 1, 2022
fc49493
Add test for .movie_details in party spec
MadelineMauser Dec 1, 2022
90a3beb
Add .movie_details in party spec
MadelineMauser Dec 1, 2022
6d521c5
Change test objects to use Date instead of DateTime
MadelineMauser Dec 1, 2022
d5e78d0
Fix stub requests
MadelineMauser Dec 2, 2022
3714dd4
Fix file name typo
MadelineMauser Dec 2, 2022
d4bb119
Fix movie poster images and test
MadelineMauser Dec 2, 2022
18aed79
Fix incorrect selectors
MadelineMauser Dec 2, 2022
1255ef2
Change email generator type
MadelineMauser Dec 2, 2022
78115e3
Merge pull request #11 from MarchandMD/feat/movie_show
MadelineMauser Dec 2, 2022
a1665e1
Merge main branch into current branch
MadelineMauser Dec 2, 2022
74d7b38
Implements VCR with testing
MarchandMD Dec 2, 2022
83ee97c
Merge pull request #12 from MarchandMD/feat/movie_show
MadelineMauser Dec 2, 2022
a0ef4ac
Merge branch main into feat/dashboard-viewing-parties
MadelineMauser Dec 2, 2022
6fcb46b
Add missing end
MadelineMauser Dec 2, 2022
4a71056
Resolve conflicts with VCR
MadelineMauser Dec 2, 2022
1a5bcd1
Merge pull request #13 from MarchandMD/feat/dashboard-viewing-parties
MarchandMD Dec 2, 2022
af3f9a8
updates git ignore, adds movie images and updates routes
MarchandMD Dec 2, 2022
743bf63
Corrects gitignore to ignore vcr_cassettes
MarchandMD Dec 2, 2022
489ea15
Merge pull request #14 from MarchandMD/hotfix/images_and_ignore
MadelineMauser Dec 2, 2022
d55beff
Add tests for new party page
MadelineMauser Dec 2, 2022
f4a0f39
Add test for .movie_runtime to party
MadelineMauser Dec 2, 2022
723e955
Add test for .movie_expanded_details to party
MadelineMauser Dec 2, 2022
bb1acb3
Add .movie_expanded_details and .movie_runtime to party
MadelineMauser Dec 2, 2022
3e0c9f9
Remove unnecessary methods from party
MadelineMauser Dec 2, 2022
aae0520
Add test for .other_users to user spec
MadelineMauser Dec 2, 2022
88682a0
Add .other_users to user
MadelineMauser Dec 2, 2022
ac8db65
Refactors to use Faraday
MarchandMD Dec 2, 2022
7308c5d
Stops tracking all fixtures
MarchandMD Dec 2, 2022
7e47744
Hotfix for users#create
MarchandMD Dec 2, 2022
a686679
Add new party form
MadelineMauser Dec 2, 2022
b092521
Complete new party form functionality
MadelineMauser Dec 2, 2022
74badaa
Merge pull request #16 from MarchandMD/hotfix/users_create
MadelineMauser Dec 2, 2022
a4eed5e
Merge main branch into current branch
MadelineMauser Dec 2, 2022
9f2e66d
Fix button path in movie show page
MadelineMauser Dec 2, 2022
f480444
Change minor formatting
MadelineMauser Dec 2, 2022
e690f06
Fix typo in path
MadelineMauser Dec 2, 2022
c986c0d
Merge pull request #17 from MarchandMD/feat/new-viewing-party
MarchandMD Dec 2, 2022
20e498f
Fixes redirect link; applies rubocop linting
MarchandMD Dec 2, 2022
ef4f3dc
Merge pull request #18 from MarchandMD/hotfix/testing_parties
MadelineMauser Dec 2, 2022
f74851d
Updates gitignore
MarchandMD Dec 10, 2022
5aae7da
adds basic authentication for user; renovates user_spec
MarchandMD Dec 11, 2022
f6ac20a
Updates test files to use factories for user
MarchandMD Dec 12, 2022
0d89315
Updates schema and controllers and views to implement authentication
MarchandMD Dec 12, 2022
b459c03
Applies authentication
MarchandMD Dec 12, 2022
5db0394
Merge pull request #19 from MarchandMD/feat/basic_auth
MarchandMD Dec 12, 2022
ba3c86c
Adds rubocop gem
MarchandMD Jan 2, 2023
cb4c506
Merge pull request #20 from MarchandMD/hotfix/rubocop
MarchandMD Jan 2, 2023
6c4ce9d
Update README.md
MarchandMD Jan 19, 2023
01aa448
Update README.md
MarchandMD Jan 19, 2023
d2b2437
Update README.md
MarchandMD Jan 19, 2023
71c39bd
Updates readme
MarchandMD Jan 22, 2023
6250a70
fixes merge conflicts
MarchandMD Jan 22, 2023
669b5f4
Merge pull request #21 from MarchandMD/reno/readme
MarchandMD Jan 22, 2023
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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@

# Ignore master key for decrypting credentials and more.
/config/master.key

/coverage

# Ignore application configuration
/config/application.yml
.rubocop.yml

/spec/fixtures/vcr_cassettes/
/spec/fixtures/
/notes/
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--require spec_helper
--format documentation
24 changes: 23 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'
Expand Down Expand Up @@ -56,3 +56,25 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "shoulda-matchers", "~> 5.2", :groups => [:test, :development]

gem "bootstrap", "~> 5.2"

gem "jquery-rails", "~> 4.5"

gem "faker", "~> 3.0"

gem "figaro", "~> 1.2", :groups => [:test, :development]

gem "webmock", "~> 3.18", :group => :test

gem "httparty", "~> 0.20.0"

gem "vcr", "~> 6.1", :group => :test

gem "faraday", "~> 2.7"

gem "factory_bot_rails", "~> 6.2", :groups => [:development, :test]

gem "rubocop", "~> 1.40"
Loading