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-marj #49

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
c286089
Initial Rails setup
Schmarj3 Nov 12, 2020
3272a22
added .idea to git ignore
Schmarj3 Nov 12, 2020
8958016
added a works controller and index method
Schmarj3 Nov 12, 2020
4a1e990
added restful route for works
Schmarj3 Nov 12, 2020
94edfb8
added views for work controller
Schmarj3 Nov 12, 2020
8a6a1fc
added method holders in work controller
Schmarj3 Nov 12, 2020
e2eadb2
added bones to works index view
Schmarj3 Nov 12, 2020
be86819
added html to work views, started db schema
Schmarj3 Nov 13, 2020
3ba12a9
added seed code for work
Schmarj3 Nov 13, 2020
d1aeeb5
added data folder and fixed work schema
Schmarj3 Nov 14, 2020
7d7cdf8
added simplecov gem
Schmarj3 Nov 14, 2020
a8f81bb
added homepage view and route
Schmarj3 Nov 14, 2020
749cdde
added some of the nav header content and links
Schmarj3 Nov 14, 2020
c4de058
added base code for log in button
Schmarj3 Nov 14, 2020
73225be
added the new work link and view
Schmarj3 Nov 14, 2020
d8d087e
completed wave 1
Schmarj3 Nov 15, 2020
b4359fe
fixed validation error error, started model test
Schmarj3 Nov 15, 2020
3339354
added yml files for tests and flash message
Schmarj3 Nov 15, 2020
6d6ce53
added user controller and model
Schmarj3 Nov 15, 2020
f116221
added user controller methods
Schmarj3 Nov 15, 2020
3a192f2
added routes for users
Schmarj3 Nov 15, 2020
f63124d
added an index view for users
Schmarj3 Nov 15, 2020
77b59e6
added relationships to vote, user, work models
Schmarj3 Nov 15, 2020
bf0627b
added logic to work model for listing votes
Schmarj3 Nov 16, 2020
c459334
added user view html and user_seeds.csv
Schmarj3 Nov 16, 2020
b2fa7fc
added link to user index page, and votes migrated to db
Schmarj3 Nov 16, 2020
7c15a19
fixed user seeding, formated user joined date
Schmarj3 Nov 16, 2020
b626c70
added user login session logic, before_action for work controller
Schmarj3 Nov 16, 2020
3d82131
added before and skip before action to user and work controllers
Schmarj3 Nov 16, 2020
84ec0e1
added upvote button
Schmarj3 Nov 17, 2020
b238322
added upvote action
Schmarj3 Nov 29, 2020
89b135a
added styling
Schmarj3 Nov 30, 2020
0b1e1d6
added styling to new user form
Schmarj3 Dec 1, 2020
35e2f8d
added fixtures for testing
Schmarj3 Dec 1, 2020
0b9ebb0
fixed site flashes and views based on feedback checklist
Schmarj3 Dec 1, 2020
397f0b8
added styling to homepage and user validation
Schmarj3 Dec 1, 2020
0d9ca6e
put top_work and top_ten method logic in work model
Schmarj3 Dec 1, 2020
bcbc09a
added all user model test, some work index styling
Schmarj3 Dec 1, 2020
c634b14
updated work model tests to use fixtures
Schmarj3 Dec 1, 2020
404d243
added relationship test for vote model
Schmarj3 Dec 1, 2020
7bdc0db
added Kaida's suggested changes from the pull request
Schmarj3 Dec 1, 2020
ff7d3ed
removed current_user method test, no path for current_user
Schmarj3 Dec 1, 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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
42 changes: 42 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# 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 rubymine generated file.
.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

# Ignore simplecov directory
coverage/*
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
82 changes: 82 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
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

group :test do
gem 'simplecov', require: false
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