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

Leaves - Natalie Tapias #42

Open
wants to merge 89 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
ba5249b
New Rails app.
NatalieTapias Oct 14, 2019
12411d6
Created HomepagesController, updated route.
NatalieTapias Oct 14, 2019
329b3a5
Added controllers for Users and Works.
NatalieTapias Oct 14, 2019
a6197c8
Resources routes for Users and Works controllers
NatalieTapias Oct 15, 2019
445d420
Generated User model
NatalieTapias Oct 15, 2019
a352a17
Seeded media database. Added users db, model, and updated schema to i…
NatalieTapias Oct 15, 2019
8ca4cf8
Works model generated, works schema established, migration for works …
NatalieTapias Oct 15, 2019
fd9362e
created view files for works
NatalieTapias Oct 15, 2019
8c4bdc1
successful db seed
NatalieTapias Oct 15, 2019
56ce51d
Index.html.erb displays work details
NatalieTapias Oct 15, 2019
c734432
added description and creator fields to the seeds.rb file
NatalieTapias Oct 15, 2019
e347f9b
Refine Homepages view
NatalieTapias Oct 15, 2019
1f59b7e
Nav added to layouts/application"
NatalieTapias Oct 15, 2019
93dfd1b
adding some bootstrap styling to Application.html.erb
NatalieTapias Oct 15, 2019
1307cdf
Modified name -> username for users chema. Added routes for custom Us…
NatalieTapias Oct 15, 2019
9f1d229
Updated UsersController#show
NatalieTapias Oct 15, 2019
75a8038
Logic for login/logout based on session status
NatalieTapias Oct 15, 2019
b7c638c
Updating header to include primary buttons
NatalieTapias Oct 15, 2019
bcd6863
Adding styling to header
NatalieTapias Oct 15, 2019
2a7e58b
Users Index show page
NatalieTapias Oct 15, 2019
ba4fb05
New Works WorksController action adn view
NatalieTapias Oct 16, 2019
8604e1d
Work Model method to randomly select top 10 works.
NatalieTapias Oct 16, 2019
0c7ab6a
Listing albums, movies, and books by category on index view for Homep…
NatalieTapias Oct 16, 2019
b562c6e
Updated new works form.
NatalieTapias Oct 16, 2019
99d38b8
Show page for each work complete.
NatalieTapias Oct 16, 2019
3cc76c0
Works#Edit and Edit pages are finished
NatalieTapias Oct 16, 2019
0609739
Added delete action
NatalieTapias Oct 16, 2019
37c8e67
Model test for Work set up
NatalieTapias Oct 16, 2019
f590ae4
Added list_works partial to HomepagesController index view.
NatalieTapias Oct 16, 2019
0e5385a
WorksController added controller filters to DRY up the WorksController.
NatalieTapias Oct 16, 2019
79877c8
Added link to individual work on WorksController Index page. Redirect…
NatalieTapias Oct 16, 2019
9b5000c
Added links on bottoms of Works Index view, and Users Index view to r…
NatalieTapias Oct 16, 2019
95609b6
tweaking scss
NatalieTapias Oct 16, 2019
c13ebb9
Updated WorksController#create to include flash[:success], and update…
NatalieTapias Oct 16, 2019
07c31da
Added flash[:success] messages that will confirm that a work has been…
NatalieTapias Oct 16, 2019
1a35415
Homepages layout
NatalieTapias Oct 16, 2019
a5cf4a7
Happily organized columns of media on homepages index view
NatalieTapias Oct 16, 2019
d861f7c
Setting up relationships in Models.
NatalieTapias Oct 16, 2019
35250ed
Add vote to user and add votes to works.
NatalieTapias Oct 17, 2019
306064b
Added hyperlink to homepages index on list of works (on work title).
NatalieTapias Oct 17, 2019
50a107a
Styling pause.
NatalieTapias Oct 17, 2019
fffb311
stylesheet update
NatalieTapias Oct 17, 2019
962c926
added button classes to bottom of show and index page for users.
NatalieTapias Oct 17, 2019
c70d9b3
Added resources for VotesController actions
NatalieTapias Oct 17, 2019
453a359
custom css for btn-primary and btn-danger.
NatalieTapias Oct 17, 2019
9895c49
Getting the user#show view ready for voting.
NatalieTapias Oct 17, 2019
218751e
Formatting tables
NatalieTapias Oct 17, 2019
236d115
Refactor to use partials on Works#show
NatalieTapias Oct 17, 2019
0cdd4a5
fix file name
NatalieTapias Oct 17, 2019
44f3bb6
Added private method to pull current user data. I've added @current_u…
NatalieTapias Oct 17, 2019
44f053f
Added private method to return @current_user based on which user is s…
NatalieTapias Oct 17, 2019
79e3032
Updated WorksController and UsersControlelr to understand @current_user
NatalieTapias Oct 17, 2019
37284c8
saving work before another migration.
NatalieTapias Oct 17, 2019
2dff3c1
added changes
NatalieTapias Oct 17, 2019
0dee98c
Renders / when session[:id] doesn't correspond with a user in the db.
NatalieTapias Oct 18, 2019
fb53f2f
VotesController#create action works.
NatalieTapias Oct 18, 2019
f1f8006
updating the vote path in works/_table
NatalieTapias Oct 18, 2019
69bc52e
minitest reporters
NatalieTapias Oct 18, 2019
e5dead0
Got upvote working again
NatalieTapias Oct 18, 2019
ff596df
Model validations
NatalieTapias Oct 18, 2019
0e32663
Form Styling
NatalieTapias Oct 18, 2019
9e4b9a9
Button sizing in nav bar.
NatalieTapias Oct 18, 2019
ebf9ae5
Still can't get the drop-down menu to behave as I'd like
NatalieTapias Oct 18, 2019
7d548a9
yml files for users and votes
NatalieTapias Oct 18, 2019
ede49fb
Modified schema to have votes hold the work_id and user_id.
NatalieTapias Oct 21, 2019
e11f8d6
Displays nuber of votes on works#index viwe.
NatalieTapias Oct 21, 2019
bce29d1
Added partial for displaying users who vote for works.
NatalieTapias Oct 21, 2019
50f4729
defined a method that tallies number of votes per user.
NatalieTapias Oct 21, 2019
dd81f47
added a readable date helper method
NatalieTapias Oct 21, 2019
8e25a1e
Updating view to accurately display number of votes per user. Updatin…
NatalieTapias Oct 21, 2019
b273750
Vote model test
NatalieTapias Oct 21, 2019
54ccebe
Media Spotlight method
NatalieTapias Oct 21, 2019
449be50
moving faker to production
NatalieTapias Oct 21, 2019
90edb24
Updating gemfile
NatalieTapias Oct 21, 2019
d5e814f
Fixing my migrations
NatalieTapias Oct 21, 2019
cdcc3cd
vote model testing.
NatalieTapias Oct 21, 2019
11a5182
vote_test
NatalieTapias Oct 21, 2019
3994454
model logic
NatalieTapias Oct 23, 2019
e820841
top ten ordering.
NatalieTapias Oct 23, 2019
c7303f5
media-spotlight model method.
NatalieTapias Oct 23, 2019
f01f1a9
fixing fixtures
NatalieTapias Oct 23, 2019
a7e1036
work model test return empty array if no works.
NatalieTapias Oct 23, 2019
03353dd
votes controller test allowing users to vote for multiple works etc
NatalieTapias Oct 23, 2019
788bac8
votes controller test
NatalieTapias Oct 23, 2019
163983a
added user otes index page
NatalieTapias Oct 23, 2019
4997436
fixing users#show action and view
NatalieTapias Oct 23, 2019
68f99a7
.travis.yml
NatalieTapias Nov 6, 2019
801d3d8
change
NatalieTapias Nov 6, 2019
d9d4a5e
Merge pull request #2 from NatalieTapias/travis
NatalieTapias Nov 6, 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
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: ruby

rvm:
- 2.5.5

services:
- postgresql

before_script:
- bin/rails db:create
- bin/rails db:migrate

script:
- bin/rails test
88 changes: 88 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
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
gem 'faker'

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 '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'
end
Loading