Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
1f38c73
initial rails setup
elle-johnnie Oct 8, 2018
8e21f35
create Works contoller
elle-johnnie Oct 8, 2018
a1497f2
tried generate scaffold for Work
elle-johnnie Oct 8, 2018
ed315c8
created seeds.rb and seeded db
elle-johnnie Oct 8, 2018
e3fc991
work model validations and tests
elle-johnnie Oct 9, 2018
42af3db
added guard and minitest gems
elle-johnnie Oct 9, 2018
47c30f0
added set default form_with
elle-johnnie Oct 9, 2018
9307595
added some flash verification for create work
elle-johnnie Oct 9, 2018
4b34d9a
session controller created
elle-johnnie Oct 9, 2018
bef2d63
session routes and actions created
elle-johnnie Oct 9, 2018
c3d3bb5
enabled login logout for user
elle-johnnie Oct 9, 2018
cba26f7
setup vote relationship model to user and work
elle-johnnie Oct 10, 2018
dd4ddd9
vote tests
elle-johnnie Oct 10, 2018
c20f1a6
changed pub year col to integer, fixed date issues throughout
elle-johnnie Oct 10, 2018
af00348
testing
elle-johnnie Oct 10, 2018
0393dd1
votes controller added
elle-johnnie Oct 10, 2018
9fb2d3c
Merge branch 'votes'
elle-johnnie Oct 10, 2018
b53031d
votes routes
elle-johnnie Oct 10, 2018
8f3e7b4
resolved merge conflicts
elle-johnnie Oct 10, 2018
0514ce0
vote test mods still not creating new in test
elle-johnnie Oct 10, 2018
9eb8cd8
added before action filter
elle-johnnie Oct 10, 2018
a973458
vote test valid good
elle-johnnie Oct 10, 2018
0e8418c
vote validation tests added
elle-johnnie Oct 10, 2018
6f4cfda
upvote method created in works controller
elle-johnnie Oct 11, 2018
88dd731
flash msg if a user tries to vote more than once for a work
elle-johnnie Oct 11, 2018
4a65bc0
edits for heroku run
elle-johnnie Oct 11, 2018
1fa84b5
more edits for heroku run
elle-johnnie Oct 11, 2018
9b014f7
more edits for heroku run
elle-johnnie Oct 11, 2018
87cf664
favicon moved to public for heroku
elle-johnnie Oct 11, 2018
fc263c0
nav links created
elle-johnnie Oct 12, 2018
452cb13
counter cache built for votes for more efficient vote count querying
elle-johnnie Oct 12, 2018
7dd8bdb
top ten works method
elle-johnnie Oct 12, 2018
2299cdc
oops added relationship tests on css branch
elle-johnnie Oct 14, 2018
7378f29
view index tables created
elle-johnnie Oct 14, 2018
95c53d9
css styling
elle-johnnie Oct 15, 2018
bfb86af
favicon bug
elle-johnnie Oct 15, 2018
fa04a0b
flash and css fixes
elle-johnnie Oct 16, 2018
4de5dae
ico
elle-johnnie Oct 16, 2018
6d05569
comment out rm col vote_count to fix heroku migration
elle-johnnie Oct 16, 2018
0d1a7b5
fixed login bug
elle-johnnie Oct 16, 2018
49ac0ab
fixed login css
elle-johnnie Oct 16, 2018
a6a03a4
works and users not found fixed
elle-johnnie Oct 16, 2018
efc2ee5
rm unnecesary file
elle-johnnie Oct 17, 2018
5192717
file cleanup complete
elle-johnnie Oct 17, 2018
490048f
created and cleaned up partials
elle-johnnie Oct 17, 2018
a1a0bfa
tests cleanup
elle-johnnie Oct 17, 2018
e46866a
factory bot created for some additional test data in works model
elle-johnnie Oct 17, 2018
ee70878
heroku custom 404 not showing
elle-johnnie Oct 17, 2018
0160ab9
config initializer assets.rb fixed to render custom 404 not found pag…
elle-johnnie Oct 17, 2018
12a7034
modify jpg to try and render in heroku
elle-johnnie Oct 17, 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
Binary file added .DS_Store
Binary file not shown.
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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
.idea
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
84 changes: 84 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
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'
gem "factory_bot_rails"
gem "faker"

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