doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(fe): show different panes according to user role

Browse source
This commit is contained in:
hexxa 2021-09-25 11:53:34 +08:00 • committed by Hexxa
parent 9501bed740
commit 08ed7f175b
8 changed files with 94 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/client/web/src/components/core_state.ts
View file

@ -19,7 +19,6 @@ export interface MsgProps {
}
export interface UIProps {
// background: url("/static/img/textured_paper.png") repeat fixed center;
wallpaper: string;
repeat: string;
position: string;
@ -63,7 +62,7 @@ export function initState(): ICoreState {
},
panes: {
displaying: "browser",
paneNames: Set<string>(["settings", "login", "admin"]),
paneNames: Set<string>([]), // "settings", "login", "admin"
},
login: {
userID: "",

21
src/client/web/src/components/pane_login.tsx
View file

@ -97,21 +97,6 @@ export class AuthPane extends React.Component<Props, State, {}> {
});
};
logout = async () => {
return updater()
.logout()
.then((ok: boolean) => {
if (ok) {
this.update(updater().updateLogin);
} else {
alertMsg(this.props.msg.pkg.get("login.logout.fail"));
}
})
.then(() => {
return this.refreshCaptcha();
});
};
refreshCaptcha = async () => {
return updater()
.getCaptchaID()
@ -177,12 +162,6 @@ export class AuthPane extends React.Component<Props, State, {}> {
</div>
</div>
</div>
<span style={{ display: this.props.login.authed ? "inherit" : "none" }}>
<button onClick={this.logout}>
{this.props.msg.pkg.get("login.logout")}
</button>
</span>
</span>
);
}

79
src/client/web/src/components/panes.tsx
View file

@ -20,7 +20,7 @@ export interface Props {
update?: (updater: (prevState: ICoreState) => ICoreState) => void;
}
export interface State {}
export interface State { }
export class Panes extends React.Component<Props, State, {}> {
constructor(p: Props) {
super(p);
@ -35,55 +35,11 @@ export class Panes extends React.Component<Props, State, {}> {
render() {
let displaying = this.props.panes.displaying;
let panesMap: Map<string, JSX.Element> = Map({});
const settingsPane = (
<PaneSettings
login={this.props.login}
msg={this.props.msg}
update={this.props.update}
/>
);
const loginPane = (
<AuthPane
login={this.props.login}
update={this.props.update}
msg={this.props.msg}
/>
);
const adminPane = (
<AdminPane
admin={this.props.admin}
msg={this.props.msg}
update={this.props.update}
/>
);
switch(this.props.login.userRole) {
case roleAdmin:
panesMap = panesMap.set("settings", settingsPane);
panesMap = panesMap.set("admin", adminPane);
panesMap = panesMap.set("login", loginPane);
break;
case roleUser:
panesMap = panesMap.set("settings", settingsPane);
panesMap = panesMap.set("login", loginPane);
break;
default:
panesMap = panesMap.set("login", loginPane);
break;
}
const panes = panesMap.keySeq().map((paneName: string): JSX.Element => {
const isDisplay = displaying === paneName ? "" : "hidden";
return (
<div key={paneName} className={`${isDisplay}`}>
{panesMap.get(paneName)}
</div>
);
});
const btnClass = displaying === "login" ? "hidden" : "";
const showSettings = this.props.panes.paneNames.get("settings") && displaying === "settings" ? "" : "hidden";
const showLogin = this.props.panes.paneNames.get("login") && displaying === "login" ? "" : "hidden";
const showAdmin = this.props.panes.paneNames.get("admin") && displaying === "admin" ? "" : "hidden";
return (
<div id="panes" className={displaying === "" ? "hidden" : ""}>
<div className="root-container">
@ -102,7 +58,30 @@ export class Panes extends React.Component<Props, State, {}> {
</div>
</div>
{panes}
<div className={`${showSettings}`}>
<PaneSettings
login={this.props.login}
msg={this.props.msg}
update={this.props.update}
/>
</div>
<div className={`${showLogin}`}>
<AuthPane
login={this.props.login}
update={this.props.update}
msg={this.props.msg}
/>
</div>
<div className={`${showAdmin}`}>
<AdminPane
admin={this.props.admin}
msg={this.props.msg}
update={this.props.update}
/>
</div>
</div>
</div>
);

1
src/client/web/src/components/root_frame.tsx
View file

@ -44,6 +44,7 @@ export class RootFrame extends React.Component<Props, State, {}> {
<TopBar
login={this.props.login}
panes={this.props.panes}
msg={this.props.msg}
update={this.props.update}
/>

14
src/client/web/src/components/state_mgr.tsx
View file

@ -1,5 +1,5 @@
import * as React from "react";
import { List } from "immutable";
import { List, Set } from "immutable";
import { updater } from "./state_updater";
import { ICoreState, newState } from "./core_state";
@ -9,8 +9,8 @@ import { UsersClient } from "../client/users";
import { IUsersClient, IFilesClient, roleAdmin, roleVisitor } from "../client";
import { alertMsg } from "../common/env";
export interface Props {}
export interface State extends ICoreState {}
export interface Props { }
export interface State extends ICoreState { }
export class StateMgr extends React.Component<Props, State, {}> {
private usersClient: IUsersClient = new UsersClient("");
@ -62,16 +62,24 @@ export class StateMgr extends React.Component<Props, State, {}> {
if (updater().props.login.userRole === roleVisitor) {
if (updater().props.browser.isSharing) {
// sharing with visitor
updater().setPanes(Set<string>(["login"]));
updater().displayPane("");
return Promise.all([]);
}
// redirect to login
updater().setPanes(Set<string>(["login"]));
updater().displayPane("login");
return Promise.all([updater().getCaptchaID()]);
}
if (updater().props.login.userRole === roleAdmin) {
updater().setPanes(Set<string>(["login", "settings", "admin"]));
} else {
updater().setPanes(Set<string>(["login", "settings"]));
}
updater().displayPane("");
return Promise.all([
updater().refreshUploadings(),
updater().initUploads(),

8
src/client/web/src/components/state_updater.ts
View file

@ -12,6 +12,7 @@ import {
UploadInfo,
Quota,
Response,
roleVisitor,
} from "../client";
import { FilesClient } from "../client/files";
import { UsersClient } from "../client/users";
@ -279,11 +280,15 @@ export class Updater {
if (pane != null) {
this.props.panes.displaying = paneName;
} else {
alertMsg(`dialgos: pane (${paneName}) not found`);
alertMsg(`pane (${paneName}) not found`);
}
}
};
setPanes = (paneNames: Set<string>) => {
this.props.panes.paneNames = paneNames;
};
self = async (): Promise<boolean> => {
const resp = await this.usersClient.self();
if (resp.status === 200) {
@ -294,6 +299,7 @@ export class Updater {
this.props.login.quota = resp.data.quota;
return true;
}
this.props.login.userRole = roleVisitor;
return false;
};

59
src/client/web/src/components/topbar.tsx
View file

@ -1,15 +1,17 @@
import * as React from "react";
import { List } from "immutable";
import { RiGithubFill } from "@react-icons/all-files/ri/RiGithubFill";
import { alertMsg } from "../common/env";
import { ICoreState, MsgProps } from "./core_state";
import { LoginProps } from "./pane_login";
import { PanesProps } from "./panes";
import { updater } from "./state_updater";
import { Flexbox } from "./layout/flexbox";
export interface State {}
export interface State { }
export interface Props {
login: LoginProps;
panes: PanesProps;
msg: MsgProps;
update?: (updater: (prevState: ICoreState) => ICoreState) => void;
}
@ -40,17 +42,34 @@ export class TopBar extends React.Component<Props, State, {}> {
});
};
logout = async () => {
return updater()
.logout()
.then((ok: boolean) => {
if (ok) {
this.props.update(updater().updateLogin);
} else {
alertMsg(this.props.msg.pkg.get("login.logout.fail"));
}
})
.then(() => {
return this.refreshCaptcha();
});
};
refreshCaptcha = async () => {
return updater()
.getCaptchaID()
.then(() => {
this.props.update(updater().updateLogin);
});
};
render() {
const adminBtn =
this.props.login.userRole === "admin" ? (
<button
onClick={this.showAdmin}
className="grey3-bg grey4-font margin-r-m"
style={{ minWidth: "7rem" }}
>
{this.props.msg.pkg.get("admin")}
</button>
) : null;
const showUserInfo = this.props.login.authed ? "" : "hidden";
const showLogin = this.props.login.authed ? "" : "hidden";
const showSettings = this.props.panes.paneNames.get("settings") ? "" : "hidden";
const showAdmin = this.props.panes.paneNames.get("admin") ? "" : "hidden";
return (
<div
@ -69,7 +88,7 @@ export class TopBar extends React.Component<Props, State, {}> {
<Flexbox
children={List([
<span>
<span className={`${showUserInfo}`}>
<span className="grey3-font font-s">
{this.props.login.userName}
</span>
@ -81,13 +100,23 @@ export class TopBar extends React.Component<Props, State, {}> {
<button
onClick={this.showSettings}
className="grey3-bg grey4-font margin-r-m"
className={`grey3-bg grey4-font margin-r-m ${showSettings}`}
style={{ minWidth: "7rem" }}
>
{this.props.msg.pkg.get("settings")}
</button>,
adminBtn,
<button
onClick={this.showAdmin}
className={`grey3-bg grey4-font margin-r-m ${showAdmin}`}
style={{ minWidth: "7rem" }}
>
{this.props.msg.pkg.get("admin")}
</button>,
<button onClick={this.logout} className={`${showLogin}`}>
{this.props.msg.pkg.get("login.logout")}
</button>,
])}
childrenStyles={List([{}, {}, {}, {}])}
/>,

1
src/handlers/multiusers/handlers.go
View file

@ -111,6 +111,7 @@ func NewMultiUsersSvc(cfg gocfg.ICfg, deps *depidx.Deps) (*MultiUsersSvc, error)
apiRuleCname(userstore.VisitorRole, "OPTIONS", "/v1/settings/health"): true,
apiRuleCname(userstore.VisitorRole, "GET", "/v1/captchas/"): true,
apiRuleCname(userstore.VisitorRole, "GET", "/v1/captchas/imgs"): true,
apiRuleCname(userstore.VisitorRole, "GET", "/v1/fs/sharings/exist"): true,
}
return &MultiUsersSvc{