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

Danebook Submission #56

Open
wants to merge 78 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 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
ef78316
Initial Rails setup
yxlau Feb 10, 2017
7df8713
Set up controller for static pages
yxlau Feb 10, 2017
2ad7ec8
Set up home page
yxlau Feb 10, 2017
facf70a
Set up timeline page
yxlau Feb 10, 2017
5c232bc
Add friends page
yxlau Feb 10, 2017
70c6542
Add about page
yxlau Feb 10, 2017
eca5319
Add photos page
yxlau Feb 10, 2017
51fb9d2
Add routes
yxlau Feb 10, 2017
9a248d4
Refactor HTML
yxlau Feb 10, 2017
669b8e3
Set up for Heroku
yxlau Feb 10, 2017
d158be6
Refactor HTML
yxlau Feb 10, 2017
2835ab1
Merge branch 'master' of https://git.heroku.com/afternoon-lake-67415
yxlau Feb 11, 2017
dcdebc1
Use more partials and fix images
yxlau Feb 11, 2017
32761e9
Do minimal twitter-bootstrap-rails setup
yxlau Feb 11, 2017
570c3ae
Merge previous
yxlau Apr 7, 2017
b8749d1
Add basic sign up feature
yxlau Apr 8, 2017
6ecede0
Add login function
yxlau Apr 10, 2017
bf460b9
Fix navbar styles
yxlau Apr 10, 2017
d307e53
Add ability to edit profiles
yxlau Apr 13, 2017
9d382d4
Switch to devise
yxlau Apr 15, 2017
dd7ac38
Use devise for registrations
yxlau Apr 16, 2017
8911690
Set up post creation, deletion, display
yxlau Apr 16, 2017
d097209
Make authenticate_user! redirect to registration
yxlau Apr 16, 2017
167e799
Set up likes
yxlau Apr 16, 2017
aad33c7
Set up seeding and comment creation, deletion and liking
yxlau Apr 17, 2017
7740869
Set up friending
yxlau Apr 17, 2017
ca5877f
Make friending unilateral
yxlau Apr 18, 2017
5177c4a
Set up friend display
yxlau Apr 18, 2017
1a2dd43
Update seeds file
yxlau Apr 18, 2017
a5df3de
Make navbar logo point to # for now
yxlau Apr 18, 2017
f09fe70
Minor style tweaks
yxlau Apr 18, 2017
b136f04
Fix merge
yxlau Apr 18, 2017
903c2f8
Add model specs
yxlau Apr 23, 2017
ec71f90
Add request, controller and feature specs
yxlau Apr 25, 2017
31eaef8
Add a few view specs
yxlau Apr 26, 2017
b7ad5f9
Add a few view specs
yxlau Apr 26, 2017
565976a
Merge branch 'master' of https://github.com/yxlau/project_danebook
yxlau Apr 26, 2017
31f093c
Add tests for profile links
yxlau Apr 28, 2017
5421462
Initial setup for photos
yxlau Apr 28, 2017
294105c
Set up logic for friendship status
yxlau Apr 28, 2017
09a4a4a
Add sign out button to nav
yxlau Apr 28, 2017
976e626
Save WIP
yxlau Apr 29, 2017
7e6b2ec
Switch to request-based friending
yxlau May 1, 2017
a1bac5d
Set up photo posts
yxlau May 2, 2017
f09b4a9
Fix specs
yxlau May 3, 2017
0847e8f
Set up mailing
yxlau May 5, 2017
e3b7007
Set up welcome email
yxlau May 5, 2017
19978bf
Add comment notification emails
yxlau May 5, 2017
a8aee7c
Fix merge
yxlau May 5, 2017
814cc3b
Add missing plaintext email
yxlau May 5, 2017
01f32a2
Save WIP
yxlau May 6, 2017
fef58ab
Move names from profile to user model
yxlau May 6, 2017
52e9688
Set up newsfeed
yxlau May 6, 2017
610d65b
Fix up photo box
yxlau May 6, 2017
10a4945
Clean up models and controllers
yxlau May 6, 2017
aa69f67
Fix button styling
yxlau May 6, 2017
853e15a
Ensure that public/assets folder is ignored
yxlau May 6, 2017
6ac7db7
Fix sign in navbar and profile nav pills
yxlau May 6, 2017
867b1bf
Update delayed email settings
yxlau May 6, 2017
521e2fe
Set up for sendgrid
yxlau May 6, 2017
bc89391
Use amazon image for default_url
yxlau May 6, 2017
dfb036d
Fix welcome email
yxlau May 6, 2017
73aee8d
Update README
yxlau May 6, 2017
8f51cf8
Add missing search
yxlau May 7, 2017
37ab2ff
Fix up nav view and specs
yxlau May 7, 2017
48393d1
Beef up activity feed
yxlau May 8, 2017
196fa7f
Add pagination
yxlau May 8, 2017
479e59b
Add photos to newsfeed
yxlau May 8, 2017
1920e70
Update README
yxlau May 8, 2017
fba092e
Try using layouts
yxlau May 8, 2017
7e2c0bb
Use js for post and comment creation and deletion
yxlau Jun 3, 2017
e68b596
Set up lightbox
yxlau Jun 3, 2017
7a8744f
Fix commenting on lightbox
yxlau Jun 3, 2017
4336ee7
Fix sign-up re-render bug
yxlau Jun 4, 2017
7db5710
Fix specs and turbolinks load issue
yxlau Jun 5, 2017
c7242c7
Ajaxify likes
yxlau Jun 5, 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
Binary file added .DS_Store
Binary file not shown.
34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# 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 the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore Byebug command history file.
.byebug_history

# Notes
notes.md
tasks.md

# Ignore application configuration
/config/application.yml

# Ignore test files
/spec/test_files/*

# Ignore these since we don't want to push them to heroku
public/assets
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 doc
80 changes: 80 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
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


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.1'
# Use sqlite3 as the database for Active Record
# 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'
# 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', '~> 3.0'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'
gem "twitter-bootstrap-rails"
gem 'simple_form'
gem 'devise'
gem 'paperclip'
gem 'aws-sdk'
gem 'figaro'
gem 'delayed_job_active_record'
gem 'daemons'
gem 'will_paginate', '~> 3.1.0'


group :production do
gem 'pg'
end

# 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 'sqlite3'
gem 'rspec-rails'
gem 'factory_girl_rails', '~> 4.0'
gem 'capybara'
gem 'launchy'
gem 'faker'

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'
gem 'jazz_fingers'
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard-rspec', require: false
gem 'letter_opener'
end

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