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

Joseph Lee and Kam Kennedy #100

Open
wants to merge 80 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
9c76522
Create pull_request_template.md
kameronk92 Nov 27, 2023
c92963e
Set up and run Rubocop
josephlee702 Nov 27, 2023
8c9bbd5
Merge pull request #14 from josephlee702/setup/rubocop
kameronk92 Nov 27, 2023
d49cff1
set up tables and relationships
josephlee702 Nov 28, 2023
526c4aa
Merge pull request #15 from josephlee702/setup/database
kameronk92 Nov 28, 2023
e3c1f6a
progress on model specs
kameronk92 Nov 28, 2023
55b7524
set up models and testing
kameronk92 Nov 28, 2023
4447f3d
Merge pull request #16 from josephlee702/setup/database
josephlee702 Nov 28, 2023
6ac0dc0
rework schema
kameronk92 Nov 28, 2023
a9b55ba
all tests passing
kameronk92 Nov 28, 2023
0bbcf73
complete user dashboard story
kameronk92 Nov 29, 2023
f48c5cf
Merge pull request #17 from josephlee702/setup/database
josephlee702 Nov 29, 2023
2818830
Merge pull request #18 from josephlee702/user/dashboard
josephlee702 Nov 29, 2023
fe633f2
add discovers index page
kameronk92 Nov 29, 2023
3816e88
refactor with advanced routing
kameronk92 Nov 29, 2023
662adb2
Merge pull request #19 from josephlee702/user/discover
josephlee702 Nov 29, 2023
4639e8a
add seed data
josephlee702 Nov 29, 2023
bd311df
progress on landing page
kameronk92 Nov 29, 2023
07a0f42
all tests passing
kameronk92 Nov 29, 2023
cc75ba2
write tests and finish user reg page
josephlee702 Nov 29, 2023
f55ddb6
add partial for link to root
kameronk92 Nov 29, 2023
dcf56f7
resolve merge conflicts
kameronk92 Nov 29, 2023
a2eb342
Merge pull request #20 from josephlee702/feat/user-registration
kameronk92 Nov 29, 2023
cfe27d5
Merge branch 'main' into user/landing
josephlee702 Nov 30, 2023
513d9c1
Merge pull request #22 from josephlee702/user/landing
josephlee702 Nov 30, 2023
f519c37
make sure all tests pass after the merge conflict
josephlee702 Nov 30, 2023
e334e87
Merge pull request #23 from josephlee702/feat/cleanupstuff
kameronk92 Nov 30, 2023
18e0e13
preliminary stuff
josephlee702 Nov 30, 2023
8355374
everything until api consumption
josephlee702 Nov 30, 2023
2cef804
figure out the api consumption
josephlee702 Nov 30, 2023
f3a1e82
Merge pull request #24 from josephlee702/feat/discover-movies-real
kameronk92 Nov 30, 2023
20748f1
write tests for feat/discover-movies and feat/movie-results
josephlee702 Dec 1, 2023
71aeca8
wrote the tests under /spec/features/movies instead
josephlee702 Dec 1, 2023
3c6a3b3
Merge pull request #25 from josephlee702/feat/write-api-consumption-t…
kameronk92 Dec 1, 2023
3af87d1
create view and controller for movie show page
kameronk92 Dec 1, 2023
629b510
all tests passing
kameronk92 Dec 1, 2023
57dfeec
Merge pull request #26 from josephlee702/feat/movie-details
josephlee702 Dec 1, 2023
79ae710
progress on new party form
kameronk92 Dec 1, 2023
3f5d66a
progress on new viewing party
kameronk92 Dec 1, 2023
38441b1
progress on new viewing party
kameronk92 Dec 1, 2023
3de738c
add uniqueness validation to user email attribute
kameronk92 Dec 1, 2023
e571d64
add uniqueness validation to user email attribute
kameronk92 Dec 1, 2023
0bb9365
Merge pull request #27 from josephlee702/user/landing
josephlee702 Dec 1, 2023
cfa378f
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
josephlee702 Dec 2, 2023
a3e152b
finish the new_viewing_party
josephlee702 Dec 2, 2023
835b8d5
Merge pull request #28 from josephlee702/feat/new_viewing_party
kameronk92 Dec 2, 2023
d29ed37
create movie facade and services and write facade top_rated
josephlee702 Dec 2, 2023
6bef6c9
all tests passing
kameronk92 Dec 2, 2023
25b9466
remove save and open page
kameronk92 Dec 2, 2023
1b98fc3
add sad path testing for new user and new viewing parties
kameronk92 Dec 2, 2023
63fb689
add header to all views, with test
kameronk92 Dec 2, 2023
9aed43a
implement facade for movies_show
josephlee702 Dec 2, 2023
a5738db
Merge pull request #29 from josephlee702/user/landing
josephlee702 Dec 2, 2023
3c5f889
fix merge conflict
josephlee702 Dec 2, 2023
091ae5d
Merge pull request #30 from josephlee702/spec_improvements
josephlee702 Dec 2, 2023
101dc75
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
josephlee702 Dec 2, 2023
dc438f8
add flash alerts for sad path
kameronk92 Dec 2, 2023
7bce31f
small adjustments
josephlee702 Dec 2, 2023
255d1a4
Merge pull request #31 from josephlee702/spec_improvements
josephlee702 Dec 2, 2023
c31072e
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
josephlee702 Dec 2, 2023
ffd7c44
test moviefacade
josephlee702 Dec 2, 2023
3902e96
refactor facades
josephlee702 Dec 2, 2023
9b285a1
Merge pull request #32 from josephlee702/feat/implement-facades
kameronk92 Dec 2, 2023
cdab967
Add reviews title before reviews start
josephlee702 Dec 2, 2023
305f8bb
add more seeds
josephlee702 Dec 2, 2023
914c7db
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
josephlee702 Dec 2, 2023
52cd627
add factory bot, faker and pull out add attendees method
kameronk92 Dec 2, 2023
17f72f1
Merge pull request #33 from josephlee702/feat/viewing_parties_helpers
josephlee702 Dec 2, 2023
19d4ba7
start work on VP dashboard story
josephlee702 Dec 2, 2023
119f4e3
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
josephlee702 Dec 2, 2023
5a9ca14
add spec for movie service
kameronk92 Dec 2, 2023
7f835a2
Merge pull request #34 from josephlee702/spec/movie_service_spec
josephlee702 Dec 2, 2023
dbcfbd7
pull kam's branch
josephlee702 Dec 2, 2023
856961a
Merge branch 'main' of github.com:josephlee702/viewing_party_lite_7 i…
josephlee702 Dec 2, 2023
5f9fdb4
idk
josephlee702 Dec 2, 2023
1402c6b
finish up the user's dashboard for vps hosting and invited to
josephlee702 Dec 2, 2023
e879f07
Merge pull request #35 from josephlee702/feat/dashboard-viewing-parti…
kameronk92 Dec 2, 2023
35a5533
finish login work from class
josephlee702 Dec 12, 2023
4ac1b8c
complete rerouting of everything and authorization challenge
josephlee702 Dec 13, 2023
6255687
Merge pull request #36 from josephlee702/feat/login_work
josephlee702 Dec 13, 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 @@ -29,3 +29,7 @@

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


# Ignore coverage
/coverage
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--require spec_helper
6 changes: 6 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Style/FrozenStringLiteralComment:
Enabled: false

Metrics/BlockLength:
IgnoredMethods:
- RSpec.describe
51 changes: 30 additions & 21 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
source "https://rubygems.org"
# frozen_string_literal: true

source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.2.2"
ruby '3.2.2'

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.0.4", ">= 7.0.4.2"
gem 'rails', '~> 7.0.4', '>= 7.0.4.2'

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
gem 'sprockets-rails'

# Use postgresql as the database for Active Record
gem "pg", "~> 1.1"
gem 'pg', '~> 1.1'

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", "~> 5.0"
gem 'puma', '~> 5.0'

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "importmap-rails"
gem 'importmap-rails'

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem "turbo-rails"
gem 'turbo-rails'

# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
gem "stimulus-rails"
gem 'stimulus-rails'

# Build JSON APIs with ease [https://github.com/rails/jbuilder]
gem "jbuilder"
gem 'jbuilder'

# Use Redis adapter to run Action Cable in production
# gem "redis", "~> 4.0"
Expand All @@ -34,40 +36,47 @@ gem "jbuilder"
# gem "kredis"

# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
# gem "bcrypt", "~> 3.1.7"
gem "bcrypt", "~> 3.1.7"

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

# Reduces boot times through caching; required in config/boot.rb
gem "bootsnap", require: false
gem 'bootsnap', require: false

# Use Sass to process CSS
# gem "sassc-rails"

# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2"

gem 'faraday'

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem "pry"
gem 'factory_bot_rails'
gem 'faker'
gem 'pry'
gem 'rspec-rails'
end

group :development do
# Use console on exceptions pages [https://github.com/rails/web-console]
gem "web-console"
gem 'web-console'

# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
# gem "rack-mini-profiler"

# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
# gem "spring"
gem "rubocop-rails"
gem 'rubocop-rails'
end

group :test do
gem "rspec-rails"
gem "capybara"
gem "launchy"
gem "simplecov"
end
gem 'capybara'
gem 'launchy'
gem 'shoulda-matchers'
gem 'simplecov'
gem 'vcr'
gem 'webmock'
end
Loading