diff --git a/dashboard/oidc_interaction_abort.html b/dashboard/oidc_interaction_abort.html index e2540f175..471d77056 100644 --- a/dashboard/oidc_interaction_abort.html +++ b/dashboard/oidc_interaction_abort.html @@ -4,51 +4,31 @@ - Authorize ##NAME## + ##NAME## OpenID Access Denied - - + + + + - -
- -
-

You do not have access to ##NAME##

- Continue -
- - - - + +
+ + diff --git a/dashboard/src/components/OidcError.vue b/dashboard/src/components/OidcError.vue deleted file mode 100644 index de0f0347a..000000000 --- a/dashboard/src/components/OidcError.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - diff --git a/dashboard/src/components/PublicPageLayout.vue b/dashboard/src/components/PublicPageLayout.vue new file mode 100644 index 000000000..25995eabc --- /dev/null +++ b/dashboard/src/components/PublicPageLayout.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/dashboard/src/login.js b/dashboard/src/login.js index 38dc5a111..1c3de3e5b 100644 --- a/dashboard/src/login.js +++ b/dashboard/src/login.js @@ -3,12 +3,12 @@ import { createApp } from 'vue'; import '@fontsource/noto-sans'; import i18n from './i18n.js'; -import Login from './components/Login.vue'; +import LoginView from './views/LoginView.vue'; import './style.css'; (async function init() { - const app = createApp(Login); + const app = createApp(LoginView); app.use(await i18n()); diff --git a/dashboard/src/oidcerror.js b/dashboard/src/oidcerror.js index de02a5580..58474b41b 100644 --- a/dashboard/src/oidcerror.js +++ b/dashboard/src/oidcerror.js @@ -3,12 +3,12 @@ import { createApp } from 'vue'; import '@fontsource/noto-sans'; import i18n from './i18n.js'; -import OidcError from './components/OidcError.vue'; +import OidcErrorView from './views/OidcErrorView.vue'; import './style.css'; (async function init() { - const app = createApp(OidcError); + const app = createApp(OidcErrorView); app.use(await i18n()); diff --git a/dashboard/src/oidcinteractionabort.js b/dashboard/src/oidcinteractionabort.js new file mode 100644 index 000000000..317903668 --- /dev/null +++ b/dashboard/src/oidcinteractionabort.js @@ -0,0 +1,16 @@ +import { createApp } from 'vue'; + +import '@fontsource/noto-sans'; + +import i18n from './i18n.js'; +import OidcInteractionAbortView from './views/OidcInteractionAbortView.vue'; + +import './style.css'; + +(async function init() { + const app = createApp(OidcInteractionAbortView); + + app.use(await i18n()); + + app.mount('#app'); +})(); diff --git a/dashboard/src/passwordreset.js b/dashboard/src/passwordreset.js index e4f968643..9231a8746 100644 --- a/dashboard/src/passwordreset.js +++ b/dashboard/src/passwordreset.js @@ -3,12 +3,12 @@ import { createApp } from 'vue'; import '@fontsource/noto-sans'; import i18n from './i18n.js'; -import PasswordReset from './components/PasswordReset.vue'; +import PasswordResetView from './views/PasswordResetView.vue'; import './style.css'; (async function init() { - const app = createApp(PasswordReset); + const app = createApp(PasswordResetView); app.use(await i18n()); diff --git a/dashboard/src/components/Login.vue b/dashboard/src/views/LoginView.vue similarity index 68% rename from dashboard/src/components/Login.vue rename to dashboard/src/views/LoginView.vue index 44fd037ae..b6780401d 100644 --- a/dashboard/src/components/Login.vue +++ b/dashboard/src/views/LoginView.vue @@ -1,8 +1,9 @@ - - - diff --git a/dashboard/src/views/OidcErrorView.vue b/dashboard/src/views/OidcErrorView.vue new file mode 100644 index 000000000..c62dc9fe4 --- /dev/null +++ b/dashboard/src/views/OidcErrorView.vue @@ -0,0 +1,23 @@ + + + diff --git a/dashboard/src/views/OidcInteractionAbortView.vue b/dashboard/src/views/OidcInteractionAbortView.vue new file mode 100644 index 000000000..8f01d8103 --- /dev/null +++ b/dashboard/src/views/OidcInteractionAbortView.vue @@ -0,0 +1,22 @@ + + + diff --git a/dashboard/src/components/PasswordReset.vue b/dashboard/src/views/PasswordResetView.vue similarity index 81% rename from dashboard/src/components/PasswordReset.vue rename to dashboard/src/views/PasswordResetView.vue index 759ff6bfb..74102b8dc 100644 --- a/dashboard/src/components/PasswordReset.vue +++ b/dashboard/src/views/PasswordResetView.vue @@ -2,8 +2,9 @@ import { ref, onMounted } from 'vue'; import { marked } from 'marked'; -import { Button, PasswordInput, TextInput, fetcher } from 'pankow'; +import { Button, PasswordInput, TextInput, fetcher, FormGroup } from 'pankow'; import { API_ORIGIN } from '../constants.js'; +import PublicPageLayout from '../components/PublicPageLayout.vue'; const ready = ref(false); const busy = ref(false); @@ -107,12 +108,8 @@ onMounted(async () => { - - -