Merge pull request #593 from eventoL/remove-bower

Remove bower and lessc and fix qrcode

.dockerignore

@@ -42,7 +42,6 @@ nosetests.xml
 #My files
 my_settings.py
 deploy.txt
-eventol/manager/static/manager/bower_components/
 eventol/manager/static/manager/css/eventol-bootstrap.css
 eventol/manager/static/manager/css/eventol.css
 eventol/static/
@@ -61,7 +60,6 @@ eventol/manager/static/rest_framework/
 eventol/manager/static/import_export/
 eventol/manager/static/debug_toolbar/
 node_modules/
-bower_components/
 .github/
 docs/
 db.sqlite3
@@ -80,6 +78,5 @@ deploy/*
 !deploy/docker/scripts/
 docs/
 eventol/front/node_modules/
-eventol/front/eventol/static/manager/bower_components/
 .vscode/
 deploy/docker/db/postgres/

.gitignore

@@ -44,7 +44,6 @@ eventol/conf/locale/**/*.mo
 #My files
 my_settings.py
 deploy.txt
-eventol/manager/static/manager/bower_components/
 eventol/manager/static/manager/css/eventol-bootstrap.css
 eventol/manager/static/manager/css/eventol.css
 eventol/static/
@@ -66,7 +65,6 @@ node_modules
 db.sqlite3
 *.mo
 webpack-stats-local.json
-eventol/front/eventol/static/bower_components
 eventol/front/eventol/static/manager/*
 !eventol/front/eventol/static/manager/less
 eventol/front/eventol/static/bundles/

Dockerfile

@@ -8,9 +8,6 @@ RUN apk --update add --no-cache \
     git gcc make autoconf automake musl-dev \
   && rm -rf /var/cache/apk/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Install bower and less
-RUN npm install -g bower less
-
 # Set working directory
 WORKDIR /app
 RUN chown -R node:node /app
@@ -22,16 +19,6 @@ USER node
 COPY --chown=node:node ./eventol/front/package.json ./eventol/front/yarn.lock ./
 RUN yarn install
 
-# Install bower dependencies
-COPY --chown=node:node ./eventol/front/bower.json ./eventol/front/.bowerrc ./
-RUN bower install
-
-# Build less files
-COPY --chown=node:node ./eventol/front/eventol/static/manager/less/ ./eventol/static/manager/less/
-RUN mkdir -p ./eventol/static/manager/css/
-RUN lessc ./eventol/static/manager/less/eventol.less > ./eventol/static/manager/css/eventol.css
-RUN lessc ./eventol/static/manager/less/eventol-bootstrap.less > ./eventol/static/manager/css/eventol-bootstrap.css
-
 # Copy code
 COPY --chown=node:node ./eventol/front/ .
 
@@ -45,7 +32,7 @@ CMD ["tail", "-f", "/dev/null"]
 #########################################
 # build image
 #########################################
-FROM python:3.8.0-alpine as development
+FROM python:3.7.4-alpine as development
 
 # Set environment variables
 ENV APP_ROOT /usr/src/app/
@@ -85,9 +72,6 @@ COPY --chown=app:app ./eventol ${APP_ROOT}/eventol
 RUN mkdir -p ${APP_ROOT}/eventol/manager/static
 RUN mkdir -p ${APP_ROOT}/eventol/front/eventol/static
 
-# Copy css
-COPY --chown=app:app --from=frontend /app/eventol/static/manager/css/ ${APP_ROOT}/eventol/manager/static/manager/css/
-
 # Copy frontend files
 COPY --chown=app:app --from=frontend /app/webpack-stats-prod.json ${APP_ROOT}/eventol/front/webpack-stats-prod.json
 COPY --chown=app:app --from=frontend /app/eventol/static ${APP_ROOT}/eventol/front/eventol/static
@@ -115,4 +99,4 @@ EXPOSE 8000
 VOLUME ${APP_ROOT}/eventol/media
 VOLUME ${APP_ROOT}/eventol/static
 
-CMD ["tail", "-f", "/dev/null"]
+CMD ["tail", "-f", "/dev/null"]

Makefile

@@ -65,8 +65,8 @@ backend-lint-with-report: ## Run backend linter and generate report
 	pylint --output-format=colorized --reports yes eventol/eventol eventol/manager
 
 backend-make-translations: ## Update translations files (update .po files)
-	cd eventol && python manage.py makemessages -a -d djangojs --no-location -i node_modules -i venv -i bower_components -i coverage -e js,jsx
-	cd eventol && python manage.py makemessages -a -d django --no-location -i node_modules -i venv -i bower_components -i coverage
+	cd eventol && python manage.py makemessages -a -d djangojs --no-location -i node_modules -i venv -i coverage -e js,jsx
+	cd eventol && python manage.py makemessages -a -d django --no-location -i node_modules -i venv -i coverage
 
 backend-compile-translations: ## Compile translations files (update .mo files)
 	cd eventol && python manage.py compilemessages
@@ -108,14 +108,6 @@ frontend-sasslint-fix: ## Run sass linter and autofix errors
 frontend-sasslint-with-report: ## Run sass linter and generate report
 	cd eventol/front && yarn sasslint:report
 
-install-bower-dependencies: ## Install bower dependencies
-	cd eventol/front && bower install --verbose --force
-
-update-css-files: ## Compile css files
-	cd eventol/front && mkdir -p ./eventol/static/manager/css/
-	cd eventol/front && lessc ./eventol/static/manager/less/eventol.less > ./eventol/static/manager/css/eventol.css
-	cd eventol/front && lessc ./eventol/static/manager/less/eventol-bootstrap.less > ./eventol/static/manager/css/eventol-bootstrap.css
-
 ## Travis CI
 travis-install-dependencies: ## Install coverage and coveralls dependencies
 	pip install coverage coveralls
@@ -297,21 +289,13 @@ docker-frontend-sasslint-fix: ## Run sass linter and autofix errors in docker-co
 docker-frontend-sasslint-with-report: ## Run sass linter and generate report in docker-compose
 	$(DOCKER_COMPOSE) exec reactjs yarn sasslint:report
 
-docker-install-bower-dependencies: ## Install bower dependencies in docker-compose
-	$(DOCKER_COMPOSE) exec reactjs bower install --allow-root --verbose --force
-
-docker-update-css-files: ## Compile css files in docker-compose
-	$(DOCKER_COMPOSE) exec reactjs mkdir -p ./eventol/static/manager/css/
-	$(DOCKER_COMPOSE) exec reactjs sh -c "lessc ./eventol/static/manager/less/eventol.less > ./eventol/static/manager/css/eventol.css"
-	$(DOCKER_COMPOSE) exec reactjs sh -c "lessc ./eventol/static/manager/less/eventol-bootstrap.less > ./eventol/static/manager/css/eventol-bootstrap.css"
-
 ## Alias
 collectstatic: docker-backend-collectstatic ## Alias to docker-backend-collectstatic
 createsuperuser: docker-backend-createsuperuser ## Alias to docker-backend-createsuperuser
 makemigrations: docker-backend-makemigrations ## Alias to docker-backend-makemigrations
 migrate: docker-backend-migrate ## Alias to docker-backend-migrate
 runserver: docker-backend-runserver ## Alias to docker-backend-runserver
-setup-frontend: docker-install-bower-dependencies docker-update-css-files docker-frontend-install-dependencies ## Setup front end (install bower depencies, compile css and install yarn dependencies) in docker-compose
+setup-frontend: docker-frontend-install-dependencies ## Setup front end in docker-compose
 start-frontend: docker-frontend-start-dev ## Alias to docker-frontend-start-dev
 make-translations: docker-backend-make-translations ## Alias to docker-backend-make-translations
 compile-translations: docker-backend-compile-translations ## Alias to docker-backend-compile-translations

deploy/scripts/install-container-dev.sh

@@ -1,16 +1,10 @@
 #!/usr/bin/env bash
+
 cd eventol
 ./manage.py migrate
 ./manage.py createsuperuser
 ./manage.py loaddata manager/initial_data/initial_data.json
 ./manage.py loaddata manager/initial_data/security.json
 ./manage.py loaddata manager/initial_data/software.json
 
-cd front
-# yarn install
-bower install --allow-root
-lessc eventol/static/manager/less/eventol.less > ../manager/static/manager/css/eventol.css
-lessc eventol/static/manager/less/eventol-bootstrap.less > ../manager/static/manager/css/eventol-bootstrap.css
-cd -
-
 ./manage.py collectstatic --no-input

deploy/scripts/install.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 pip3 install -r requirements.txt -r requirements-dev.txt
 cd eventol
 ./manage.py migrate
@@ -7,13 +8,9 @@ cd eventol
 ./manage.py loaddata manager/initial_data/security.json
 ./manage.py loaddata manager/initial_data/software.json
 
-sudo npm install -g less bower
 sudo npm install -g yarn
 cd front
 yarn install
-bower install
-lessc eventol/static/manager/less/eventol.less > ../manager/static/manager/css/eventol.css
-lessc eventol/static/manager/less/eventol-bootstrap.less > ../manager/static/manager/css/eventol-bootstrap.css
 cd -
 
 ./manage.py collectstatic --no-input

eventol/front/.eslintrc.json

@@ -24,6 +24,7 @@
     "process": true,
     "__dirname": true,
     "global": true,
+    "qrcode": true,
     "window": true,
     "document": true,
     "console": true

eventol/front/package.json

@@ -77,8 +77,14 @@
     "@babel/runtime": "^7.4.5",
     "babel-eslint": "^10.0.2",
     "babel-loader": "^8.0.6",
+    "bootstrap": "^3.3.7",
+    "bootstrap-datepicker": "~1.6.4",
+    "bootstrap-material-design": "0.5.10",
+    "bootstrap-sass": "^3.3.7",
     "classnames": "^2.2.6",
+    "clipboard": "^2.0.4",
     "css-loader": "^3.0.0",
+    "eonasdan-bootstrap-datetimepicker": "^4.17.47",
     "eslint": "^5.0.0",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-config-prettier": "^5.0.0",
@@ -90,17 +96,27 @@
     "eslint-plugin-react": "^7.13.0",
     "eslint-plugin-react-hooks": "^1.6.0",
     "file-loader": "^4.0.0",
+    "font-awesome": "^4.7.0",
+    "fullcalendar": "^3.2.0",
+    "fullcalendar-scheduler": "^1.5.1",
+    "geocomplete": "^1.7.0",
+    "html5-qrcode": "git+https://github.com/dwa012/html5-qrcode.git",
     "image-webpack-loader": "^5.0.0",
     "jest": "^24.8.0",
     "jest-fetch-mock": "^2.1.2",
     "jest-mock-console": "^1.0.0",
     "js-cookie": "^2.2.0",
+    "leaflet": "~1.0.3",
     "mock-socket": "^8.0.5",
+    "moment": "^2.24.0",
+    "morris.js": "git+https://github.com/morrisjs/morris.js.git#0.5.1",
     "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss-safe-parser": "^4.0.1",
     "prettier": "^1.18.2",
+    "q": "~1.4.1",
     "raf": "^3.4.1",
+    "raphael": "^2.0",
     "react": "^16.8.6",
     "react-csv": "^1.1.1",
     "react-dom": "^16.8.6",
@@ -112,11 +128,14 @@
     "react-test-renderer": "^16.8.6",
     "redux": "^4.0.1",
     "redux-thunk": "^2.3.0",
+    "resolve-url-loader": "^3.1.0",
+    "roboto-fontface": "^0.10.0",
     "sass-lint": "^1.13.1",
     "sass-lint-auto-fix": "^0.17.0",
     "sass-loader": "^7.1.0",
     "scss-lint-html-reporter": "^0.4.1",
-    "slick-carousel": "^1.8.1",
+    "slick": "^1.12.2",
+    "slick-carousel": "1.6.0",
     "style-loader": "^0.23.1",
     "terser-webpack-plugin": "^1.3.0",
     "uglifyjs-webpack-plugin": "^2.1.3",

eventol/front/src/libs/base.js

@@ -0,0 +1,10 @@
+import './base.scss';
+
+window.jQuery = $;
+window.$ = $;
+global.$ = $;
+global.jQuery = $;
+
+require('bootstrap/dist/js/bootstrap');
+require('bootstrap-material-design/dist/js/ripples');
+require('bootstrap-material-design/dist/js/material');