Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c0708af
Merge pull request #1 from 1UnboundedSentience/static-pages
1UnboundedSentience Jan 23, 2016
cad0167
Merge pull request #3 from 1UnboundedSentience/static-pages
1UnboundedSentience Jan 23, 2016
55a031a
Created Contact Page
nofrazie Jan 24, 2016
ae0894f
Added home, about and contact page
nofrazie Jan 24, 2016
8702c01
"merge 6pm"
nofrazie Jan 24, 2016
489fdf1
my
nofrazie Jan 24, 2016
fd13153
Complete contact page
nofrazie Jan 24, 2016
c48cff6
Complete shelter pg
nofrazie Jan 24, 2016
db6344d
Complete shelter
nofrazie Jan 24, 2016
f2d8e25
version after hackathon jan26
1UnboundedSentience Jan 26, 2016
6504ab9
instructions
1UnboundedSentience Jan 26, 2016
38eddc5
afterhackathon version
1UnboundedSentience Jan 26, 2016
9e1003f
new
Jan 27, 2016
c80d4a0
Include map key
Jan 27, 2016
1820aca
Fixed bugs
Jan 28, 2016
90eaaa0
removed merge conflict head excess, implementing mapbox with searchba…
1UnboundedSentience Feb 5, 2016
4d5a9bb
map feature working
1UnboundedSentience Feb 12, 2016
1471f14
database changes
1UnboundedSentience Feb 12, 2016
bd7be14
precompile assets
1UnboundedSentience Feb 12, 2016
b3aa69e
removed images from static pages folder
nofrazie Mar 4, 2016
6bd429a
Added jquery and bootstrap javascript to create mobile dropdown menu …
nofrazie Mar 4, 2016
56e9661
Fixed toggle issue with navbar collapse button and eliminated duplica…
nofrazie Mar 4, 2016
d8ed750
Added Nolan Frazier's image and name to the about page
nofrazie Mar 4, 2016
ac7b564
Merge pull request #4 from nofrazie/master
1UnboundedSentience Mar 4, 2016
b7459a8
"nolans stuff"
1UnboundedSentience Mar 4, 2016
26dde87
Resize the height of footer
f-ocal Mar 11, 2016
040ecbb
Remove sprockets cache from tmp
f-ocal Mar 11, 2016
911f148
Align team member images @about pg
f-ocal Mar 11, 2016
8b9821e
Remove tmp/cache files
f-ocal Mar 11, 2016
ab7082c
Re-write home page text
f-ocal Mar 11, 2016
0786523
Include fatma's pic
f-ocal Mar 11, 2016
5e97269
Delete cache sprockets
f-ocal Mar 11, 2016
923f027
Remove API key
f-ocal Mar 11, 2016
13e0bb8
updated photos, will work on map ui
1UnboundedSentience Mar 11, 2016
a59df60
Include project descriptions in read me file
f-ocal Mar 11, 2016
4f69afb
Include project descriptions in read me file
f-ocal Mar 11, 2016
24e6950
react demo
1UnboundedSentience Mar 11, 2016
170b8b7
update readme
1UnboundedSentience Mar 11, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_WITHOUT: production
17 changes: 0 additions & 17 deletions .gitignore

This file was deleted.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.2.2
21 changes: 18 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
Expand All @@ -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
61 changes: 48 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -95,50 +115,59 @@ 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)
activesupport (= 4.2.4)
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)
sass (~> 3.1)
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)
thread_safe (~> 0.1)
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
Expand All @@ -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
39 changes: 38 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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/
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file added app/.DS_Store
Binary file not shown.
Binary file added app/assets/.DS_Store
Binary file not shown.
Binary file added app/assets/images/aa1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/aa3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/aa4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/ab1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/ac1.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/ad1.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/fatma.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/ho93.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/nolan_frazier.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions app/assets/javascripts/components.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= require_tree ./components
Empty file.
6 changes: 6 additions & 0 deletions app/assets/javascripts/components/test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var HelloMessage = React.createClass({
render: function() {
//debugger
return (<tr><th colSpan="2">{this.props.name} is the coolest ever!</th></tr>);
}
});
69 changes: 69 additions & 0 deletions app/assets/javascripts/map.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// This example adds a search box to a map, using the Google Place Autocomplete
// feature. People can enter geographical searches. The search box will return a
// pick list containing a mix of places and predicted search terms.

// This example requires the Places library. Include the libraries=places
// parameter when you first load the API. For example:
// <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places">
function initAutocomplete() {
var map = new google.maps.Map(document.getElementById('map'), {
center: {lat: 37.7833, lng: -122.4167},
zoom: 13,
mapTypeId: google.maps.MapTypeId.ROADMAP
});
//debugger
// Create the search box and link it to the UI element.
var input = document.getElementById('pac-input');
var searchBox = new google.maps.places.SearchBox(input);
map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);

// Bias the SearchBox results towards current map's viewport.
map.addListener('bounds_changed', function() {
searchBox.setBounds(map.getBounds());
});

var markers = [];
// Listen for the event fired when the user selects a prediction and retrieve
// more details for that place.
searchBox.addListener('places_changed', function() {
var places = searchBox.getPlaces();

if (places.length == 0) {
return;
}

// Clear out the old markers.
markers.forEach(function(marker) {
marker.setMap(null);
});
markers = [];

// For each place, get the icon, name and location.
var bounds = new google.maps.LatLngBounds();
places.forEach(function(place) {
var icon = {
url: place.icon,
size: new google.maps.Size(71, 71),
origin: new google.maps.Point(0, 0),
anchor: new google.maps.Point(17, 34),
scaledSize: new google.maps.Size(25, 25)
};

// Create a marker for each place.
markers.push(new google.maps.Marker({
map: map,
icon: icon,
title: place.name,
position: place.geometry.location
}));

if (place.geometry.viewport) {
// Only geocodes have viewport.
bounds.union(place.geometry.viewport);
} else {
bounds.extend(place.geometry.location);
}
});
map.fitBounds(bounds);
});
}
Loading