Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
96fb386
Initial Rails setup
kdow Apr 22, 2019
ede0858
Create homepage controller/test/route/view
kdow Apr 22, 2019
f3ca940
Create Work model and seed file
kdow Apr 22, 2019
58c69d6
Create Works controller and index
kdow Apr 23, 2019
ea37d79
Change works index view to display all titles by category
kdow Apr 23, 2019
1d5546b
Create spotlight method and index view
kdow Apr 23, 2019
f0291c2
Create top_ten works method and view
kdow Apr 23, 2019
fbeed1b
Add New action, test, and view
kdow Apr 24, 2019
a849d86
Add Create action, tests
kdow Apr 24, 2019
3396edb
Add check_flash helper method and title validation to Work
kdow Apr 24, 2019
8d01117
Add flash display for new work errors
kdow Apr 24, 2019
1d4e806
Add show work action and test
kdow Apr 24, 2019
135347f
Create show work view
kdow Apr 24, 2019
745e512
Write edit work tests
kdow Apr 24, 2019
06bd687
Write edit work action
kdow Apr 24, 2019
fb3b5c4
Add edit work view and create form partial for new and edit
kdow Apr 24, 2019
b64735d
Write update work tests
kdow Apr 24, 2019
0ea40ca
Add update work action
kdow Apr 24, 2019
bfd31c2
Write destroy work tests
kdow Apr 24, 2019
5a54a2f
Add destory work action
kdow Apr 24, 2019
cdf5019
Add links to edit and delete works on show work page
kdow Apr 24, 2019
2214c7f
Add links on homepage and works index to show details for each work
kdow Apr 24, 2019
525e7ac
Add Work model tests and fixtures
kdow Apr 25, 2019
f7f9e25
Add Work index test for no works
kdow Apr 25, 2019
b5cf57a
Add Work model and controller tests
kdow Apr 25, 2019
b7c8e02
Refactor Work tests to use controller filter
kdow Apr 25, 2019
e201cf5
Add header with nav links to view all works, top works, and add a work
kdow Apr 25, 2019
852fcb5
Add some styling to navbar
kdow Apr 26, 2019
1dbe042
Add User model and controller and login routes
kdow Apr 26, 2019
4ffee87
Add User login_form, login, and logout actions
kdow Apr 26, 2019
4656aa8
Add login form
kdow Apr 26, 2019
8c22cb0
Add login button to navbar
kdow Apr 26, 2019
89736b5
Add Vote model and relationships
kdow Apr 26, 2019
11f958a
Add columns to homepage
kdow Apr 26, 2019
b768c2f
Add form control styling
kdow Apr 26, 2019
211289c
Add form groups
kdow Apr 26, 2019
db39de9
Add color and alignment styling to header
kdow Apr 26, 2019
9c4a38b
Add Votes controller
kdow Apr 26, 2019
d98e30c
Add current user functionality
kdow Apr 26, 2019
6171379
Add current user view
kdow Apr 26, 2019
6f4a97f
Add logout button to header
kdow Apr 27, 2019
81f9a49
Add styling to login form
kdow Apr 27, 2019
c7fdba6
Add work_id and user_id to votes
kdow Apr 27, 2019
9eaed4a
Add upvote action, route, and show view link
kdow Apr 28, 2019
e89e437
Add number of votes to homepage view
kdow Apr 28, 2019
9c68bd9
Add number of votes and link to upvote to works index
kdow Apr 28, 2019
35db5f1
Sort works on works index view
kdow Apr 28, 2019
5980a95
Disallow users voting on same work more than once
kdow Apr 28, 2019
e47c577
Rewrite get_spotlight to respect vote count
kdow Apr 28, 2019
02073a0
Rewrite get_top_ten to respect vote count and sort by votes
kdow Apr 28, 2019
163a85c
Refactor homepage top tens to use partial views and link to show work
kdow Apr 28, 2019
85b3672
Add styling to media spotlight and top tens
kdow Apr 28, 2019
6a63eda
Add styling to new and edit form and h2
kdow Apr 28, 2019
c8a75cd
Add styling to show work details
kdow Apr 28, 2019
5a25be6
Add test for users voting on same work more than once
kdow Apr 29, 2019
0e1084c
Add vote relation tests
kdow Apr 29, 2019
a98c294
Add test for sorted_works
kdow Apr 29, 2019
eb16048
Add tests for get_spotlight
kdow Apr 29, 2019
b12cd70
Remove unneeded controller, method, and route
kdow Apr 29, 2019
4cb502a
Add user controller tests
kdow Apr 29, 2019
d854960
Add tests for upvote action
kdow Apr 29, 2019
8b08f34
Fix for js bug
kdow Apr 29, 2019
b0c0e4f
Add users index and show actions, tests, and routes
kdow Apr 29, 2019
a5274dc
Create index view for users
kdow Apr 29, 2019
aa7b7d9
Add show page for user
kdow Apr 29, 2019
38a1f2e
Add styling to users
kdow Apr 29, 2019
cbe72d4
Add user index link
kdow Apr 29, 2019
b3c23d1
style works index
kdow Apr 29, 2019
76521d2
heroku test comment
kdow Apr 29, 2019
8e199ce
heroku test comments
kdow Apr 29, 2019
52e13db
heroku test
kdow Apr 29, 2019
51f6ad0
update for heroku
kdow Apr 29, 2019
d3cabd9
merge conflict
kdow Apr 29, 2019
4205b4a
Add margins on homepage
kdow Apr 29, 2019
c1207be
Add styling
kdow Apr 29, 2019
ad9e4c9
Adjust spacing
kdow Apr 29, 2019
3eaf09d
Add styling to work index
kdow Apr 29, 2019
56edda5
style heading bold
kdow Apr 29, 2019
ce38fc1
Style header spacing and adjust log in/log out buttons
kdow Apr 29, 2019
e9601e1
Add owl favicon
kdow Apr 29, 2019
f99b4c5
Fix logged in as user link
kdow Apr 29, 2019
22b5745
Merge branch 'master' into header
kdow Apr 29, 2019
86cd815
Add spacing above user log in button
kdow Apr 29, 2019
2c61d2b
Add Travis CI
kdow May 15, 2019
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
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: ruby

rvm:
- 2.5.1

services:
- postgresql

before_script:
- bin/rails db:create
- bin/rails db:migrate

script:
- bin/rails test
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.3'
# 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
Loading