diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/core/web/README | 6 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/README.rst | 2 | ||||
| -rw-r--r-- | ui/Makefile (renamed from www/Makefile) | 0 | ||||
| -rw-r--r-- | ui/README.md (renamed from www/README.md) | 0 | ||||
| -rw-r--r-- | ui/app/app.js (renamed from www/app/app.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/area.js (renamed from www/app/components/area.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/center.js (renamed from www/app/components/center.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/debug_panel.js (renamed from www/app/components/debug_panel.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/error_panel.js (renamed from www/app/components/error_panel.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/greeter_panel.js (renamed from www/app/components/greeter_panel.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/list_edit.js (renamed from www/app/components/list_edit.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/login.js (renamed from www/app/components/login.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/account_list.js (renamed from www/app/components/main_panel/account_list.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/email_section.js (renamed from www/app/components/main_panel/email_section.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/index.js (renamed from www/app/components/main_panel/index.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/main_panel.less (renamed from www/app/components/main_panel/main_panel.less) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/section_layout.js (renamed from www/app/components/main_panel/section_layout.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/user_section.js (renamed from www/app/components/main_panel/user_section.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/main_panel/vpn_section.js (renamed from www/app/components/main_panel/vpn_section.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/panel_switcher.js (renamed from www/app/components/panel_switcher.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/spinner/index.js (renamed from www/app/components/spinner/index.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/spinner/spinner.css (renamed from www/app/components/spinner/spinner.css) | 0 | ||||
| -rw-r--r-- | ui/app/components/splash.js (renamed from www/app/components/splash.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/wizard/add_provider_modal.js (renamed from www/app/components/wizard/add_provider_modal.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/wizard/index.js (renamed from www/app/components/wizard/index.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/wizard/provider_select_stage.js (renamed from www/app/components/wizard/provider_select_stage.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/wizard/stage_layout.js (renamed from www/app/components/wizard/stage_layout.js) | 0 | ||||
| -rw-r--r-- | ui/app/components/wizard/wizard.less (renamed from www/app/components/wizard/wizard.less) | 0 | ||||
| -rw-r--r-- | ui/app/css/bootstrap.less (renamed from www/app/css/bootstrap.less) | 0 | ||||
| -rw-r--r-- | ui/app/css/common.css (renamed from www/app/css/common.css) | 0 | ||||
| -rw-r--r-- | ui/app/img/arrow-down.svg (renamed from www/app/img/arrow-down.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/arrow-up.svg (renamed from www/app/img/arrow-up.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/cloud.svg (renamed from www/app/img/cloud.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/disabled.svg (renamed from www/app/img/disabled.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/envelope.svg (renamed from www/app/img/envelope.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/gear.svg (renamed from www/app/img/gear.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/mask.svg (renamed from www/app/img/mask.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/off.svg (renamed from www/app/img/off.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/on.svg (renamed from www/app/img/on.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/planet.svg (renamed from www/app/img/planet.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/unknown.svg (renamed from www/app/img/unknown.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/user.svg (renamed from www/app/img/user.svg) | 0 | ||||
| -rw-r--r-- | ui/app/img/wait.svg (renamed from www/app/img/wait.svg) | 0 | ||||
| -rw-r--r-- | ui/app/index.html (renamed from www/app/index.html) | 0 | ||||
| -rw-r--r-- | ui/app/lib/bitmask.js (renamed from www/app/lib/bitmask.js) | 0 | ||||
| -rw-r--r-- | ui/app/lib/color.js (renamed from www/app/lib/color.js) | 0 | ||||
| -rw-r--r-- | ui/app/lib/colors.js (renamed from www/app/lib/colors.js) | 0 | ||||
| -rw-r--r-- | ui/app/lib/common.js (renamed from www/app/lib/common.js) | 0 | ||||
| -rw-r--r-- | ui/app/lib/validate.js (renamed from www/app/lib/validate.js) | 0 | ||||
| -rw-r--r-- | ui/app/main.js (renamed from www/app/main.js) | 0 | ||||
| -rw-r--r-- | ui/app/models/account.js (renamed from www/app/models/account.js) | 0 | ||||
| -rw-r--r-- | ui/app/models/dummy_account.js (renamed from www/app/models/dummy_account.js) | 0 | ||||
| -rw-r--r-- | ui/package.json (renamed from www/package.json) | 0 | ||||
| -rw-r--r-- | ui/pydist/README.md (renamed from www/pydist/README.md) | 0 | ||||
| -rw-r--r-- | ui/pydist/setup.py (renamed from www/pydist/setup.py) | 0 | ||||
| -rw-r--r-- | ui/webpack.config.js (renamed from www/webpack.config.js) | 0 |
59 files changed, 10 insertions, 10 deletions
@@ -35,9 +35,9 @@ venv/ ENV/ # Javascript, web-ui -www/node_modules -www/npm-debug.log -www/pydist/bitmask_js +ui/node_modules +ui/npm-debug.log +ui/pydist/bitmask_js # vim *.swp @@ -4,7 +4,7 @@ clean: dev-mail: pip install -e '.[mail]' - make -C www dev-install-prebuilt + make -C ui dev-install-prebuilt dev-all: pip install -e '.[all]' @@ -111,11 +111,11 @@ First, install the javascript prerequisites: Next, run ``dev-install``: source venv/bin/activate # if not already activated - cd www + cd ui make dev-install # install JS user interface as a python package in "develop" mode. node run watch # continually rebuild javascript bundle when source files change. -For more information, see ``www/README.md``. +For more information, see ``ui/README.md``. cross-testing +++++++++++++++++++++++++++++++++++++++ diff --git a/src/leap/bitmask/core/web/README b/src/leap/bitmask/core/web/README index 76a745d..5826c52 100644 --- a/src/leap/bitmask/core/web/README +++ b/src/leap/bitmask/core/web/README @@ -1,9 +1,9 @@ This is the original implementation of the bitmask.js library, which uses the REST api exposed by the HTTPRequestDispatcher. -The development of bitmask_js is in the www/ folder in this bitmask-dev repo. +The development of bitmask_js is in the ui/ folder in this bitmask-dev repo. -A pre-compiled version of the html+js web-ui can be found in the leap.bitmask_www package. +A pre-compiled version of the html+js web-ui can be found in the bitmask_js package. This remains here to be able to develop against the REST api without the need -of installing the full-fledged bitmask_www package. +of installing the full-fledged bitmask_js package. diff --git a/src/leap/bitmask/gui/README.rst b/src/leap/bitmask/gui/README.rst index 431bcfc..c3a6a0f 100644 --- a/src/leap/bitmask/gui/README.rst +++ b/src/leap/bitmask/gui/README.rst @@ -1,5 +1,5 @@ bitmask.gui is a module that depends on PyQt. It is declared as an extra in bitmask setup.py -Its function is to launch a minimalistic browser that serves the bitmask_www +Its function is to launch a minimalistic browser that serves the bitmask_js interface. diff --git a/www/Makefile b/ui/Makefile index d67a02b..d67a02b 100644 --- a/www/Makefile +++ b/ui/Makefile diff --git a/www/README.md b/ui/README.md index 3f276c0..3f276c0 100644 --- a/www/README.md +++ b/ui/README.md diff --git a/www/app/app.js b/ui/app/app.js index 57120a4..57120a4 100644 --- a/www/app/app.js +++ b/ui/app/app.js diff --git a/www/app/components/area.js b/ui/app/components/area.js index e903e5f..e903e5f 100644 --- a/www/app/components/area.js +++ b/ui/app/components/area.js diff --git a/www/app/components/center.js b/ui/app/components/center.js index 6fa6212..6fa6212 100644 --- a/www/app/components/center.js +++ b/ui/app/components/center.js diff --git a/www/app/components/debug_panel.js b/ui/app/components/debug_panel.js index 7515ba8..7515ba8 100644 --- a/www/app/components/debug_panel.js +++ b/ui/app/components/debug_panel.js diff --git a/www/app/components/error_panel.js b/ui/app/components/error_panel.js index fc88d45..fc88d45 100644 --- a/www/app/components/error_panel.js +++ b/ui/app/components/error_panel.js diff --git a/www/app/components/greeter_panel.js b/ui/app/components/greeter_panel.js index 4552db1..4552db1 100644 --- a/www/app/components/greeter_panel.js +++ b/ui/app/components/greeter_panel.js diff --git a/www/app/components/list_edit.js b/ui/app/components/list_edit.js index 0d557d2..0d557d2 100644 --- a/www/app/components/list_edit.js +++ b/ui/app/components/list_edit.js diff --git a/www/app/components/login.js b/ui/app/components/login.js index fe4ef5b..fe4ef5b 100644 --- a/www/app/components/login.js +++ b/ui/app/components/login.js diff --git a/www/app/components/main_panel/account_list.js b/ui/app/components/main_panel/account_list.js index d0ef092..d0ef092 100644 --- a/www/app/components/main_panel/account_list.js +++ b/ui/app/components/main_panel/account_list.js diff --git a/www/app/components/main_panel/email_section.js b/ui/app/components/main_panel/email_section.js index a6525d9..a6525d9 100644 --- a/www/app/components/main_panel/email_section.js +++ b/ui/app/components/main_panel/email_section.js diff --git a/www/app/components/main_panel/index.js b/ui/app/components/main_panel/index.js index 3cc6c11..3cc6c11 100644 --- a/www/app/components/main_panel/index.js +++ b/ui/app/components/main_panel/index.js diff --git a/www/app/components/main_panel/main_panel.less b/ui/app/components/main_panel/main_panel.less index 4e0ecb0..4e0ecb0 100644 --- a/www/app/components/main_panel/main_panel.less +++ b/ui/app/components/main_panel/main_panel.less diff --git a/www/app/components/main_panel/section_layout.js b/ui/app/components/main_panel/section_layout.js index e7c6f2a..e7c6f2a 100644 --- a/www/app/components/main_panel/section_layout.js +++ b/ui/app/components/main_panel/section_layout.js diff --git a/www/app/components/main_panel/user_section.js b/ui/app/components/main_panel/user_section.js index 0b4ba13..0b4ba13 100644 --- a/www/app/components/main_panel/user_section.js +++ b/ui/app/components/main_panel/user_section.js diff --git a/www/app/components/main_panel/vpn_section.js b/ui/app/components/main_panel/vpn_section.js index e69de29..e69de29 100644 --- a/www/app/components/main_panel/vpn_section.js +++ b/ui/app/components/main_panel/vpn_section.js diff --git a/www/app/components/panel_switcher.js b/ui/app/components/panel_switcher.js index aaf2dc5..aaf2dc5 100644 --- a/www/app/components/panel_switcher.js +++ b/ui/app/components/panel_switcher.js diff --git a/www/app/components/spinner/index.js b/ui/app/components/spinner/index.js index ffc3285..ffc3285 100644 --- a/www/app/components/spinner/index.js +++ b/ui/app/components/spinner/index.js diff --git a/www/app/components/spinner/spinner.css b/ui/app/components/spinner/spinner.css index 5e8535c..5e8535c 100644 --- a/www/app/components/spinner/spinner.css +++ b/ui/app/components/spinner/spinner.css diff --git a/www/app/components/splash.js b/ui/app/components/splash.js index 46170d2..46170d2 100644 --- a/www/app/components/splash.js +++ b/ui/app/components/splash.js diff --git a/www/app/components/wizard/add_provider_modal.js b/ui/app/components/wizard/add_provider_modal.js index bc5e023..bc5e023 100644 --- a/www/app/components/wizard/add_provider_modal.js +++ b/ui/app/components/wizard/add_provider_modal.js diff --git a/www/app/components/wizard/index.js b/ui/app/components/wizard/index.js index 613b88f..613b88f 100644 --- a/www/app/components/wizard/index.js +++ b/ui/app/components/wizard/index.js diff --git a/www/app/components/wizard/provider_select_stage.js b/ui/app/components/wizard/provider_select_stage.js index 20674be..20674be 100644 --- a/www/app/components/wizard/provider_select_stage.js +++ b/ui/app/components/wizard/provider_select_stage.js diff --git a/www/app/components/wizard/stage_layout.js b/ui/app/components/wizard/stage_layout.js index 3154022..3154022 100644 --- a/www/app/components/wizard/stage_layout.js +++ b/ui/app/components/wizard/stage_layout.js diff --git a/www/app/components/wizard/wizard.less b/ui/app/components/wizard/wizard.less index 29efc20..29efc20 100644 --- a/www/app/components/wizard/wizard.less +++ b/ui/app/components/wizard/wizard.less diff --git a/www/app/css/bootstrap.less b/ui/app/css/bootstrap.less index 3b77228..3b77228 100644 --- a/www/app/css/bootstrap.less +++ b/ui/app/css/bootstrap.less diff --git a/www/app/css/common.css b/ui/app/css/common.css index acf164e..acf164e 100644 --- a/www/app/css/common.css +++ b/ui/app/css/common.css diff --git a/www/app/img/arrow-down.svg b/ui/app/img/arrow-down.svg index 14c4b5d..14c4b5d 100644 --- a/www/app/img/arrow-down.svg +++ b/ui/app/img/arrow-down.svg diff --git a/www/app/img/arrow-up.svg b/ui/app/img/arrow-up.svg index 30ea8fd..30ea8fd 100644 --- a/www/app/img/arrow-up.svg +++ b/ui/app/img/arrow-up.svg diff --git a/www/app/img/cloud.svg b/ui/app/img/cloud.svg index bf7a94a..bf7a94a 100644 --- a/www/app/img/cloud.svg +++ b/ui/app/img/cloud.svg diff --git a/www/app/img/disabled.svg b/ui/app/img/disabled.svg index 90804d8..90804d8 100644 --- a/www/app/img/disabled.svg +++ b/ui/app/img/disabled.svg diff --git a/www/app/img/envelope.svg b/ui/app/img/envelope.svg index 5775e09..5775e09 100644 --- a/www/app/img/envelope.svg +++ b/ui/app/img/envelope.svg diff --git a/www/app/img/gear.svg b/ui/app/img/gear.svg index be5a5b3..be5a5b3 100644 --- a/www/app/img/gear.svg +++ b/ui/app/img/gear.svg diff --git a/www/app/img/mask.svg b/ui/app/img/mask.svg index f254c5e..f254c5e 100644 --- a/www/app/img/mask.svg +++ b/ui/app/img/mask.svg diff --git a/www/app/img/off.svg b/ui/app/img/off.svg index 35c49a5..35c49a5 100644 --- a/www/app/img/off.svg +++ b/ui/app/img/off.svg diff --git a/www/app/img/on.svg b/ui/app/img/on.svg index 36938e0..36938e0 100644 --- a/www/app/img/on.svg +++ b/ui/app/img/on.svg diff --git a/www/app/img/planet.svg b/ui/app/img/planet.svg index 5697d5d..5697d5d 100644 --- a/www/app/img/planet.svg +++ b/ui/app/img/planet.svg diff --git a/www/app/img/unknown.svg b/ui/app/img/unknown.svg index 6003863..6003863 100644 --- a/www/app/img/unknown.svg +++ b/ui/app/img/unknown.svg diff --git a/www/app/img/user.svg b/ui/app/img/user.svg index ad86a75..ad86a75 100644 --- a/www/app/img/user.svg +++ b/ui/app/img/user.svg diff --git a/www/app/img/wait.svg b/ui/app/img/wait.svg index 2ae0113..2ae0113 100644 --- a/www/app/img/wait.svg +++ b/ui/app/img/wait.svg diff --git a/www/app/index.html b/ui/app/index.html index 440e0b6..440e0b6 100644 --- a/www/app/index.html +++ b/ui/app/index.html diff --git a/www/app/lib/bitmask.js b/ui/app/lib/bitmask.js index fedd5fc..fedd5fc 100644 --- a/www/app/lib/bitmask.js +++ b/ui/app/lib/bitmask.js diff --git a/www/app/lib/color.js b/ui/app/lib/color.js index 5b1dfee..5b1dfee 100644 --- a/www/app/lib/color.js +++ b/ui/app/lib/color.js diff --git a/www/app/lib/colors.js b/ui/app/lib/colors.js index d86ca0a..d86ca0a 100644 --- a/www/app/lib/colors.js +++ b/ui/app/lib/colors.js diff --git a/www/app/lib/common.js b/ui/app/lib/common.js index 14a30c3..14a30c3 100644 --- a/www/app/lib/common.js +++ b/ui/app/lib/common.js diff --git a/www/app/lib/validate.js b/ui/app/lib/validate.js index 4e672e8..4e672e8 100644 --- a/www/app/lib/validate.js +++ b/ui/app/lib/validate.js diff --git a/www/app/main.js b/ui/app/main.js index b162895..b162895 100644 --- a/www/app/main.js +++ b/ui/app/main.js diff --git a/www/app/models/account.js b/ui/app/models/account.js index 52fea93..52fea93 100644 --- a/www/app/models/account.js +++ b/ui/app/models/account.js diff --git a/www/app/models/dummy_account.js b/ui/app/models/dummy_account.js index 99fb662..99fb662 100644 --- a/www/app/models/dummy_account.js +++ b/ui/app/models/dummy_account.js diff --git a/www/package.json b/ui/package.json index d491edd..d491edd 100644 --- a/www/package.json +++ b/ui/package.json diff --git a/www/pydist/README.md b/ui/pydist/README.md index 6e2b11f..6e2b11f 100644 --- a/www/pydist/README.md +++ b/ui/pydist/README.md diff --git a/www/pydist/setup.py b/ui/pydist/setup.py index b5d3ffb..b5d3ffb 100644 --- a/www/pydist/setup.py +++ b/ui/pydist/setup.py diff --git a/www/webpack.config.js b/ui/webpack.config.js index c0f8d19..c0f8d19 100644 --- a/www/webpack.config.js +++ b/ui/webpack.config.js |
