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

Ren - Fire #35

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
dbd72d8
initial rails setup
Nov 11, 2020
7f04883
generates csv faker data; updates seeds.rb to generate works from the…
Nov 11, 2020
dada098
generates basic work model
Nov 11, 2020
2d9ae41
Merge pull request #1 from RenCarothers/basic-model-setup-for-seeding
RenCarothers Nov 11, 2020
04f9297
generates basic works controller
Nov 11, 2020
b27b996
adds a basic show and index view for works
Nov 11, 2020
ac9576d
updates index view to sort list by category using .by_category method…
Nov 12, 2020
64935e4
tweaks works show view to better match heroku demo
Nov 12, 2020
148e02a
adds homepage controller; methods to display top_ten and spotlight; i…
Nov 12, 2020
2c19dbe
creates edit/new views/methods, strong params
Nov 12, 2020
1a9a497
adds basic destroy method
Nov 12, 2020
d7b0b2f
adds edit and delete buttons to work show view
Nov 12, 2020
6b163ea
adds basic validations for work
Nov 12, 2020
3071f1a
corrects code for works #destroy
Nov 12, 2020
b8e3aad
adds validations tests
Nov 13, 2020
d7206e6
adds positive tests for custom methods
Nov 13, 2020
027a8c2
adds testing and code for custom methods nil cases
Nov 13, 2020
c8eb2fc
adds blank user model
Nov 13, 2020
decf10c
adds users controller and routes
Nov 13, 2020
9b221a7
adds user controller methods and views to allow login/logout
Nov 13, 2020
14c0b9f
adds some tests for login/logout feature
Nov 13, 2020
76dd2bc
creates vote model
Nov 14, 2020
0eae1bf
creates relations for votes, migrations
Nov 14, 2020
937d15a
creates upvote method
Nov 14, 2020
890b4c2
adds validation for votes
Nov 14, 2020
b42bc5f
adds flash messages to login/logout methods
Nov 14, 2020
fdfcc83
Merge pull request #2 from RenCarothers/wave1-basic-CRUD-for-homepage
RenCarothers Nov 14, 2020
d5f0143
pulls flash changes from wave1-implementing-session
Nov 14, 2020
9a35c1c
adds votes info to works show and index
Nov 14, 2020
8bba608
adds counter_cache for votes instead of votes.count
Nov 14, 2020
8f8be57
updates views to reflect counter_cache
Nov 14, 2020
6cf6b37
updates homepage methods to reflect votes_count
Nov 14, 2020
176075e
updates homepage methods' tests
Nov 14, 2020
b4919be
fixes errors in homepage method and tests
Nov 14, 2020
6342e49
adds vote relation test to work model tests
Nov 14, 2020
a6b9a91
adds relations testing for user and votes models
Nov 14, 2020
8daa1f2
adds validation test for vote model
Nov 14, 2020
6d4db33
adds works voted on to user show page
Nov 14, 2020
733beea
copy/pastes basic stylings
Nov 15, 2020
17fc57e
tweaks heading font sizes, buttons, forms to mirror heroku
Nov 15, 2020
12ddd96
adds stylings for homepage columns
Nov 15, 2020
8a73b82
adds flash stylings
Nov 15, 2020
6b31750
tweaks flash spacing slightly
Nov 15, 2020
ba931d1
Merge pull request #3 from RenCarothers/wave2-implementing-session
RenCarothers Nov 15, 2020
fc1381f
Merge pull request #4 from RenCarothers/wave2-implementing-votes
RenCarothers Nov 15, 2020
ae07979
fixes spacing on login form
Nov 15, 2020
f9c9357
fixes upvote errors and flash for it
Nov 16, 2020
5dd61a0
fixes flash display to better match heroku model
Nov 16, 2020
44f2a12
adds filter for find work, fixes flash yet again
Nov 16, 2020
2b03d68
adds filter for finding session, tweaks flash hopefully for the last …
Nov 16, 2020
d7b8979
adds vote test for non logged in voting
Nov 16, 2020
fc8c0c3
fixes delete method to delete a work's votes as well as work
Nov 16, 2020
07d50b7
adds username validation, can't be blank
Nov 16, 2020
5e03036
adds validation test for blank username
Nov 16, 2020
5fb0178
restricts vote routes to those used
Nov 16, 2020
3bbf7fb
Merge branch 'master' into css-design
RenCarothers Nov 16, 2020
b2e8bce
Merge pull request #5 from RenCarothers/css-design
RenCarothers Nov 16, 2020
0b93510
Merge pull request #6 from RenCarothers/corrections-for-rubric
RenCarothers Nov 16, 2020
2cc3e30
just getting more practice: adds view helper for displaying time
Nov 16, 2020
87a973d
just getting more practice: adds testing for view helper
Nov 16, 2020
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
41 changes: 41 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# 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'

# Ingore .idea
.idea
.idea/
.idea/*

# Ignore bundler config.
/.bundle

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

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

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

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
78 changes: 78 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', 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.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 web drivers to run system tests with browsers
gem 'webdrivers'
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'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
Loading