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

Luke's Danebook #53

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f089f17
Initial commit
eriktrautman Aug 20, 2014
d21472b
initial commit
eriktrautman Aug 20, 2014
a4889e0
Update README.md
eriktrautman Jan 4, 2015
48776f1
update readme and assets
KenKot Jul 26, 2016
536b69a
top navbar story via the original bootstrap copied/pasted navbar w/ n…
KenKot Jul 26, 2016
d124b80
story 1, top navbar satisifed
KenKot Jul 27, 2016
9d8dc05
Update mynotes.md
KenKot Jul 27, 2016
e1fa830
Revisit mobile section note
KenKot Jul 27, 2016
a49e74f
story 2, About page - Main Photos satisifed
KenKot Jul 27, 2016
05b2b3d
Refractored
KenKot Jul 27, 2016
47550c9
about.html complete
KenKot Jul 28, 2016
998a40f
about_edit.html complete
KenKot Jul 28, 2016
4dda5d5
Story: timeline_page -- Post Creation Form Complete
KenKot Jul 28, 2016
7d13364
temp save
KenKot Jul 29, 2016
1a47a8e
temp save 2
KenKot Jul 29, 2016
2539219
temp save 3
KenKot Jul 29, 2016
8b2d20c
temp save 4
KenKot Jul 29, 2016
53e951b
timeline.html complete
KenKot Jul 30, 2016
68a9a11
add save changes button @ editprofile.html
KenKot Jul 30, 2016
1339173
fix timeline.html's about section
KenKot Jul 30, 2016
67e3192
almost finish photos.html
KenKot Jul 31, 2016
fbaa3fa
temp save
KenKot Jul 31, 2016
655cd58
Stories complete
KenKot Aug 1, 2016
4733f49
update mynotes.md
KenKot Aug 1, 2016
f99e8ac
Version 1 complete
KenKot Aug 1, 2016
0ecddb8
readme update
KenKot Dec 7, 2016
af0d4b4
add index.html
KenKot Dec 7, 2016
e5faccc
added sessions and users controller
luke-schleicher Dec 7, 2016
56d4b58
implement bootstrap
KenKot Dec 7, 2016
78a9be5
adding cookie-based auth
luke-schleicher Dec 8, 2016
cb6cecb
5pm
KenKot Dec 8, 2016
926c070
tweaked sign up page
luke-schleicher Dec 8, 2016
320427a
Tweaked show page styles
luke-schleicher Dec 8, 2016
43164b6
finished about page
luke-schleicher Dec 9, 2016
6e1e5ff
finished building edit profile page
luke-schleicher Dec 9, 2016
36ea59c
deploying to heroku
luke-schleicher Dec 9, 2016
a702f65
completed posting stories
luke-schleicher Dec 9, 2016
64bfd3a
working on likes
luke-schleicher Dec 10, 2016
2fb7b4a
fixed post delete functionality, fixed comments
luke-schleicher Dec 13, 2016
b3f7231
added comment deletion
luke-schleicher Dec 13, 2016
6390234
created feature tests
luke-schleicher Dec 13, 2016
626c477
fixed liking
luke-schleicher Dec 14, 2016
e546d9b
adding image functionality
luke-schleicher Dec 16, 2016
bab7d15
completed photos, refactored, and adding welcome email
luke-schleicher Dec 17, 2016
9259d92
fixed friend functionality and working on triggered mailer
luke-schleicher Dec 19, 2016
c48d126
tweaked seeds file
luke-schleicher Dec 19, 2016
f9bc71b
completed comment mailer functionality
luke-schleicher Dec 19, 2016
1b083c6
pushing to heroku
luke-schleicher Dec 20, 2016
6d8d7d1
changed aws region
luke-schleicher Dec 20, 2016
b4d663f
tweaked production.rb
luke-schleicher Dec 20, 2016
895d0cb
user search
luke-schleicher Jan 18, 2017
ca9c160
adding timeline functionality
luke-schleicher Jan 18, 2017
8393b7f
newfeed debugged, front end tweaks, view refactoring, remove turbolinks
luke-schleicher Jan 18, 2017
9b577da
posts and comments ajax-enabled
luke-schleicher Jan 18, 2017
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
22 changes: 22 additions & 0 deletions # Highlights a potential bug where a nested resour
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Highlights a potential bug where a nested resource could have the same ID as the current user causing the logical expression `params[:id] == current_user.id.to_s` to be true and not redirecting when it should

# user/:user_id/posts/:id/
# user_id == 1
# post.id == 1


# HAS BUG
def require_current_user
unless params[:id] == current_user.id.to_s || params[:user_id] == current_user.id.to_s
# redirect here
end
end


# Fixes bug
def require_current_user
user_id_key = controller_name == 'users' ? :id : :user_id
unless params[user_id_key] == current_user.id.to_s
#
end
end
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# 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 Byebug command history file.
.byebug_history

# Ignore application configuration
/config/application.yml
3 changes: 3 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--color
--require spec_helper
--format documentation
79 changes: 79 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
source 'https://rubygems.org'
ruby '2.3.0'

gem 'bootstrap-sass'

gem 'binding_of_caller'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'

# 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', '~> 3.0'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'

gem 'paperclip'

gem 'aws-sdk'

gem 'figaro'

gem 'delayed_job_active_record'

gem 'faker'

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

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'jazz_fingers'
gem 'rspec-rails'
gem 'factory_girl_rails', '~> 4.0'
gem 'shoulda-matchers'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console'
gem 'listen', '~> 3.0.5'
# 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'
gem 'better_errors'
gem 'guard-rspec'
gem 'letter_opener'
end

group 'test' do
gem 'capybara'
gem 'launchy'
end

group :production do

gem 'rails_12factor'

end

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