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

Port to React #70

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
d765181
Added react, redux, glamor and babel
jfresco Nov 5, 2016
2388ee5
Refactor components
jfresco Nov 5, 2016
1a58e15
Tune up linter rules
jfresco Nov 5, 2016
c17e6fa
Bump version
jfresco Nov 5, 2016
61ff3e9
Add build dirs
jfresco Nov 5, 2016
766a1bb
Make server to work
jfresco Nov 5, 2016
16b86e5
Show app list
jfresco Nov 5, 2016
e939d2a
Clean db-api code
jfresco Nov 5, 2016
02d4faf
Remove unused packages and bump the remaining ones
jfresco Nov 5, 2016
76652ce
wip
jfresco Dec 1, 2016
4c3bb3a
rename npm module
mjlescano Dec 1, 2016
266da93
remove xo
mjlescano Dec 1, 2016
6fe076d
remove Makefile
mjlescano Dec 1, 2016
75f4f7d
wip
jfresco Dec 1, 2016
45f1a87
fix import vs require declaration
mjlescano Dec 1, 2016
fb3358d
remove webpack devtool
mjlescano Dec 2, 2016
a4528fe
wip
jfresco Dec 2, 2016
de1230f
Add router
mjlescano Dec 2, 2016
1c3421a
Fix AppList not being shown
jfresco Dec 11, 2016
6f4ce79
Code style
jfresco Dec 11, 2016
92b0360
Add language middleware and a little refactor
jfresco Dec 11, 2016
4174c27
add babel-eslint
mjlescano Jan 24, 2017
0f794c0
wip
jfresco Jan 24, 2017
775f277
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Jan 24, 2017
56f044c
wip
jfresco Jan 24, 2017
757dd9f
update mongoose to 4.7.8
mjlescano Jan 24, 2017
2b65385
use native Promise for mongoose
mjlescano Jan 24, 2017
9c4a750
force express version
mjlescano Jan 24, 2017
11f8097
use absolute path for tempaltes
mjlescano Jan 24, 2017
a75a700
:fire:
mjlescano Jan 24, 2017
d90480b
re-add bin/civicstack-dump-emails
mjlescano Jan 24, 2017
fe31931
fix entry point
mjlescano Jan 24, 2017
d26d054
remove useless app.js
mjlescano Jan 24, 2017
618f108
Countries filter (first iteration)
jfresco Jan 24, 2017
438e7bc
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Jan 24, 2017
df24c44
pin package.json versions
mjlescano Jan 25, 2017
ca9e034
Merge pull request #72 from CivicStack/remove/old-files
mjlescano Jan 25, 2017
ea04c60
remove unused deps
mjlescano Jan 25, 2017
6f36e50
Fix some bugs in country filter
jfresco Jan 25, 2017
0b9cf72
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Jan 25, 2017
e715556
add ismorphic config using democracyos-config
mjlescano Jan 31, 2017
e8fca73
Merge pull request #73 from CivicStack/chore/config
mjlescano Jan 31, 2017
9e10e7d
Technology filters and some refactor
jfresco Jan 31, 2017
82aed45
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Jan 31, 2017
1b91586
Add democracyos-config
jfresco Feb 9, 2017
65c65f1
Add tags filter modal
jfresco Feb 9, 2017
38c1a8e
add favicon
mjlescano Feb 9, 2017
8738ef1
fix 404 when loading
mjlescano Feb 9, 2017
856d7c0
Implement search
jfresco Feb 10, 2017
bff170e
Add missing propTypes
jfresco Feb 10, 2017
f0422b0
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Feb 10, 2017
411de14
fix apps beign loaded by AppsList
mjlescano Feb 16, 2017
d637f1c
rename app-card -> AppCard
mjlescano Feb 16, 2017
a1b25d2
fix locale on initial-state
mjlescano Feb 16, 2017
f06bbc8
fix missing key attrs
mjlescano Feb 16, 2017
bd99008
Refactor applications API and db-api
jfresco Feb 16, 2017
78611e1
Show logs in console
jfresco Feb 16, 2017
102403c
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Feb 16, 2017
5c06eef
rename App -> Layout
mjlescano Feb 16, 2017
d1d32e8
Merge branch 'chore/react' of github.com:CivicStack/civicstack into c…
mjlescano Feb 16, 2017
821b350
Move `AppList` to `containers`
jfresco Feb 16, 2017
9b17549
update react-router
mjlescano Feb 16, 2017
d2aeee8
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Feb 16, 2017
bdc79b1
update react-router
mjlescano Feb 16, 2017
13ebec0
add missing babel-core dependency
mjlescano Feb 16, 2017
90a5af2
Refactor
jfresco Feb 16, 2017
cdbd3f8
Merge branch 'chore/react' of github.com:DemocraciaEnRed/civicstack i…
jfresco Feb 16, 2017
d06558c
fix views
mjlescano Feb 23, 2017
45d8679
fix routes
mjlescano Feb 23, 2017
26e2341
remove conflict
mjlescano Feb 23, 2017
19d1ced
Upvote
jfresco Feb 24, 2017
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
25 changes: 25 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"presets": ["es2015", "stage-0", "react"],
"plugins": [
"transform-runtime",
"glamor/babel"
],
"env": {
"start": {
"plugins": [
"react-transform"
]
},
"extra": {
"react-transform": {
"transforms": [
{
"transform": "react-transform-hmr",
"imports": ["react"],
"locals": ["module"]
}
]
}
}
}
}
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
dist/
24 changes: 24 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"parser": "babel-eslint",
"extends": ["standard", "standard-react"],
"plugins": [
"react"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true,
"experimentalObjectRestSpread": true
}
},
"env": {
"node": true,
"es6": true
},
"rules": {
"react/jsx-curly-spacing": [2, "never"],
"space-before-function-paren": [2, "always"],
"object-curly-spacing": [2, "always"],
"array-bracket-spacing": [2, "never"],
"no-console": 2
}
}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ node_modules
/mm-config.*.json

# Extra ignores
components
public
dist
.DS_Store
26 changes: 0 additions & 26 deletions Makefile

This file was deleted.

1 change: 0 additions & 1 deletion Procfile

This file was deleted.

11 changes: 3 additions & 8 deletions bin/civicstack
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
#!/usr/bin/env node

/**
* Module dependencies.
*/

var program = require('commander');
const program = require('commander')
const version = require('../package.json').version

program
.version('0.0.2')
.command('install', "Install client components.")
.command('build', "Builds client application and compiles assets.")
.version(version)
.command('dump-emails', "Exports all user's emails on database to a CSV file")
.parse(process.argv)
22 changes: 0 additions & 22 deletions bin/civicstack-build

This file was deleted.

23 changes: 0 additions & 23 deletions bin/civicstack-config

This file was deleted.

40 changes: 19 additions & 21 deletions bin/civicstack-dump-emails
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
#!/usr/bin/env node

/**
* Module dependencies.
*/

var fs = require('fs');
var write = fs.writeFileSync;
var program = require('commander');
var MongoClient = require('mongodb').MongoClient;
const fs = require('fs')
const write = fs.writeFileSync
const program = require('commander')
const MongoClient = require('mongodb').MongoClient

program
.option('-o, --out <f>', 'file name to write')
.option('-d, --db <d>', 'database URL')
.parse(process.argv);
.parse(process.argv)

MongoClient.connect(program.db, function (err, db) {
if (err) {
console.error(err);
process.exit(1);
console.error(err)
process.exit(1)
}

var users = db.collection('users');
console.log('Fetching users...');
const users = db.collection('users')

console.log('Fetching users...')

users.find().toArray(function (err, docs) {
var userList = docs.filter(function (doc) {
return doc.email;
const userList = docs.filter(function (doc) {
return doc.email
}).map(function (doc) {
return (doc.firstName || '') + ',' + (doc.lastName || '') + ',' + (doc.email || '');
});
return (doc.firstName || '') + ',' + (doc.lastName || '') + ',' + (doc.email || '')
})

console.log('Writing file...')
write(program.out, userList.join('\n'));
write(program.out, userList.join('\n'))
console.log('Wrote ' + userList.length + ' entries.')
process.exit(0);
});
});
process.exit(0)
})
})
54 changes: 0 additions & 54 deletions bin/civicstack-install

This file was deleted.

20 changes: 0 additions & 20 deletions component.json

This file was deleted.

2 changes: 2 additions & 0 deletions config/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.json
!defaults.json
4 changes: 4 additions & 0 deletions config/defaults.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"port": 3000,
"client": []
}
25 changes: 0 additions & 25 deletions docker-compose.yml

This file was deleted.

16 changes: 0 additions & 16 deletions docker/development.Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions docker/development.env

This file was deleted.

16 changes: 0 additions & 16 deletions index.js

This file was deleted.

16 changes: 0 additions & 16 deletions lib/about/about.js

This file was deleted.

12 changes: 0 additions & 12 deletions lib/about/about.styl

This file was deleted.

Loading