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 - Iris Lux #37

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
879601c
initial rails setup
iris-lux Nov 11, 2020
162461a
initial setup of Work model and WorksController
iris-lux Nov 11, 2020
b13e220
created votes and users, related votes, users, and works
iris-lux Nov 11, 2020
611bcbc
seed script - fixed typo in work and user models
iris-lux Nov 11, 2020
c52e2b0
altered seeds so that it creates dat object for date_published
iris-lux Nov 12, 2020
be699b2
CRUD actions for works, and respective tests
iris-lux Nov 12, 2020
2e174a0
homepages controller
iris-lux Nov 12, 2020
3b1908f
homepage view and styling
iris-lux Nov 12, 2020
cdee93c
edit and _form
iris-lux Nov 12, 2020
888c6ae
new view
iris-lux Nov 12, 2020
f36389b
moved top_ten and top_one to model
iris-lux Nov 12, 2020
7345d75
user controller - login, login_form, logout, current - assoc. routes
iris-lux Nov 13, 2020
0bfc680
login_form view and application view - added conditional login logout
iris-lux Nov 13, 2020
1706ba4
revised success_check so that it takes error/success msgs as optional…
iris-lux Nov 13, 2020
6ee65a2
revised success_check calls so that they now include error/success msgs
iris-lux Nov 13, 2020
6669aeb
added flash msgs
iris-lux Nov 13, 2020
2f30a03
added voting capabilities - action on work_controller, and assoc rout…
iris-lux Nov 13, 2020
c5fa535
now using int instead of date for publication_date
iris-lux Nov 14, 2020
fd6a69a
changed publication_date from Date to int
iris-lux Nov 14, 2020
bba2503
refactored tests with new publication_date data type
iris-lux Nov 14, 2020
3cc6390
tests for work relationships and validations:
iris-lux Nov 14, 2020
7aaf28f
helper method tests for work
iris-lux Nov 14, 2020
a8a5fce
modifies Work helpers so that they sort ties alphabetically, added va…
iris-lux Nov 14, 2020
8e9a8fa
user validtions and respective tests
iris-lux Nov 14, 2020
ef13a04
added validation on vote so that user cant vote for same owrk twice
iris-lux Nov 14, 2020
4754e45
added index and show actions to user_controller
iris-lux Nov 15, 2020
a74fd28
flash messages for errors
iris-lux Nov 15, 2020
fc358c0
refactored error messages with ErrorFlash class
iris-lux Nov 15, 2020
199ab5b
refactored ErrorFlash as method instead of class
iris-lux Nov 15, 2020
65e63e0
refactored errors to use string key, implemented error msgs for crud …
iris-lux Nov 15, 2020
efe1f99
user view
iris-lux Nov 15, 2020
ab094a4
added nil check for view
iris-lux Nov 16, 2020
fa8c6f5
more nil checks in homepg view
iris-lux Nov 16, 2020
3311f0f
tidied up styling so that it matches example
iris-lux Nov 16, 2020
532baa3
tests for all user controller actions
iris-lux Nov 16, 2020
4778b85
tests for upvote and edge cases for work controller
iris-lux Nov 16, 2020
2d64ae9
added date formatting
iris-lux Nov 16, 2020
4125862
implemented view partials for tables
iris-lux Nov 16, 2020
6d1d717
helper methods for single votes and not available info - implemented …
iris-lux Nov 16, 2020
3f85136
added display details to works
iris-lux Nov 16, 2020
6dd5f1b
changed not available to na
iris-lux Nov 16, 2020
fbb8d8d
fixed error in display_details helper
iris-lux Nov 16, 2020
584e975
added dependant: destroy to models
iris-lux Nov 16, 2020
a5e8407
added tests for delete dependant in user and work
iris-lux 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
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:application_record" /><Generator name="application_record" /><Generator name="assets" /><Generator name="channel" /><Generator name="controller" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="mailbox" /><Generator name="mailer" /><Generator name="migration" /><Generator name="minitest:generator" /><Generator name="minitest:install" /><Generator name="minitest:plugin" /><Generator name="model" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:channel" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailbox" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /></GeneratorsGroup></Settings>
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