Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
900a833
Initial rails setup
jacquelynoelle Oct 8, 2018
9a359af
Generated models
jacquelynoelle Oct 8, 2018
b6b53a8
Setup seeds.rb
jacquelynoelle Oct 8, 2018
ada1571
Set up relationships
jacquelynoelle Oct 8, 2018
52e1bba
Added controllers for Works and Users
jacquelynoelle Oct 8, 2018
dc9561f
Generated HomeController
jacquelynoelle Oct 8, 2018
594aa73
Fixed naming for Home controller
jacquelynoelle Oct 8, 2018
347e704
Implemented Works#index and Works#show with draft views
jacquelynoelle Oct 8, 2018
170c8dc
Implemented Works#new and Works#create with draft view for new
jacquelynoelle Oct 8, 2018
fe466d8
Created home page and added header/nav to application layout
jacquelynoelle Oct 8, 2018
f7c2765
Created works fixtures
jacquelynoelle Oct 8, 2018
0ee8527
Set up initial validation and test for work title
jacquelynoelle Oct 9, 2018
3a220e1
Created Sessions controller
jacquelynoelle Oct 9, 2018
6e4d273
Merge pull request #1 from jacquelynoelle/controllers
jacquelynoelle Oct 9, 2018
8913bb4
Created routes for sessions and added content to views to track sessions
jacquelynoelle Oct 9, 2018
e54f22a
Merge pull request #2 from jacquelynoelle/controllers
jacquelynoelle Oct 9, 2018
837331f
Fixed bug in Works#create
jacquelynoelle Oct 9, 2018
e9808ac
Merge pull request #3 from jacquelynoelle/controllers
jacquelynoelle Oct 9, 2018
ab74ad8
Created tests for Work model relationships, validations, and custom m…
jacquelynoelle Oct 9, 2018
fbe45d6
Added Works#edit Works#update and Works#destroy and setup respective …
jacquelynoelle Oct 9, 2018
aaee8ce
Added spacing for legibility in controller methods
jacquelynoelle Oct 9, 2018
3560c93
Merge pull request #4 from jacquelynoelle/controllers
jacquelynoelle Oct 9, 2018
2344082
Added tests for title uniqueness validation within category - passing…
jacquelynoelle Oct 9, 2018
0ab7265
Merge pull request #5 from jacquelynoelle/controllers
jacquelynoelle Oct 9, 2018
38a6b64
Added user and vote yml data and relationship tests for work
jacquelynoelle Oct 9, 2018
75ab59e
Merge pull request #6 from jacquelynoelle/controllers
jacquelynoelle Oct 9, 2018
ed63282
Added session tracking to allow users to log in/out
jacquelynoelle Oct 10, 2018
0409392
Removed some unnecessary views
jacquelynoelle Oct 10, 2018
a838aaf
Added feature to allow users to only vote once per work
jacquelynoelle Oct 10, 2018
9d1c7e9
Merge pull request #7 from jacquelynoelle/controllers
jacquelynoelle Oct 10, 2018
81a5415
Added sorting by vote to work model methods
jacquelynoelle Oct 10, 2018
c1e4116
Merge pull request #8 from jacquelynoelle/models
jacquelynoelle Oct 10, 2018
5b53274
Added users who upvoted to work show view
jacquelynoelle Oct 10, 2018
fa0c8fa
Fixed typo in Users#show
jacquelynoelle Oct 10, 2018
a82446b
Added content to user show view
jacquelynoelle Oct 10, 2018
7680067
Merge pull request #9 from jacquelynoelle/front_end
jacquelynoelle Oct 10, 2018
727a933
Added vote_date method to user model
jacquelynoelle Oct 10, 2018
564094d
Merge pull request #10 from jacquelynoelle/models
jacquelynoelle Oct 10, 2018
700f8f7
Added setting of date when vote is instantiated
jacquelynoelle Oct 10, 2018
cbc0414
Merge pull request #11 from jacquelynoelle/controllers
jacquelynoelle Oct 10, 2018
095aebb
Created users index view and fixed bug in work show view's table
jacquelynoelle Oct 10, 2018
5b4c7eb
Merge pull request #12 from jacquelynoelle/front_end
jacquelynoelle Oct 10, 2018
960ea8a
Changed work publication_year to integer and modified seeds.rb to acc…
jacquelynoelle Oct 10, 2018
9da24ce
Removed unnecessary user controller methods and routes
jacquelynoelle Oct 10, 2018
d9144c6
Forgot to save this file in the previous commit
jacquelynoelle Oct 10, 2018
5c4fa66
DRYed up Work model methods
jacquelynoelle Oct 10, 2018
0f082c7
DRYed up tests to go along with DRYing of model method
jacquelynoelle Oct 10, 2018
eda99ed
Added relationship tests for vote model -- passing tests
jacquelynoelle Oct 10, 2018
858d513
Created relationships and validation tests for user model -- passing …
jacquelynoelle Oct 10, 2018
f995941
Added vote_count method to user and work models; added tests for cust…
jacquelynoelle Oct 10, 2018
a2f8e68
Added validations and tests for vote model
jacquelynoelle Oct 10, 2018
5b5f3e8
Created eligible_to_vote User model method to DRY up Works controller
jacquelynoelle Oct 11, 2018
2ec5fbf
Fixed bug with error messages
jacquelynoelle Oct 11, 2018
e1cbd4d
Merge pull request #13 from jacquelynoelle/models
jacquelynoelle Oct 11, 2018
d8bc7e7
Merge pull request #14 from jacquelynoelle/development
jacquelynoelle Oct 11, 2018
827f60a
Bootstrap class additions to lists, buttons, nav
jacquelynoelle Oct 11, 2018
673c212
Styling for headers, use of grid, card, and list groups on home page
jacquelynoelle Oct 11, 2018
d5e44c4
Merge pull request #15 from jacquelynoelle/front_end
jacquelynoelle Oct 11, 2018
3e7de62
Merge pull request #16 from jacquelynoelle/development
jacquelynoelle Oct 11, 2018
a005810
CSS font styling
jacquelynoelle Oct 11, 2018
965c29e
Homepage styling
jacquelynoelle Oct 11, 2018
8d0b1d8
Finished styling to make site look like example site
jacquelynoelle Oct 12, 2018
11ade35
Merge pull request #17 from jacquelynoelle/development
jacquelynoelle Oct 12, 2018
87af2b6
Added final tests around sorting lists, checking for 0 votes; DRYed u…
jacquelynoelle Oct 12, 2018
bd69742
Favicon
jacquelynoelle Oct 12, 2018
fb6b7d1
Used rails favicon path
jacquelynoelle Oct 12, 2018
eb36770
DRYed up index views
jacquelynoelle Oct 15, 2018
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
27 changes: 27 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# 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 'mini_racer', 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', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

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

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

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]
end

group :development do
# Access an interactive console on exception pages or by calling '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

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

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

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
277 changes: 277 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
autoprefixer-rails (9.1.4)
execjs
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap (4.1.3)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.12.9, < 2)
sass (>= 3.5.2)
builder (3.2.3)
byebug (10.0.2)
capybara (3.9.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.25)
formatador (0.2.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
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.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.4)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.3)
popper_js (1.14.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.6.0)
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.7)
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.14.1)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
shellany (0.0.1)
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.2)
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.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
bootstrap (~> 4.1.3)
byebug
capybara (>= 2.15)
chromedriver-helper
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.1)
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)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.2
Loading