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

Earth - Beauttie #38

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a3b0d92
Initial Rails setup
beauttie Nov 10, 2020
c859251
Seed data, create controllers for Works and Users, define CR actions,…
beauttie Nov 12, 2020
7733040
Add views with partials, write controller tests
beauttie Nov 13, 2020
03198eb
Add login and logout controller actions for User, create model for vo…
beauttie Nov 15, 2020
5e27697
Establish indirect relations, test User model, create upvote controll…
beauttie Nov 16, 2020
98930c2
Write test for Votes model
beauttie Nov 16, 2020
edc7bfb
Flash error message when user votes for the same work more than once
beauttie Nov 16, 2020
d48837d
Create custom methods for top ten media and spotlight
beauttie Nov 16, 2020
6b3aac2
Create view to show user's details
beauttie Nov 16, 2020
d1f7252
DRY up index page for Works
beauttie Nov 16, 2020
b380f81
Add table about votes for a work
beauttie Nov 16, 2020
5e73e84
Configure root path to homepage view and created view for the homepage
beauttie Nov 16, 2020
d4e9f40
Add header to all views, create link that indicates current logged in…
beauttie Nov 16, 2020
9e7ed76
Add validations when logging in
beauttie Nov 16, 2020
7c9ccc4
Tests for Work model before using fixtures
beauttie Nov 16, 2020
c884075
Write tests for custom methods in Work model
beauttie Nov 16, 2020
dbbc975
Fix test expectation counts that include fixture data
beauttie Nov 16, 2020
8be2cd9
Write tests for upvote action in Works controller
beauttie Nov 16, 2020
e27fe02
DRY up Works Controller with controller filters
beauttie Nov 16, 2020
6611d7d
Test for flash messages and redirects in Users controller
beauttie Nov 16, 2020
f4354e8
Change production settings for database
beauttie Nov 16, 2020
b2e2d8c
Change production settings for database again
beauttie Nov 16, 2020
2b24d3f
Revert prod db changes
beauttie Nov 16, 2020
757463a
Add flash to Works controller actions
beauttie Nov 16, 2020
da076c0
Test flash for Works controller
beauttie Nov 16, 2020
f318cf4
Fix Heroku deployment issue with spotlight
beauttie Nov 16, 2020
32e9bfd
Add CSS to header, nav, spotlight
beauttie Nov 17, 2020
bc353c4
Add CSS for spotlight and top ten lists
beauttie Nov 17, 2020
005f989
Add CSS for index page
beauttie Nov 17, 2020
2539d9f
Add CSS for new and edit actions
beauttie Nov 17, 2020
06810b1
Add CSS for show action and login page
beauttie Nov 17, 2020
8bb72ba
Add CSS for Users show page
beauttie Nov 17, 2020
275bb2a
Add CSS for flash messages
beauttie Nov 17, 2020
cc7937a
Edit name of flash keys to use CSS Bootstrap
beauttie Nov 17, 2020
f051d8e
Fix flash keys in Works controller tests
beauttie Nov 17, 2020
5f5eddd
Finally figured out how to get rid of annoying border for top ten lists
beauttie Nov 17, 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