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

finish #54

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
3944800
Initial commit
eriktrautman Aug 19, 2014
5d52eea
update project requirements
eriktrautman Aug 19, 2014
79c61f0
update description
eriktrautman Aug 19, 2014
3b54bb2
add simple example file to display
eriktrautman Aug 19, 2014
ab286c1
link to example file
eriktrautman Aug 19, 2014
cbbd6c3
tweak
eriktrautman Aug 19, 2014
69d8827
index
eriktrautman Aug 19, 2014
6ee8ee5
clean up
eriktrautman Aug 19, 2014
913dfb0
add pivotal tracker
eriktrautman Aug 19, 2014
f089f17
Initial commit
eriktrautman Aug 20, 2014
d21472b
initial commit
eriktrautman Aug 20, 2014
ece8dc4
clarify workflows
eriktrautman Sep 7, 2014
616f3dd
update readme
eriktrautman Jan 4, 2015
2150dab
update readme
eriktrautman Jan 4, 2015
552f31d
update readme
eriktrautman Jan 4, 2015
876bc8d
update readme
eriktrautman Jan 4, 2015
8937f1d
update readme
eriktrautman Jan 4, 2015
a4889e0
Update README.md
eriktrautman Jan 4, 2015
fd586ee
add name to README
eating247 Oct 30, 2016
6da8795
finish home page
eating247 Oct 31, 2016
9f7f538
finish sign-in
eating247 Oct 31, 2016
5d673ed
finish sign up
eating247 Oct 31, 2016
fd52fda
add name to README
eating247 Oct 31, 2016
9b5c96b
finish about page
eating247 Nov 1, 2016
54850ea
finish about edit
eating247 Nov 1, 2016
de9e654
finish friends page
eating247 Nov 1, 2016
103c2ac
finish photos page
eating247 Nov 1, 2016
e06b332
finish timeline page
eating247 Nov 1, 2016
3aee778
add gitignore
eating247 Nov 1, 2016
bb7a82a
set up
eating247 Jan 22, 2017
1470fd1
add model and routes
eating247 Jan 22, 2017
924d273
integrate html/css from previous work
eating247 Jan 23, 2017
dbc8188
migrations and validations for user model
eating247 Jan 23, 2017
4596e35
sign in form
eating247 Jan 23, 2017
f757a5d
log-in
eating247 Jan 23, 2017
6e89708
profile form functional
eating247 Jan 23, 2017
1888746
fix header
eating247 Jan 23, 2017
0e626f3
implement static timeline page
eating247 Jan 24, 2017
05284e9
add timeline
eating247 Jan 25, 2017
b378071
add friend button
eating247 Jan 25, 2017
e1da52e
add and display comments
eating247 Jan 25, 2017
854ed0a
create like model
eating247 Jan 25, 2017
3bb77e3
add like/unlike feature
eating247 Jan 25, 2017
80b42f8
destroy like and comment
eating247 Jan 26, 2017
4a1da35
refactor nav and delete existing test directory
eating247 Feb 1, 2017
9dea6c7
set up rspec and guard
eating247 Feb 1, 2017
84b927e
model specs
eating247 Feb 2, 2017
3d94621
features specs
eating247 Feb 2, 2017
9d5265d
controller and view specs
eating247 Feb 3, 2017
aa1d5d6
friendings and photos basic functionality
eating247 Feb 9, 2017
b3589c1
formatting and bugs
eating247 Feb 9, 2017
fb4071e
friend button formatting
eating247 Feb 9, 2017
fead5da
basic newsfeed functionality
eating247 Feb 10, 2017
50b5e2d
refactor newsfeed and other things
eating247 Feb 10, 2017
7244164
heroku deployment
eating247 Apr 25, 2017
ad7e2e2
update readme
eating247 Apr 25, 2017
faa3254
update readme
eating247 Apr 26, 2017
d6da21c
password placeholder
eating247 May 8, 2017
7decf4e
refactor and seed db
eating247 May 8, 2017
527b902
fix cover photo css
eating247 May 10, 2017
3f3dc60
configure responiveness for photo show page
eating247 May 10, 2017
03c8a0f
add timeline link to navbar
eating247 May 10, 2017
c2a3652
add bottom margin to layout
eating247 May 10, 2017
cce5650
broke everything
eating247 May 17, 2017
bf9c5de
fix friending
eating247 May 17, 2017
daf67f4
fix some bugs + styling
eating247 May 17, 2017
a8f57fb
update tests
eating247 May 17, 2017
ac597db
add screenshots
eating247 May 17, 2017
c45432f
adding screenshotsMerge branch 'master' of github.com:eating247/proje…
eating247 May 17, 2017
dd91a1b
organize screenshots
eating247 May 17, 2017
dcba977
Add files via upload
eating247 May 17, 2017
a98d538
'more photos'Merge branch 'master' of github.com:eating247/project_da…
eating247 May 17, 2017
b757e23
more screenshots
eating247 May 17, 2017
c4bbdee
edit readme
eating247 May 17, 2017
327e12f
edit readme
eating247 May 17, 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
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<<<<<<< HEAD
# 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 SASS cache
.sass.cache
=======
# Ignore SASS cache

.sass-cache
>>>>>>> 5d673ed28d9ecc6caea75b04498ce02b10a67b76

# Ignore application configuration
/config/application.yml
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--require spec_helper
Binary file not shown.
Binary file not shown.
86 changes: 86 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
source 'https://rubygems.org'

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

gem 'bootstrap-sass', '~> 3.3.6'
gem 'sass-rails', '>= 3.2'
gem 'faker'
gem 'hirb'
gem 'paperclip'
gem 'figaro'
gem 'aws-sdk'
gem 'delayed_job_active_record'

group :development do
gem "better_errors"
gem "binding_of_caller"
gem "letter_opener"
end


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

# 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
# Rspec
gem 'rspec-rails'
# Factory Girl
gem 'factory_girl_rails', '~> 4.0'
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'
# Guard
gem 'guard-rspec', require: false
end

group :test do
gem 'capybara'
gem 'launchy'
gem 'shoulda-matchers', require: false
gem 'pry-rails'
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