diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..6ed0029 Binary files /dev/null and b/.DS_Store differ diff --git a/.bundle/config b/.bundle/config new file mode 100644 index 0000000..1c9fb93 --- /dev/null +++ b/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_WITHOUT: production diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 050c9d9..0000000 --- a/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -# 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/* -!/log/.keep -/tmp diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..b1b25a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.2.2 diff --git a/Gemfile b/Gemfile index b4d9f4c..0c1b4a0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,21 @@ source 'https://rubygems.org' +ruby '2.2.2' +gem 'pg' +gem 'react-rails', '~> 1.6.0' + +#gem 'rails_12factor', group: :production + +gem 'muni' +gem 'dotenv-rails', :groups => [:development, :test] +gem 'gmaps4rails' +gem 'underscore-rails' + gem 'bootstrap-sass', '3.2.0.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.4' # Use sqlite3 as the database for Active Record -gem 'sqlite3' + # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -21,7 +32,7 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', '~> 0.4.0', group: :doc +#gem 'sdoc', '~> 0.4.0', group: :doc # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' @@ -32,16 +43,20 @@ gem 'sdoc', '~> 0.4.0', group: :doc # 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' + gem 'sqlite3' end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' - # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end +group :production do + gem 'thin' +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index c2cc60e..3279458 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,13 +36,19 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + amatch (0.3.0) + tins (~> 1.0) arel (6.0.3) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-sass (3.2.0.0) sass (~> 3.2) builder (3.2.2) - byebug (8.2.1) + byebug (8.2.2) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -51,13 +57,21 @@ GEM execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.0) + connection_pool (2.2.0) + daemons (1.2.3) debug_inspector (0.0.2) + dotenv (2.1.0) + dotenv-rails (2.1.0) + dotenv (= 2.1.0) + railties (>= 4.0, < 5.1) erubis (2.7.0) + eventmachine (1.0.9.1) execjs (2.6.0) globalid (0.3.6) activesupport (>= 4.1.0) + gmaps4rails (2.1.2) i18n (0.7.0) - jbuilder (2.4.0) + jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) jquery-rails (4.1.0) @@ -73,8 +87,14 @@ GEM mini_portile2 (2.0.0) minitest (5.8.4) multi_json (1.11.2) + muni (0.0.8) + actionpack + amatch + thor + xml-simple nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) + pg (0.18.4) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -95,7 +115,7 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (4.2.4) actionpack (= 4.2.4) @@ -103,8 +123,13 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) - rdoc (4.2.1) - json (~> 1.4) + react-rails (1.6.2) + babel-transpiler (>= 0.7.0) + coffee-script-source (~> 1.8) + connection_pool + execjs + rails (>= 3.2) + tilt sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) @@ -112,21 +137,23 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) - spring (1.6.2) + spring (1.6.3) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.0.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) + thin (1.6.4) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (2.0.2) + tins (1.8.2) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) @@ -134,11 +161,13 @@ GEM uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - web-console (2.2.1) + underscore-rails (1.8.3) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) + xml-simple (1.1.5) PLATFORMS ruby @@ -147,16 +176,22 @@ DEPENDENCIES bootstrap-sass (= 3.2.0.0) byebug coffee-rails (~> 4.1.0) + dotenv-rails + gmaps4rails jbuilder (~> 2.0) jquery-rails + muni + pg rails (= 4.2.4) + react-rails (~> 1.6.0) sass-rails (~> 5.0) - sdoc (~> 0.4.0) spring sqlite3 + thin turbolinks uglifier (>= 1.3.0) + underscore-rails web-console (~> 2.0) BUNDLED WITH - 1.10.6 + 1.11.2 diff --git a/README.md b/README.md index 3e31c1c..b43f2e8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,39 @@ # HelpMyNeighbor -Providing resources to local business to connect the homeless in your local community as well as live chat on life advice + +##What is it? +Our mission is to make San Francisco community aware of current Homeless problem in the city and get small businesses support society focusing on homelessness. + +We are a team dedicated to providing support to homeless with the help of small businesses. We are here to make our society better and become more social responsible. + +To facilitate this we have developed a website that will make it easy for a homeless to find resources with in the small business community. + +##Technologies: +* Ruby +* Rails +* Javascript +* React +* Googe Map API +* PostgreSQL +* JQuery +* HTML5 +* CSS3 +* Bootstrap +* Heroku + +##Authors: +* Fatma Ocal +* Jason Xu +* Jorge Ortiz + +##To run locally via the command line: + +1. git clone https://github.com/1UnboundedSentience/HelpMyNeighbor.git +2. cd HelpMyNeighbor +3. bundle install +4. rake db:create +5. rake db:migrate +6. rake db:seed +7. rails server +8. http://localhost:3000/ + +### Deployed @ http://helpmyneighbor.herokuapp.com/ diff --git a/Rakefile b/Rakefile index ba6b733..c25e089 100644 --- a/Rakefile +++ b/Rakefile @@ -4,3 +4,9 @@ require File.expand_path('../config/application', __FILE__) Rails.application.load_tasks + +require 'dotenv/tasks' + +task :mytask => :dotenv do + # things that require .env +end \ No newline at end of file diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000..b66d5b2 Binary files /dev/null and b/app/.DS_Store differ diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store new file mode 100644 index 0000000..5a4eab3 Binary files /dev/null and b/app/assets/.DS_Store differ diff --git a/app/assets/images/aa1.png b/app/assets/images/aa1.png new file mode 100644 index 0000000..adf8f65 Binary files /dev/null and b/app/assets/images/aa1.png differ diff --git a/app/assets/images/aa3.png b/app/assets/images/aa3.png new file mode 100644 index 0000000..4f6a97e Binary files /dev/null and b/app/assets/images/aa3.png differ diff --git a/app/assets/images/aa4.png b/app/assets/images/aa4.png new file mode 100644 index 0000000..61fc40a Binary files /dev/null and b/app/assets/images/aa4.png differ diff --git a/app/assets/images/ab1.png b/app/assets/images/ab1.png new file mode 100644 index 0000000..36983e1 Binary files /dev/null and b/app/assets/images/ab1.png differ diff --git a/app/assets/images/ac1.jpeg b/app/assets/images/ac1.jpeg new file mode 100644 index 0000000..cee1c21 Binary files /dev/null and b/app/assets/images/ac1.jpeg differ diff --git a/app/assets/images/ad1.jpeg b/app/assets/images/ad1.jpeg new file mode 100644 index 0000000..cee1c21 Binary files /dev/null and b/app/assets/images/ad1.jpeg differ diff --git a/app/assets/images/fatma.jpeg b/app/assets/images/fatma.jpeg new file mode 100644 index 0000000..339e1a0 Binary files /dev/null and b/app/assets/images/fatma.jpeg differ diff --git a/app/assets/images/ho93.jpg b/app/assets/images/ho93.jpg new file mode 100644 index 0000000..3448cde Binary files /dev/null and b/app/assets/images/ho93.jpg differ diff --git a/app/assets/images/nolan_frazier.jpg b/app/assets/images/nolan_frazier.jpg new file mode 100644 index 0000000..3cf5269 Binary files /dev/null and b/app/assets/images/nolan_frazier.jpg differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e07c5a8..4f10dbf 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,10 @@ //= require jquery //= require jquery_ujs //= require turbolinks +//= require react +//= require react_ujs +//= require components //= require_tree . +//= require underscore +//= require gmaps/google +//= require map.js diff --git a/app/assets/javascripts/components.js b/app/assets/javascripts/components.js new file mode 100644 index 0000000..9ce7a4f --- /dev/null +++ b/app/assets/javascripts/components.js @@ -0,0 +1 @@ +//= require_tree ./components diff --git a/app/assets/javascripts/components/.gitkeep b/app/assets/javascripts/components/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/components/test.jsx b/app/assets/javascripts/components/test.jsx new file mode 100644 index 0000000..e7cb44b --- /dev/null +++ b/app/assets/javascripts/components/test.jsx @@ -0,0 +1,6 @@ +var HelloMessage = React.createClass({ + render: function() { + //debugger + return (