Merge branch 'production' into 'master'
Production See merge request chehabfl/outgoing_rex!38
Procfile
deleted
100644 → 0
deploy.sh
0 → 100644
general/settings/.gitignore
0 → 100644
general/settings/__init__.py
0 → 100644
This diff is collapsed.
... | ... | @@ -4,8 +4,8 @@ |
"description": "[](https://gitlab.utc.fr/chehabfl/outgoing_rex/pipelines) [](https://chehabfl.gitlab.utc.fr/outgoing_rex/) [](https://opensource.org/licenses/BSD-2-Clause)", | ||
"main": "manage.py", | ||
"scripts": { | ||
"dev": "make generate_frontend && webpack --mode development", | ||
"build": "make generate_frontend && webpack --mode production", | ||
"dev": "webpack --mode development", | ||
"build": "webpack --mode production", | ||
"test": "echo \"Error: no test specified\" && exit 1", | ||
"stats": "webpack --profile --json > frontend/static/frontend/stats.json", | ||
"view-stats": "webpack-bundle-analyzer frontend/static/frontend/stats.json" | ||
... | ... | @@ -17,21 +17,22 @@ |
"author": "", | ||
"license": "ISC", | ||
"dependencies": { | ||
"@material-ui/core": "^3.0.1", | ||
"@material-ui/docs": "^1.0.0-alpha.5", | ||
"@material-ui/lab": "^3.0.0-alpha.14", | ||
"@material-ui/core": "^3.1.0", | ||
"@material-ui/icons": "^2.0.3", | ||
"@material-ui/lab": "^3.0.0-alpha.16", | ||
"babel-polyfill": "^6.26.0", | ||
"babel-preset-stage-0": "^6.24.1", | ||
"cross-fetch": "^2.2.2", | ||
"date-fns": "^2.0.0-alpha.16", | ||
"downshift": "^2.2.0", | ||
"extract-text-webpack-plugin": "^3.0.2", | ||
"fuzzysort": "^1.1.4", | ||
"js-cookie": "^2.2.0", | ||
"leaflet.markercluster": "^1.3.0", | ||
"leaflet": "^1.3.4", | ||
"lodash": "^4.17.11", | ||
"material-ui-pickers": "^1.0.0-rc.14", | ||
"react": "^16.5.1", | ||
"react-awesome-slider": "^0.5.2", | ||
"react-dom": "^16.5.1", | ||
"react-leaflet": "^2.0.1", | ||
"react-markdown": "^3.6.0", | ||
"react-redux": "^5.0.7", | ||
"react-router-dom": "^4.3.1", | ||
... | ... | @@ -39,13 +40,9 @@ |
"redux": "^4.0.0", | ||
"redux-logger": "^3.0.6", | ||
"redux-thunk": "^2.3.0", | ||
"style-loader": "^0.23.0", | ||
"typeface-roboto": "0.0.54" | ||
}, | ||
"devDependencies": { | ||
"@babel/cli": "^7.0.0", | ||
"@babel/preset-env": "^7.0.0", | ||
"@material-ui/icons": "^2.0.3", | ||
"autoprefixer": "^9.1.5", | ||
"babel-core": "^6.26.3", | ||
"babel-loader": "^7.1.5", | ||
... | ... | @@ -58,20 +55,13 @@ |
"eslint": "^5.4.0", | ||
"eslint-config-google": "^0.9.1", | ||
"file-loader": "^2.0.0", | ||
"leaflet": "^1.3.4", | ||
"mini-css-extract-plugin": "^0.4.2", | ||
"node-sass": "^4.9.3", | ||
"postcss-loader": "^3.0.0", | ||
"prop-types": "^15.6.2", | ||
"react": "^16.4.2", | ||
"react-dom": "^16.4.2", | ||
"react-leaflet": "^2.0.1", | ||
"react-lorem-component": "^0.13.0", | ||
"react-script": "^2.0.5", | ||
"recharts": "^1.1.0", | ||
"redux-devtools": "^3.4.1", | ||
"sass-loader": "^7.1.0", | ||
"weak-key": "^1.0.1", | ||
"webpack": "^4.17.0", | ||
"webpack-bundle-analyzer": "^3.0.2", | ||
"webpack-cli": "^3.1.0" | ||
... | ... |
#OutGoing_REX | ||
Django==2.0.3 | ||
django_heroku==0.3.1 | ||
gunicorn==19.7.1 | ||
psycopg2-binary==2.7.4 | ||
git+https://github.com/mingchen/django-cas-ng.git@e9c0472e326087bfb839487f0736a4e1454cffda#egg=django-cas-ng | ||
djangorestframework==3.8.2 # Django REST Framework | ||
markdown==2.6.11 # Complement for Django REST framework | ||
django-filter==1.1.0 # Support filter in REST API | ||
coreapi==2.3.3 # Automatic API doc generation | ||
Pillow==5.0.0 | ||
django-imagekit==4.0.2 | ||
django-reversion==2.0.13 | ||
django-reversion-compare==0.8.4 | ||
reverse-geocoder==1.5.1 | ||
pytest-django==3.4.2 | ||
pytest-cov==2.5.1 | ||
pytest-xdist==1.23.0 | ||
... | ... | @@ -21,3 +14,4 @@ django-debug-toolbar==1.9.1 |
pandas | ||
pyyaml | ||
git+https://github.com/FloChehab/django-extensions.git@30c1a807aeb985739358d70907496e98d1857abb#egg=django-extensions | ||
uwsgi | ||
\ No newline at end of file |
Please register or sign in to comment