mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2025-12-06 02:30:47 -08:00
Fix registered users are unable to use all features (#2)
This commit is contained in:
parent
8f278285ee
commit
e9ddf80c20
3 changed files with 15 additions and 13 deletions
|
|
@ -51,8 +51,8 @@
|
|||
"blueimp-md5": "2.12.0",
|
||||
"classnames": "2.2.6",
|
||||
"concurrently": "4.1.2",
|
||||
"cross-env": "5.2.0",
|
||||
"electron": "6.0.5",
|
||||
"cross-env": "5.2.1",
|
||||
"electron": "6.0.7",
|
||||
"electron-builder": "21.2.0",
|
||||
"eslint": "6.1.0",
|
||||
"eslint-config-airbnb": "18.0.1",
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ const Main = ({
|
|||
isFullScreen,
|
||||
isLoading,
|
||||
navigationBar,
|
||||
registered,
|
||||
workspaces,
|
||||
}) => (
|
||||
<div className={classes.outerRoot}>
|
||||
|
|
@ -161,7 +162,7 @@ const Main = ({
|
|||
<WorkspaceSelector
|
||||
id="add"
|
||||
onClick={() => {
|
||||
if (Object.keys(workspaces).length > 1) {
|
||||
if (!registered && Object.keys(workspaces).length > 1) {
|
||||
requestShowLicenseRegistrationWindow();
|
||||
return;
|
||||
}
|
||||
|
|
@ -221,6 +222,7 @@ Main.propTypes = {
|
|||
isFullScreen: PropTypes.bool.isRequired,
|
||||
isLoading: PropTypes.bool.isRequired,
|
||||
navigationBar: PropTypes.bool.isRequired,
|
||||
registered: PropTypes.bool.isRequired,
|
||||
workspaces: PropTypes.object.isRequired,
|
||||
};
|
||||
|
||||
|
|
@ -229,6 +231,7 @@ const mapStateToProps = (state) => ({
|
|||
isFullScreen: state.general.isFullScreen,
|
||||
isLoading: state.general.isLoading,
|
||||
navigationBar: state.preferences.navigationBar,
|
||||
registered: state.preferences.registered,
|
||||
workspaces: state.workspaces,
|
||||
});
|
||||
|
||||
|
|
|
|||
19
yarn.lock
19
yarn.lock
|
|
@ -4221,13 +4221,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
|
|||
safe-buffer "^5.0.1"
|
||||
sha.js "^2.4.8"
|
||||
|
||||
cross-env@5.2.0:
|
||||
version "5.2.0"
|
||||
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
|
||||
integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==
|
||||
cross-env@5.2.1:
|
||||
version "5.2.1"
|
||||
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d"
|
||||
integrity sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==
|
||||
dependencies:
|
||||
cross-spawn "^6.0.5"
|
||||
is-windows "^1.0.0"
|
||||
|
||||
cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
|
||||
version "6.0.5"
|
||||
|
|
@ -5124,10 +5123,10 @@ electron-window-state@5.0.3:
|
|||
jsonfile "^4.0.0"
|
||||
mkdirp "^0.5.1"
|
||||
|
||||
electron@6.0.5:
|
||||
version "6.0.5"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.5.tgz#f4c25126001b91be6e935005577eb5427f11a50e"
|
||||
integrity sha512-B3gjUvvXxVH4QnmGEMYne83lG2XJNbNe0FPwVDhzA9FkapnBgvrsE/Fz6NFXTaZm6zSdC2ut1j38rfSTFvUtDA==
|
||||
electron@6.0.7:
|
||||
version "6.0.7"
|
||||
resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.7.tgz#cf3f02502aa58d1517f3befd9c2da2a95cd2eb46"
|
||||
integrity sha512-W0TFnJrBdYBUhzRnEqZt/CfYFmG9RwSnhhXBbOumn/qLQYr9e7kXb6z4y0XQQLhXKkDhuXp+dNqfzhtId5ZiQw==
|
||||
dependencies:
|
||||
"@types/node" "^10.12.18"
|
||||
electron-download "^4.1.0"
|
||||
|
|
@ -7338,7 +7337,7 @@ is-utf8@^0.2.0:
|
|||
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
|
||||
integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
|
||||
|
||||
is-windows@^1.0.0, is-windows@^1.0.2:
|
||||
is-windows@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
|
||||
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue