Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
6dc37b7
Initial Rails setup 👍
RebeccaRoach May 15, 2020
b137416
Modified seeds, added works controller, views, model.
RebeccaRoach May 15, 2020
2a3c267
Added homepage controller/view and seeded database
RebeccaRoach May 16, 2020
3f8414c
Changed publication_year to integer in works
RebeccaRoach May 17, 2020
62549df
Added User model, controller, basic views.
RebeccaRoach May 17, 2020
dd4e4e2
Scaffold Works controller actions, views.
RebeccaRoach May 17, 2020
46836f0
Added Vote model and made associations with User and Work.
RebeccaRoach May 18, 2020
065424a
Changed years in works-seeds and added comments on models.
RebeccaRoach May 19, 2020
e786286
Show table for User show page implemented.
RebeccaRoach May 19, 2020
b1ca7f0
Implemented index page for users.
RebeccaRoach May 19, 2020
0ab4299
Implemented work show table except upvote and flash on delete.
RebeccaRoach May 19, 2020
2f8854e
Made _form partial to display 3 media sections in works index, implem…
RebeccaRoach May 20, 2020
738f4db
Implemented new works form.
RebeccaRoach May 20, 2020
502cd99
Added routes, controller actions and views for log in, enabled flash …
RebeccaRoach May 20, 2020
37c5c0b
Log in working with flash, login_form view implemented.
RebeccaRoach May 20, 2020
5563de3
Implemented logout method.
RebeccaRoach May 20, 2020
7ea196e
Added basic site nav.
RebeccaRoach May 20, 2020
176964e
Changed labels and text field for user login form to match db
RebeccaRoach May 20, 2020
6a00543
Merge branch 'master' into navigation
RebeccaRoach May 20, 2020
e65ff2a
Merge branch 'master' into feature/user-logout
RebeccaRoach May 20, 2020
508afe1
Merge branch 'master' into feature/user-logout
RebeccaRoach May 21, 2020
2e58791
Cleaned logout method
RebeccaRoach May 21, 2020
b755b7e
Implemented top_ten method and added partial for media displays.
RebeccaRoach May 21, 2020
89a70b8
Implemented self#spotlight and #most_recent_vote_date methods in work…
RebeccaRoach May 21, 2020
3418ead
Modified self#spotlight to not accept args, implemented partial for s…
RebeccaRoach May 21, 2020
80487c0
Added class to anchor tag spotlight
RebeccaRoach May 21, 2020
7791cb4
Created votes controller and made new, create, and destroy actions.
RebeccaRoach May 22, 2020
edbd41e
Moved logic from votes controller and vote model class method to acti…
RebeccaRoach May 22, 2020
8073349
started tests on current_user
RebeccaRoach May 22, 2020
d10380f
Users can upvote using show or index page.
RebeccaRoach May 22, 2020
473064d
Added validation on vote model for uniqueness of user_id within work_…
RebeccaRoach May 22, 2020
2638c3c
Deleted unnecessary vote controller and vote files generated.
RebeccaRoach May 22, 2020
ada28b6
Merge branch 'feature/top-10-media'
RebeccaRoach May 22, 2020
67d5c1e
Merge branch 'feature/current_user'
RebeccaRoach May 22, 2020
97aaf40
Renamed form to work_table and made new form partial to DRY up new an…
RebeccaRoach May 22, 2020
c779a5e
Sorted works on index page by max votes.
RebeccaRoach May 22, 2020
d1a4fc8
Added styles to application.scss
RebeccaRoach May 22, 2020
e6ce13e
Added logic to login button text.
RebeccaRoach May 22, 2020
a941c95
Added flash_class helper, restructured flash html on application leve…
RebeccaRoach May 22, 2020
3287a6d
Changed works index view to talk to controller, not model. Passed in …
RebeccaRoach May 22, 2020
8059334
Cherry-picked commit from login/display-logic
RebeccaRoach May 22, 2020
e3ed14f
Merged fix/works-index into master
RebeccaRoach May 23, 2020
2d5780c
Merge branch 'master' into css/styles
RebeccaRoach May 23, 2020
00b43b2
Styles for application and header/nav in place.
RebeccaRoach May 23, 2020
978e4a5
Validations tests on work passing.
RebeccaRoach May 23, 2020
f1aba60
Relations tests passing for work and vote
RebeccaRoach May 24, 2020
9aadff3
Custom methods testing: most_recent_vote_date, spotlight, top_ten
RebeccaRoach May 24, 2020
0754318
User tests in place and passing (relations and validations).
RebeccaRoach May 24, 2020
a37ec33
Added instantiation test in work_test.rb
RebeccaRoach May 24, 2020
5b396df
Tests for vote model (relations and validations) implemented and pass…
RebeccaRoach May 24, 2020
9fa979d
Main page styles in place.
RebeccaRoach May 25, 2020
e28b12b
Cleaned up styles for all pages, deleted unnecessary files.
RebeccaRoach May 25, 2020
ef63d24
Merge pull request #1 from RebeccaRoach/css/styles
RebeccaRoach May 25, 2020
2ca4280
Merge branch 'master' into tests/work
RebeccaRoach May 25, 2020
ad3a57f
Added work validation for uniqueness of title in given category.
RebeccaRoach May 25, 2020
16627d2
Changed a tags to link_to helpers.
RebeccaRoach May 25, 2020
07d0152
Refactored works model methods, tests.
RebeccaRoach May 25, 2020
504d702
Refactored and cleaned code. Ready for submission.
RebeccaRoach May 26, 2020
771905c
Fixed works controller upvote method.
RebeccaRoach May 26, 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
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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 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'
# 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