Skip to content

Commit

Permalink
Merge pull request #663 from linkedpipes/develop
Browse files Browse the repository at this point in the history
Hotfix in quick-start script
  • Loading branch information
aorumbayev authored Aug 22, 2019
2 parents 26bc61f + 6f8b6e0 commit 44bda59
Show file tree
Hide file tree
Showing 4 changed files with 517 additions and 396 deletions.
23 changes: 21 additions & 2 deletions lpa-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ startDevelopmentPersistent() {
startProductionNoCloning() {

mkdir -p lpa_temp/docker
mkdir -p lpa_temp/nginx

if [ -e "lpa_temp/docker/docker-compose.yml" ]; then
echo 'docker-compose.yml already exists' >&2
Expand All @@ -36,7 +35,27 @@ startProductionNoCloning() {
if [ -e "lpa_temp/docker/nginx-prod.conf" ]; then
echo 'nginx-prod.conf already exists' >&2
else
curl https://raw.githubusercontent.com/linkedpipes/applications/master/nginx/nginx-prod.conf -o lpa_temp/nginx/nginx-prod.conf
curl https://raw.githubusercontent.com/linkedpipes/applications/master/docker/nginx-prod.conf -o lpa_temp/docker/nginx-prod.conf
fi

if [ -e "lpa_temp/src/backend/src/main/resources/db/migration" ]; then
echo 'migrations already exist' >&2
else
mkdir -p lpa_temp/src/backend/src/main/resources/db/migration

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/R__Vacuum.sql -o lpa_temp/src/backend/src/main/resources/db/migration/R__Vacuum.sql

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/V1.0__Create_schema.sql -o lpa_temp/src/backend/src/main/resources/db/migration/V1.0__Create_schema.sql

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/V1.1__Extended_user_profile_and_storing_discovery_and_ETL_parameters.sql -o lpa_temp/src/backend/src/main/resources/db/migration/V1.1__Extended_user_profile_and_storing_discovery_and_ETL_parameters.sql

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/V1.2__Multiple_named_graphs.sql -o lpa_temp/src/backend/src/main/resources/db/migration/V1.2__Multiple_named_graphs.sql

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/V1.3__Color_schemes_on_user%2C_drop_applications%2C_named_graphs_on_delete_cascade.sql -o lpa_temp/src/backend/src/main/resources/db/migration/V1.3__Color_schemes_on_user%2C_drop_applications%2C_named_graphs_on_delete_cascade.sql

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/V1.4__Applications.sql -o lpa_temp/src/backend/src/main/resources/db/migration/V1.4__Applications.sql

curl https://raw.githubusercontent.com/linkedpipes/applications/master/src/backend/src/main/resources/db/migration/V1.5__Repeated_executions.sql -o lpa_temp/src/backend/src/main/resources/db/migration/V1.5__Repeated_executions.sql
fi

cd lpa_temp/docker
Expand Down
38 changes: 19 additions & 19 deletions src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
},
"flow:status": "flow status --quiet",
"dependencies": {
"@babel/core": "7.5.4",
"@babel/runtime": "7.5.4",
"@babel/core": "7.5.5",
"@babel/runtime": "7.5.5",
"@comunica/actor-init-sparql-rdfjs": "^1.7.2",
"@mapbox/geo-viewport": "^0.4.0",
"@material-ui/core": "4.2.0",
"@material-ui/core": "4.2.1",
"@material-ui/icons": "4.2.1",
"@sentry/browser": "5.5.0",
"@turf/bbox": "^6.0.1",
Expand Down Expand Up @@ -73,7 +73,7 @@
"react-redux": "7.1.0",
"react-router-dom": "4.3.1",
"react-swipeable-views": "^0.13.3",
"react-toastify": "5.3.1",
"react-toastify": "5.3.2",
"redux": "4.0.4",
"redux-logger": "3.0.6",
"redux-thunk": "2.3.0",
Expand All @@ -85,15 +85,15 @@
"uuid": "3.3.2"
},
"devDependencies": {
"@babel/cli": "7.5.0",
"@babel/plugin-proposal-class-properties": "7.5.0",
"@babel/plugin-proposal-object-rest-spread": "7.5.4",
"@babel/cli": "7.5.5",
"@babel/plugin-proposal-class-properties": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/plugin-transform-runtime": "7.5.0",
"@babel/preset-env": "7.5.4",
"@babel/plugin-transform-runtime": "7.5.5",
"@babel/preset-env": "7.5.5",
"@babel/preset-flow": "7.0.0",
"@babel/preset-react": "7.0.0",
"@mdx-js/loader": "1.0.27",
"@mdx-js/loader": "1.1.0",
"@sentry/webpack-plugin": "1.7.0",
"babel-cli": "6.26.0",
"babel-eslint": "10.0.2",
Expand All @@ -102,36 +102,36 @@
"babel-plugin-smart-webpack-import": "1.4.6",
"babel-preset-flow": "6.23.0",
"cross-env": "5.2.0",
"css-loader": "3.0.0",
"css-loader": "3.1.0",
"docz": "1.2.0",
"docz-plugin-css": "0.11.0",
"docz-theme-default": "1.2.0",
"eslint": "6.0.1",
"eslint": "6.1.0",
"eslint-config-airbnb": "17.1.1",
"eslint-config-prettier": "6.0.0",
"eslint-import-resolver-babel-module": "5.1.0",
"eslint-import-resolver-webpack": "0.11.1",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-flowtype": "3.11.1",
"eslint-plugin-import": "2.18.0",
"eslint-plugin-flowtype": "3.12.1",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-material-ui": "1.0.1",
"eslint-plugin-prettier": "3.1.0",
"eslint-plugin-react": "7.14.2",
"file-loader": "4.0.0",
"flow-bin": "0.102.0",
"file-loader": "4.1.0",
"flow-bin": "0.103.0",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"lint-staged": "9.2.0",
"node-sass": "4.12.0",
"prettier": "1.18.2",
"pretty-quick": "1.11.1",
"react-hot-loader": "4.12.6",
"react-hot-loader": "4.12.8",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"webpack": "4.35.3",
"webpack": "4.36.1",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.5",
"webpack-cli": "3.3.6",
"webpack-conditional-loader": "1.0.12",
"webpack-dev-server": "3.7.2"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class ApplicationContainer extends PureComponent<Props, State> {

return (
<Grid container className={this.props.classes.root} direction="row">
{renderFilters && this.state.applicationType !== 'Loading' && (
{renderFilters && visible && this.state.applicationType !== 'Loading' && (
<Grid
item
lg={4}
Expand Down
Loading

0 comments on commit 44bda59

Please sign in to comment.