mirror of
https://github.com/revoltchat/revite.git
synced 2024-11-21 22:50:59 -05:00
Update react-overlapping-panels.
Fix: bottom navigation appearing in wrong place. Fix: Redirect to server from invite if already joined. Fix: Use monoscape font for code textareas.
This commit is contained in:
parent
197ba53c60
commit
ce67c5acdb
4 changed files with 18 additions and 14 deletions
|
@ -89,12 +89,12 @@
|
|||
"react-device-detect": "^1.17.0",
|
||||
"react-helmet": "^6.1.0",
|
||||
"react-hook-form": "6.3.0",
|
||||
"react-overlapping-panels": "1.2.1",
|
||||
"react-overlapping-panels": "1.2.2",
|
||||
"react-redux": "^7.2.4",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scroll": "^1.8.2",
|
||||
"redux": "^4.1.0",
|
||||
"revolt.js": "4.3.3-alpha.9",
|
||||
"revolt.js": "4.3.3-alpha.10",
|
||||
"rimraf": "^3.0.2",
|
||||
"sass": "^1.35.1",
|
||||
"shade-blend-color": "^1.0.0",
|
||||
|
|
|
@ -48,7 +48,7 @@ export default styled.textarea<TextAreaProps>`
|
|||
${(props) =>
|
||||
props.code
|
||||
? css`
|
||||
font-family: var(--monoscape-font-font), monospace;
|
||||
font-family: var(--monoscape-font), monospace;
|
||||
`
|
||||
: css`
|
||||
font-family: inherit;
|
||||
|
|
|
@ -105,11 +105,15 @@ export default function Invite() {
|
|||
try {
|
||||
setProcessing(true);
|
||||
|
||||
if (invite.type === "Server") {
|
||||
if (client.servers.get(invite.server_id)) {
|
||||
history.push(`/server/${invite.server_id}/channel/${invite.channel_id}`);
|
||||
}
|
||||
}
|
||||
|
||||
let result = await client.joinInvite(code);
|
||||
if (result.type === "Server") {
|
||||
history.push(
|
||||
`/server/${result.server._id}/channel/${result.channel._id}`,
|
||||
);
|
||||
history.push(`/server/${result.server._id}/channel/${result.channel._id}`);
|
||||
}
|
||||
} catch (err) {
|
||||
setError(takeError(err));
|
||||
|
|
16
yarn.lock
16
yarn.lock
|
@ -3388,10 +3388,10 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
|
|||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||
|
||||
react-overlapping-panels@1.2.1:
|
||||
version "1.2.1"
|
||||
resolved "https://registry.yarnpkg.com/react-overlapping-panels/-/react-overlapping-panels-1.2.1.tgz#3775a09ae6c83604d058d4082d1c8fed5cc59fe9"
|
||||
integrity sha512-vkHLqX+X6HO13nAppZ5Z4tt4s8IMTA8sVf/FZFnnoqlQFIfTJAgdgZDa3LejMIrOJO6YMftVSVpzmusWTxvlUA==
|
||||
react-overlapping-panels@1.2.2:
|
||||
version "1.2.2"
|
||||
resolved "https://registry.yarnpkg.com/react-overlapping-panels/-/react-overlapping-panels-1.2.2.tgz#16b60ed60045a7fa40bcf321de113c655f6e0acd"
|
||||
integrity sha512-jZ8ZT4tnqM2YQF91Ct+9dLk7rSjnNiudxzgKlsaVfgwEjdBAWtE8nWJX9d2jDZZ9qimWgg43u5+SF6U+ELjyKQ==
|
||||
|
||||
react-redux@^7.2.4:
|
||||
version "7.2.4"
|
||||
|
@ -3563,10 +3563,10 @@ reusify@^1.0.4:
|
|||
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
|
||||
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
|
||||
|
||||
revolt.js@4.3.3-alpha.9:
|
||||
version "4.3.3-alpha.9"
|
||||
resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-4.3.3-alpha.9.tgz#7015793e465438a78b7e6e57a688be4e75f9c934"
|
||||
integrity sha512-RIFexFJMInTeEvOGx+l0VPtzoFIcl3ruQN0NA2UFYiz1zoQ4J3KGmmt5ig/OK/mZTbTysyQx1LSIdmMs2yZBFw==
|
||||
revolt.js@4.3.3-alpha.10:
|
||||
version "4.3.3-alpha.10"
|
||||
resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-4.3.3-alpha.10.tgz#3acbdd4f44c7f12be53faa0318396ce21694acde"
|
||||
integrity sha512-s9VEJX1LBiHCl8mXyqD0+GnIQg6WJj7CV8vUAO6Rv35Jwy0gOjjOvma4csXeZTdiLpPoVFxutgBj8bXMnVL5Aw==
|
||||
dependencies:
|
||||
"@insertish/mutable" "1.1.0"
|
||||
axios "^0.19.2"
|
||||
|
|
Loading…
Reference in a new issue