Skip to content

Commit bddd19e

Browse files
eluchsingereluchsinger
authored
Merge pull request #58 from Flux-Coordinator/develop
Merge develop into master
2 parents 263b465 + 67ede9c commit bddd19e

File tree

127 files changed

+4328
-1162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+4328
-1162
lines changed

‎README.md‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,43 @@
11
# Flux-Frontend
22

33
<div align="center">
4-
5-
[![Tested with Jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
6-
[![GitHub license](https://img.shields.io/github/license/Flux-Coordinator/flux-frontend.svg)](https://github.com/Flux-Coordinator/flux-frontend)
7-
[![Sonar Cloud Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=reliability_rating)](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=reliability_rating)
8-
[![Sonar Cloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=coverage)](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=coverage)
9-
[![Sonar Cloud Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=alert_status)](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=alert_status)
10-
[![Build Status](https://travis-ci.org/Flux-Coordinator/flux-frontend.svg?branch=master)](https://travis-ci.org/Flux-Coordinator/flux-frontend)
11-
[![Code Style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
12-
[![Dependencies](https://david-dm.org/Flux-Coordinator/flux-frontend.svg)](https://david-dm.org/Flux-Coordinator/flux-frontend)
13-
[![DevDependencies](https://david-dm.org/Flux-Coordinator/flux-frontend/dev-status.svg)](https://david-dm.org/Flux-Coordinator/flux-frontend?type=dev)
14-
[![peerDependency Status](https://david-dm.org/Flux-Coordinator/repo/peer-status.svg)](https://david-dm.org/Flux-Coordinator/flux-frontend?type=peer)
15-
4+
5+
[![Tested with Jest](https://img.shields.io/badge/tested_with-jest-99424f.svg)](https://github.com/facebook/jest)
6+
[![GitHub license](https://img.shields.io/github/license/Flux-Coordinator/flux-frontend.svg)](https://github.com/Flux-Coordinator/flux-frontend)
7+
[![Sonar Cloud Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=reliability_rating)](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=reliability_rating)
8+
[![Sonar Cloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=coverage)](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=coverage)
9+
[![Sonar Cloud Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=alert_status)](https://sonarcloud.io/api/project_badges/measure?project=flux-frontend&metric=alert_status)
10+
[![Build Status](https://travis-ci.org/Flux-Coordinator/flux-frontend.svg?branch=master)](https://travis-ci.org/Flux-Coordinator/flux-frontend)
11+
[![Code Style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
12+
[![Dependencies](https://david-dm.org/Flux-Coordinator/flux-frontend.svg)](https://david-dm.org/Flux-Coordinator/flux-frontend)
13+
[![DevDependencies](https://david-dm.org/Flux-Coordinator/flux-frontend/dev-status.svg)](https://david-dm.org/Flux-Coordinator/flux-frontend?type=dev)
14+
[![peerDependency Status](https://david-dm.org/Flux-Coordinator/repo/peer-status.svg)](https://david-dm.org/Flux-Coordinator/flux-frontend?type=peer)
15+
1616
</div>
1717

18-
## Ordnerstruktur
18+
## How to run this application in development mode
19+
20+
Follow the guide below to run this application in development mode.
21+
**Prerequisites:** [NodeJS 8](https://nodejs.org/en/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (recommended) or NPM.
22+
23+
1. Download the repository
24+
2. Install the dependencies using `yarn` or `npm install`
25+
3. Run the application using the `yarn start` or the `npm run start` command.
26+
27+
The URI for the connection to the [flux-server](https://github.com/Flux-Coordinator/flux-server) instance needs to be set either as an environment variable named `REACT_APP_SERVICE_URI` or using a [_.env_](https://github.com/motdotla/dotenv) file, in which you have the following content:
28+
29+
```
30+
REACT_APP_SERVICE_URI = <sever_uri>
31+
```
32+
33+
## Run in Production Mode
34+
35+
To run this application in production mode, you need to build it first, using the `yarn build` or `npm run build` command. After the command has run through, you will find the built application in the _/build_ folder. You can deploy that folder on your preferred static webserver or using [serve](https://github.com/zeit/serve).
36+
37+
To install serve globally, you can use the `yarn global add serve` or `npm install -g serve`. After the installation is complete, you can use the command `serve -s build`, where build the _/build_ folder.
38+
39+
If you use a webserver other than serve, you will need to make some changes. Follow the guide [here](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#serving-apps-with-client-side-routing).
1940

20-
Die Ordnerstruktur im **./src** Ordner sieht wie folgt aus:
41+
## More informations
2142

22-
| Ordner | Beschreibung |
23-
| -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
24-
| src/api | Die JS Dateien in diesem Ordner stellen die Anfragen an das backend API. |
25-
| src/components | In diesem Ordner befinden sich die Presentational Components. Merke, dass die CSS und Tests ebenfalls in diesem Ordner zusammen mit ihren Components befinden. |
26-
| src/containers | In diesem Ordner befinden sich die Container Components. Diese machen die API Calls und besitzen einen State. Merke, dass die CSS und Tests ebenfalls in diesem Ordner zusammen mit ihren Components befinden. |
27-
| src/images | Hier befinden sich die Bilder, die in der Anwendung verwendet werden. |
28-
| src/index.jsx | In dieser Datei wird die App initialisiert. |
29-
| src/utils | Alles, was sonst nicht eingeordnet werden kann und keinen eigenen Ordner verdient. |
43+
For more information about running and deploying the application, you can consult the CRA documentation [here](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md).

‎flow-typed/npm/@flux-coordinator/heatmapjs_vx.x.x.js‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
// flow-typed signature: 1becce44f344e7ddc91c138bd08004b8
2+
// flow-typed version: <<STUB>>/@flux-coordinator/heatmapjs_v^2.1.4/flow_v0.73.0
3+
4+
/**
5+
* This is an autogenerated libdef stub for:
6+
*
7+
* '@flux-coordinator/heatmapjs'
8+
*
9+
* Fill this stub out by replacing all the `any` types.
10+
*
11+
* Once filled out, we encourage you to share your work with the
12+
* community by sending a pull request to:
13+
* https://github.com/flowtype/flow-typed
14+
*/
15+
16+
declare module "@flux-coordinator/heatmapjs" {
17+
declare module.exports: any;
18+
}
19+
20+
/**
21+
* We include stubs for each file inside this npm package in case you need to
22+
* require those files directly. Feel free to delete any files that aren't
23+
* needed.
24+
*/
25+
declare module "@flux-coordinator/heatmapjs/build/heatmap" {
26+
declare module.exports: any;
27+
}
28+
29+
declare module "@flux-coordinator/heatmapjs/build/heatmap.min" {
30+
declare module.exports: any;
31+
}
32+
33+
declare module "@flux-coordinator/heatmapjs/docs/assets/js/prism" {
34+
declare module.exports: any;
35+
}
36+
37+
declare module "@flux-coordinator/heatmapjs/plugins/angular-heatmap/angular-heatmap" {
38+
declare module.exports: any;
39+
}
40+
41+
declare module "@flux-coordinator/heatmapjs/plugins/boilerplate" {
42+
declare module.exports: any;
43+
}
44+
45+
declare module "@flux-coordinator/heatmapjs/plugins/gmaps-heatmap/gmaps-heatmap" {
46+
declare module.exports: any;
47+
}
48+
49+
declare module "@flux-coordinator/heatmapjs/plugins/leaflet-heatmap/leaflet-heatmap" {
50+
declare module.exports: any;
51+
}
52+
53+
declare module "@flux-coordinator/heatmapjs/plugins/segment-heatmap" {
54+
declare module.exports: any;
55+
}
56+
57+
declare module "@flux-coordinator/heatmapjs/plugins/svg-area-heatmap" {
58+
declare module.exports: any;
59+
}
60+
61+
// Filename aliases
62+
declare module "@flux-coordinator/heatmapjs/build/heatmap.js" {
63+
declare module.exports: $Exports<"@flux-coordinator/heatmapjs/build/heatmap">;
64+
}
65+
declare module "@flux-coordinator/heatmapjs/build/heatmap.min.js" {
66+
declare module.exports: $Exports<
67+
"@flux-coordinator/heatmapjs/build/heatmap.min"
68+
>;
69+
}
70+
declare module "@flux-coordinator/heatmapjs/docs/assets/js/prism.js" {
71+
declare module.exports: $Exports<
72+
"@flux-coordinator/heatmapjs/docs/assets/js/prism"
73+
>;
74+
}
75+
declare module "@flux-coordinator/heatmapjs/plugins/angular-heatmap/angular-heatmap.js" {
76+
declare module.exports: $Exports<
77+
"@flux-coordinator/heatmapjs/plugins/angular-heatmap/angular-heatmap"
78+
>;
79+
}
80+
declare module "@flux-coordinator/heatmapjs/plugins/boilerplate.js" {
81+
declare module.exports: $Exports<
82+
"@flux-coordinator/heatmapjs/plugins/boilerplate"
83+
>;
84+
}
85+
declare module "@flux-coordinator/heatmapjs/plugins/gmaps-heatmap/gmaps-heatmap.js" {
86+
declare module.exports: $Exports<
87+
"@flux-coordinator/heatmapjs/plugins/gmaps-heatmap/gmaps-heatmap"
88+
>;
89+
}
90+
declare module "@flux-coordinator/heatmapjs/plugins/leaflet-heatmap/leaflet-heatmap.js" {
91+
declare module.exports: $Exports<
92+
"@flux-coordinator/heatmapjs/plugins/leaflet-heatmap/leaflet-heatmap"
93+
>;
94+
}
95+
declare module "@flux-coordinator/heatmapjs/plugins/segment-heatmap.js" {
96+
declare module.exports: $Exports<
97+
"@flux-coordinator/heatmapjs/plugins/segment-heatmap"
98+
>;
99+
}
100+
declare module "@flux-coordinator/heatmapjs/plugins/svg-area-heatmap.js" {
101+
declare module.exports: $Exports<
102+
"@flux-coordinator/heatmapjs/plugins/svg-area-heatmap"
103+
>;
104+
}

‎flow-typed/npm/@storybook/addon-actions_v3.x.x.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// flow-typed signature: 9f7284fc113607b916f1c64b0640c2a2
2-
// flow-typed version: 1709d3212d/@storybook/addon-actions_v3.x.x/flow_>=v0.25.x
1+
// flow-typed signature: 64850c161373321ab9eabcceb1268d56
2+
// flow-typed version: 5edd39ab2e/@storybook/addon-actions_v3.x.x/flow_>=v0.25.x
33

44
declare module "@storybook/addon-actions" {
5-
declare type Action = (name: string) => Function;
5+
declare type Action = (name: string) => (...args: Array<any>) => void;
66
declare type DecorateFn = (args: Array<any>) => Array<any>;
77

88
declare module.exports: {

‎flow-typed/npm/babel-core_vx.x.x.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: 640dcf7cdffdff8dddcaaf78dadb5f3c
2-
// flow-typed version: <<STUB>>/babel-core_v^6.26.0/flow_v0.69.0
1+
// flow-typed signature: 39d0eadd11a69e2aeda7316112446dcf
2+
// flow-typed version: <<STUB>>/babel-core_v^6.26.0/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:
@@ -78,6 +78,10 @@ declare module "babel-core/lib/transformation/file/logger" {
7878
declare module.exports: any;
7979
}
8080

81+
declare module "babel-core/lib/transformation/file/merge-map" {
82+
declare module.exports: any;
83+
}
84+
8185
declare module "babel-core/lib/transformation/file/metadata" {
8286
declare module.exports: any;
8387
}
@@ -191,6 +195,11 @@ declare module "babel-core/lib/transformation/file/index.js" {
191195
declare module "babel-core/lib/transformation/file/logger.js" {
192196
declare module.exports: $Exports<"babel-core/lib/transformation/file/logger">;
193197
}
198+
declare module "babel-core/lib/transformation/file/merge-map.js" {
199+
declare module.exports: $Exports<
200+
"babel-core/lib/transformation/file/merge-map"
201+
>;
202+
}
194203
declare module "babel-core/lib/transformation/file/metadata.js" {
195204
declare module.exports: $Exports<
196205
"babel-core/lib/transformation/file/metadata"

‎flow-typed/npm/babel-eslint_vx.x.x.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: 7d8a567071271aca71f1d7c450898abf
2-
// flow-typed version: <<STUB>>/babel-eslint_v^8.2.2/flow_v0.69.0
1+
// flow-typed signature: 314ce81bedc5d07c55803f538814840d
2+
// flow-typed version: <<STUB>>/babel-eslint_v^8.2.2/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:

‎flow-typed/npm/babel-jest_vx.x.x.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: 75b3bccd57b6eba723a724ffb80ca92a
2-
// flow-typed version: <<STUB>>/babel-jest_v^23.0.0-alpha.6r/flow_v0.69.0
1+
// flow-typed signature: ccf9085e5314b6f182a280470d108a9e
2+
// flow-typed version: <<STUB>>/babel-jest_v^23.0.0-alpha.6r/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:

‎flow-typed/npm/babel-preset-env_vx.x.x.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: bda3a77185ea3a353196e1409d969036
2-
// flow-typed version: <<STUB>>/babel-preset-env_v^1.6.1/flow_v0.69.0
1+
// flow-typed signature: 018fca8d3628a5c28a0a374ac04f9e47
2+
// flow-typed version: <<STUB>>/babel-preset-env_v^1.6.1/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:

‎flow-typed/npm/babel-preset-react_vx.x.x.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: 46ec1259939954a65717a38374f317fb
2-
// flow-typed version: <<STUB>>/babel-preset-react_v^6.24.1/flow_v0.69.0
1+
// flow-typed signature: c4e07d3388f058d6c12cb0237ef117a8
2+
// flow-typed version: <<STUB>>/babel-preset-react_v^6.24.1/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:

‎flow-typed/npm/concurrently_vx.x.x.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: abc8bd6e18ea696dacd822c5811ecf8c
2-
// flow-typed version: <<STUB>>/concurrently_v^3.5.1/flow_v0.69.0
1+
// flow-typed signature: 013874c5df49939f15bf4b73d996e0c1
2+
// flow-typed version: <<STUB>>/concurrently_v^3.5.1/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:

‎flow-typed/npm/cross-env_vx.x.x.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// flow-typed signature: d3eaccdd0d0a86addedd10d3aec2d14c
2-
// flow-typed version: <<STUB>>/cross-env_v^5.1.4/flow_v0.69.0
1+
// flow-typed signature: b12f88213252516ab4f4dc8caace85e4
2+
// flow-typed version: <<STUB>>/cross-env_v^5.1.4/flow_v0.73.0
33

44
/**
55
* This is an autogenerated libdef stub for:

0 commit comments

Comments
 (0)