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 - Emily #33

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
4dce90b
initial Rails setup
emirry Nov 10, 2020
bb71486
added header and footer
emirry Nov 12, 2020
e37ec3b
added routes for root path, index, and show
emirry Nov 12, 2020
349f72b
updated seed file and migrated. schema is up to date
emirry Nov 12, 2020
ba2c197
wrote seed file. app is connecting to works-seeds.csv
emirry Nov 12, 2020
b60565b
updated works-seeds? i also forgot to commit and push initial setup
emirry Nov 12, 2020
b58893b
I'm confused about all these files i'm committing. it says new file?
emirry Nov 12, 2020
3064d53
pseudocode for model tests, testing spotlight method and top ten medi…
emirry Nov 12, 2020
96c5430
refactored work.rb one method for finding top ten media. fixed broken…
emirry Nov 12, 2020
60e8042
added conditional to index page to handle 0 works
emirry Nov 12, 2020
475453f
added media details to works show.html.erb file
emirry Nov 12, 2020
530ccc9
refactored routes to resources
emirry Nov 12, 2020
f68a06b
generated users controller
emirry Nov 12, 2020
e2d0c9a
created form, new, and edit views. implemented form to add a new work…
emirry Nov 12, 2020
325e063
fixed typos and added a couple of movies to test new work form. success
emirry Nov 12, 2020
06312c7
Added nav bar with some links
emirry Nov 12, 2020
e5ee0ba
added a back button to media details page
emirry Nov 12, 2020
d4222e1
included update method and refactored some code
emirry Nov 13, 2020
791187d
refactored top ten method in work model
emirry Nov 13, 2020
7b21b0f
checks for validation. model test written
emirry Nov 13, 2020
b8aca8e
added edit button
emirry Nov 13, 2020
d2aebcd
model test for works written. come back to write tests for relatioins…
emirry Nov 13, 2020
edb1a5d
included edit and destroy actions and refactored edit form button
emirry Nov 13, 2020
d48a25e
added delete button
emirry Nov 13, 2020
a82fcc2
migration. changed column name in users to username
emirry Nov 13, 2020
f363a65
implemented users index and show actions. updated routes
emirry Nov 13, 2020
182429c
added index and show erb pages
emirry Nov 13, 2020
3c3f32b
added user login/logout custom routes
emirry Nov 13, 2020
7ac09b4
user controller tests for logging in
emirry Nov 13, 2020
ba0bf24
implemented user login_form and login actions
emirry Nov 13, 2020
b9e68f6
added view all users and log in links to nav bar
emirry Nov 13, 2020
32b9db6
login_form erb file. added in log in text field
emirry Nov 13, 2020
b1def60
user controller test for testing that it can log in an existing user
emirry Nov 13, 2020
ca8da5b
included logout action and added button to nav bar
emirry Nov 13, 2020
032d609
logout test for users_controller_test
emirry Nov 13, 2020
383c410
commented out spotlight test in works and added in an edge case test.…
emirry Nov 13, 2020
fa73821
added flash message to application.html.erb
emirry Nov 14, 2020
ca36a4f
uncommented user controller tests
emirry Nov 14, 2020
44d9206
added current action and view page
emirry Nov 14, 2020
c6c97d4
created votes controller and model. modified all models to connectrel…
emirry Nov 14, 2020
acfa69f
added flash message to create action for works
emirry Nov 14, 2020
8f8bc1d
added logged in as current user button to nav. modified users current…
emirry Nov 14, 2020
6a4aa66
added code throughout works to show logged in as username in the nav
emirry Nov 14, 2020
9c8c0c4
added code in works show method to show logged in by specific user in…
emirry Nov 14, 2020
a534fdc
updated schema to add works and user ref to votes, although not sure …
emirry Nov 14, 2020
8e62f67
changed redirect_to to redirect_back
emirry Nov 14, 2020
b4877f8
added votes table for user's profile
emirry Nov 14, 2020
65d6144
modified tables for current_user and user index
emirry Nov 14, 2020
d8dc2c1
changed logged in as username in nav bar
emirry Nov 14, 2020
843f00e
can select spotlight based on votes
emirry Nov 14, 2020
e998631
can find top ten works based off of hightest votes
emirry Nov 14, 2020
f1cbcdf
changed category form to show all three categories
emirry Nov 14, 2020
7f63577
added extra information about spotlight
emirry Nov 14, 2020
67d5868
added uniqueness validation to works
emirry Nov 15, 2020
47fa480
test to check upvote method
emirry Nov 15, 2020
c8bd75f
test for uniquessness. test for relationship does not pass yet
emirry Nov 15, 2020
74b9264
created pages controller to view all media
emirry Nov 15, 2020
c38625a
made pages index the homepage
emirry Nov 15, 2020
16a22a4
works index page now lists all media. need to refactor
emirry Nov 15, 2020
f4b447d
trying to test if login is blank. revisit this logic
emirry Nov 15, 2020
05c473d
validating that username isn't blank and tests written
emirry Nov 15, 2020
ddb5acf
user logging in validation
emirry Nov 15, 2020
913a54d
can see who voted for each work
emirry Nov 16, 2020
caee074
added links to view individual work in works index
emirry Nov 16, 2020
c59997a
can see user details page
emirry Nov 16, 2020
dfcfa18
added before_action if user wants to vote, add new work, view all users
emirry Nov 16, 2020
2f4a3c7
dried up code with before_actions
emirry Nov 16, 2020
e6f384b
testing relationship that vote belongs to work and user
emirry Nov 16, 2020
2a83c8c
fixed require_login to current_user instead of @current_user. Now pro…
emirry Nov 16, 2020
40d3cce
media is sorted by highest votes on list all media page. code is not dry
emirry Nov 16, 2020
09fb7b6
added some style
emirry Nov 16, 2020
b76e1f7
homepage not working via heroku. added home action to pages controlle…
emirry 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
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