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

Kimberley Zell - Pipes - MediaRanker #40

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
d6186cb
Initial Rails Setup
kimpossible1 Oct 10, 2017
fb6266b
setting up models and controllers
kimpossible1 Oct 10, 2017
33c899e
completed initial set up of models and controls with correct schema
kimpossible1 Oct 10, 2017
7cfee9c
seeded data successfully. Added to WorksController: method for index …
kimpossible1 Oct 10, 2017
d1bc848
added folder for main page in views, and added index html erb file.
kimpossible1 Oct 10, 2017
29631b7
works#index page, creating table
kimpossible1 Oct 10, 2017
753abb0
still working on table for all media.
kimpossible1 Oct 10, 2017
421314c
added main controller for homepage and a main#index view
kimpossible1 Oct 11, 2017
f002dac
Attempted to add a form to create the tables to display full list of …
kimpossible1 Oct 11, 2017
e6f8f2c
added defs in works controller. Fixed issue in Works Model def for to…
kimpossible1 Oct 12, 2017
8555095
forgot to commit updates. Nearly completed wave 1, refactoring some c…
kimpossible1 Oct 12, 2017
db93a93
finished refactoring the list form for works index
kimpossible1 Oct 12, 2017
61dac8a
edited routes to only have what I am currently using
kimpossible1 Oct 12, 2017
c8ad15c
wrote just a few tests
kimpossible1 Oct 12, 2017
004b742
we did some stuff for css framework in class that did not work
kimpossible1 Oct 12, 2017
167fc80
wrote some YAMLS in fixtures. starting writing tests for models, star…
kimpossible1 Oct 12, 2017
1cefe4d
have some model tests. The one that uses my fixture data will not wor…
kimpossible1 Oct 13, 2017
d10b288
mostly tested works model
kimpossible1 Oct 13, 2017
443ecd6
got help from Dan to fix model tests that were not working for Work -…
kimpossible1 Oct 13, 2017
94dc0d1
added test to models to check top media (includes votes). Added work …
kimpossible1 Oct 13, 2017
5e86881
Got work model tests completed, including those dealing with votes. …
kimpossible1 Oct 13, 2017
404501f
nearly finsihed with works#controller tests
kimpossible1 Oct 13, 2017
3b7418d
added view for works edit.html.erb. Finished controller tests for Wor…
kimpossible1 Oct 13, 2017
bd82af6
added some methods to User controller. Added a User show page and a …
kimpossible1 Oct 13, 2017
f28d51b
update
kimpossible1 Oct 13, 2017
0b65fa4
added some code in the view pages for Users but don't have users to v…
kimpossible1 Oct 14, 2017
3a9eb0f
small update before trying sessions stuff
kimpossible1 Oct 14, 2017
b6a475b
added sessionscontroller
kimpossible1 Oct 14, 2017
8733bf2
added flash to root page. Added basic code in sessions controller
kimpossible1 Oct 14, 2017
2786546
added more to root page. Moved login def to user controller
kimpossible1 Oct 14, 2017
fd45e44
working on sessions
kimpossible1 Oct 14, 2017
5593b03
Code seems to be in place for logging in a user but it does not work …
kimpossible1 Oct 14, 2017
adfec78
wrote create method for votes but there's an error I cannot find.
kimpossible1 Oct 14, 2017
ec0efea
wrote more code in controller for votes, need to test.
kimpossible1 Oct 14, 2017
40554bb
thought i did somethig wrong so read up online and started making ses…
kimpossible1 Oct 14, 2017
bd92af9
deleted sessions controller and related views
kimpossible1 Oct 14, 2017
a82fd62
got log out workinggit add . adjusted code for login and log out. Fo…
kimpossible1 Oct 14, 2017
2bb7b8c
upvoting not working. need to make tests and troubleshoot later
kimpossible1 Oct 14, 2017
0cd6001
suddenly the user show is not working and I dont know why
kimpossible1 Oct 14, 2017
9a4ee00
fixed issue with user show page.
kimpossible1 Oct 14, 2017
d5c74e0
small adjustment to the log in form to show the submit button
kimpossible1 Oct 14, 2017
85b945a
small updates for upvote links and work.votes.count in views
kimpossible1 Oct 14, 2017
a4aae4f
most basic functionality is working now! have not tried allowing user…
kimpossible1 Oct 14, 2017
90d351d
dryed up code in works with the form upvote, it now works for works i…
kimpossible1 Oct 14, 2017
93f6407
updated the foundation file but no change visible on my site
kimpossible1 Oct 14, 2017
bca876f
small update on foundation
kimpossible1 Oct 14, 2017
3f6e147
added some css styling and html stuff but it's not all displaying cor…
kimpossible1 Oct 14, 2017
00fa5ee
trying to add tests but struggling I think because of sessions. Test…
kimpossible1 Oct 15, 2017
0c731dc
update:
kimpossible1 Oct 15, 2017
f3c15eb
updated ruby version
kimpossible1 Oct 15, 2017
5459293
update
kimpossible1 Oct 15, 2017
4dfda21
not much
kimpossible1 Oct 15, 2017
11987fc
small update
kimpossible1 Oct 16, 2017
f6b3634
updates
kimpossible1 Oct 16, 2017
d9de6b5
Fix require statements at the top of application.css
kimpossible1 Oct 16, 2017
30f2e81
got foundation fixed
kimpossible1 Oct 16, 2017
a5add36
updated spotlight so that it shoudl work now with heroku
kimpossible1 Oct 16, 2017
ac845f3
tyring to get heroku working
kimpossible1 Oct 16, 2017
10efa34
ather update
kimpossible1 Oct 16, 2017
6ab56f0
update
kimpossible1 Oct 16, 2017
f249d68
update
kimpossible1 Oct 16, 2017
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
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

/node_modules
/yarn-error.log

.byebug_history
66 changes: 66 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

ruby '2.4.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

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

gem 'jquery-turbolinks'
group :development do
gem 'better_errors'
gem 'pry-rails'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
222 changes: 222 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
better_errors (2.3.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.1.0)
capybara (2.15.4)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.2)
debug_inspector (0.0.3)
erubi (1.7.0)
execjs (2.7.0)
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
i18n (0.8.6)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.18)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.2)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pg (0.21.0)
pry (0.11.1)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.5.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.6.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
web-console (3.5.1)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
jbuilder (~> 2.5)
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

BUNDLED WITH
1.15.4
Loading