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

Water - Jessica #51

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5014dda
Initial Rails setup
jwinchan Nov 12, 2020
73acece
added seeding script
jwinchan Nov 13, 2020
21cbcf8
created users and works controllers and work model
jwinchan Nov 13, 2020
68edebd
add routes for works and seeded db for works
jwinchan Nov 13, 2020
302202d
created model and restful routes for user
jwinchan Nov 13, 2020
f184bd5
created homepages controller and added views for homepage, works, and…
jwinchan Nov 13, 2020
5a93f9b
created views for user and homepage index
jwinchan Nov 15, 2020
63319b6
created forms for works new and edit
jwinchan Nov 16, 2020
67b3685
changed user form to a login form and changed routes accordingly
jwinchan Nov 16, 2020
c669fcb
created votes controller
jwinchan Nov 16, 2020
2f1a0a4
created vote model
jwinchan Nov 16, 2020
66ff1dd
created tests for login method
jwinchan Nov 16, 2020
b59b5f3
edited login form and tests
jwinchan Nov 16, 2020
6498bbd
login method is functioning
jwinchan Nov 16, 2020
af1d7b6
added to application to be able to see flash
jwinchan Nov 16, 2020
5f22a93
changed styling for all pages
jwinchan Nov 16, 2020
537c180
changes to css and html for homepage and menu
jwinchan Nov 16, 2020
e04fd7b
created tests for works restful routes
jwinchan Nov 16, 2020
22f162e
added login function to test helper
jwinchan Nov 17, 2020
37426d7
created fixtures for testing
jwinchan Nov 17, 2020
c3016eb
added flash to all work methods and added data in fixtures
jwinchan Nov 17, 2020
544e1ea
edited works show and edit views
jwinchan Nov 17, 2020
d1e38ec
upvote method
jwinchan Nov 17, 2020
c5b0935
added columns to vote table
jwinchan Nov 17, 2020
a2e5688
matching views to demo
jwinchan Nov 17, 2020
f31c352
corrected tests
jwinchan Nov 17, 2020
50c62bc
edited users controller tests
jwinchan Nov 17, 2020
948dfa2
edited controller test
jwinchan Nov 17, 2020
409bd73
added testing for works model
jwinchan Nov 18, 2020
df093a8
edited work models test
jwinchan Nov 18, 2020
d394ac6
edited vote models test
jwinchan Nov 18, 2020
6772997
user model tests
jwinchan Nov 18, 2020
cd36fce
unskipped test
jwinchan Nov 18, 2020
721a224
changed spotlight
jwinchan Nov 18, 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', '>= 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