Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use yarn to manage JS/CSS libraries

Roland Geiderc8889abf3dbd
diff --git a/.dockerignore b/.dockerignore
index 8fccc3aef..00b49fa92 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
venv
node_modules
-bower_components
**/__pycache__
*.egg-info
diff --git a/.gitignore b/.gitignore
index 22760faf3..9c8a9dd45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,7 @@ target/
.idea/
# External Libraries
-wger/core/static/bower_components
+wger/core/static/yarn
node_modules
venv
diff --git a/.yarnrc b/.yarnrc
new file mode 100644
index 000000000..f55801715
--- /dev/null
+++ b/.yarnrc
@@ -0,0 +1,2 @@
+# install modules here
+--modules-folder wger/core/static/yarn/
diff --git a/README.rst b/README.rst
index 7ba473fe6..88bf601fe 100644
--- a/README.rst
+++ b/README.rst
@@ -45,12 +45,13 @@ and stable state.
::
$ sudo apt-get install python3-dev nodejs npm git
+ $ sudo npm install -g yarn
Then install the python packages from pypi in the virtualenv::
- $ python3 -m venv venv-django
- $ source venv-django/bin/activate
+ $ python3 -m venv venv-wger
+ $ source venv-wger/bin/activate
2) Start the application. This will download the required JS and CSS libraries
@@ -60,10 +61,7 @@ Then install the python packages from pypi in the virtualenv::
$ git clone https://github.com/wger-project/wger.git
$ cd wger
- $ pip install --upgrade pip
- $ pip install -r requirements.txt # or requirements_devel.txt to develop
- $ npm install
- $ npm install bower
+ $ pip install -r requirements.txt
$ python setup.py develop
$ wger create_settings \
--settings-path /path/to/current/folder/settings.py \
@@ -75,7 +73,7 @@ Then install the python packages from pypi in the virtualenv::
3) Log in as: **admin**, password **admin**
-After the first run you can just use django's development server::
+After the first run you just start django's development server::
$ python manage.py runserver
@@ -88,8 +86,9 @@ Stable version (from PyPI)
::
$ sudo apt-get install python3-dev nodejs npm git
- $ python3 -m venv venv-django
- $ source venv-django/bin/activate
+ $ sudo npm install -g yarn
+ $ python3 -m venv venv-wger
+ $ source venv-wger/bin/activate
$ pip install wger
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 203405d93..d082d9e41 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,8 +6,9 @@ Changelog
Upgrade steps from 1.9:
+* Install ``yarn`` (e.g. ``sudo npm install -g yarn``)
* Update python libraries ``pip install -r requirements.txt``
-* Update CSS and JS libraries ``python manage.py bower install``
+* Update CSS and JS libraries ``yarn install``
* Update static files (only production): ``python manage.py collectstatic``
@@ -25,6 +26,7 @@ Upgrade steps from 1.9:
* Improved docker and docker-compose images `#340`_
* Updated many libraries to last version (bootstrap, font awesome, etc.)
+* Use yarn to download CSS/JS libraries
.. _#340: https://github.com/wger-project/wger/issues/340
diff --git a/docs/development.rst b/docs/development.rst
index 79446ab98..7a0c80bae 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -28,7 +28,7 @@ Install Requirements
::
$ pip install -r requirements_devel.txt
- $ npm install bower
+ $ npm install yarn
$ python setup.py develop
Install application
diff --git a/docs/tips_and_tricks.rst b/docs/tips_and_tricks.rst
index 35ace8884..4a8a472aa 100644
--- a/docs/tips_and_tricks.rst
+++ b/docs/tips_and_tricks.rst
@@ -17,28 +17,15 @@ come from new versions of django or the installed dependencies). If you start
the development server and see a message that there are unapplied migrations,
just do ``python manage.py migrate --all``.
-Downloading dependencies with Bower
-```````````````````````````````````
+Downloading JS and CSS libraries
+````````````````````````````````
-Bower is used to download different JS and CSS libraries. If you update master
-it is recommended that you first delete the existing libraries
-(``rm wger/core/static/bower_components``) and then download the new versions
-with::
+We use yarn to download the JS and CSS libraries. To update them just go to
+the source and do ::
- $ python manage.py bower install
-
-
-Some info about bower, during the bootstrap process bower is installed locally
-to src/wger. If this didn't work and you get an error saying that bower is not
-installed, you can manually install it by going to the project's root directory
-and performing the step manually::
-
- $ cd src/wger
- $ npm install bower
-
-Alternatively, you can manually set the path to the bower binary by editing
-``BOWER_PATH`` (see ``wger/settings_global.py``).
+ $ yarn install
+This happens automatically during the bootstrap process.
Clearing the cache
``````````````````
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfile
index 1aaeffc0b..442f3d3a9 100644
--- a/extras/docker/apache/Dockerfile
+++ b/extras/docker/apache/Dockerfile
@@ -85,8 +85,6 @@ RUN . /home/wger/venv/bin/activate \
&& pip install wheel \
&& pip install --no-cache /wheels/* \
&& python setup.py develop \
- && npm install \
- && npm install bower \
&& wger create_settings \
--settings-path /home/wger/src/settings.py \
--database-path /home/wger/db/database.sqlite \
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfile
index b840307ee..f9c7329d4 100644
--- a/extras/docker/base/Dockerfile
+++ b/extras/docker/base/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update \
sqlite3 \
netcat-openbsd \
&& rm -rf /var/lib/apt/lists/* \
+ && npm install -g yarn \
&& locale-gen en_US.UTF-8
# Environmental variables
diff --git a/extras/docker/compose/README.md b/extras/docker/compose/README.md
index 4e0ffa836..dd9588a13 100644
--- a/extras/docker/compose/README.md
+++ b/extras/docker/compose/README.md
@@ -47,8 +47,8 @@ To view the application's log:
You might need to issue other commands or do other manual work in the container,
e.g.
- docker-compose -f extras/docker/compose/docker-compose.yml exec web python3 manage.py bower install
- docker-compose -f extras/docker/compose/docker-compose.yml exec web /bin/bash
+ docker-compose -f extras/docker/compose/docker-compose.yml exec web yarn install
+ docker-compose -f extras/docker/compose/docker-compose.yml exec --user root web /bin/bash
## Building
diff --git a/extras/docker/development-venv/Dockerfile b/extras/docker/development-venv/Dockerfile
index 18b5ce0a9..423572493 100644
--- a/extras/docker/development-venv/Dockerfile
+++ b/extras/docker/development-venv/Dockerfile
@@ -66,8 +66,6 @@ RUN . /home/wger/venv/bin/activate \
&& pip install --upgrade pip \
&& pip install --no-cache /wheels/* \
&& python setup.py develop \
- && npm install \
- && npm install bower \
&& wger create_settings \
--settings-path /home/wger/src/settings.py \
--database-path /home/wger/db/database.sqlite \
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index 34834a34b..cc59f6f65 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -49,8 +49,7 @@ RUN chmod +x /home/wger/entrypoint.sh
RUN pip3 install --no-cache /wheels/* \
&& pip3 install psycopg2-binary \
&& pip3 install django-redis \
- && python3 setup.py develop \
- && npm install -g bower
+ && python3 setup.py develop
RUN chown -R wger:wger .
diff --git a/extras/docker/development/README.md b/extras/docker/development/README.md
index bc98e2296..c342bae02 100644
--- a/extras/docker/development/README.md
+++ b/extras/docker/development/README.md
@@ -27,18 +27,11 @@ use the more verbose mount instead:
--mount type=bind,source='"C:\your\path\to your\checkout"',target=/home/wger/src
-### 2 - Download additional files
-
-On the first run, you need to download some CSS and JS files with bower (
-as well as every time there are updates):
-
- docker exec -ti wger.devel python3 manage.py bower install
-
You might also want to download the exercise images (will take some time):
docker exec -ti wger.devel python3 manage.py download-exercise-images
-### 3 - Open the Application
+### 2 - Open the Application
Just open <http://localhost:8000> and log in as: **admin**, password **admin**
@@ -50,6 +43,13 @@ To start developing again:
```sudo docker container start --attach wger.devel```
+### 3 - Other commands
+
+If you need to update the CSS/JS libraries or just issue some other command:
+
+ docker exec -ti wger.devel yarn
+ docker exec -ti wger.devel /bin/bash
+
## Building
If you build this yourself, keep in mind that you **must** build from the
diff --git a/extras/docker/development/settings.py b/extras/docker/development/settings.py
index b639d10f0..bea1370fd 100644
--- a/extras/docker/development/settings.py
+++ b/extras/docker/development/settings.py
@@ -77,5 +77,3 @@ if os.environ.get("DJANGO_CACHE_BACKEND"):
}
}
}
-
-BOWER_PATH = '/usr/local/bin/bower'
diff --git a/package.json b/package.json
index f72dcca56..20efcef1b 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,10 @@
{
"name": "wger",
- "version": "1.9.0",
+ "version": "2.0.dev1",
"description": "Self hosted FLOSS fitness/workout and weight tracker",
"directories": {
"doc": "docs"
},
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
- },
"repository": {
"type": "git",
"url": "git+https://github.com/wger-project/wger/wger.git"
@@ -19,6 +16,19 @@
},
"homepage": "https://github.com/wger-project/wger",
"dependencies": {
- "bower": "^1.8.8"
+ "yarn": "^1.22.4",
+ "Sortable": "RubaXa/Sortable#1.4.x",
+ "bootstrap": "twbs/bootstrap#4.x",
+ "components-font-awesome": "components/font-awesome#5.13.x",
+ "d3": "mbostock-bower/d3-bower#>=4",
+ "datatables": "DataTables/DataTables#1.10.x",
+ "devbridge-autocomplete": "devbridge/jQuery-Autocomplete#1.2.x",
+ "jquery": "jquery/jquery-dist#2.x",
+ "metrics-graphics": "mozilla/metrics-graphics#2.15.x",
+ "shariff": "heiseonline/shariff#1.24.1",
+ "tinymce": "tinymce/tinymce-dist#4.5.x"
+ },
+ "engines": {
+ "yarn": ">= 1.0.0"
}
}
diff --git a/requirements.txt b/requirements.txt
index 53fd817e1..817f315a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ wheel
# Application
bleach~=3.1
django-bootstrap-breadcrumbs~=0.9
-django-bower==5.2.0
django-formtools~=2.0
django-recaptcha==2.0.6
Django~=3.0
diff --git a/wger/.bowerrc b/wger/.bowerrc
deleted file mode 100644
index 6b111d1bc..000000000
--- a/wger/.bowerrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "directory" : "core/static/bower_components",
- "interactive": false
-}
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index c5cc26068..f20e538da 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -49,23 +49,23 @@
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager-common.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/all.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap/dist/css/bootstrap.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/shariff/build/shariff.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/metrics-graphics/dist/metricsgraphics.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/shariff/build/shariff.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/metrics-graphics/dist/metricsgraphics.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/metricsgraphics-custom.css' %}">
{% endcompress %}
<link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
{% compress js %}
- <script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
- <script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
- <script src="{% static 'bower_components/Sortable/Sortable.min.js' %}"></script>
- <script src="{% static 'bower_components/d3/d3.js' %}"></script>
- <script src="{% static 'bower_components/metrics-graphics/dist/metricsgraphics.min.js' %}"></script>
- <script src="{% static 'bower_components/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}"></script>
+ <script src="{% static 'yarn/jquery/dist/jquery.js' %}"></script>
+ <script src="{% static 'yarn/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
+ <script src="{% static 'yarn/Sortable/Sortable.min.js' %}"></script>
+ <script src="{% static 'yarn/d3/d3.js' %}"></script>
+ <script src="{% static 'yarn/metrics-graphics/dist/metricsgraphics.min.js' %}"></script>
+ <script src="{% static 'yarn/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}"></script>
<script src="{% static 'js/wger-core.js' %}"></script>
<script src="{% static 'js/exercises.js' %}"></script>
<script src="{% static 'js/nutrition.js' %}"></script>
@@ -216,7 +216,7 @@
</div>
</footer>
-<script src="{% static 'bower_components/shariff/build/shariff.min.js' %}"></script>
+<script src="{% static 'yarn/shariff/build/shariff.min.js' %}"></script>
</body>
{% endspaceless_config %}
</html>
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index 4c703e50a..42b71252e 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -46,17 +46,17 @@
{% compress css %}
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/all.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap/dist/css/bootstrap.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/agency.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/shariff/build/shariff.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/shariff/build/shariff.min.css' %}">
{% endcompress %}
<link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
{% compress js %}
- <script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
- <script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
+ <script src="{% static 'yarn/jquery/dist/jquery.js' %}"></script>
+ <script src="{% static 'yarn/bootstrap/dist/js/bootstrap.min.js' %}"></script>
{% endcompress %}
<title>wger Workout Manager - {% trans "Features" %}</title>
@@ -130,7 +130,7 @@
</div>
</footer>
-<script src="{% static 'bower_components/shariff/build/shariff.min.js' %}"></script>
+<script src="{% static 'yarn/shariff/build/shariff.min.js' %}"></script>
</body>
{% endspaceless_config %}
</html>
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index bfb3dd4b6..b5f0bdf78 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -219,7 +219,7 @@ class ExercisesEditAddView(WgerFormMixin):
'license_author']
class Media:
- js = (settings.STATIC_URL + 'bower_components/tinymce/tinymce.min.js',)
+ js = (settings.STATIC_URL + 'yarn/tinymce/tinymce.min.js',)
return ExerciseForm
diff --git a/wger/gym/templates/gym/partial_user_list.html b/wger/gym/templates/gym/partial_user_list.html
index 65e30c0a6..793fbec8b 100644
--- a/wger/gym/templates/gym/partial_user_list.html
+++ b/wger/gym/templates/gym/partial_user_list.html
@@ -1,8 +1,8 @@
{% load i18n static %}
-<link rel="stylesheet" type="text/css" href="{% static 'bower_components/datatables/media/css/dataTables.bootstrap.min.css' %}">
-<script src="{% static 'bower_components/datatables/media/js/jquery.dataTables.min.js' %}" ></script>
-<script src="{% static 'bower_components/datatables/media/js/dataTables.bootstrap.min.js' %}" ></script>
+<link rel="stylesheet" type="text/css" href="{% static 'yarn/datatables/media/css/dataTables.bootstrap.min.css' %}">
+<script src="{% static 'yarn/datatables/media/js/jquery.dataTables.min.js' %}" ></script>
+<script src="{% static 'yarn/datatables/media/js/dataTables.bootstrap.min.js' %}" ></script>
<script>
$(document).ready( function () {
/* Make table sortable */
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 6a3eb27d2..4aa8c6f03 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -87,24 +87,6 @@ INSTALLED_APPS = (
# CORS
'corsheaders',
-
- # django-bower for installing bower packages
- 'djangobower',
-)
-
-# added list of external libraries to be installed by bower
-BOWER_INSTALLED_APPS = (
- 'bootstrap#4.x',
- 'components-font-awesome#5.13.x',
- 'd3#5.16.x',
- 'DataTables',
- 'devbridge-autocomplete#1.2.x',
- 'jquery#2.x',
- 'metrics-graphics',
- 'shariff#1.24.1',
- 'sortablejs#1.4.x',
- 'tinymce',
- 'tinymce-dist',
)
@@ -171,8 +153,6 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
- # added BowerFinder to list of static file finders
- 'djangobower.finders.BowerFinder',
# Django compressor
'compressor.finders.CompressorFinder',
@@ -349,12 +329,6 @@ COMPRESS_JS_FILTERS = [
]
COMPRESS_ROOT = STATIC_ROOT
-# BOWER binary
-if sys.platform.startswith('win32'):
- BOWER_PATH = os.path.abspath(os.path.join(BASE_DIR, '..', 'node_modules', '.bin', 'bower.cmd'))
-else:
- BOWER_PATH = os.path.abspath(os.path.join(BASE_DIR, '..', 'node_modules', '.bin', 'bower'))
-
#
# Django Rest Framework
#
diff --git a/wger/tasks.py b/wger/tasks.py
index 3bf871c71..bdfa41126 100644
--- a/wger/tasks.py
+++ b/wger/tasks.py
@@ -108,8 +108,8 @@ def bootstrap(context,
load_fixtures(context, settings_path=settings_path)
create_or_reset_admin(context, settings_path=settings_path)
- # Download JS libraries with bower
- call_command("bower", "install")
+ # Download JS and CSS libraries
+ context.run("yarn install")
# Start the webserver
if start_server:
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..1ee1ebcce
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,438 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+Sortable@RubaXa/Sortable#1.4.x:
+ version "1.4.2"
+ resolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/51337f72792525e438680695e223b327b1648e0a"
+
+bootstrap@twbs/bootstrap#4.x:
+ version "4.5.0"
+ resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/7a6da5e3e7ad7c749dde806546a35d4d4259d965"
+
+commander@2:
+ version "2.20.3"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+components-font-awesome@components/font-awesome#5.13.x:
+ version "5.13.1"
+ resolved "https://codeload.github.com/components/font-awesome/tar.gz/7689f740772e9ce3db04e41455a48474e6afc1f1"
+
+d3-array@1, d3-array@^1.2.0:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
+ integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
+
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc"
+ integrity sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw==
+
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz#31a705a0b535e65759de14173a31933137f18efa"
+ integrity sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo=
+
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz#00c2f238019f24f6c0a194a26d41a1530ffe7bc4"
+ integrity sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=
+ dependencies:
+ d3-dispatch "1"
+ d3-drag "1"
+ d3-interpolate "1"
+ d3-selection "1"
+ d3-transition "1"
+
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.4.tgz#7dec4f0ba886f713fe111c45f763414f6f74ca2c"
+ integrity sha1-fexPC6iG9xP+ERxF92NBT290yiw=
+ dependencies:
+ d3-array "1"
+ d3-path "1"
+
+d3-collection@1:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
+ integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
+
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2"
+ integrity sha1-NC39EoN8kJdPM/HMCnha6lcNzcI=
+
+d3-color@1:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
+
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz#bc7643fca8e53a8347e2fbdaffa236796b58509b"
+ integrity sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=
+
+d3-dispatch@1:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
+ integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
+
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8"
+ integrity sha1-RuFJHqqbWMNY/OW+TovtYm54cfg=
+
+d3-drag@1:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
+ integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
+ dependencies:
+ d3-dispatch "1"
+ d3-selection "1"
+
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz#df8dd4c502fb490fc7462046a8ad98a5c479282d"
+ integrity sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==
+ dependencies:
+ d3-dispatch "1"
+ d3-selection "1"
+
+d3-dsv@1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
+ integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
+ dependencies:
+ commander "2"
+ iconv-lite "0.4"
+ rw "1"
+
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.8.tgz#907e240d57b386618dc56468bacfe76bf19764ae"
+ integrity sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==
+ dependencies:
+ commander "2"
+ iconv-lite "0.4"
+ rw "1"
+
+d3-ease@1:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz#ebdb6da22dfac0a22222f2d4da06f66c416a0ec0"
+ integrity sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ==
+
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"
+ integrity sha1-aL+8NJM4o4DETYrMT7wzBKotjA4=
+
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.1.0.tgz#cebf3c694f1078fcc3d4daf8e567b2fbd70d4ea3"
+ integrity sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==
+ dependencies:
+ d3-collection "1"
+ d3-dispatch "1"
+ d3-quadtree "1"
+ d3-timer "1"
+
+d3-format@1:
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.4.tgz#356925f28d0fd7c7983bfad593726fce46844030"
+ integrity sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw==
+
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz#1a39c479c8a57fe5051b2e67a3bee27061a74e7a"
+ integrity sha512-zH9CfF/3C8zUI47nsiKfD0+AGDEuM8LwBIP7pBVpyR4l/sKkZqITmMtxRp04rwBrlshIZ17XeFAaovN3++wzkw==
+
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz#157e3b0f917379d0f73bebfff3be537f49fa7356"
+ integrity sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==
+ dependencies:
+ d3-array "1"
+
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz#a1c845c42f84a206bcf1c01c01098ea4ddaa7a26"
+ integrity sha1-ochFxC+Eoga88cAcAQmOpN2qeiY=
+
+d3-interpolate@1:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
+ integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
+ dependencies:
+ d3-color "1"
+
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6"
+ integrity sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==
+ dependencies:
+ d3-color "1"
+
+d3-path@1:
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
+ integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
+
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764"
+ integrity sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q=
+
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.3.tgz#16888e9026460933f2b179652ad378224d382c62"
+ integrity sha1-FoiOkCZGCTPysXllKtN4Ik04LGI=
+
+d3-quadtree@1:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
+ integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
+
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz#ac7987e3e23fe805a990f28e1b50d38fcb822438"
+ integrity sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg=
+
+ version "3.0.7"
+ resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz#c93a2e54b417c0959129d7d73f6cf7d4292e7618"
+ integrity sha1-yTouVLQXwJWRKdfXP2z31Ckudhg=
+
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz#6642e506c6fa3a648595d2b2469788a8d12529d3"
+ integrity sha1-ZkLlBsb6OmSFldKyRpeIqNElKdM=
+
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.6.tgz#a1044a9ef4ec28c824171c9379fae6d79474b19f"
+ integrity sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==
+ dependencies:
+ d3-collection "1"
+ d3-dispatch "1"
+ d3-dsv "1"
+ xmlhttprequest "1"
+
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d"
+ integrity sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==
+ dependencies:
+ d3-array "^1.2.0"
+ d3-collection "1"
+ d3-color "1"
+ d3-format "1"
+ d3-interpolate "1"
+ d3-time "1"
+ d3-time-format "2"
+
+d3-selection@1, d3-selection@^1.1.0:
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
+ integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
+
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.0.tgz#d53772382d3dc4f7507bfb28bcd2d6aed2a0ad6d"
+ integrity sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA==
+
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777"
+ integrity sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=
+ dependencies:
+ d3-path "1"
+
+d3-time-format@2:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz#0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb"
+ integrity sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==
+ dependencies:
+ d3-time "1"
+
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz#85b7cdfbc9ffca187f14d3c456ffda268081bb31"
+ integrity sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==
+ dependencies:
+ d3-time "1"
+
+d3-time@1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
+ integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
+
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84"
+ integrity sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ==
+
+d3-timer@1:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
+ integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
+
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531"
+ integrity sha512-vMZXR88XujmG/L5oB96NNKH5lCWwiLM/S2HyyAQLcjWJCloK5shxta4CwOFYLZoY3AWX73v8Lgv4cCAdWtRmOA==
+
+d3-transition@1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
+ integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
+ dependencies:
+ d3-color "1"
+ d3-dispatch "1"
+ d3-ease "1"
+ d3-interpolate "1"
+ d3-selection "^1.1.0"
+ d3-timer "1"
+
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039"
+ integrity sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==
+ dependencies:
+ d3-color "1"
+ d3-dispatch "1"
+ d3-ease "1"
+ d3-interpolate "1"
+ d3-selection "^1.1.0"
+ d3-timer "1"
+
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"
+ integrity sha1-Fodmfo8TotFYyAwUgMWinLDYlzw=
+
+ version "1.7.1"
+ resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.1.tgz#02f43b3c3e2db54f364582d7e4a236ccc5506b63"
+ integrity sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==
+ dependencies:
+ d3-dispatch "1"
+ d3-drag "1"
+ d3-interpolate "1"
+ d3-selection "1"
+ d3-transition "1"
+
+d3@^4:
+ version "4.13.0"
+ resolved "https://registry.yarnpkg.com/d3/-/d3-4.13.0.tgz#ab236ff8cf0cfc27a81e69bf2fb7518bc9b4f33d"
+ integrity sha512-l8c4+0SldjVKLaE2WG++EQlqD7mh/dmQjvi2L2lKPadAVC+TbJC4ci7Uk9bRi+To0+ansgsS0iWfPjD7DBy+FQ==
+ dependencies:
+ d3-array "1.2.1"
+ d3-axis "1.0.8"
+ d3-brush "1.0.4"
+ d3-chord "1.0.4"
+ d3-collection "1.0.4"
+ d3-color "1.0.3"
+ d3-dispatch "1.0.3"
+ d3-drag "1.2.1"
+ d3-dsv "1.0.8"
+ d3-ease "1.0.3"
+ d3-force "1.1.0"
+ d3-format "1.2.2"
+ d3-geo "1.9.1"
+ d3-hierarchy "1.1.5"
+ d3-interpolate "1.1.6"
+ d3-path "1.0.5"
+ d3-polygon "1.0.3"
+ d3-quadtree "1.0.3"
+ d3-queue "3.0.7"
+ d3-random "1.1.0"
+ d3-request "1.0.6"
+ d3-scale "1.0.7"
+ d3-selection "1.3.0"
+ d3-shape "1.2.0"
+ d3-time "1.0.8"
+ d3-time-format "2.1.1"
+ d3-timer "1.0.7"
+ d3-transition "1.1.1"
+ d3-voronoi "1.1.2"
+ d3-zoom "1.7.1"
+
+d3@mbostock-bower/d3-bower#>=4:
+ version "0.0.0"
+ resolved "https://codeload.github.com/mbostock-bower/d3-bower/tar.gz/c15b85ce115be200bd4ca473f97fcd0bb43bba07"
+
+datatables@DataTables/DataTables#1.10.x:
+ version "1.10.21"
+ resolved "https://codeload.github.com/DataTables/DataTables/tar.gz/83e59694a105225ff889ddfa0d723a3ab24fda78"
+ dependencies:
+ jquery ">=1.7"
+
+devbridge-autocomplete@devbridge/jQuery-Autocomplete#1.2.x:
+ version "1.2.27"
+ resolved "https://codeload.github.com/devbridge/jQuery-Autocomplete/tar.gz/062811cd42f35a25c667223334226872dc4011e8"
+ dependencies:
+ jquery ">=1.7"
+
+font-awesome@^4.3.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+ integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
+
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+ dependencies:
+ safer-buffer ">= 2.1.2 < 3"
+
+jquery@>=1.7:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+ integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
+
+jquery@^1.11.2:
+ version "1.12.4"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c"
+ integrity sha1-AeHfuikP5z3rp3zurLD5ui/sngw=
+
+jquery@jquery/jquery-dist#2.x:
+ version "2.2.4"
+ resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"
+
+metrics-graphics@mozilla/metrics-graphics#2.15.x:
+ version "2.15.6"
+ resolved "https://codeload.github.com/mozilla/metrics-graphics/tar.gz/9c213c7d80a19191bc3cf26e1ca17942447aa240"
+ dependencies:
+ d3 "^4"
+
+rw@1:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+ integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+
+"safer-buffer@>= 2.1.2 < 3":
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+shariff@heiseonline/shariff#1.24.1:
+ version "1.24.1"
+ resolved "https://codeload.github.com/heiseonline/shariff/tar.gz/51153c199b58b7684e694b0b97cf41b75bb1dda9"
+ dependencies:
+ font-awesome "^4.3.0"
+ jquery "^1.11.2"
+
+tinymce@tinymce/tinymce-dist#4.5.x:
+ version "4.5.12"
+ resolved "https://codeload.github.com/tinymce/tinymce-dist/tar.gz/3d007282ded510e32c638b2ed5a9ffe1f219d329"
+
+xmlhttprequest@1:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
+ integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
+
+yarn@^1.22.4:
+ version "1.22.4"
+ resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.4.tgz#01c1197ca5b27f21edc8bc472cd4c8ce0e5a470e"
+ integrity sha512-oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA==