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

Branches - Linnea #39

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
27c963a
Initial Rails setup
llinneaa Oct 14, 2019
0100fed
Seeded db, generated models and controllers
llinneaa Oct 15, 2019
8badcbc
Added html and css
llinneaa Oct 15, 2019
3b14fb9
Refactored HTML code in works index.html.erb file and added CSS to wo…
llinneaa Oct 16, 2019
de34a4e
added works show, new, and _form files, changed data type of publicat…
llinneaa Oct 16, 2019
d9f5249
reseeded database, publication_year now working
llinneaa Oct 16, 2019
934b061
log in works, creates user. Refactored views so nav bar lives in appl…
llinneaa Oct 17, 2019
7ccdb50
Users functionality works
llinneaa Oct 17, 2019
c895fb9
added to upvote method in work model, updated votes controller, updat…
llinneaa Oct 17, 2019
703e770
Voting works, need to refactor homepage
llinneaa Oct 18, 2019
307943b
homepage functions correctly with spotlight and top ten methods
llinneaa Oct 18, 2019
df2f51b
adjusted validations
llinneaa Oct 18, 2019
a34b8a5
Nullify dependent relationships on destroy
llinneaa Oct 18, 2019
f38397f
Updated form views
llinneaa Oct 20, 2019
c945150
Flash working on new works page, but I have a duplicate message
llinneaa Oct 20, 2019
1b36995
Flashing working across all pages, need to DRY up code to prevent dup…
llinneaa Oct 20, 2019
62aa724
completed wave 3 display requirements, updated frontpage view for spo…
llinneaa Oct 21, 2019
fc83f85
Updated logged in as button to display the name of the currently logg…
llinneaa Oct 21, 2019
b49a098
User model tests written
llinneaa Oct 21, 2019
74d44e2
Added fixtures
llinneaa Oct 21, 2019
581f340
Added fixtures
llinneaa Oct 21, 2019
10fae90
Added relationship test to users
llinneaa Oct 21, 2019
6c00ef7
Added reltionship test to work
llinneaa Oct 21, 2019
c95e6d2
Faker working in Rails test
llinneaa Oct 21, 2019
1c242c6
Changes to work tests
llinneaa Oct 21, 2019
d12f126
Added work tests
llinneaa Oct 21, 2019
708d855
Added relationship tests to vote
llinneaa Oct 21, 2019
c60eb13
Added relationship tests to vote
llinneaa Oct 21, 2019
eeb6888
Added test for spotlight method
llinneaa Oct 21, 2019
6fc6234
Added vote/votes to homepage top ten
llinneaa Oct 21, 2019
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
27 changes: 27 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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 uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.5
93 changes: 93 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# 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.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', 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.0.5', '< 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 chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'pry-byebug'

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

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

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

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

group :rake do
gem 'faker'
end
Loading