Skip to content

Commit

Permalink
Implementing front-page
Browse files Browse the repository at this point in the history
Using React+Redux
  • Loading branch information
itamarjo authored and BlueHotDog committed Jan 15, 2018
1 parent 2305c0a commit 0229164
Show file tree
Hide file tree
Showing 109 changed files with 14,156 additions and 9,835 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.*]
indent_style = space
indent_size = 2
end_of_line = lf
123 changes: 1 addition & 122 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,124 +1,3 @@
{
// http://eslint.org/docs/rules/

"ecmaFeatures": {
"binaryLiterals": false, // enable binary literals
"blockBindings": false, // enable let and const (aka block bindings)
"defaultParams": false, // enable default function parameters
"forOf": false, // enable for-of loops
"generators": false, // enable generators
"objectLiteralComputedProperties": false, // enable computed object literal property names
"objectLiteralDuplicateProperties": false, // enable duplicate object literal properties in strict mode
"objectLiteralShorthandMethods": false, // enable object literal shorthand methods
"objectLiteralShorthandProperties": false, // enable object literal shorthand properties
"octalLiterals": false, // enable octal literals
"regexUFlag": false, // enable the regular expression u flag
"regexYFlag": false, // enable the regular expression y flag
"templateStrings": false, // enable template strings
"unicodeCodePointEscapes": false, // enable code point escapes
"jsx": true // enable JSX
},

"env": {
"browser": false, // browser global variables.
"node": true, // Node.js global variables and Node.js-specific rules.
"amd": false, // defines require() and define() as global variables as per the amd spec.
"mocha": false, // adds all of the Mocha testing global variables.
"jasmine": false, // adds all of the Jasmine testing global variables for version 1.3 and 2.0.
"phantomjs": false, // phantomjs global variables.
"jquery": false, // jquery global variables.
"prototypejs": false, // prototypejs global variables.
"shelljs": false, // shelljs global variables.
"es6": true
},

"globals": {
// e.g. "angular": true
},

"plugins": [
// e.g. "react" (must run `npm install eslint-plugin-react` first)
],

"rules": {
"accessor-pairs": 2,
"array-callback-return": 2,
"block-scoped-var": 2,
"class-methods-use-this": 0,
"complexity": 2,
"consistent-return": 2,
"curly": 2,
"default-case": 2,
"dot-location": 0,
"dot-notation": 2,
"eqeqeq": 2,
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
"no-case-declarations": 2,
"no-div-regex": 2,
"no-else-return": 2,
"no-empty-function": 2,
"no-empty-pattern": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-extra-label": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-global-assign": 2,
"no-implicit-coercion": 2,
"no-implicit-globals": 2,
"no-implied-eval": 2,
"no-invalid-this": 2,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-magic-numbers": [
2,
{
"ignore": [
-1,
0,
1
]
}
],
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-param-reassign": 2,
"no-proto": 2,
"no-redeclare": 2,
"no-restricted-properties": 2,
"no-return-assign": 2,
"no-return-await": 2,
"no-script-url": 2,
"no-self-assign": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-throw-literal": 2,
"no-unmodified-loop-condition": 2,
"no-unused-expressions": 2,
"no-unused-labels": 2,
"no-useless-call": 2,
"no-useless-concat": 2,
"no-useless-escape": 2,
"no-useless-return": 2,
"no-void": 2,
"no-warning-comments": 2,
"no-with": 2,
"prefer-promise-reject-errors": 2,
"radix": 2,
"require-await": 2,
"vars-on-top": 2,
"wrap-iife": 2,
"yoda": 2
}
"extends": "airbnb-base"
}
6 changes: 3 additions & 3 deletions backend/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"client": "mysql",
"connection": {
"host": "localhost",
"user": "your_database_user",
"password": "your_database_password",
"database": "citizen",
"user": "root",
"password": "",
"database": "meirim",
"charset": "utf8"
}
},
Expand Down
11 changes: 8 additions & 3 deletions client/.babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"presets" : ["es2015", "react"]
}

"presets": ["react", "es2015"],
"plugins": [
["import", {
"libraryName": "antd",
"style": "css"
}]
]
}
2 changes: 1 addition & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/coverage

# production
/build
/public

# misc
.DS_Store
Expand Down
Loading

0 comments on commit 0229164

Please sign in to comment.