Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Wip/bigger refactoring #34

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a3a3501
Merge pull request #2 from markuskiss/fix-swagger-packagename
wicked539 Dec 1, 2017
1d6890a
Merge branch 'master' into feature/codereviewindyarni
wicked539 Dec 1, 2017
082cdd8
fix package name to clean merge conflict after base package rename
indyarni Dec 1, 2017
f1cae3d
Merge pull request #1 from indyarni/feature/codereviewindyarni
indyarni Dec 1, 2017
7d17722
delete duplicate class
indyarni Dec 1, 2017
e31da97
re-commit lost test after local git inconsistency
indyarni Dec 1, 2017
bb5a6c6
removed last remaining places where filiadata is mentioned
indyarni Dec 13, 2017
62d8a18
add maintainers.md
indyarni Dec 13, 2017
1c8ab92
remove filiadata artifactory url
indyarni Dec 13, 2017
d6b96bb
remove personal information
indyarni Dec 13, 2017
5d85279
anonymize some urls
indyarni Dec 13, 2017
84ec217
Merge pull request #3 from dm-drogeriemarkt/opensource_fixes
wicked539 Dec 13, 2017
08e97d0
update maintainers file
wicked539 Dec 13, 2017
9c9a251
use java.io.tmpdir config value instead of hardcoded /tmp folder
deki Dec 29, 2017
c347727
Add screenshot
wicked539 Jan 22, 2018
6efe8ea
Merge pull request #4 from deki/java.io.tmpdir
wicked539 Jan 22, 2018
02d9f58
added esLint and fixed errors
Jan 26, 2018
0b91f13
fixed all linting issues
Jan 26, 2018
d642ae9
Fixes PropTypes and Redux connection
Jan 26, 2018
6a44074
Fixed all but 1 test
Jan 26, 2018
8ae563d
fixes last test
Feb 23, 2018
1379a62
Merge branch 'master' of github.com:dm-drogeriemarkt/selavi into fron…
Jun 29, 2018
1e6d8ac
moves frontend files to javascript folder
Jun 29, 2018
bc42d02
Splits components and containers
Jun 29, 2018
e842e0b
Fixes prop-types issues
Jun 29, 2018
315b9ec
refactors folder structure
Jun 29, 2018
d2fc9f9
Fixes linting settings for imports
Jun 29, 2018
9d4ed60
replaces all occurencies of onTouchTap with onClick
Jul 20, 2018
0641bde
Merge branch 'master' of github.com:dm-drogeriemarkt/selavi into fron…
Jul 20, 2018
9412c31
uses create react app and jest and redux-saga
Jul 20, 2018
1377add
fixes some api calls
Jul 20, 2018
752c2c0
fixes props mapping in container
Jul 20, 2018
e64ef6a
moves login api to login component
Jul 20, 2018
6aad7d7
removes snackbar call and renames variables
Jul 20, 2018
d8296b2
removes obsolete login function from app
Jul 20, 2018
e0dd654
fixes reducer and actions in app
Jul 20, 2018
b86006f
fixes styling
Jul 20, 2018
e29d781
fixes action to select microservice in mindmap
Jul 20, 2018
dc93649
fixes lint errors
Jul 20, 2018
50cc974
fixes filtering
Jul 20, 2018
44c172d
fixes action payload in app reducer for selecting microservice nodes
Jul 20, 2018
363833b
renames frontend folder back to javascript
Jul 23, 2018
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
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

48 changes: 0 additions & 48 deletions package.json

This file was deleted.

18 changes: 10 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -224,34 +224,36 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>

<version>1.3</version>
<configuration>
<installDirectory>target</installDirectory>
<workingDirectory>src/main/javascript</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<id>install node and yarn</id>
<goals>
<goal>install-node-and-npm</goal>
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v6.9.1</nodeVersion>
<npmVersion>4.0.3</npmVersion>
<nodeVersion>v8.9.4</nodeVersion>
<yarnVersion>v0.16.1</yarnVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<id>yarn</id>
<goals>
<goal>npm</goal>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>npm run test</id>
<id>yarn run test</id>
<goals>
<goal>npm</goal>
<goal>yarn</goal>
</goals>
<phase>test</phase>
<configuration>
Expand Down
10 changes: 10 additions & 0 deletions src/main/javascript/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"presets": [["es2015", {"modules": false}], "env", "react"],
"plugins": ["transform-class-properties", "transform-object-rest-spread"],
"env": {
"test": {
"presets": [["es2015"], "env", "react"],
"plugins": ["transform-class-properties", "transform-object-rest-spread"]
}
}
}
1 change: 1 addition & 0 deletions src/main/javascript/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NODE_PATH=src/
1 change: 1 addition & 0 deletions src/main/javascript/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/**/resources/**/*.js
45 changes: 45 additions & 0 deletions src/main/javascript/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parser": "babel-eslint",
"extends": ["airbnb"],
"plugins": ["jest"],
"env": {
"es6": true,
"commonjs": true,
"node": true,
"jest": true,
"browser": true,
"mocha": true
},
"globals": {
"vis": true
},
"settings": { "import/resolver": { "node": { "paths": ["src"] } } } ,
"rules": {
"comma-dangle": [2, "never"],
"react/jsx-filename-extension": [
2, {
"extensions": [".js", ".jsx"]
}
],
"no-tabs": [0],
"max-len": [0],
"no-confusing-arrow": "off",
"jsx-a11y/no-static-element-interactions": [0],
"arrow-parens": [0, "as-needed"],
"no-else-return": [1],
"react/no-array-index-key": [0],
"react/jsx-wrap-multilines": [0],
"no-unused-expressions": [0, "allowShortCircuit"],
"no-param-reassign": [0, {"props": false}],
"newline-per-chained-call": ["error", {"ignoreChainWithDepth": 6}],
"react/jsx-tag-spacing": [
2, {
"closingSlash": "never",
"beforeSelfClosing": "allow",
"afterOpening": "never"
}
],
"padded-blocks": [0],
"react/forbid-prop-types": [0, {"forbid": ["<any>"]}]
}
}
21 changes: 21 additions & 0 deletions src/main/javascript/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Loading