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

User Authentication Complete #60

Open
wants to merge 159 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
a382cbd
Create README.md
eriktrautman Sep 23, 2014
eef2540
Update README.md
eriktrautman Jul 20, 2015
899aafe
Initial commit
lortza Nov 9, 2017
59b18e9
Adds boostrap navbar
lortza Nov 9, 2017
ea8da50
Adds boostrap basic layout
lortza Nov 9, 2017
3ef4bcf
Adds pages controller and basic pages
lortza Nov 9, 2017
1683350
Styles for my_feed page
lortza Nov 9, 2017
880cb87
Makes navbar FB blue
lortza Nov 9, 2017
2d7c872
Rounds top corners on feed images
lortza Nov 9, 2017
8af6400
Builds out sidebar-right
lortza Nov 9, 2017
7b24830
Adds status and app stats
lortza Nov 9, 2017
22e46a2
Notes heroku auto-deploy
lortza Nov 9, 2017
042b3f5
Merged previous work into new repo
lortza Jan 3, 2018
8eae1df
Updates db name
lortza Jan 3, 2018
3e0ab1b
Adds flashes with bootsrap styles
lortza Jan 3, 2018
48da385
Adds user scaffold
lortza Jan 3, 2018
65c19ae
Adds sessions controller
lortza Jan 3, 2018
5e8829d
Adds mockup images
lortza Jan 3, 2018
68aecae
Authorizes users to sign up and view profiles as well as edit their o…
lortza Jan 4, 2018
b91e980
Updates status
lortza Jan 4, 2018
27e4e93
Moves 'faker' gem into global gem space
lortza Jan 4, 2018
7698026
Adds bullet and rails-erd
lortza Jan 5, 2018
6059594
Fixes name display bug
lortza Jan 5, 2018
ea8e8d0
Adjusts syles to match FB
lortza Jan 5, 2018
f8497c8
Adds placeholders for users who have not yet uploaded photos
lortza Jan 5, 2018
550abfd
Adds timelines and policies
lortza Jan 5, 2018
3765035
Adds posts
lortza Jan 5, 2018
6f7f8bb
Updates existing views with new timelines resource
lortza Jan 5, 2018
bb52ee3
Fixes styles
lortza Jan 5, 2018
3c751bb
Adds policy to post delete
lortza Jan 5, 2018
855940c
Adds policies to the user controller
lortza Jan 5, 2018
a0caa81
Permits a user to like a post
lortza Jan 8, 2018
68e9749
Adds favicon
lortza Jan 8, 2018
f456bf5
Permits a user to 'unlike' a post
lortza Jan 8, 2018
f7460aa
Refactors likes into partial
lortza Jan 8, 2018
2271f34
Allows users to comment on posts and delete their comments
lortza Jan 8, 2018
ad81fab
Removes temporary ids
lortza Jan 9, 2018
ae8028a
Adds comments and likes to seeds
lortza Jan 9, 2018
aca53cb
Updates delete action with new resources
lortza Jan 9, 2018
3b4ef87
Removes unused items from navbars
lortza Jan 9, 2018
13cc749
WIP liking and commenting on comments
lortza Jan 9, 2018
6d51fac
Allows users to like and unlike comments
lortza Jan 9, 2018
1ffc93c
Installs rspec and guard gems
lortza Jan 9, 2018
f8f54d8
Adds the ability to friend and unfriend users
lortza Jan 9, 2018
a6c02dd
Renames timelines to timeline and resolves likes commas
lortza Jan 9, 2018
caa72d9
Renames helper method for clarity
lortza Jan 9, 2018
4ed6dec
Removes unused helper files
lortza Jan 9, 2018
e7ac8af
Install rspec
lortza Jan 12, 2018
45fcdc0
Adds user feed
lortza Jan 12, 2018
0cd715b
Adds placeholder structure for uploaded photos
lortza Jan 12, 2018
16a3cdb
Refactors like and comment redirect for brevity
lortza Jan 12, 2018
7a405dd
Permits only current user to see their feed
lortza Jan 12, 2018
4c684fd
Removes extra . from seed content
lortza Jan 12, 2018
ba61ecb
Changes user link destination over to user timeline
lortza Jan 12, 2018
28bf9f3
Adds placeholders for photos
lortza Jan 12, 2018
daf0059
Refactors posts for brevity
lortza Jan 12, 2018
8a65697
Adds ability to make a post in your own feed
lortza Jan 12, 2018
25cb38d
Permits users to see their own posts within their feed
lortza Jan 12, 2018
03f8c1f
Refactors styles on user show pages for brevity
lortza Jan 12, 2018
95c93bb
Adds stats useful for testing and debugging
lortza Jan 12, 2018
40e04c6
Limits number of friends displayed to 9
lortza Jan 12, 2018
37878df
Adds styles for active link in user header navbar
lortza Jan 15, 2018
87e375a
Finishes model specs for users
lortza Jan 17, 2018
c64c4fc
Writes model specs for posts
lortza Jan 17, 2018
29ce456
Model specs for comments
lortza Jan 17, 2018
2ee77cc
Dumps user seeds into seeds file
lortza Jan 17, 2018
57b3b16
Locks down likes table and model so a user can only like something once
lortza Jan 17, 2018
713eea6
Model specs for likes
lortza Jan 18, 2018
ae0d25a
Refactors to use standard ruby library method
lortza Jan 18, 2018
a4f324c
Adds specs for friendings
lortza Jan 18, 2018
1d5265e
Adds Capybara & launchy
lortza Jan 18, 2018
eedd04c
Redirects signed-in users to their feed as their root path
lortza Jan 18, 2018
2175025
Adds timeline posting feature specs
lortza Jan 18, 2018
1995671
Specs and code corrections for authentication
lortza Jan 18, 2018
21f41ca
Removes concatenation from button classes that don't need it
lortza Jan 18, 2018
d93e3da
Adds logout macro
lortza Jan 18, 2018
a97af1f
Moves timeline specs into posting, commenting, and liking spec files
lortza Jan 18, 2018
2e2e26c
Adds feed posting specs
lortza Jan 19, 2018
1e51db0
Adds feed specs for comments
lortza Jan 19, 2018
841937b
Specs for feed liking
lortza Jan 19, 2018
d569fd9
WIP controller specs
lortza Jan 19, 2018
ab4c84d
Updates howwarts seeds
lortza Jan 19, 2018
2a06255
Resolves missing friend headshots
lortza Jan 19, 2018
9d153c5
Adds background color to image tile
lortza Jan 19, 2018
7a3c04b
Removes unused controller action
lortza Jan 22, 2018
6646de5
Adds paperclip gem
lortza Jan 24, 2018
f004cf3
Adds placeholder for photo upload form
lortza Jan 24, 2018
6758542
Sets up Figaro and AWS S3
lortza Jan 25, 2018
b249552
Removes old mockup pages
lortza Jan 25, 2018
056f43c
Adds placeholder pics for paperclip
lortza Jan 25, 2018
81189bc
Permist user to upload photos to their feed
lortza Jan 25, 2018
d8c56e7
Displays photos in timeline stream and allows liking
lortza Jan 25, 2018
2e37868
Allows users to comment & delete comments on photos
lortza Jan 25, 2018
513be43
Removes conditional from timeline and feed views
lortza Jan 25, 2018
30f07e1
Refactors likes into generic cross-model method
lortza Jan 25, 2018
2fe11de
Removes unused 'delete photo' checkbox and shows errors in flash
lortza Jan 25, 2018
d9b4c32
Resolves comment like/unlike style issues
lortza Jan 25, 2018
cf4a1b1
Refactors dupe activity content into partials
lortza Jan 25, 2018
f409236
Displays thumbnails of friend photos
lortza Jan 25, 2018
614ca4b
Moves activity form into shared namespace
lortza Jan 25, 2018
7e3b514
Allows users to uload pics from the photos index page and view a larg…
lortza Jan 26, 2018
ae9e7ce
WIP user can set profile and cover pics
lortza Jan 26, 2018
3b5698f
Refactors profile pic setting for more true crud behavior
lortza Jan 26, 2018
a25fd11
Renames method for clarity of purpose
lortza Jan 26, 2018
3330327
Permits user to assign profile and cover pics via profile edit page
lortza Jan 26, 2018
1f821e5
Refactors from table layout to bootstrap columns
lortza Jan 26, 2018
c1cb8a6
Sets return to location globally
lortza Jan 26, 2018
ceab3db
Resolves unfriending bug so users can unfriend a friend regardless of…
lortza Jan 26, 2018
0327a91
Renames styles for clarity
lortza Jan 26, 2018
26d8cbc
Refactors user profile styles for integration of friend and photos se…
lortza Jan 26, 2018
e4ad9aa
Moves user-ish methods from timeline to user model because that's whe…
lortza Jan 26, 2018
8b9dd25
Adds user search functionality
lortza Jan 26, 2018
77d4e6e
Updates status
lortza Jan 26, 2018
4673036
Resolves redirects bug
lortza Jan 26, 2018
7b8a4ca
Refactors liking and commenting into shared module
lortza Jan 31, 2018
d6c4d24
Adds WIP logic to change header based on search results
lortza Jan 31, 2018
24dc055
Adds recently active friends to feed (and configs bullet gem to help …
lortza Jan 31, 2018
e8db847
Adds pagination to photos page
lortza Jan 31, 2018
7ffdf9b
Adds current user headshot to navbar
lortza Jan 31, 2018
d08ab55
Refactors to reduce redundancy between photos and posts
lortza Jan 31, 2018
6d2d11e
Reduces n+1 queries for nested relationships
lortza Jan 31, 2018
85544fc
Sets up a welcome mailing for when new users sign up
lortza Jan 31, 2018
6da0dc7
Sends email notifications when a user comments on your posts/photos
lortza Feb 1, 2018
10b3a63
Debugging premailer in production 1
lortza Feb 1, 2018
1ceb71b
Adds premailer gem
lortza Feb 1, 2018
77a775c
Debugging premailer in production 2
lortza Feb 1, 2018
c0148dd
Adds styles to 404 pages
lortza Feb 1, 2018
156f000
Adds sendgrid credentials and config
lortza Feb 1, 2018
316df9b
Sendgrid integration debugging 1
lortza Feb 1, 2018
0fd1363
Sendgrid integration debugging 2
lortza Feb 1, 2018
c98df13
Corrects typo
lortza Feb 1, 2018
fdfb83e
Generates erd for project
lortza Mar 2, 2018
4297a9e
Removes duplicate erd gem
lortza Mar 3, 2018
1ef6659
Removes dependency from erd module
lortza Mar 3, 2018
9672223
Rubycritic refactors
lortza Mar 7, 2018
fc6c437
Adds config options
lortza Mar 7, 2018
cf2d620
WIP tour of app section
lortza Mar 7, 2018
e05e167
Corrects image locations
lortza Mar 7, 2018
146eacb
Adds User Authorization explanation
lortza Mar 7, 2018
b18511c
Updates authorization section
lortza Mar 7, 2018
bb3a631
Removes comments and adds missing policy
lortza Mar 7, 2018
36bfd0e
Changes line breaks for readability
lortza Mar 7, 2018
b4e9e66
Adds mailer host url for testing
lortza Mar 7, 2018
739c83a
Updates tests
lortza Mar 7, 2018
ce3c0b3
Adds explanation for self-referencing model
lortza Mar 7, 2018
fb226e7
Adds explanation for polymorphic relationships
lortza Mar 8, 2018
443277b
Converts polymorphic likes to ajax
lortza Apr 20, 2018
defa3db
Update readme
lortza Apr 20, 2018
24ca0db
Updates srockets for security
lortza Jul 24, 2018
62e6b02
Adds codeclimate badge
lortza Aug 19, 2018
2f7e4fb
Add ruby version file
lortza Oct 21, 2018
8225b98
Replaces photos with placeholder links
lortza Oct 21, 2018
7166f19
Add travis file
lortza Oct 22, 2018
81d9aa6
Add travis badge
lortza Oct 22, 2018
9b228d4
WIP liking and posting specs
lortza Oct 23, 2018
ac05c7f
WIP add env to travis file
lortza Oct 23, 2018
5d7c722
WIP add env to travis file
lortza Oct 23, 2018
4eb0384
Remove seeding from test db
lortza Oct 23, 2018
1f88425
Update README.md
lortza Apr 28, 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
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
4 changes: 4 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
--color
--require spec_helper
--require pry
--format documentation
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.2
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
language: ruby
rvm:
- 2.4.2
services:
- postgresql
env:
- RAILS_ENV=test
before_script:
- psql -c 'create database travis_ci_test;' -U postgres
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script:
- bundle exec rake db:create
- bundle exec rake db:migrate
- bundle exec rspec
82 changes: 82 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

ruby '2.4.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.6'
# 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'

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

gem 'paperclip'
gem 'figaro'
gem 'aws-sdk', '< 3.0'

gem 'will_paginate', '~> 3.1.0'

gem 'seed_dump'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'pry-rails'
gem 'pry-awesome_print'
gem 'better_errors' #creates console in browser for errors
gem 'binding_of_caller' #goes with better_errors
gem 'rspec-rails'
gem "factory_bot_rails", "~> 4.0"

gem 'premailer-rails' # configures inline styles for mailer templates
gem 'nokogiri' # parses html for premailer-rails (and other things)
gem "rubycritic", require: false # provides stats on code build

end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
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 'bullet' #detects N+1 queries via config/initializers/bullet.rb
gem 'rails-erd', require: false # generates ERD chart for your schema
gem 'guard-rspec', require: false # runs rspec automatically
gem 'letter_opener'
end

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

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