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

Update Readme and fix indent #2

Open
wants to merge 90 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
c35716d
Merge pull request #9 from maurop123/master
ErnieAtLYD Jul 21, 2015
2a636e1
Create README.md
maurop123 Jul 23, 2015
132288b
update data link
maurop123 Jul 23, 2015
d03d829
adds informational md files to the project
Jul 31, 2015
3770093
adds informational md files to the project
Jul 31, 2015
0e8f99b
adds minor edits to contributing.md
Jul 31, 2015
5849a64
adds minor edits to contributing.md
Jul 31, 2015
3ae66bd
deletes spring rspec from documentation
Jul 31, 2015
d97f927
deletes spring rspec from documentation
Jul 31, 2015
5771138
Merge pull request #11 from mugab686/master
ErnieAtLYD Jul 31, 2015
3e2cf61
Merge pull request #11 from mugab686/master
ErnieAtLYD Jul 31, 2015
5f38973
gregs frontend
maurop123 Aug 4, 2015
c5c7fc1
gregs frontend
maurop123 Aug 4, 2015
04de37b
update index
maurop123 Aug 4, 2015
151db36
update index
maurop123 Aug 4, 2015
542e91d
finalize frontend for live release
maurop123 Aug 4, 2015
008dc04
finalize frontend for live release
maurop123 Aug 4, 2015
fc3cba9
last frontend updates for first live
maurop123 Aug 4, 2015
a5e75a5
last frontend updates for first live
maurop123 Aug 4, 2015
f6c79be
Rollback README.md
ErnieAtLYD Aug 5, 2015
f7313f1
Rollback README.md
ErnieAtLYD Aug 5, 2015
b1d7304
Merge pull request #13 from Code-for-Miami/ErnieAtLYD-patch-1
maurop123 Aug 7, 2015
3e14be6
Merge pull request #13 from Code-for-Miami/ErnieAtLYD-patch-1
maurop123 Aug 7, 2015
4e3cba3
blog link in nav
maurop123 Aug 17, 2015
5e22d86
blog link in nav
maurop123 Aug 17, 2015
8f72465
Delete CivicHacker.png
HiGregory Aug 25, 2015
fc3d866
Delete CivicHacker.png
HiGregory Aug 25, 2015
76c3a32
Delete CivicHacker2.png
HiGregory Aug 25, 2015
5f63c7e
Delete CivicHacker2.png
HiGregory Aug 25, 2015
e389723
Delete CivicHacker3.png
HiGregory Aug 25, 2015
902dae9
Delete CivicHacker3.png
HiGregory Aug 25, 2015
cdbab3c
Delete CivicHacker4.png
HiGregory Aug 25, 2015
5bfcecb
Delete CivicHacker4.png
HiGregory Aug 25, 2015
c74e254
site updates; add contributor sean; update README
maurop123 Aug 27, 2015
193b11d
site updates; add contributor sean; update README
maurop123 Aug 27, 2015
79f6e11
site and readme changes
maurop123 Aug 27, 2015
15e9bce
site and readme changes
maurop123 Aug 27, 2015
f66be6c
update
maurop123 Aug 27, 2015
e96f6fa
update
maurop123 Aug 27, 2015
c0320b2
Merge pull request #23 from HiGregory/patch-2
maurop123 Aug 31, 2015
5dcb9ad
Merge pull request #23 from HiGregory/patch-2
maurop123 Aug 31, 2015
058d20f
Merge pull request #26 from HiGregory/patch-5
maurop123 Aug 31, 2015
93783bd
Merge pull request #26 from HiGregory/patch-5
maurop123 Aug 31, 2015
d0acb1f
Merge pull request #25 from HiGregory/patch-4
maurop123 Aug 31, 2015
8907944
Merge pull request #25 from HiGregory/patch-4
maurop123 Aug 31, 2015
34f3050
Merge pull request #24 from HiGregory/patch-3
maurop123 Aug 31, 2015
13aeac6
Merge pull request #24 from HiGregory/patch-3
maurop123 Aug 31, 2015
9e0ce41
index changes and removing .git from sunburst directory
maurop123 Sep 10, 2015
34fa4e2
index changes and removing .git from sunburst directory
maurop123 Sep 10, 2015
b63e212
Merge branch 'master' of https://github.com/Code-for-Miami/miami-budget
maurop123 Sep 10, 2015
968d4e7
Merge branch 'master' of https://github.com/Code-for-Miami/miami-budget
maurop123 Sep 10, 2015
0f3b9fd
readd sunburst
maurop123 Sep 10, 2015
ff69643
readd sunburst
maurop123 Sep 10, 2015
15e88a1
Removed a transform which was moving labels off the canvas for Firefox
nowthis Sep 22, 2015
225667f
Removed a transform which was moving labels off the canvas for Firefox
nowthis Sep 22, 2015
17a1d41
Merge branch 'nowthis-fix_firefox'
maurop123 Sep 23, 2015
384652d
Merge branch 'nowthis-fix_firefox'
maurop123 Sep 23, 2015
1f7f4e5
meteor init
maurop123 Oct 25, 2015
ff1df00
Merge branch 'master' of https://github.com/Code-for-Miami/miami-budget
maurop123 Oct 25, 2015
3970d85
Merge branch 'master' of https://github.com/Code-for-Miami/miami-budget
maurop123 Oct 25, 2015
79dab82
adding readme files
maurop123 Oct 25, 2015
eeb107b
adding readme files
maurop123 Oct 25, 2015
4a507bd
almost there
maurop123 Oct 25, 2015
1449384
almost there
maurop123 Oct 25, 2015
2014726
final stable meteor copy of previously static site
maurop123 Oct 25, 2015
d327eaa
final stable meteor copy of previously static site
maurop123 Oct 25, 2015
248d1db
add sunburst route. clean up directories
maurop123 Oct 25, 2015
2b34a75
add sunburst route. clean up directories
maurop123 Oct 25, 2015
6034722
front page design simplified
maurop123 Oct 25, 2015
57d7fcd
front page design simplified
maurop123 Oct 25, 2015
57084ea
Delete settings.json
maurop123 Oct 27, 2015
6bfcc36
Delete settings.json
maurop123 Oct 27, 2015
2f1cba1
Delete mup.json
maurop123 Oct 27, 2015
1eec949
Delete mup.json
maurop123 Oct 27, 2015
738f633
init
maurop123 Nov 2, 2015
aeb5360
missing files
maurop123 Nov 2, 2015
eb2bb73
clean up repo
maurop123 Nov 3, 2015
0108fcb
deleted files
maurop123 Nov 3, 2015
b24c0c9
Merge branch 'master' of https://github.com/Code-for-Miami/miami-budget
maurop123 Nov 3, 2015
520d16a
readme and license update
maurop123 Nov 3, 2015
bd806cb
fix readme
maurop123 Nov 3, 2015
70f688c
Test/Added the word please
Nov 10, 2015
5ea9fee
Merge pull request #43 from lisacarson/master
maurop123 Nov 10, 2015
85d6884
layout template and three eleven data
maurop123 Nov 15, 2015
8359d37
Merge branch 'master' of https://github.com/Code-for-Miami/miami-budget
maurop123 Nov 15, 2015
ae780b0
layout template and three eleven data
maurop123 Nov 15, 2015
05088ba
updated 311
maurop123 Nov 17, 2015
b669153
include 311 graph on front page with title links
maurop123 Nov 17, 2015
cde56ba
merge in 311 branch
maurop123 Nov 17, 2015
19789aa
Merge pull request #46 from Code-for-Miami/master
maurop123 Nov 24, 2015
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*.swp
mup.json
settings.json
12 changes: 12 additions & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file contains information which helps Meteor properly upgrade your
# app when you run 'meteor update'. You should check it into version control
# with your project.

notices-for-0.9.0
notices-for-0.9.1
0.9.4-platform-file
notices-for-facebook-graph-api-2
1.2.0-standard-minifiers-package
1.2.0-meteor-platform-split
1.2.0-cordova-changes
1.2.0-breaking-changes
1 change: 1 addition & 0 deletions .meteor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
local
7 changes: 7 additions & 0 deletions .meteor/.id
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file contains a token that is unique to your project.
# Check it into your repository along with the rest of this directory.
# It can be used for purposes such as:
# - ensuring you don't accidentally deploy one app on top of another
# - providing package authors with aggregated statistics

1drptg9f1c9a41wwqeqt
32 changes: 32 additions & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Meteor packages used by this project, one per line.
# Check this file (and the other files in this directory) into your repository.
#
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

autopublish
insecure
fourseven:scss
jquery
coffeescript
mquandalle:jade
fortawesome:fontawesome
cunneen:mailgun
meteorhacks:kadira
d3js:d3
iron:router
standard-minifiers
meteor-base
mobile-experience
mongo
blaze-html-templates
session
tracker
logging
reload
random
ejson
spacebars
check
poetic:materialize-scss
pcel:loading
2 changes: 2 additions & 0 deletions .meteor/platforms
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
server
browser
1 change: 1 addition & 0 deletions .meteor/release
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
METEOR@1.2.1
87 changes: 87 additions & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
autopublish@1.0.4
autoupdate@1.2.4
babel-compiler@5.8.24_1
babel-runtime@0.1.4
base64@1.0.4
binary-heap@1.0.4
blaze@2.1.3
blaze-html-templates@1.0.1
blaze-tools@1.0.4
boilerplate-generator@1.0.4
caching-compiler@1.0.0
caching-html-compiler@1.0.2
callback-hook@1.0.4
check@1.1.0
coffeescript@1.0.11
cunneen:mailgun@0.9.1
d3js:d3@3.5.8
ddp@1.2.2
ddp-client@1.2.1
ddp-common@1.2.2
ddp-server@1.2.2
deps@1.0.9
diff-sequence@1.0.1
ecmascript@0.1.6
ecmascript-runtime@0.2.6
ejson@1.0.7
email@1.0.8
fastclick@1.0.7
fortawesome:fontawesome@4.4.0
fourseven:scss@3.4.1
geojson-utils@1.0.4
hot-code-push@1.0.0
html-tools@1.0.5
htmljs@1.0.5
http@1.1.1
id-map@1.0.4
insecure@1.0.4
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
iron:layout@1.0.12
iron:location@1.0.11
iron:middleware-stack@1.0.11
iron:router@1.0.12
iron:url@1.0.11
jquery@1.11.4
launch-screen@1.0.4
livedata@1.0.15
localstorage@1.0.5
logging@1.0.8
meteor@1.1.10
meteor-base@1.0.1
meteorhacks:kadira@2.26.3
meteorhacks:meteorx@1.4.1
minifiers@1.1.7
minimongo@1.0.10
mobile-experience@1.0.1
mobile-status-bar@1.0.6
mongo@1.1.3
mongo-id@1.0.1
mongo-livedata@1.0.9
mquandalle:jade@0.4.5
mquandalle:jade-compiler@0.4.5
npm-mongo@1.4.39_1
observe-sequence@1.0.7
ordered-dict@1.0.4
pcel:loading@1.0.3
poetic:materialize-scss@1.3.5
promise@0.5.1
random@1.0.5
reactive-dict@1.1.3
reactive-var@1.0.6
reload@1.1.4
retry@1.0.4
routepolicy@1.0.6
session@1.1.1
spacebars@1.0.7
spacebars-compiler@1.0.7
standard-minifiers@1.0.2
templating@1.1.5
templating-tools@1.0.0
tracker@1.0.9
ui@1.0.8
underscore@1.0.4
url@1.0.5
webapp@1.2.3
webapp-hashing@1.0.5
93 changes: 93 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
## How to Contribute
In the spirit of open source software, **everyone** is encouraged to help
improve this project.

### Ways *you* can contribute:
* by [testing the software](http://mauroaperez.com/miamibudget)
* by [using the issue tracker][issue_tracker] for...
* reporting bugs
* suggesting new features
* suggesting labels for our issues
* by improving the code through:
* writing or editing documentation
* writing test specifications
* refactoring the code (**no patch is too small**: fix typos, add comments,
clean up inconsistent whitespace).
* reviewing [open Pull Requests][open_prs]
* by [donating to Code for America][donate]

### Reporting a bug or other issue
We use the GitHub issue tracker to track bugs and feature
requests. To submit a bug report or feature request:

1. **[Browse][issue_tracker] or [search][issue_search] our issues** to make
sure your issue hasn't already been submitted.

2. **[Submit an issue][new_issue]**.
If you're submitting a bug report, it's helpful to include any details that
may be necessary to reproduce the bug, including:

- a screenshot
- your operating system (Windows 7, Mac OSX 10.9.2, etc.)
- your web browser and version (Internet Explorer 9, Chrome 27, etc.)
- a stack trace of any errors encountered
- your Ruby version (use `ruby -v` from the command line)

For developers, a bug report should ideally include a pull request with
failing specs.

### Help Wanted
Some issues in particular we'd be happy if contributors like yourself were
interested in fixing. Browse the issues [labelled `help wanted`][help_wanted]
and see if there's something there that you could fix.

### Updating the Code? Open a Pull Request
To submit a code change to the project for review by the team:

1. **Setup:** Make sure you have the [prerequisites installed][prerequisites]
on your computer.

2. **Fork:** [Fork this repository and clone it on your computer][fork].

3. **Install Dependencies:** From the root directory of the app, run `bundle`.

4. **Branch:** [Create a topic branch][branch] for the one specific issue
you're addressing.

5. **Write Specs:** Add specs for your unimplemented feature or bug fix in the
`/spec/` directory.

6. **Test to fail:**

7. **Implement:** Implement your feature or bug fix.

8. **Test to pass:** Run `script/test` to run the test suite in addition to the
style checkers. If your specs fail and/or style offenses are reported, return
to **step 7**.

9. _(If applicable)_ **Clean up JavaScript code:** Run `rake jshint` to check
JavaScript code quality.

10. **Commit changes:** Add, commit, and push your changes.

11. **Pull request:** [Submit a pull request][pr] to send your changes to this
repository for review.

_*If you use Sublime Text, please make sure to set your tab indentation to 2
spaces. We also highly recommend you use the [TrailingSpaces][trailing_spaces]
plugin and set it to [Trim On Save][trim_on_save]._

[install_instructions]: https://github.com/codeforamerica/ohana-web-search/blob/master/INSTALL.md
[open_prs]: https://github.com/Code-for-Miami/miami-budget/pulls
[help_wanted]: https://github.com/Code-for-Miami/miami-budget/labels/help%20wanted
[donate]: http://codeforamerica.org/support-us/
[issue_tracker]: https://github.com/Code-for-Miami/miami-budget/issues
[issue_search]: https://github.com/Code-for-Miami/miami-budget/search?utf8=%E2%9C%93&q=
[new_issue]: https://github.com/Code-for-Miami/miami-budget/issues/new
[prerequisites]: https://github.com/Code-for-Miami/miami-budget/blob/master/INSTALL.md
[fork]: http://help.github.com/fork-a-repo/
[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
[style_guide]: https://github.com/bbatsov/ruby-style-guide
[pr]: http://help.github.com/send-pull-requests/
[trailing_spaces]: https://github.com/SublimeText/TrailingSpaces
[trim_on_save]: https://github.com/SublimeText/TrailingSpaces#trim-on-save
27 changes: 27 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@

# Running Ohana Web Search on your computer

## Install Prerequisites

You'll need to have the following software installed and/or referenced for this project:

- [jQuery][jQuery]
- [D3.js][d3js]
- [Meteor.js][meteorjs] (only used for running the tests)

[jQuery]: http://jquery.com/download/
[D3.js]: http://d3js.org/
[Meteor.js]: https://www.meteor.com/install

## Installation Instructions

Clone the `Code for Miami/miami-budget` repository and navigate to the project's directory:

git clone git@github.com:Code-for-Miami/miami-budget.git
cd miami-budget

### Run the app
Instructions to be added. The application will run using meteor.js

### Customize the app
To Be Added
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) [year] [fullname]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
39 changes: 39 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Miami Graph

![Budget Sunburst](http://leadmiami.co/content/images/2015/08/sunburst.png)

### Experience Miami's Data
Miami Graph started as a single D3.js sunburst visualization of Miami Dade county's 2016 budget proposal data. It aims to make Miami's data more engaging for its citizens.

[miamigraph.com](http://miamigraph.com)

**Table of Contents**

- [Installation](#installation)
- [Contribute](#contribute)

### Installation

1. [Install Meteor](https://www.meteor.com/install)
2. `git clone https://github.com/Code-for-Miami/miamigraph.git`
3. From the cloned repo, run `meteor`
4. After the app builds, please visit [http://localhost:3000](http://localhost:3000)

###Gotcha!
* `Scss compiler error: file to import not found or unreadable: .meteor/.../sass/materialize.scss`
* Ignore this error. Ctrl+C and rerun the app with `meteor`

### Contribute
* [Trello Task List](https://trello.com/b/fIe4tQWP/miami-graph)
* We meet us at Code for Miami every Monday @7pm @TheLabMiami

#### Coding
* Fork this repo and clone it on your computer
* Checkout a branch for your work
* Submit a pull request to add your changes

#### Writing
Refer to Trello

#### Research
Refer to Trello
6 changes: 6 additions & 0 deletions client/head.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
head
meta(http-equiv="Content-Type" content="text/html; charset=UTF-8")
meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no")
title Miami Dade County Budget

script(src="//cdnjs.cloudflare.com/ajax/libs/numeral.js/1.4.5/numeral.min.js")
Loading