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

sdfsdf #40

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
dc78730
create model, controller, table for users
adrianmui Aug 10, 2016
823961b
sign up form
adrianmui Aug 10, 2016
148050e
navbar is loggin, done with cookies
adrianmui Aug 11, 2016
5ba7fe2
sqlit3 to postgres
adrianmui Aug 11, 2016
c56f406
heroku deploy
adrianmui Aug 11, 2016
1382f1c
heroku problems
adrianmui Aug 11, 2016
90d5121
css + login working
adrianmui Aug 11, 2016
f3cf013
sign up + profile
adrianmui Aug 11, 2016
5a75883
edit about inc
adrianmui Aug 12, 2016
8e562f7
edit fin
adrianmui Aug 12, 2016
222f344
post on timeline
adrianmui Aug 12, 2016
62d60f8
paths are fixed
adrianmui Aug 12, 2016
f63739c
touchup
adrianmui Aug 12, 2016
b9935c3
comment model
adrianmui Aug 15, 2016
bf903a8
rspec
adrianmui Aug 15, 2016
7cbcae7
factory
adrianmui Aug 15, 2016
1b0047d
testing user/profile model
adrianmui Aug 15, 2016
61ed645
finish post, working liking
adrianmui Aug 15, 2016
77f9b36
test for user.profile.post.likes
adrianmui Aug 16, 2016
6b9bcd4
tests
adrianmui Aug 18, 2016
5702eb5
post photosworking, profile photos not working, app not working atm
adrianmui Aug 19, 2016
f47d2ef
works now?
adrianmui Aug 19, 2016
5f48eb2
welcome on create_user messages, trigger on create_post messages via …
adrianmui Aug 19, 2016
f074433
slight touches, wall posts are now aligned
adrianmui Aug 19, 2016
e068ed6
added Friending model, added selfreference associations to User
adrianmui Aug 19, 2016
6cea5cc
Friending joinmodel table migrated
adrianmui Aug 19, 2016
1027508
create and wrote index, create,destroy method for friendings controll…
adrianmui Aug 19, 2016
19163d5
friending and unfriending works
adrianmui Aug 20, 2016
b35db91
touchups, friends has count
adrianmui Aug 20, 2016
7caf736
search form working for users
adrianmui Aug 22, 2016
85ccd95
newsfeeds recent and all
adrianmui Aug 22, 2016
b117414
comment redo
adrianmui Aug 22, 2016
2154bfe
creating polymorphic comments
adrianmui Aug 22, 2016
1d4da44
comment halffin, emails heroku deploy now
adrianmui Aug 22, 2016
dc04d9d
bug
adrianmui Aug 22, 2016
06cfa4a
bug
adrianmui Aug 22, 2016
e572bca
bug
adrianmui Aug 22, 2016
24930db
bug
adrianmui Aug 22, 2016
b4f12cc
haha
adrianmui Aug 22, 2016
a5402b8
Update README.md
adrianmui Sep 17, 2016
d111873
Update README.md
adrianmui Sep 18, 2016
77721fe
Update README.md
adrianmui Sep 18, 2016
d649d86
touch up, fixing bugs atm
adrianmui Sep 18, 2016
5159421
Merge branch 'master' of https://github.com/adrianmui/project_danebook
adrianmui Sep 18, 2016
dec46b7
photos is weird
adrianmui Sep 19, 2016
0fb3ddd
heorku
adrianmui Sep 19, 2016
541ab88
photos
adrianmui Sep 19, 2016
bc53615
tochup
adrianmui Sep 20, 2016
bdff5b7
touchup, photo working
adrianmui Sep 21, 2016
23425e6
pry heroku bug
adrianmui Sep 21, 2016
8e7571f
fix up comments
adrianmui Sep 21, 2016
7bac244
stuff is working, but the styling is crap. must redo over weekend
adrianmui Sep 21, 2016
56188a9
ok
adrianmui Sep 22, 2016
3dc5472
ok
adrianmui Sep 22, 2016
3784592
revamped outlook
adrianmui Sep 25, 2016
53ffce7
links to readme
adrianmui Sep 25, 2016
f59246e
done for sat, will work on hard stuff sunday
adrianmui Sep 25, 2016
90ceb4e
sleeping now
adrianmui Sep 25, 2016
52d6fa4
touch up
adrianmui Sep 26, 2016
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
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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

# 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 doc
78 changes: 78 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
source 'https://rubygems.org'

#mail
gem 'daemons'
gem 'delayed_job_active_record'
#photos
gem 'paperclip'
gem 'figaro'
gem 'aws-sdk'
#rails app
gem 'rails-controller-testing'
gem 'simple_form'
gem 'taps'
gem 'pg'
gem 'hirb'
gem 'faker'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0'
# 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'

# 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 'guard-rspec'
end

group :test do
gem 'capybara'
gem 'launchy'
gem 'shoulda-matchers', '~> 3.1'
end

group :production do
gem 'rails_12factor'
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 'binding_of_caller'
gem 'rspec-rails'
gem 'guard-rspec', require: false
gem 'factory_girl_rails', '~> 4.0'
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