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

Fire - Madeline #44

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
663f482
Initial Rails setup
made-line Nov 12, 2020
0f031c9
generated Works controller, work model, and finished seed file
made-line Nov 14, 2020
d201369
seeded database
made-line Nov 14, 2020
a4f3962
added works routes and works index page sorted by category
made-line Nov 14, 2020
d72e146
generated Homepages controller
made-line Nov 14, 2020
7e7ac2a
added header and nav links in layout template
made-line Nov 15, 2020
c9d37f1
added create work method and added flash display in layout template
made-line Nov 15, 2020
6ebe52d
added new work view
made-line Nov 16, 2020
84647ac
added show method and show view
made-line Nov 16, 2020
8eec0e5
added edit method and form template for edit/new
made-line Nov 16, 2020
9fdc5d6
fixed create form to select a category and update the index page
made-line Nov 16, 2020
e806ce2
built main page. removed homepages controller/view
made-line Nov 16, 2020
5b1a8c4
added destroy method and fixed edit method
made-line Nov 16, 2020
7d951a1
Merge pull request #1 from made-line/work-functionality
made-line Nov 16, 2020
3322c24
validations testing done. done with wave 1
made-line Nov 16, 2020
e6e1773
generated Users controller
made-line Nov 16, 2020
75c889b
generated users model and put in user routes
made-line Nov 16, 2020
26a226f
added method for login form, login, and current
made-line Nov 16, 2020
d62c943
added logout method
made-line Nov 16, 2020
b92e038
login and logout button
made-line Nov 16, 2020
3f712cf
Merge pull request #2 from made-line/users
made-line Nov 16, 2020
903ccba
added user login tests. added some files to .gitignore
made-line Dec 1, 2020
4a655c3
Merge pull request #3 from made-line/users
made-line Dec 1, 2020
ca1a41d
added logout test
made-line Dec 1, 2020
e0306a3
added current user test
made-line Dec 1, 2020
b8ad30e
Merge pull request #4 from made-line/users
made-line Dec 1, 2020
71e9f89
added votes model. added vote count to works schema
made-line Dec 1, 2020
24b5eb5
require login for CRUD actions
made-line Dec 1, 2020
b4941eb
added upvote route and find user method to app controller.
made-line Dec 1, 2020
b697643
added votes method and buttons
made-line Dec 1, 2020
476c554
functional vote method
made-line Dec 1, 2020
7c1543f
added spotlight feature
made-line Dec 1, 2020
848c84e
spotlight feature is by most upvoted
made-line Dec 1, 2020
10bde3c
sorted top 10 by votes on homepage
made-line Dec 1, 2020
01f685a
cleaned up index. added sort books and sort album method to model
made-line Dec 1, 2020
fde4a1f
Merge pull request #5 from made-line/votes
made-line Dec 1, 2020
7dce16e
made work model code DRY
made-line Dec 2, 2020
f53aef2
styled lists on homepage. added flash error if work isn't found. chan…
made-line Dec 2, 2020
43f39ee
added movies category. updated homepage view and work model
made-line Dec 2, 2020
b65376e
added 3rd category to index. also added top media button on index
made-line Dec 2, 2020
5504f92
added fixtures. work relations test not passing. fixed before_action …
made-line Dec 2, 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
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# 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

**/.DS_Store

.idea/*
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