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

All the changes #2

Merged
merged 25 commits into from
Mar 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3361f7f
Build process refactoring
contolini Feb 24, 2015
39a8d1f
Fix tests, add dummy data
contolini Feb 24, 2015
91aa344
Update docs and tests
contolini Feb 24, 2015
1b66c28
Automatically move the app behind nginx
contolini Feb 24, 2015
48280e9
Update README.md
contolini Feb 24, 2015
84d0448
Update README.md
contolini Feb 24, 2015
587d265
Update README.md
contolini Feb 24, 2015
02ccb65
Update README.md
contolini Feb 24, 2015
92c1896
WIP -syncing up
imuchnik Feb 25, 2015
e8223e3
Add floobits
contolini Feb 25, 2015
e0f9fd1
Day's work, now we have stores for users and teams
imuchnik Feb 25, 2015
0ca7a70
Revert "Day's work, now we have stores for users and teams"
imuchnik Feb 25, 2015
6923599
Add some storez
contolini Feb 26, 2015
eae8ea2
Merge pull request #1 from contolini/stores
imuchnik Feb 26, 2015
0b595ad
Wired up actions, mostly got all Fluxx components figured out more or…
imuchnik Feb 27, 2015
911a2b1
Merge pull request #1 from imuchnik/stores
contolini Feb 27, 2015
22ab8fe
Dump lib versions in front-end build script
contolini Feb 27, 2015
2fc90eb
Set up eslint
contolini Feb 27, 2015
87bd112
Config eslint and format files accordingly
contolini Feb 28, 2015
0c09e1c
Set up gulp build process
contolini Feb 28, 2015
c0248bc
Merge branch 'team-list' into eslint
contolini Feb 28, 2015
024821f
Update docs
contolini Feb 28, 2015
9058fbd
Kill old deps step
contolini Feb 28, 2015
1a161ae
Improve build process
contolini Mar 2, 2015
df55ae9
Create user actions, fix some tests
contolini Mar 2, 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: 1 addition & 1 deletion .bowerrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"directory" : "../../dependencies/"
"directory" : "src/vendor/"
}
36 changes: 36 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
ecmaFeatures:
ecmascript: 6
jsx: true

env:
browser: true
node: true
jasmine: true

globals:
$: true
jest: true

plugins: [react]

rules:
eqeqeq: 0
indent: [2, 2]
no-irregular-whitespace: 2
no-space-before-semi: 2
no-trailing-spaces: 2
no-multi-spaces: 2
no-space-before-semi: 2
curly: 2
strict: 0
quotes: [2, "single"]
space-after-keywords: [2, "always"]
semi: true
no-use-before-define: true
no-unused-vars: false
no-multi-str: false
no-underscore-dangle: false
space-before-function-parentheses: [2, "never"]
space-in-parens: [1, "never"]
space-in-brackets: [2, "never"]
react/wrap-multilines: 1
3 changes: 3 additions & 0 deletions .floo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"url": "https://floobits.com/devdash/dash"
}
8 changes: 8 additions & 0 deletions .flooignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#*
*.o
*.pyc
*~
extern/
node_modules/
tmp
vendor/
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
/node_modules
/node_modules
dist
src/bundle.js
src/vendor
36 changes: 6 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
Installation
------------

* `npm install -g gulp`
* `npm install -g bower`
* `npm install -g jest-cli`
* `npm install .`
* `npm install -g gulp bower jest-cli browserify`
* `./frontendbuild.sh`

Testing
-------
Expand All @@ -13,34 +11,12 @@ Testing

Developing
----------
To create a new set of javascript and css files:

* create a new directory in ./manifests
* place a bower.json in that directory
* Set up [`devdash`](https://github.com/cfpb/devdash#installation) so that [http://localhost:8000](http://localhost:8000) is correctly serving DevDash.
* `cd` back to this repo and `npm run watch`

# bower.json
{
"name": "portal",
...
"include": {
"js": ["path1", "path2"...],
"jsx": ["path1", "path2"...],
"css": [...]
}
}

* use the shim at src/dev_shim to seemlessly import all constituent files during development
* development files must be served by a webserver.
You can use `python -m SimpleHTTPServer 8000` to do so.
When files are edited, tests will be run and this repo will be copied over to the `devdash` directory to be served by nginx. Reload http://localhost:8000 to see your changes.

Build
-----
* run `gulp` to build the minified files in the `./build` directory.


Dependencies
------------
Specify dependencies in your bower.json.
When you modify dependencies,
enter the directery with you bower.json and run `bower install`.
This will install the dependencies to /dependencies.
* Run `gulp` to build the minified files into the `dist` directory.
34 changes: 0 additions & 34 deletions __tests__/example/CheckboxWithLabel-test.coffee

This file was deleted.

20 changes: 20 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "dash",
"version": "0.0.0",
"homepage": "https://github.com/contolini/dash",
"authors": [
"Chris Contolini <christopher.contolini@cfpb.gov>"
],
"license": "CC0",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"devDependencies": {
"less": "~2.4.0"
}
}
101 changes: 0 additions & 101 deletions build-utils.js

This file was deleted.

24 changes: 0 additions & 24 deletions build/js/example.js

This file was deleted.

19 changes: 0 additions & 19 deletions debug.html

This file was deleted.

23 changes: 0 additions & 23 deletions dependencies/jquery/.bower.json

This file was deleted.

43 changes: 0 additions & 43 deletions dependencies/jquery/.editorconfig

This file was deleted.

2 changes: 0 additions & 2 deletions dependencies/jquery/.gitattributes

This file was deleted.

13 changes: 0 additions & 13 deletions dependencies/jquery/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions dependencies/jquery/.gitmodules

This file was deleted.

Loading