refactor to work with jupyter_server

voila-dashboards · Jun 26, 2019 · 388121a · 388121a
1 parent 5dfb744
commit 388121a
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 438 deletions.
diff --git a/etc/jupyter/jupyter_server_config.d/voila.json b/etc/jupyter/jupyter_server_config.d/voila.json
@@ -1,7 +1,7 @@
 {
     "ServerApp": {
         "jpserver_extensions": {
-            "voila.server_extension": true
+            "voila": true
         }
     }
 }
diff --git a/setup.py b/setup.py
@@ -273,7 +273,7 @@ def get_data_files():
     },
     'entry_points': {
         'console_scripts': [
-            'voila = voila.app:main'
+            'jupyter-voila = voila.app:main'
         ]
     },
     'install_requires': [

diff --git a/share/jupyter/voila/templates/default/nbconvert_templates/base.tpl b/share/jupyter/voila/templates/default/nbconvert_templates/base.tpl
@@ -14,7 +14,7 @@
 
 {%- block html_head_js -%}
 
-<script src="{{resources.base_url}}voila/static/jquery.min.js"></script>
+<script src="{{resources.base_url}}static/voila/jquery.min.js"></script>
 
 <script id="jupyter-config-data" type="application/json">
 {
@@ -34,15 +34,18 @@
 {% block footer %}
 {% block footer_js %}
 <script
-    src="{{resources.base_url}}voila/static/require.min.js"
+    src="{{resources.base_url}}static/voila/require.min.js"
     integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA="
     crossorigin="anonymous">
 </script>
 <script>
-requirejs.config({ baseUrl: '{{resources.base_url}}voila/', waitSeconds: 30})
+requirejs.config({ 
+    baseUrl: '{{resources.base_url}}static/voila/', 
+    waitSeconds: 30
+})
 requirejs(
     [
-        "static/main",
+        "main",
     {% for ext in resources.nbextensions -%}
         "{{resources.base_url}}voila/nbextensions/{{ ext }}.js",
     {% endfor %}

diff --git a/share/jupyter/voila/templates/default/nbconvert_templates/voila.tpl b/share/jupyter/voila/templates/default/nbconvert_templates/voila.tpl
@@ -2,12 +2,12 @@
 {% from 'mathjax.tpl' import mathjax %}
 
 {%- block html_head_css -%}
-<link rel="stylesheet" type="text/css" href="{{resources.base_url}}voila/static/index.css"></link>
+<link rel="stylesheet" type="text/css" href="{{resources.base_url}}static/voila/index.css"></link>
 
 {% if resources.theme == 'dark' %}
-    <link rel="stylesheet" type="text/css" href="{{resources.base_url}}voila/static/theme-dark.css"></link>
+    <link rel="stylesheet" type="text/css" href="{{resources.base_url}}static/voila/theme-dark.css"></link>
 {% else %}
-    <link rel="stylesheet" type="text/css" href="{{resources.base_url}}voila/static/theme-light.css"></link>
+    <link rel="stylesheet" type="text/css" href="{{resources.base_url}}static/voila/theme-light.css"></link>
 {% endif %}
 
 {% for css in resources.inlining.css %}

diff --git a/share/jupyter/voila/templates/default/static/main.js b/share/jupyter/voila/templates/default/static/main.js
@@ -7,7 +7,7 @@
 ****************************************************************************/
 
 // NOTE: this file is not transpiled, async/await is the only modern feature we use here
-require(['static/voila'], function(voila) {
+require(['voila'], function(voila) {
     // requirejs doesn't like to be passed an async function, so create one inside
     (async function() {
         var kernel = await voila.connectKernel()

diff --git a/voila/__init__.py b/voila/__init__.py
@@ -7,8 +7,9 @@
 #############################################################################
 
 from ._version import __version__  # noqa
-from .server_extension import load_jupyter_server_extension  # noqa
+from .app import Voila  # noqa
 
+load_jupyter_server_extension = Voila.load_jupyter_server_extension
 
 def _jupyter_nbextension_paths():
     return [dict(