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

Alastair Lloyd & Brandon Gray - Project - Viewing Party #209

Open
wants to merge 57 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
a5e36b9
Create pull_request_template.md
bGray88 Jan 31, 2023
aa0a731
Merge pull request #1 from Adrlloyd/bGray88-PR-Template
Adrlloyd Jan 31, 2023
2e65dcb
feat: setup Rubocop and PR Templates + Misc. Gems
bGray88 Jan 31, 2023
97292be
Merge pull request #2 from Adrlloyd/bgray/setup_US-1-2
Adrlloyd Jan 31, 2023
4031f41
db set up and model presence/validation tests
Adrlloyd Jan 31, 2023
3851249
Merge pull request #14 from Adrlloyd/dbsetup
bGray88 Jan 31, 2023
96e97fb
feat: factory bot factories
bGray88 Jan 31, 2023
b9b5338
test: welcome/landing page contents
bGray88 Jan 31, 2023
ad143ae
feat: welcome/landing page contents-links
bGray88 Jan 31, 2023
1836596
test: welcome display user link
bGray88 Jan 31, 2023
19f88f2
feat: welcome/landing page users links
bGray88 Jan 31, 2023
d082b00
Merge pull request #15 from Adrlloyd/bgray/US_4_landing_page
Adrlloyd Jan 31, 2023
7053569
add test for user story 5
Adrlloyd Jan 31, 2023
f3d1a42
add users controller
Adrlloyd Jan 31, 2023
e621cf3
add views for the users
Adrlloyd Jan 31, 2023
ede091c
add to routes file register
Adrlloyd Jan 31, 2023
d1baad3
modify layout view to add flash message
Adrlloyd Jan 31, 2023
5e8d953
Merge pull request #16 from Adrlloyd/US5
bGray88 Jan 31, 2023
027806b
will add yml file to ignore
Adrlloyd Jan 31, 2023
3bca460
feat: user story 7- user discover route
bGray88 Jan 31, 2023
3ef3d0c
feat: Adds API call services and User show dashboard info
bGray88 Feb 1, 2023
30ad106
Merge pull request #17 from Adrlloyd/bgray/US_6-7
Adrlloyd Feb 1, 2023
4128079
add unused file to simple cov ignore. amend tests in user show
Adrlloyd Feb 1, 2023
52982c1
amend method name to better describe function
Adrlloyd Feb 1, 2023
b9c3372
amended views to align with user stories
Adrlloyd Feb 1, 2023
c76f1ae
added email back into user dashboard
Adrlloyd Feb 1, 2023
cebb019
add tests related to user story 8
Adrlloyd Feb 1, 2023
aceede7
delete as in wrong folder
Adrlloyd Feb 1, 2023
5522832
add host_user method
Adrlloyd Feb 1, 2023
ed3a4f3
amend api call to hide key
Adrlloyd Feb 1, 2023
6359ed5
add details for viewing parties
Adrlloyd Feb 1, 2023
39e4066
add commented out code attempting to resolve image display
Adrlloyd Feb 1, 2023
8c13bac
add attendees and user in bold
Adrlloyd Feb 1, 2023
7b55eef
Merge pull request #18 from Adrlloyd/USt8
bGray88 Feb 1, 2023
41fe81c
test: image display on user show page
bGray88 Feb 1, 2023
457264e
feat: image display on user show page
bGray88 Feb 1, 2023
c473ac8
test: discover page buttons and fields
bGray88 Feb 1, 2023
8103d21
feat: discover buttons and fields
bGray88 Feb 1, 2023
9cf34c9
Merge pull request #19 from Adrlloyd/bgray/US_9
Adrlloyd Feb 1, 2023
d96f257
add tests for user story10
Adrlloyd Feb 2, 2023
d8e95d0
add poros and test
Adrlloyd Feb 2, 2023
3c2305c
add search function
Adrlloyd Feb 2, 2023
3f8b5f2
test: adds test related to user story 10
Adrlloyd Feb 2, 2023
3444e51
feat: add views and needed methods to pass user story 10
Adrlloyd Feb 2, 2023
89cca4c
add updated bundle
Adrlloyd Feb 2, 2023
f3574a6
Merge pull request #20 from Adrlloyd/US10
bGray88 Feb 2, 2023
f27c7ec
test: movie show page features- reviews, movie details
bGray88 Feb 2, 2023
766f705
feat: movie show page features- reviews, movie details
bGray88 Feb 2, 2023
8bee4ed
fix: rubocop alignment
bGray88 Feb 2, 2023
e29b615
Merge pull request #21 from Adrlloyd/bgray/US_11
Adrlloyd Feb 2, 2023
630b8d6
added tests for userstory 12
Adrlloyd Feb 3, 2023
f94cb29
add methods/view and model to pass user story 12
Adrlloyd Feb 3, 2023
096fa14
Merge pull request #22 from Adrlloyd/US12
bGray88 Feb 3, 2023
f99e8c6
feat: match wireframe displays
bGray88 Feb 3, 2023
766f832
Merge pull request #23 from Adrlloyd/miscellaneous-views
Adrlloyd Feb 3, 2023
ce448ab
fix: viewing party test string
bGray88 Feb 3, 2023
ed78c81
Merge pull request #24 from Adrlloyd/miscellaneous-views
Adrlloyd Feb 3, 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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@

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

# Ignore application configuration
/config/application.yml
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ gem 'bootsnap', '>= 1.1.0', require: false
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'pry'
gem 'factory_bot_rails'
gem 'faker'
gem 'figaro'
gem 'shoulda-matchers'
gem 'faraday'
gem 'orderly'
end

group :development do
Expand All @@ -53,6 +59,5 @@ group :test do
gem 'simplecov'
end


# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
238 changes: 142 additions & 96 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.6)
actionpack (= 5.2.6)
actioncable (5.2.8.1)
actionpack (= 5.2.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
actionmailer (5.2.8.1)
actionpack (= 5.2.8.1)
actionview (= 5.2.8.1)
activejob (= 5.2.8.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.6)
actionview (= 5.2.6)
activesupport (= 5.2.6)
actionpack (5.2.8.1)
actionview (= 5.2.8.1)
activesupport (= 5.2.8.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.6)
activesupport (= 5.2.6)
actionview (5.2.8.1)
activesupport (= 5.2.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.6)
activesupport (= 5.2.6)
activejob (5.2.8.1)
activesupport (= 5.2.8.1)
globalid (>= 0.3.6)
activemodel (5.2.6)
activesupport (= 5.2.6)
activerecord (5.2.6)
activemodel (= 5.2.6)
activesupport (= 5.2.6)
activemodel (5.2.8.1)
activesupport (= 5.2.8.1)
activerecord (5.2.8.1)
activemodel (= 5.2.8.1)
activesupport (= 5.2.8.1)
arel (>= 9.0)
activestorage (5.2.6)
actionpack (= 5.2.6)
activerecord (= 5.2.6)
activestorage (5.2.8.1)
actionpack (= 5.2.8.1)
activerecord (= 5.2.8.1)
marcel (~> 1.0.0)
activesupport (5.2.6)
activesupport (5.2.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
arel (9.0.0)
ast (2.4.2)
bindex (0.8.1)
bootsnap (1.9.1)
msgpack (~> 1.0)
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
capybara (3.36.0)
capybara (3.38.0)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -67,120 +67,157 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.0)
crass (1.0.6)
diff-lcs (1.4.4)
date (3.3.3)
diff-lcs (1.5.0)
docile (1.4.0)
erubi (1.10.0)
erubi (1.12.0)
execjs (2.8.1)
ffi (1.15.4)
globalid (0.5.2)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (3.1.0)
i18n (>= 1.8.11, < 2)
faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
ffi (1.15.5)
figaro (1.2.0)
thor (>= 0.14.0, < 2)
globalid (1.1.0)
activesupport (>= 5.0)
i18n (1.8.11)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jbuilder (2.11.3)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
launchy (2.5.0)
addressable (~> 2.7)
json (2.6.3)
launchy (2.5.2)
addressable (~> 2.8)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.12.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.0.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
minitest (5.14.4)
msgpack (1.4.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
msgpack (1.6.0)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
nokogiri (1.14.1)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.12.5-arm64-darwin)
nokogiri (1.14.1-arm64-darwin)
racc (~> 1.4)
parallel (1.21.0)
parser (3.0.2.0)
orderly (0.1.1)
capybara (>= 1.1)
rspec (>= 2.14)
parallel (1.22.1)
parser (3.2.0.0)
ast (~> 2.4.1)
pg (1.2.3)
pry (0.14.1)
pg (1.4.5)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
public_suffix (5.0.1)
puma (3.12.6)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.6)
actioncable (= 5.2.6)
actionmailer (= 5.2.6)
actionpack (= 5.2.6)
actionview (= 5.2.6)
activejob (= 5.2.6)
activemodel (= 5.2.6)
activerecord (= 5.2.6)
activestorage (= 5.2.6)
activesupport (= 5.2.6)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (>= 1.3)
rails (5.2.8.1)
actioncable (= 5.2.8.1)
actionmailer (= 5.2.8.1)
actionpack (= 5.2.8.1)
actionview (= 5.2.8.1)
activejob (= 5.2.8.1)
activemodel (= 5.2.8.1)
activerecord (= 5.2.8.1)
activestorage (= 5.2.8.1)
activesupport (= 5.2.8.1)
bundler (>= 1.3.0)
railties (= 5.2.6)
railties (= 5.2.8.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.2.6)
actionpack (= 5.2.6)
activesupport (= 5.2.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (5.2.8.1)
actionpack (= 5.2.8.1)
activesupport (= 5.2.8.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.1.1)
regexp_parser (2.6.2)
rexml (3.2.5)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.0)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-rails (5.0.2)
rspec-support (~> 3.12.0)
rspec-rails (5.1.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
railties (>= 5.2)
rspec-core (~> 3.10)
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.3)
rubocop (1.23.0)
rspec-support (3.12.0)
rubocop (1.44.1)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.0.0.0)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.12.0, < 2.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.13.0)
parser (>= 3.0.1.1)
rubocop-rails (2.12.4)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-rails (2.17.4)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
rubocop (>= 1.33.0, < 2.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
ruby_dep (1.5.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -193,27 +230,30 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
simplecov (0.21.2)
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.3)
simplecov_json_formatter (0.1.4)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
thor (1.1.0)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.9)
tilt (2.0.11)
timeout (0.3.1)
tzinfo (1.2.11)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.1.0)
unicode-display_width (2.4.2)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
Expand All @@ -233,16 +273,22 @@ DEPENDENCIES
bootsnap (>= 1.1.0)
capybara
coffee-rails (~> 4.2)
factory_bot_rails
faker
faraday
figaro
jbuilder (~> 2.5)
launchy
listen (>= 3.0.5, < 3.2)
orderly
pg (>= 0.18, < 2.0)
pry
puma (~> 3.11)
rails (~> 5.2.6)
rspec-rails
rubocop-rails
sass-rails (~> 5.0)
shoulda-matchers
simplecov
tzinfo-data
uglifier (>= 1.3.0)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/stylesheets/movies.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.body {
display: inline;
}
Loading