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

Ports - Heather #27

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
38e838b
Initial Rails setup
piffer59 Apr 22, 2019
e3f415d
Added all WorksController methods, tests for index, show, new, create…
piffer59 Apr 23, 2019
b588287
Added tests for Works Controller edit, update
piffer59 Apr 24, 2019
7382f57
Updated Works Controller update tests
piffer59 Apr 24, 2019
203c3d3
Works controller tests, changed update test and added destroy tests
piffer59 Apr 24, 2019
645e1de
Work model tests for validation
piffer59 Apr 25, 2019
9728d7f
Added homepages controller and index view page
piffer59 Apr 25, 2019
ab4e1e6
Added Users controller
piffer59 Apr 25, 2019
180f4be
Added User model
piffer59 Apr 25, 2019
f670b71
Updated User Controller and added nav bar links
piffer59 Apr 25, 2019
3e09c4b
Added index action to User Controller, view page, link in nav bar
piffer59 Apr 25, 2019
d9ab5bb
Updated application and works view pages, User Controller logout action
piffer59 Apr 25, 2019
0841ad5
User controller tests
piffer59 Apr 25, 2019
ded020a
Completed User Controller tests
piffer59 Apr 26, 2019
3b3ee59
updated Works Controller index view
piffer59 Apr 26, 2019
c6f91b1
Added User Controller show action, test, added link to user show page…
piffer59 Apr 26, 2019
9b84f0a
Added vote model
piffer59 Apr 26, 2019
a9c81eb
Added vote controller and model with upvote method
piffer59 Apr 26, 2019
e61293b
Added table to Works index view
piffer59 Apr 27, 2019
3ea3270
Votes Controller updated upvote method
piffer59 Apr 27, 2019
e0aa286
Updated routes and can Votes Controller upvote method
piffer59 Apr 27, 2019
93b53f8
Updated homepage view with top 10
piffer59 Apr 27, 2019
978c37d
Updated homepage view with links and vote counts
piffer59 Apr 27, 2019
fe276ed
Added Media Spotlight to homepage
piffer59 Apr 28, 2019
b9d3b8c
Added a table to user index view
piffer59 Apr 28, 2019
724fd17
Added table to user show page
piffer59 Apr 28, 2019
299579d
changed code to count votes in works and homepages index views
piffer59 Apr 28, 2019
5b6f35c
general clean up of code
piffer59 Apr 28, 2019
6625689
Added partial view for works index page
piffer59 Apr 28, 2019
83d698a
Added vote table to work show view
piffer59 Apr 28, 2019
91cbaed
Test for Homepages Controller
piffer59 Apr 28, 2019
3641954
Fixed User Controller login action to pass test
piffer59 Apr 28, 2019
a4632aa
Votes Controller tests
piffer59 Apr 29, 2019
c5b6e8e
Change to homepages view
piffer59 Apr 29, 2019
dda8337
Changed homepage view
piffer59 Apr 29, 2019
d2f69b6
cleaned up votes controller tests
piffer59 Apr 29, 2019
b8e6cd3
Added user model validation tests
piffer59 Apr 29, 2019
2a69f22
User model relationship tests
piffer59 Apr 29, 2019
48edddf
Work model relationship tests
piffer59 Apr 29, 2019
980fed1
Vote model validation tests
piffer59 Apr 29, 2019
aed3826
Vote model relationship tests
piffer59 Apr 29, 2019
62e8b68
Work model custom method tests
piffer59 Apr 29, 2019
370976d
added links to work show view
piffer59 Apr 29, 2019
24dd9b9
cleaned up homepages view
piffer59 Apr 29, 2019
76ab613
added edge case tests to work model top_ten test
piffer59 Apr 29, 2019
3489511
CSS for nav bar
piffer59 Apr 30, 2019
b98bb34
travis yml
piffer59 May 15, 2019
f44e22b
Merge pull request #1 from piffer59/test-travis
piffer59 May 15, 2019
b0970a4
moved travis.yml
piffer59 May 15, 2019
4601cd0
updated gemfile
piffer59 May 15, 2019
aabb710
Merge pull request #2 from piffer59/test-travis
piffer59 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
Binary file added .DS_Store
Binary file not shown.
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.3
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