diff options
| author | Anike Arni <anikarni@gmail.com> | 2016-12-30 10:09:22 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-30 10:09:22 -0200 |
| commit | a86c55a4baf36c711d946331ea3637ce5a6049f7 (patch) | |
| tree | 0ef0b40ffa6af7f0d14d5c40062bc7978c67aebc /service/pixelated | |
| parent | 6141facf1b8bb6789a2d89270723b1df0d7afcf4 (diff) | |
| parent | 413672fdba891168301c853c679f21700ebaeb90 (diff) | |
Merge pull request #893 from pixelated/webpack
Transition from require to webpack
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/resources/login_resource.py | 4 | ||||
| -rw-r--r-- | service/pixelated/resources/root_resource.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index ed0cb54e..2a11b73e 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -40,11 +40,11 @@ def _get_startup_folder(): def _get_static_folder(): - static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app")) + static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "dist")) # this is a workaround for packaging if not os.path.exists(static_folder): static_folder = os.path.abspath( - os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "app")) + os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist")) if not os.path.exists(static_folder): static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent') return static_folder diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index 8df76c70..101ff6b8 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -111,11 +111,11 @@ class RootResource(BaseResource): return os.path.join(path, '..', 'assets') def _get_static_folder(self): - static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app")) + static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "dist")) # this is a workaround for packaging if not os.path.exists(static_folder): static_folder = os.path.abspath( - os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "app")) + os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist")) if not os.path.exists(static_folder): static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent') return static_folder |