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

Finished Danebook #61

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 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
55cbf90
initial commit
MariahAcacia Aug 29, 2017
fd2d614
updated readme
MariahAcacia Aug 29, 2017
9308de2
updated readme
MariahAcacia Aug 29, 2017
01a62ad
added root to home, view and action
MariahAcacia Aug 29, 2017
e828d6f
finished timeline page and route
MariahAcacia Aug 30, 2017
918f14e
finished adding friends page and route
MariahAcacia Aug 30, 2017
289b7fb
added about page and route
MariahAcacia Aug 30, 2017
4452e30
finished photo page and route
MariahAcacia Aug 30, 2017
aea32e6
fixed navbar for home(not logged in) vs. other pages(logged in)
MariahAcacia Aug 30, 2017
0380dea
added and finished about_edit page and route, link on about page works
MariahAcacia Aug 31, 2017
ea87444
links work for all pages
MariahAcacia Aug 31, 2017
390c06d
fixed pages links so they are gray when on that page
MariahAcacia Aug 31, 2017
02c0773
fixed a few little styling/spacing issues
MariahAcacia Aug 31, 2017
38bc6ad
gave each page it's own css file
MariahAcacia Aug 31, 2017
3125c1f
broke timeline page into partials
MariahAcacia Aug 31, 2017
65bdc7b
broke photos into partials
MariahAcacia Aug 31, 2017
a0ed27a
broke friends page into partials
MariahAcacia Aug 31, 2017
c2b4c76
broke botha bout pages into partials
MariahAcacia Aug 31, 2017
cdec5f3
refactored stylesheets
MariahAcacia Aug 31, 2017
211bc51
added pg gem for production
MariahAcacia Aug 31, 2017
e85ea76
getting ready to deploy
MariahAcacia Sep 1, 2017
483b2e9
gettingready to deploy
MariahAcacia Sep 1, 2017
e7f2870
added secrets.yml to gitignore
MariahAcacia Sep 1, 2017
8edaca7
gitignore
MariahAcacia Sep 1, 2017
df501e6
gitignore
MariahAcacia Sep 1, 2017
659ba64
changed db to pg
MariahAcacia Sep 1, 2017
8718e48
fixed small display issue
MariahAcacia Sep 1, 2017
e9b4579
added deployed version to readme
MariahAcacia Sep 1, 2017
89d0822
fixed navbar issue
MariahAcacia Sep 2, 2017
1b93765
merged repos
MariahAcacia Apr 24, 2018
15aaf6a
added user model and beginnings of cookie auth
MariahAcacia Apr 24, 2018
b14fa1c
login and new user function working
MariahAcacia May 3, 2018
f802022
working on getting profile show and edit up and working
MariahAcacia May 9, 2018
a3db7ed
update profile functional
MariahAcacia May 11, 2018
c9f0946
fixed spacing
MariahAcacia May 11, 2018
8e8aca9
like function working
MariahAcacia Jun 5, 2018
30585a8
liking function working, seeded database
MariahAcacia Jun 12, 2018
5943d83
added spec files finished feature tests for users
MariahAcacia Aug 9, 2018
9a0f4ed
finished controller spec for users
MariahAcacia Aug 14, 2018
7769085
finished request specs, except comments - need help on comments requests
MariahAcacia Aug 20, 2018
0d2ef1a
started post and comment index view specs, need to do like unlike links
MariahAcacia Aug 21, 2018
b56ab34
finished comments index spec, added like, unlike test to post index spec
MariahAcacia Aug 22, 2018
111138f
added new deployed address
MariahAcacia Aug 22, 2018
5a45b59
trying to fix home, signup page layout
MariahAcacia Aug 22, 2018
975f416
fixed spacing issued on homepage
MariahAcacia Aug 22, 2018
34d0688
fixed spacing issued on homepage
MariahAcacia Aug 22, 2018
b55d65d
fixed spacing issued on homepage
MariahAcacia Aug 22, 2018
2f00030
added friending functionality (one way no confirmation), added friend…
MariahAcacia Sep 13, 2018
6b07cc6
added photo mvc, changed comments to polymorphic to apply to photos a…
MariahAcacia Sep 14, 2018
e6334ab
fixed comment form for posts to take commentable id and type instead …
MariahAcacia Sep 14, 2018
75372f6
most of photo functionality working, still need widget and index layout
MariahAcacia Sep 14, 2018
4e0ddc9
almost finish with styling photo index page
MariahAcacia Sep 14, 2018
403b632
fixed spacing on photos page, fixed route and file structure slightly…
MariahAcacia Sep 15, 2018
f91c735
timeline photos widget now working
MariahAcacia Sep 17, 2018
c3b3044
Added coverphotoid and profilephotoid to profiles photos now on thumb…
MariahAcacia Sep 18, 2018
65117cd
fixed some styling on timeline
MariahAcacia Sep 18, 2018
80c74d2
fixed some specs
MariahAcacia Sep 23, 2018
f735d7f
finished fixing specs
MariahAcacia Sep 24, 2018
f048423
added request and model tests for photos
MariahAcacia Sep 27, 2018
2a3a7e3
fixed some spacing issues
MariahAcacia Oct 3, 2018
4cc825c
added user search function and wired up search in navbar
MariahAcacia Oct 25, 2018
6f46346
added delayed jobs, delayed welcome email, added email for comments, …
MariahAcacia Oct 26, 2018
2b97b96
newsfeed post list done, left side recently active list not done
MariahAcacia Oct 27, 2018
ea56b6a
finished recently active friend list for newsfeed, started on clean u…
MariahAcacia Oct 29, 2018
cc1a8fe
refectoring, fixing newfeed
MariahAcacia Oct 31, 2018
cc35a35
finished newsfeed
MariahAcacia Nov 5, 2018
2a0f0d5
fixed some spacing on newsfeed, refactored controllers
MariahAcacia Nov 5, 2018
2e28ed3
refactored views
MariahAcacia Nov 5, 2018
7ddae65
more refactoring and fixed tests to reflect
MariahAcacia Nov 6, 2018
1a962b8
started to add comment request test coverage
MariahAcacia Nov 6, 2018
13eb3eb
added address section to mailers, added comment request tests, delete…
MariahAcacia Nov 7, 2018
12df6ca
finished adding comment request testing
MariahAcacia Nov 8, 2018
d32b34a
adding form error messages
MariahAcacia Nov 9, 2018
01dd84e
fixed user request spec, controllers to build and edit profile throug…
MariahAcacia Nov 9, 2018
67ac124
added error messages to forms
MariahAcacia Nov 9, 2018
4013cbc
fixed some styling and spacing issues
MariahAcacia Nov 10, 2018
b456269
added delete account and unsubscribe from email option, still need to…
MariahAcacia Nov 17, 2018
dc7847c
fixed like association so it is destroyed when user is, fixed a littl…
MariahAcacia Nov 26, 2018
934065c
added profile for heroku
MariahAcacia Nov 26, 2018
81fc2a4
fixed link url in mailers
MariahAcacia Nov 26, 2018
d808fc0
Delete secrets.yml
MariahAcacia Nov 26, 2018
aedbc56
Create secrets.yml
MariahAcacia Nov 27, 2018
401fc2d
Delete secrets.yml
MariahAcacia Nov 27, 2018
70c47ed
Create secrets.yml
MariahAcacia Nov 27, 2018
c023fd0
hopefully fixed merge issue
MariahAcacia Nov 27, 2018
d0be363
Merge branch 'master' of https://github.com/MariahAcacia/project_dane…
MariahAcacia Nov 27, 2018
6670335
fixed merge issue
MariahAcacia Nov 27, 2018
44b0b4a
removed merge
MariahAcacia Nov 27, 2018
8c3d65f
fixed issue when you delete photo if it was set as profile or cover p…
MariahAcacia Nov 28, 2018
f944d5f
fixed some styles, bugs, and refactor
MariahAcacia Dec 4, 2018
dd2d05f
added default host to all env
MariahAcacia Dec 6, 2018
a7356d1
added url for deployed version
MariahAcacia Dec 7, 2018
8c9c1fb
updated readme
MariahAcacia Dec 7, 2018
b4da019
refactored a bit"
MariahAcacia Dec 7, 2018
bcf83ee
got rid of whitespace above navbar
MariahAcacia Dec 10, 2018
f14fa31
compiled assets to deploy
MariahAcacia Dec 10, 2018
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
33 changes: 33 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# 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


/public/system

/config/application.yml

.env

/config/secrets.yml

# 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
100 changes: 100 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
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.5'
# 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 postgresql for development and production
gem 'pg'

# Use Paperclip for uploading images
gem 'paperclip'

# Use Figaro for ENV variable management
gem 'figaro'

# Use AWS s3 for storage
gem 'aws-sdk'

# Delayed Jobs for email
gem 'delayed_job_active_record'

# 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
# testing
gem 'rspec-rails'
gem 'factory_girl_rails', '~> 4.0'
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 'pry'
gem "better_errors"
gem "binding_of_caller"
gem 'bullet'
gem 'hirb'

# fake sending emails
gem 'letter_opener'

# testing
gem 'guard-rspec', require: false

# Gems for efficiency
gem 'counter_culture'
gem 'rack-mini-profiler'
gem 'lol_dba'
end

group :test do
gem 'capybara'
gem 'launchy'
gem 'rails-controller-testing'
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