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

Don't merge - Review weds #53

Open
wants to merge 258 commits into
base: review-base
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
258 commits
Select commit Hold shift + click to select a range
9c51b67
Change readme to markdown format
Bigless27 Jan 7, 2016
c361605
Merge pull request #1 from nyc-copperheads-2016/Ryan
jhack32 Jan 7, 2016
3a52fe1
Change Gemfile to ruby version 2.2.1 >
Bigless27 Jan 7, 2016
e86cf39
Declare current version of ruby
Bigless27 Jan 7, 2016
7f2d7d8
Finally specify right version of ruby
Bigless27 Jan 7, 2016
0e188db
Merge pull request #2 from nyc-copperheads-2016/Ryan
jhack32 Jan 7, 2016
c61a61b
Add shoulda-matchers function
jhack32 Jan 7, 2016
479b1a2
Merge pull request #3 from nyc-copperheads-2016/shoulda-matchers
Bigless27 Jan 7, 2016
01103f7
Add migrations and models for user preference media category
Jan 7, 2016
6319774
Add has many filters through preference source media in user model
Jan 7, 2016
6d191f9
Merge pull request #4 from nyc-copperheads-2016/models-migrations
Bigless27 Jan 7, 2016
f3af9b7
Add spec files
Bigless27 Jan 7, 2016
6529bbb
Add rspec for models
Bigless27 Jan 7, 2016
3d671a9
Remove extra semi colon from files
Bigless27 Jan 8, 2016
1dacf24
Change file name from plural to singular
Bigless27 Jan 8, 2016
c17cc52
Add schema
Bigless27 Jan 8, 2016
7539727
Write rspec for models
Bigless27 Jan 8, 2016
fb2aded
Update README.md
Bigless27 Jan 8, 2016
bd1fc54
Merge pull request #5 from nyc-copperheads-2016/rspec
elizaway Jan 8, 2016
7c92628
Add specs for user
Bigless27 Jan 8, 2016
49f682f
Add rspec for category
Bigless27 Jan 8, 2016
2bf9c59
Add rspec to media
Bigless27 Jan 8, 2016
26c276a
Add rspec for preferences
Bigless27 Jan 8, 2016
359f613
Add rspec for users
Bigless27 Jan 8, 2016
14b4eb1
Change type to reference in model
Bigless27 Jan 8, 2016
e60dd96
Merge pull request #6 from nyc-copperheads-2016/rspec
elizaway Jan 8, 2016
8455a8b
Add user login, register, and routes
Jan 8, 2016
6bf7b9a
add user logged in checks
Jan 8, 2016
5df7eef
Merge pull request #7 from nyc-copperheads-2016/user-login-register
elizaway Jan 8, 2016
6c9c42c
Add factory girl with seeds
Jan 8, 2016
94e7999
add index views, and controllers
jhack32 Jan 8, 2016
c89e018
add routes for media and categories
jhack32 Jan 8, 2016
262c7fe
add media controller and views
jhack32 Jan 8, 2016
36542e6
Remove validation because has_secure_password
Jan 8, 2016
d7902a6
Merge pull request #8 from nyc-copperheads-2016/category-controller
arcpetretta Jan 8, 2016
05c81c4
Don't need to validate password comp in model
Jan 8, 2016
9c61655
Remove column type and add media_type
Jan 8, 2016
8b5d902
Create seeds with factory girl
Jan 8, 2016
80eda77
Fix validation and column name
Jan 8, 2016
a531bf5
Change name form media type to category type
Jan 8, 2016
0488597
Change media_type to category_type
Jan 8, 2016
ddd9dd5
Change validation to category type
Jan 8, 2016
1d518f5
Merge pull request #9 from nyc-copperheads-2016/factory_girl
jhack32 Jan 8, 2016
3bfc40c
add preference route
jhack32 Jan 8, 2016
6f5946d
create preference
jhack32 Jan 8, 2016
37f0fed
add creating filter func
jhack32 Jan 8, 2016
34354e3
Merge pull request #10 from nyc-copperheads-2016/create-filter
arcpetretta Jan 8, 2016
20af918
resolve merge conflict in config/routes
arcpetretta Jan 8, 2016
69b6175
initial extension
jhack32 Jan 8, 2016
6e1ebca
Merge pull request #11 from nyc-copperheads-2016/start-extension
Bigless27 Jan 8, 2016
bed027e
login logout functionality complete; able to register new users
arcpetretta Jan 8, 2016
c1aa5a6
Merge pull request #12 from nyc-copperheads-2016/session-views
arcpetretta Jan 8, 2016
f6a8d0a
Add untracked file
Jan 8, 2016
08afd24
Add user dummy view files for testing
Jan 8, 2016
84d4ec5
Add some user spec's
Jan 8, 2016
39609b8
Give username a minimum length
Jan 8, 2016
7403529
Add user new and show rspecs
Jan 8, 2016
4ba048d
Rename catgory file
Jan 8, 2016
01825aa
Merge pull request #13 from nyc-copperheads-2016/controller_rspec
Bigless27 Jan 8, 2016
458e41f
Add x-frame-options to allow
jhack32 Jan 8, 2016
43f5628
iframe added
jhack32 Jan 8, 2016
5bad973
Merge pull request #14 from nyc-copperheads-2016/start-extension
Bigless27 Jan 8, 2016
39a736a
Add create specs to controller
Jan 8, 2016
3b8dd19
Finish User_controller spec!!!
Jan 8, 2016
d21c006
Merge pull request #15 from nyc-copperheads-2016/user_controller_spec
jhack32 Jan 8, 2016
d5a50fc
Add media controller rspec
Jan 8, 2016
005655c
Change the config/initializers/inflections.rb to include "media, plur…
Jan 8, 2016
42dd42b
Merge pull request #16 from nyc-copperheads-2016/media_controllers_spec
Bigless27 Jan 8, 2016
41f6969
create basic user show page
arcpetretta Jan 8, 2016
3404bdc
add link to home page and user show page.
arcpetretta Jan 8, 2016
e554e36
Add destroy and edit routes to preferences controller
arcpetretta Jan 8, 2016
949dfeb
add resources for preferences and preference partial to user show page.
arcpetretta Jan 8, 2016
fd47ddc
Add on_or_off methods for preferences...Used in user show page.
arcpetretta Jan 8, 2016
d9c70e1
content.js added and modified manifest to include content scripts
jhack32 Jan 8, 2016
4f1c524
Merge pull request #19 from nyc-copperheads-2016/js-extension
Bigless27 Jan 8, 2016
7902c20
self is unnecessary
arcpetretta Jan 8, 2016
d4a764c
Merge pull request #18 from nyc-copperheads-2016/user-show-page
Bigless27 Jan 8, 2016
f5b0b64
edit path to category_media_index_path
jhack32 Jan 9, 2016
94a4d9a
testing with jquery/js
jhack32 Jan 9, 2016
4365c80
local storage shows whether or not the user is logged into our app
jhack32 Jan 9, 2016
df8f6b6
remove the hello message
jhack32 Jan 9, 2016
2897a26
Add preference tests
Jan 9, 2016
ce3ebfb
Add stub current user!
Jan 9, 2016
328e308
Delete extra white space
Jan 9, 2016
9221856
Add rspec tests to preference controller
Jan 9, 2016
7192858
Merge pull request #21 from nyc-copperheads-2016/preference_controlle…
elizaway Jan 9, 2016
4d3806c
Change media_controller_spec.rb to rid merge conflicts
Jan 9, 2016
81eb85d
Change name of route path
Jan 9, 2016
6b8a475
Change name of template
Jan 9, 2016
dd6a903
Adds more tests for media and category controllers
Jan 9, 2016
506a5d7
Correct mysterious ghost seed - category: move - beware
Jan 9, 2016
24089eb
Merge pull request #20 from nyc-copperheads-2016/media_controllers_spec
Bigless27 Jan 9, 2016
71702ae
Merge pull request #22 from nyc-copperheads-2016/extension-function
jhack32 Jan 9, 2016
95040dc
Add gems for bootstrap, add requires in app.js, add imports in scss
Jan 9, 2016
c03df7f
Add MVC for javascript
Jan 9, 2016
921ad1c
Merge pull request #23 from nyc-copperheads-2016/bootstrap
jhack32 Jan 9, 2016
a81f1b6
Add initial movie search function
Jan 9, 2016
bcea261
Add function to retrive credits
Jan 10, 2016
eec846f
Add title to returned object
Jan 10, 2016
a714341
Merge pull request #24 from nyc-copperheads-2016/JSON
jhack32 Jan 10, 2016
ace10b9
moved.
Jan 9, 2016
8355203
create ability to toggle filter settings for user. ensures no double …
Jan 10, 2016
a77627d
redirect to user_path from creating preferences
Jan 10, 2016
4606091
Merge pull request #25 from nyc-copperheads-2016/enable-disable-filters
arcpetretta Jan 10, 2016
e2c090e
Add bootstrap gem and req files
Jan 10, 2016
d741f87
Add bootstrap gem and req files
Jan 10, 2016
4260755
Adds some bootstrap stying on layouts/application.html file
Jan 10, 2016
7a9ca05
Merge branch 'bootstrap' of https://github.com/nyc-copperheads-2016/u…
Jan 10, 2016
af6320e
Merge pull request #26 from nyc-copperheads-2016/bootstrap
Bigless27 Jan 10, 2016
364ecfd
add flash message for invalid login
Jan 10, 2016
8260246
move flash message display to layout.
Jan 11, 2016
9fcd543
Merge pull request #27 from nyc-copperheads-2016/flash-message-login
Bigless27 Jan 11, 2016
1ee043f
Fix login error
Jan 10, 2016
14a2c31
Add functionality to categories with user not
Jan 10, 2016
4445cfc
Add ajax to clicking on a category
Jan 10, 2016
9274055
Change _new to new
Jan 10, 2016
c570242
Add ajax for adding a filter
Jan 10, 2016
5764e43
Try to fix bootstrap file
Jan 10, 2016
b613955
Fixed error with media index
Jan 11, 2016
aa28bab
Add seed data for columns
Jan 11, 2016
de83e88
Switch rspec test to account for AJAX
Jan 11, 2016
4ac332e
Merge pull request #28 from nyc-copperheads-2016/JSON
Bigless27 Jan 11, 2016
5582a84
Add error messages to create user
Jan 11, 2016
e128fb4
Fix flash messages!
Jan 11, 2016
fe24528
Merge pull request #29 from nyc-copperheads-2016/formatting
Bigless27 Jan 11, 2016
6ce57cf
Fix path to users show page
Jan 11, 2016
2527022
Merge pull request #30 from nyc-copperheads-2016/formatting
elizaway Jan 11, 2016
3df4206
add function to hide elements from an array (only from certain tags)
jhack32 Jan 9, 2016
588db04
store whether or not filter is active to local storage
jhack32 Jan 9, 2016
084b6da
working oop to get filtered words for movies
jhack32 Jan 10, 2016
c3b94c5
uncomment line
jhack32 Jan 10, 2016
72233e8
add hidden value for title
jhack32 Jan 10, 2016
5b27ae2
create table to store filtered words
jhack32 Jan 11, 2016
6c1ce2f
add api to get filtered words and create
jhack32 Jan 11, 2016
0c21220
remove line
jhack32 Jan 11, 2016
802f1bc
grab filter words, search through words and dom elements, then hide
jhack32 Jan 11, 2016
7452aea
hardcoded words for demo
jhack32 Jan 11, 2016
0a9851a
fix document.ready
jhack32 Jan 11, 2016
30f176c
Merge pull request #32 from nyc-copperheads-2016/extension-hide-elements
elizaway Jan 11, 2016
a292347
adds styling for layout and catergories
Jan 11, 2016
4cc4b82
Add styling for media/index and some ajax
Jan 11, 2016
1984469
Merge pull request #31 from nyc-copperheads-2016/bootstrap
jhack32 Jan 11, 2016
f4089a4
remove extra form_for and change form name for ajax
jhack32 Jan 11, 2016
e5f0576
working for preview (hardcoded hide)
jhack32 Jan 11, 2016
5036a6d
Merge pull request #33 from nyc-copperheads-2016/extension-function-01
Bigless27 Jan 11, 2016
b230eb3
Add fixed ajax to the filter route
Jan 11, 2016
5947c0d
Change link_to to render the partial
Jan 11, 2016
d1c0723
Fix ajax problem with button
Jan 11, 2016
e5383c1
Have word belong to preference
Jan 11, 2016
0eabd3b
Don't crash on bad user id in session
Jan 11, 2016
8eb89cb
Move filtered_words route to users_controller
Jan 11, 2016
deb5a32
Add httparty gem
Jan 11, 2016
6c0e054
Add ajax to the my filters link
Jan 11, 2016
2aaf4be
Error messages reveal more data about what's wrong
Jan 11, 2016
5dfe9e5
Remove tmdb gem
Jan 11, 2016
ad81f4d
Seed from tmdb
Jan 11, 2016
88b19d1
local storage now gets the correct keywords
Jan 11, 2016
ecbecb7
Merge pull request #34 from nyc-copperheads-2016/switch-api-to-rails
elizaway Jan 11, 2016
4094c13
Add ajax for my filter and add filter
Jan 11, 2016
e4719fe
Add rendering for my filter
Jan 11, 2016
08553e0
Fix error with ajax to failing route
Jan 11, 2016
5227535
Merge pull request #35 from nyc-copperheads-2016/more_ajax
elizaway Jan 11, 2016
fe567a5
adds more styling on media index page
Jan 11, 2016
0614923
Remove ajax functionality for media index page because media now inde…
Jan 11, 2016
91bae14
Add another category 'Sports Teams' and one media belonging to sports…
Jan 11, 2016
f5efa59
Add styling of cat and media index views
Jan 11, 2016
bb20e40
Merge pull request #36 from nyc-copperheads-2016/bootstrap
Bigless27 Jan 11, 2016
c85db2a
Test
Jan 11, 2016
ad38727
Don't use FactoryGirl in seeds
Jan 11, 2016
e4dc40d
targets all elements except html, head, body and div
Jan 11, 2016
1b68d84
Add error messages to preferences on right place
Jan 11, 2016
4ffc13a
Merge pull request #37 from nyc-copperheads-2016/heroku-test
Bigless27 Jan 11, 2016
f1d5c7d
FIx log out error
Jan 11, 2016
097468b
Add Sweet alerts, and there sweet
Jan 11, 2016
39f357b
Fix error with rspec
Jan 11, 2016
8803735
Merge pull request #38 from nyc-copperheads-2016/error-fix
arcpetretta Jan 11, 2016
fa3eb8b
Change ID to Class
Jan 11, 2016
f630eb1
Get rid of debugger
Jan 11, 2016
322a31f
Add spacing to Sweet Alert
Jan 11, 2016
9a9eced
Merge pull request #39 from nyc-copperheads-2016/error-fix
arcpetretta Jan 11, 2016
42a8816
Show Filter
Jan 12, 2016
2f0e18b
Merge pull request #40 from nyc-copperheads-2016/Even_more_ajax
elizaway Jan 12, 2016
14cdee5
Filter works if user.active is true and user is logged in
Jan 11, 2016
8c3a05d
remove add_filter_words
Jan 11, 2016
f77a796
create words, remove from media controller
Jan 11, 2016
8633ba5
comment out controller
Jan 11, 2016
ea1d3db
comment out storage clear
Jan 11, 2016
e9cbac2
filtered words on/off feature
Jan 12, 2016
1c70801
get request to test on localhost
Jan 12, 2016
2acad4d
Merge pull request #41 from nyc-copperheads-2016/toggle-user-filter-p…
elizaway Jan 12, 2016
9f0f40e
add option to filter on/off
Jan 12, 2016
a3d53ed
add byebug history
Jan 12, 2016
3c39f86
add production gem rails 12 factor
Jan 12, 2016
693969d
add movies and tv
Jan 12, 2016
95cd013
move methods into model
Jan 12, 2016
a118d8b
Merge pull request #42 from nyc-copperheads-2016/add-filter-on-off
Bigless27 Jan 12, 2016
0d580d7
Add ajax to my filter on/off
Jan 12, 2016
a5f89b2
Add ajax to the delete route
Jan 12, 2016
5f3d57d
Add delete confirmation button
Jan 12, 2016
d547b15
Merge pull request #43 from nyc-copperheads-2016/Even_more_ajax
jhack32 Jan 12, 2016
d66383e
add styling for home route
Jan 12, 2016
6cf8161
Adds edits on cat index page
Jan 12, 2016
cf51328
adds style tweaks
Jan 12, 2016
9dd8282
Add extension favicon
Jan 12, 2016
8e8f5e2
adds style tweaks
Jan 12, 2016
18ad8ec
.DS_Store banished!
Jan 12, 2016
ad84051
adds logo centering
Jan 12, 2016
e75f96c
Add style
Jan 12, 2016
7d1fc48
Merge pull request #44 from nyc-copperheads-2016/bootstrap
elizaway Jan 12, 2016
8b15f7c
Bring back the buttons on home page
Jan 12, 2016
943848d
add new logo
Jan 12, 2016
99c9480
Merge pull request #45 from nyc-copperheads-2016/bootstrap
elizaway Jan 12, 2016
463d5fa
start filtering people
Jan 12, 2016
7c40e0e
start on people filter
Jan 12, 2016
7f553be
add image to replace spoilers
Jan 12, 2016
79cae2e
does not store word if it's empty
Jan 12, 2016
3847e36
stying of the layouts page
Jan 12, 2016
cab1888
fixes layout
Jan 12, 2016
fd052da
Delete commented out text
Jan 12, 2016
a79defb
Make logo a link to go home
Jan 12, 2016
9e739cc
Add temp coloring to hover over logo
Jan 12, 2016
4c3059c
downcase when storing words
Jan 12, 2016
66d3409
add ability to reveal spoilers when clicked on.
Jan 12, 2016
8736cbe
remove unnecessary prevHTML global variable
Jan 12, 2016
aee1c76
Add ajax to user create account
Jan 12, 2016
bf83312
Display error messages in create user
Jan 13, 2016
486ccd3
Merge pull request #46 from nyc-copperheads-2016/styling
arcpetretta Jan 13, 2016
2ee88f8
Add styling of the login page
Jan 13, 2016
b3bc1c0
inline style to hide spoilers
Jan 13, 2016
d138a4a
Add tagline reformat and button reformat
Jan 13, 2016
e23f13b
Revert to flat style logo on homepage
Jan 13, 2016
1b58be5
hide words but need to fix filter function
Jan 13, 2016
b9c3d8c
Merge pull request #47 from nyc-copperheads-2016/bootstrap
Bigless27 Jan 13, 2016
9570d9b
Merge pull request #48 from nyc-copperheads-2016/optimization
Bigless27 Jan 13, 2016
eb5ce1f
Add non-3D image back
Jan 13, 2016
5199a83
Color code tag line with footer
Jan 13, 2016
f7f619c
Make colors more robust
Jan 13, 2016
7b34b06
Move category table down a bit
Jan 13, 2016
85605fa
Fix white text in from
Jan 13, 2016
71aab00
Add initial code for adding buttons
Jan 13, 2016
abdf244
Merge pull request #49 from nyc-copperheads-2016/more_styling
jhack32 Jan 13, 2016
37998a1
working extension
Jan 13, 2016
c1398c2
remove extra bracket, delete console.log
Jan 13, 2016
4a7e283
change green to blue for primary button group
Jan 13, 2016
ab9f0c3
Get rid of whitespace / uncommented stuff
Jan 13, 2016
67f28ea
Replace old, blue logo with new, more purple logo- new_logo.png to sw…
Jan 13, 2016
fb017a5
remove whitespace
Jan 13, 2016
3c9cbb1
remove people category
Jan 13, 2016
1a66d81
Merge pull request #50 from nyc-copperheads-2016/reliable-extension
elizaway Jan 13, 2016
4258dc6
Merge pull request #51 from nyc-copperheads-2016/bootstrap
Bigless27 Jan 13, 2016
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
Prev Previous commit
Next Next commit
add flash message for invalid login
  • Loading branch information
Arcangelo Petretta & Jack Huang committed Jan 10, 2016
commit 364ecfd41a9b8da72db73d739450fb80ca4100aa
4 changes: 2 additions & 2 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def create
session[:user_id] = user.id
redirect_to root_path
else
render :_new
redirect_to root_path, flash: {notice: "Invalid email or password"}
end
end

Expand All @@ -16,6 +16,6 @@ def destroy
end

def user_logged_in
render :json => current_user
render :json => current_user
end
end
4 changes: 4 additions & 0 deletions app/views/categories/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<% if flash[:notice] %>
<p class='notice'><%=h flash[:notice] %></p>
<% end %>

<h1>Categories:</h1>
<ul>
<% @categories.each do |category| %>
Expand Down
2 changes: 2 additions & 0 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
<div class="col-sm-3"><%= link_to 'Logout', logout_path(current_user.id), method: "delete" %></div>
</div>
<% else %>

<%= render "sessions/new" %>
<div>
<%= link_to "Create Account", new_user_path %>
</div>
<% end %>

<body>

<%= yield %>
Expand Down
1 change: 0 additions & 1 deletion app/views/sessions/_new.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<div id='login-form'>
<%= form_tag login_path do %>
Username: <%= text_field_tag :username %>
Expand Down