Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/feature/037-iframe' into…
Browse files Browse the repository at this point in the history
… dev
  • Loading branch information
p-a-s-c-a-l committed Sep 6, 2019
2 parents fcbc570 + fc22ea7 commit a4d9004
Show file tree
Hide file tree
Showing 57 changed files with 26,700 additions and 88,905 deletions.
8 changes: 0 additions & 8 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PUBLIC_URL=/apps/map-component/build
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

# production
/build
/dist

# misc
.DS_Store
Expand All @@ -19,5 +20,10 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/dist/gen/js/src
/nbproject/private

# cypress
/cypress

# styleguide
styleguide

56 changes: 56 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"version": "0.2.0",
"configurations": [{
"name": "Chrome",
"type": "chrome",
"request": "attach",
"port": 9222,
"url": "http://localhost:3000/CharacteriseHazardMap/?url=https://csis.myclimateservice.eu&study_uuid=c3609e3e-f80f-482b-9e9f-3a26226a6859",
"webRoot": "${workspaceFolder}/src",
"sourceMapPathOverrides": {
"webpack:///src/*": "${webRoot}/*"
}
}, {
"name": "Debug ALL CRA Tests",
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"--runInBand",
"--no-cache",
"--env=jsdom",
"--watchAll=false"
],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"sourceMapPathOverrides": {
"webpack:///src/*": "${webRoot}/*"
}
}, {
"name": "Debug CRA Current File",
"type": "node",
"request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
"args": [
"test",
"${fileBasenameNoExtension}",
"--no-cache",
"--env=jsdom",
"--verbose=false",
"--watchAll=false"
],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"disableOptimisticBPs": true,
"sourceMapPathOverrides": {
"webpack:///src/*": "${webRoot}/*",
}
}
]
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"npm.packageManager": "yarn",
"npm.enableScriptExplorer": true,
"editor.formatOnSave": false
}
19 changes: 19 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "build",
"problemMatcher": [
"$jshint"
]
},
{
"type": "npm",
"script": "start",
"problemMatcher": []
}
]
}
28 changes: 28 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
pipeline {
agent {
docker {
image 'node:latest'
args '-p 3000:3000'
}
}
environment {
CI = 'true'
}
stages {
stage('Install') {
steps {
sh 'yarn install --network-concurrency 1'
}
}
stage('Test') {
steps {
sh 'yarn test'
}
}
stage('Build') {
steps {
sh 'yarn build'
}
}
}
}
1 change: 1 addition & 0 deletions cypress.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
26 changes: 0 additions & 26 deletions dist/css/Control.Loading.css

This file was deleted.

Binary file removed dist/css/images/layers.png
Binary file not shown.
27 changes: 0 additions & 27 deletions dist/css/images/spritesheet.svg

This file was deleted.

Loading

0 comments on commit a4d9004

Please sign in to comment.