mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

Move back-button to login view

Browse Source 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
RMidhunSuresh 2021-08-19 21:37:26 +05:30
parent 3af2ae3bdd
commit 5ab405fc30
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/domain/login/LoginViewModel.js
View File

@ -42,6 +42,7 @@ export class LoginViewModel extends ViewModel {
get defaultHomeServer() { return this._homeserver; } get defaultHomeServer() { return this._homeserver; }
get errorMessage() { return this._errorMessage; } get errorMessage() { return this._errorMessage; }
get showHomeserver() { return !this._completeSSOLoginViewModel; } get showHomeserver() { return !this._completeSSOLoginViewModel; }
get cancelUrl() { return this.urlCreator.urlForSegment("session"); }
async _createViewModels(homeserver) { async _createViewModels(homeserver) {
if (this._loginToken) { if (this._loginToken) {

1
src/domain/login/PasswordLoginViewModel.js
View File

@ -30,7 +30,6 @@ export class PasswordLoginViewModel extends ViewModel {
} }
get loadViewModel() {return this._loadViewModel; } get loadViewModel() {return this._loadViewModel; }
get cancelUrl() { return this.urlCreator.urlForSegment("session"); }
get isBusy() { get isBusy() {
if (!this._loadViewModel) { if (!this._loadViewModel) {

3
src/platform/web/ui/css/login.css
View File

@ -74,11 +74,12 @@ limitations under the License.
.StartSSOLoginView { .StartSSOLoginView {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 0.4em 0;
} }
.StartSSOLoginView_button { .StartSSOLoginView_button {
flex: 1; flex: 1;
margin-top: 10px; margin-top: 12px;
} }
.LoginView_separator { .LoginView_separator {

5
src/platform/web/ui/css/themes/element/theme.css
View File

@ -228,6 +228,11 @@ a.button-action {
border-radius: 8px; border-radius: 8px;
} }
.LoginView_back {
background-image: url("./icons/chevron-left.svg");
background-color: transparent;
}
.LoginView_separator { .LoginView_separator {
font-weight: 500; font-weight: 500;
font-size: 1.5rem; font-size: 1.5rem;

1
src/platform/web/ui/login/LoginView.js
View File

@ -30,6 +30,7 @@ export class LoginView extends TemplateView {
}); });
return t.div({className: "PreSessionScreen"}, [ return t.div({className: "PreSessionScreen"}, [
t.a({className: "button-utility LoginView_back", href: vm.cancelUrl}),
t.div({className: "logo"}), t.div({className: "logo"}),
t.h1([vm.i18n`Sign In`]), t.h1([vm.i18n`Sign In`]),
t.mapView(vm => vm.completeSSOLoginViewModel, vm => vm ? new CompleteSSOView(vm) : null), t.mapView(vm => vm.completeSSOLoginViewModel, vm => vm ? new CompleteSSOView(vm) : null),

4
src/platform/web/ui/login/PasswordLoginView.js
View File

@ -45,10 +45,6 @@ export class PasswordLoginView extends TemplateView {
t.div({ className: "form-row" }, [t.label({ for: "password" }, vm.i18n`Password`), password]), t.div({ className: "form-row" }, [t.label({ for: "password" }, vm.i18n`Password`), password]),
t.mapView(vm => vm.loadViewModel, loadViewModel => loadViewModel ? new SessionLoadStatusView(loadViewModel) : null), t.mapView(vm => vm.loadViewModel, loadViewModel => loadViewModel ? new SessionLoadStatusView(loadViewModel) : null),
t.div({ className: "button-row" }, [ t.div({ className: "button-row" }, [
t.a({
className: "button-action secondary",
href: vm.cancelUrl
}, [vm.i18n`Go Back`]),
t.button({ t.button({
className: "button-action primary", className: "button-action primary",
type: "submit" type: "submit"