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

Allan Evans and Blane Kennedy Entry; 2308 #92

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
20e14a8
add PR template
bkchilidawg Nov 28, 2023
e6e953b
Added initial database setup
aevans27 Nov 28, 2023
0f7d13a
Add missing tests for db tables and relationships, updated gem file t…
aevans27 Nov 28, 2023
4cffe87
Add api key encryption
aevans27 Nov 28, 2023
efb0dfc
Merge pull request #1 from aevans27/db-setup
bkchilidawg Nov 28, 2023
024d480
Add discover page and initial setup to facades
aevans27 Nov 28, 2023
ef93fcf
Added facades and tests with webmock
aevans27 Nov 28, 2023
be435f8
Added check for data in top 20 fixture
aevans27 Nov 28, 2023
9fa154f
Merge pull request #2 from aevans27/discover-movies-page
bkchilidawg Nov 29, 2023
539e132
add features and testing for the Landing Page
bkchilidawg Nov 29, 2023
01c3868
Merge pull request #3 from aevans27/feat/landing_page
aevans27 Nov 29, 2023
8c2c853
add feature and tests for the user registration page
bkchilidawg Nov 29, 2023
dfec496
add html for users show page and testing
bkchilidawg Nov 29, 2023
4de7ce1
Merge pull request #5 from aevans27/user_dashboard_page
aevans27 Nov 29, 2023
ce6c5b8
Add test for movie details, include webmock and json fixtures. Also a…
aevans27 Nov 29, 2023
ebaa4ce
Merge pull request #6 from aevans27/movie-details-page
bkchilidawg Nov 29, 2023
805a184
add feature for discover movies dashboard
bkchilidawg Nov 29, 2023
055a9e0
Removed a redundant landing page link, also removed id and url from d…
aevans27 Nov 29, 2023
7e01c96
add tests for dashboard discover movies and edit rubocop to ignore specs
bkchilidawg Nov 29, 2023
e57e57c
Merge pull request #7 from aevans27/movie-details-page
bkchilidawg Nov 29, 2023
a4c69dc
fix tests for dashboard discover movies
bkchilidawg Nov 29, 2023
76e1445
Merge branch 'main' into feat/dashboard_discover_movies
aevans27 Nov 29, 2023
0ae8e9d
Merge pull request #8 from aevans27/feat/dashboard_discover_movies
aevans27 Nov 29, 2023
cf5d5a7
Add creation of viewing parties and add the flag that shows which use…
aevans27 Nov 29, 2023
8407327
Merge pull request #9 from aevans27/new-viewing-party-page
bkchilidawg Nov 30, 2023
ce7c00e
Added in display for current user to see when parties they are host a…
aevans27 Nov 30, 2023
461d335
Merge pull request #10 from aevans27/dashboard-viewing-parties-allan
bkchilidawg Nov 30, 2023
df1083f
Add missing link to movies in viewing party
aevans27 Dec 1, 2023
d94df44
Merge pull request #11 from aevans27/dashboard-viewing-parties-allan
bkchilidawg Dec 1, 2023
b6bb0b7
Added check for duration and tests
aevans27 Dec 1, 2023
331e27c
Merge pull request #12 from aevans27/dashboard-viewing-parties-allan
bkchilidawg Dec 1, 2023
16428a3
Add missing tests for sad paths
aevans27 Dec 1, 2023
77e18ce
Merge pull request #13 from aevans27/test-checking-allan
bkchilidawg Dec 1, 2023
5608b3b
add function, html and tests for invite accept extension
bkchilidawg Dec 1, 2023
6d98b74
remove save and open page
bkchilidawg Dec 1, 2023
66b3a04
Merge pull request #14 from aevans27/ext/feat/invite_accept
aevans27 Dec 1, 2023
f16009d
fix date/time
bkchilidawg Dec 1, 2023
b9543e7
Just update to readme, no code
aevans27 Dec 1, 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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@
/public/assets

# Ignore master key for decrypting credentials and more.
coverage
/config/master.key
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
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ 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 ]
Expand All @@ -47,6 +47,8 @@ gem "bootsnap", require: false

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

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
Expand All @@ -69,5 +71,7 @@ group :test do
gem "rspec-rails"
gem "capybara"
gem "launchy"
gem "shoulda-matchers"
gem "simplecov"
gem 'webmock'
end
Loading