diff --git a/proxy.conf.json b/proxy.conf.json index afc31ac..2d8d46f 100644 --- a/proxy.conf.json +++ b/proxy.conf.json @@ -8,5 +8,15 @@ "secure": false, "changeOrigin": true, "logLevel": "info" + }, + "/i18n": { + "target": { + "host": "172.27.0.1", + "protocol": "http:", + "port": 8000 + }, + "secure": false, + "changeOrigin": true, + "logLevel": "info" } } diff --git a/src/app/pages/error/error.component.css b/src/app/pages/error/error.component.css index 623307b..5ca0450 100644 --- a/src/app/pages/error/error.component.css +++ b/src/app/pages/error/error.component.css @@ -3,13 +3,26 @@ flex-flow: column wrap; align-items: center; justify-content: center; - + height: 100%; + width: 100%; +} + +.errorDialog { + min-width: 30%; + min-height: 30%; + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22); + display: flex; + flex-flow: column wrap; + align-items: center; + justify-content: center; } .header { - background-color: blueviolet; + /*background-color: blueviolet;*/ + font-size: 1rem; } .message { - background-color: aqua; + font-size: 1rem; + height: 30%; } \ No newline at end of file diff --git a/src/app/pages/error/error.component.html b/src/app/pages/error/error.component.html index 212654d..828fbb1 100644 --- a/src/app/pages/error/error.component.html +++ b/src/app/pages/error/error.component.html @@ -1,8 +1,10 @@
-
-

Error

-
-
- {{ this.error }} +
+
+

Error

+
+
+

{{ this.error }}

+
diff --git a/src/app/pages/error/error.component.ts b/src/app/pages/error/error.component.ts index 0f14c9a..e62fbf0 100644 --- a/src/app/pages/error/error.component.ts +++ b/src/app/pages/error/error.component.ts @@ -18,7 +18,7 @@ export class ErrorComponent implements OnInit { getError(): void { const id = this.route.snapshot.paramMap.get('id'); try { - this.error = window.atob(id + '=='); + this.error = window.atob(id); } catch (e) { this.error = django.gettext('Invalid error string'); } diff --git a/src/app/pages/login/login.component.css b/src/app/pages/login/login.component.css index e1e3194..f7d72a2 100644 --- a/src/app/pages/login/login.component.css +++ b/src/app/pages/login/login.component.css @@ -20,7 +20,7 @@ -moz-box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 3px 1px -2px rgba(0,0,0,0.12),0 1px 5px 0 rgba(0,0,0,0.2); box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 3px 1px -2px rgba(0,0,0,0.12),0 1px 5px 0 rgba(0,0,0,0.2); transition: all 0.3s cubic-bezier(.25,.8,.25,1); - /* flex: 1 0 51%; */ + flex: 1 0 auto; justify-content: center; flex-flow: column wrap; align-items: center;