Skip to content
Snippets Groups Projects
Unverified Commit 88116bdf authored by Bruno Windels's avatar Bruno Windels Committed by GitHub
Browse files

Merge pull request #225 from matrix-org/danilafe/legal-disclaimer

Add a legal disclaimer view
parents 24f89879 a773daa0
No related branches found
No related tags found
No related merge requests found
...@@ -18,10 +18,12 @@ import {TemplateView} from "./utils/TemplateView.js"; ...@@ -18,10 +18,12 @@ import {TemplateView} from "./utils/TemplateView.js";
import {OpenLinkView} from "./open/OpenLinkView.js"; import {OpenLinkView} from "./open/OpenLinkView.js";
import {CreateLinkView} from "./create/CreateLinkView.js"; import {CreateLinkView} from "./create/CreateLinkView.js";
import {LoadServerPolicyView} from "./policy/LoadServerPolicyView.js"; import {LoadServerPolicyView} from "./policy/LoadServerPolicyView.js";
import {DisclaimerView} from "./disclaimer/DisclaimerView.js";
export class RootView extends TemplateView { export class RootView extends TemplateView {
render(t, vm) { render(t, vm) {
return t.div({className: "RootView"}, [ return t.div({className: "RootView"}, [
t.mapView(vm => vm.showDisclaimer, disclaimer => disclaimer ? new DisclaimerView() : null),
t.mapView(vm => vm.openLinkViewModel, vm => vm ? new OpenLinkView(vm) : null), t.mapView(vm => vm.openLinkViewModel, vm => vm ? new OpenLinkView(vm) : null),
t.mapView(vm => vm.createLinkViewModel, vm => vm ? new CreateLinkView(vm) : null), t.mapView(vm => vm.createLinkViewModel, vm => vm ? new CreateLinkView(vm) : null),
t.mapView(vm => vm.loadServerPolicyViewModel, vm => vm ? new LoadServerPolicyView(vm) : null), t.mapView(vm => vm.loadServerPolicyViewModel, vm => vm ? new LoadServerPolicyView(vm) : null),
...@@ -33,6 +35,7 @@ export class RootView extends TemplateView { ...@@ -33,6 +35,7 @@ export class RootView extends TemplateView {
t.li(externalLink(t, "https://github.com/matrix-org/matrix.to/tree/main/src/open/clients", "Add your app")), t.li(externalLink(t, "https://github.com/matrix-org/matrix.to/tree/main/src/open/clients", "Add your app")),
t.li({className: {hidden: vm => !vm.hasPreferences}}, t.li({className: {hidden: vm => !vm.hasPreferences}},
t.button({className: "text", onClick: () => vm.clearPreferences()}, "Clear preferences")), t.button({className: "text", onClick: () => vm.clearPreferences()}, "Clear preferences")),
t.li(t.a({href: "#/disclaimer/"}, "Disclaimer")),
]) ])
]) ])
]); ]);
......
...@@ -29,6 +29,7 @@ export class RootViewModel extends ViewModel { ...@@ -29,6 +29,7 @@ export class RootViewModel extends ViewModel {
this.openLinkViewModel = null; this.openLinkViewModel = null;
this.createLinkViewModel = null; this.createLinkViewModel = null;
this.loadServerPolicyViewModel = null; this.loadServerPolicyViewModel = null;
this.showDisclaimer = false;
this.preferences.on("canClear", () => { this.preferences.on("canClear", () => {
this.emitChange(); this.emitChange();
}); });
...@@ -57,12 +58,18 @@ export class RootViewModel extends ViewModel { ...@@ -57,12 +58,18 @@ export class RootViewModel extends ViewModel {
} }
updateHash(hash) { updateHash(hash) {
this.showDisclaimer = false;
if (hash.startsWith("#/policy/")) { if (hash.startsWith("#/policy/")) {
const server = hash.substr(9); const server = hash.substr(9);
this._hideLinks(); this._hideLinks();
this.loadServerPolicyViewModel = new LoadServerPolicyViewModel(this.childOptions({server})); this.loadServerPolicyViewModel = new LoadServerPolicyViewModel(this.childOptions({server}));
this.loadServerPolicyViewModel.load(); this.loadServerPolicyViewModel.load();
this.emitChange(); this.emitChange();
} else if (hash.startsWith("#/disclaimer/")) {
this._hideLinks();
this.loadServerPolicyViewModel = null;
this.showDisclaimer = true;
this.emitChange();
} else { } else {
const oldLink = this.link; const oldLink = this.link;
this.loadServerPolicyViewModel = null; this.loadServerPolicyViewModel = null;
......
/*
Copyright 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import {TemplateView} from "../utils/TemplateView.js";
export class DisclaimerView extends TemplateView {
render(t) {
return t.div({ className: "DisclaimerView card" }, [
t.h1("Disclaimer"),
t.p(
'Matrix.to is a service provided by the Matrix.org Foundation ' +
'which allows you to easily create invites to Matrix rooms and accounts, ' +
'regardless of your Matrix homeserver. The service is provided "as is" without ' +
'warranty of any kind, either express, implied, statutory or otherwise. ' +
'The Matrix.org Foundation shall not be responsible or liable for the room ' +
'and account contents shared via this service.'
),
]);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment