Skip to content

Commit

Permalink
Merge pull request #16 from lofi-nowhale/noelle_6_discover
Browse files Browse the repository at this point in the history
Noelle 6 discover
  • Loading branch information
JorjaF authored Oct 11, 2023
2 parents 1070e06 + 32012eb commit 4ef4b63
Show file tree
Hide file tree
Showing 11 changed files with 185 additions and 188 deletions.
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ GEM
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
figaro (1.2.0)
thor (>= 0.14.0, < 2)
globalid (1.1.0)
activesupport (>= 5.0)
hashdiff (1.0.1)
Expand Down Expand Up @@ -275,7 +273,6 @@ DEPENDENCIES
bootsnap
capybara
faraday
figaro
importmap-rails
jbuilder
launchy
Expand Down
6 changes: 5 additions & 1 deletion app/views/users/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<h1><%= @user.name %>'s Dashboard</h1>
<h2>Welcome, <%= @user.name %>!</h2>
<p>Email: <%= @user.email %></p>
<p><%= link_to "Landing Page", root_path %></p>
<p><%= link_to "Landing Page", root_path %></p>

<h2 id="viewing_parties">My Viewing Parties</h2>

<p id="discover"><%= button_to "Discover Movies", "/users/#{@user.id}/discover", method: :get %></p>
1 change: 1 addition & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
root to: 'landing_page#index'

resources :users, only: %i[show new create]
resources :discover, only: [:index]
end
2 changes: 1 addition & 1 deletion coverage/.last_run.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"result": {
"line": 93.65
"line": 93.44
}
}
60 changes: 26 additions & 34 deletions coverage/.resultset.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"RSpec": {
"coverage": {
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/spec/spec_helper.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/spec/spec_helper.rb": {
"lines": [
1
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/environment.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/environment.rb": {
"lines": [
null,
null,
Expand All @@ -17,7 +17,7 @@
1
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/application.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/application.rb": {
"lines": [
null,
null,
Expand Down Expand Up @@ -60,7 +60,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/boot.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/boot.rb": {
"lines": [
null,
null,
Expand All @@ -70,7 +70,7 @@
1
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/environments/test.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/environments/test.rb": {
"lines": [
null,
null,
Expand Down Expand Up @@ -136,7 +136,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/initializers/assets.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/initializers/assets.rb": {
"lines": [
null,
null,
Expand All @@ -154,7 +154,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/initializers/content_security_policy.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/initializers/content_security_policy.rb": {
"lines": [
null,
null,
Expand Down Expand Up @@ -184,7 +184,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/initializers/filter_parameter_logging.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/initializers/filter_parameter_logging.rb": {
"lines": [
null,
null,
Expand All @@ -198,7 +198,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/initializers/inflections.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/initializers/inflections.rb": {
"lines": [
null,
null,
Expand All @@ -219,7 +219,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/initializers/permissions_policy.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/initializers/permissions_policy.rb": {
"lines": [
null,
null,
Expand All @@ -235,7 +235,7 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/config/routes.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/config/routes.rb": {
"lines": [
null,
null,
Expand All @@ -247,30 +247,31 @@
1,
null,
1,
1,
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/helpers/application_helper.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/app/helpers/application_helper.rb": {
"lines": [
null,
null,
1,
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/helpers/landing_page_helper.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/app/helpers/landing_page_helper.rb": {
"lines": [
1,
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/models/user.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/app/models/user.rb": {
"lines": [
1,
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/models/application_record.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/app/models/application_record.rb": {
"lines": [
null,
null,
Expand All @@ -279,29 +280,12 @@
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/controllers/landing_page_controller.rb": {
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/app/controllers/users_controller.rb": {
"lines": [
1,
1,
2,
null,
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/controllers/application_controller.rb": {
"lines": [
null,
null,
1,
null
]
},
"/Users/jorjafleming/mod3/viewing_party_lite/viewing_party_lite_7/app/controllers/users_controller.rb": {
"lines": [
1,
1,
1,
null,
null,
1,
null,
Expand All @@ -317,8 +301,16 @@
null,
null
]
},
"/Users/noellehemphill/turing_work/3mod/projects/viewing_party_lite_7/app/controllers/application_controller.rb": {
"lines": [
null,
null,
1,
null
]
}
},
"timestamp": 1696973543
"timestamp": 1697039978
}
}
Loading

0 comments on commit 4ef4b63

Please sign in to comment.