diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ddb58a780..64c8eaed87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,6 +129,8 @@ jobs: run: | node_major=$(echo "${{ matrix.NODE_VERSION }}" | cut -d'.' -f1) echo "::set-output name=node_major::$(echo $node_major)" + - name: Fix usage of insecure GitHub protocol + run: sudo git config --system url."https://github".insteadOf "git://github" - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.NODE_VERSION }} uses: actions/setup-node@v1 diff --git a/changelogs/CHANGELOG_alpha.md b/changelogs/CHANGELOG_alpha.md index 31f3d1f539..a333b73176 100644 --- a/changelogs/CHANGELOG_alpha.md +++ b/changelogs/CHANGELOG_alpha.md @@ -1,3 +1,21 @@ +# [4.2.0-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.3-alpha.1...4.2.0-alpha.1) (2022-07-04) + + +### Bug Fixes + +* login fails with error `req.session.regenerate is not a function` ([#2195](https://github.com/ParsePlatform/parse-dashboard/issues/2195)) [skip release] ([31a2b78](https://github.com/ParsePlatform/parse-dashboard/commit/31a2b7813531e370e11b1a050ea28b575a058816)) + +### Features + +* remove support and documentation links ([#2203](https://github.com/ParsePlatform/parse-dashboard/issues/2203)) ([35e4476](https://github.com/ParsePlatform/parse-dashboard/commit/35e44768f65c64a228cb6ea8314aa534c5342f08)) + +## [4.1.3-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.2...4.1.3-alpha.1) (2022-06-18) + + +### Bug Fixes + +* security upgrade semver-regex from 3.1.3 to 3.1.4 ([#2154](https://github.com/ParsePlatform/parse-dashboard/issues/2154)) ([4f9090a](https://github.com/ParsePlatform/parse-dashboard/commit/4f9090ad22460913f7987964ee54f26d348ca254)) + ## [4.1.2-alpha.3](https://github.com/ParsePlatform/parse-dashboard/compare/4.1.2-alpha.2...4.1.2-alpha.3) (2022-06-04) diff --git a/package-lock.json b/package-lock.json index 8b32b7020b..9ea8aba68b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "parse-dashboard", - "version": "4.1.3-beta.1", + "version": "4.2.0-alpha.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2220,10 +2220,44 @@ "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", "dev": true }, + "@graphiql/react": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@graphiql/react/-/react-0.4.3.tgz", + "integrity": "sha512-MnH+7LqRqFnwo8YBDtgDfJOdeS5QqNTzH2gTvTbEYYWaNQW1+Vhbsyu2RKHnPSgKVQlfLzdjw6SAMtSb3q1Qog==", + "requires": { + "@graphiql/toolkit": "^0.6.0", + "codemirror": "^5.65.3", + "codemirror-graphql": "^1.3.2", + "copy-to-clipboard": "^3.2.0", + "escape-html": "^1.0.3", + "graphql-language-service": "^5.0.6", + "markdown-it": "^12.2.0", + "set-value": "^4.1.0" + }, + "dependencies": { + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "^3.0.1" + } + }, + "set-value": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz", + "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==", + "requires": { + "is-plain-object": "^2.0.4", + "is-primitive": "^3.0.1" + } + } + } + }, "@graphiql/toolkit": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.4.5.tgz", - "integrity": "sha512-QXuuMSSK/0GfBS7tltrGZdyhIvm6oe9TK4VW9pfa8dALYttpzyJ64Q4Sx9I1Ng++yOMJWziM/ksa043zkNHsjQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@graphiql/toolkit/-/toolkit-0.6.0.tgz", + "integrity": "sha512-mbAwbt4lw2bFp9QW3NLVmh/r/ymczlcqvXk1HfvuC7Ma4h0yzrJiQauJyh1/gF5kjqevcRSquvP/YQJSvh1u6w==", "requires": { "@n1ru4l/push-pull-async-iterable-iterator": "^3.1.0", "meros": "^1.1.4" @@ -3040,9 +3074,9 @@ } }, "@popperjs/core": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz", - "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==" + "version": "2.11.5", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", + "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==" }, "@react-dnd/asap": { "version": "4.0.0", @@ -5197,16 +5231,16 @@ "dev": true }, "codemirror": { - "version": "5.65.5", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.5.tgz", - "integrity": "sha512-HNyhvGLnYz5c+kIsB9QKVitiZUevha3ovbIYaQiGzKo7ECSL/elWD9RXt3JgNr0NdnyqE9/Rc/7uLfkJQL638w==" + "version": "5.65.6", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.6.tgz", + "integrity": "sha512-zNihMSMoDxK9Gqv9oEyDT8oM51rcRrQ+IEo2zyS48gJByBq5Fj8XuNEguMra+MuIOuh6lkpnLUJeL70DoTt6yw==" }, "codemirror-graphql": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.3.0.tgz", - "integrity": "sha512-Inqecp/PpUsNFz6+V6jpgQD1m7jjGg3yby60baw2t5yb2stBH8Z/6cHm/IYp9eN0Aq2EWqomd0GkGmiISPi4jQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/codemirror-graphql/-/codemirror-graphql-1.3.2.tgz", + "integrity": "sha512-glwFsEVlH5TvxjSKGymZ1sNy37f3Mes58CB4fXOd0zy9+JzDL08Wti1b5ycy4vFZYghMDK1/Or/zRSjMAGtC2w==", "requires": { - "graphql-language-service": "^5.0.4" + "graphql-language-service": "^5.0.6" } }, "collection-visit": { @@ -5476,9 +5510,9 @@ } }, "core-js": { - "version": "3.22.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.7.tgz", - "integrity": "sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg==" + "version": "3.22.8", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.8.tgz", + "integrity": "sha512-UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA==" }, "core-js-compat": { "version": "3.19.2", @@ -8046,38 +8080,15 @@ "dev": true }, "graphiql": { - "version": "1.8.9", - "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.8.9.tgz", - "integrity": "sha512-X+olqol3VfOrFrsAfYzgNbvHoEE0lDUtg52+f3yLeNY4Ens+rAH4RSdH4wVtoRdh3CafmhVsfLQvn04hHkgftQ==", + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/graphiql/-/graphiql-1.9.7.tgz", + "integrity": "sha512-rn0njwDkCpFn5GwDbSuzt7GwjiFLhYCdgiscYm4n8Oq9EeOyGrIxQK/PjUz1YaR/+T7lg1raIBuRAX/Nei9KcQ==", "requires": { - "@graphiql/toolkit": "^0.4.4", - "codemirror": "^5.65.3", - "codemirror-graphql": "^1.3.0", - "copy-to-clipboard": "^3.2.0", + "@graphiql/react": "^0.4.1", + "@graphiql/toolkit": "^0.6.0", "entities": "^2.0.0", - "escape-html": "^1.0.3", - "graphql-language-service": "^5.0.4", - "markdown-it": "^12.2.0", - "set-value": "^4.1.0" - }, - "dependencies": { - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, - "set-value": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz", - "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==", - "requires": { - "is-plain-object": "^2.0.4", - "is-primitive": "^3.0.1" - } - } + "graphql-language-service": "^5.0.5", + "markdown-it": "^12.2.0" } }, "graphql": { @@ -8086,9 +8097,9 @@ "integrity": "sha512-qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA==" }, "graphql-language-service": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.0.4.tgz", - "integrity": "sha512-lX+ahYBwvTHJe1N7JqA08moNwbr0RWaFILxVnbciaaeb469TTIhQi87ZgVJ/y9Szre4d0r3vjIt2EstwafzcDA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.0.6.tgz", + "integrity": "sha512-FjE23aTy45Lr5metxCv3ZgSKEZOzN7ERR+OFC1isV5mHxI0Ob8XxayLTYjQKrs8b3kOpvgTYmSmu6AyXOzYslg==", "requires": { "nullthrows": "^1.0.0", "vscode-languageserver-types": "^3.15.1" @@ -14529,13 +14540,12 @@ "dev": true }, "passport": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz", - "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz", + "integrity": "sha512-gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA==", "requires": { "passport-strategy": "1.x.x", - "pause": "0.0.1", - "utils-merge": "^1.0.1" + "pause": "0.0.1" } }, "passport-local": { @@ -15389,29 +15399,22 @@ "integrity": "sha512-FNbLuG/HAdapQoybeZSoes1PWdOj0w242gb+e1R0hicf3Gyj/Mf8M9NaED2AnXVOX01b2FXomwUiw1xP1K+8sA==" }, "react-popper": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz", - "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", + "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", "requires": { "react-fast-compare": "^3.0.1", "warning": "^4.0.2" - }, - "dependencies": { - "react-fast-compare": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz", - "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" - } } }, "react-popper-tooltip": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-4.3.1.tgz", - "integrity": "sha512-/Lj1vjAEFEFxKKWnxupeS9pRrXYQlJd++OAAj/Ht3uOSqjWLtYWDXKV99e+YO6b5hV3SgXbtkHFzHH4eqlMWJA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-popper-tooltip/-/react-popper-tooltip-4.4.1.tgz", + "integrity": "sha512-Qe4KH/CAdUYKWzCiV5g7XQGAHxqw9HIbZJpCUmvS+9s0d4qXk+ViCBp/lcTjUr1EG9FeNRt5LCy52tYBh2kO1Q==", "requires": { - "@babel/runtime": "^7.15.4", - "@popperjs/core": "^2.10.2", - "react-popper": "^2.2.5" + "@babel/runtime": "^7.18.3", + "@popperjs/core": "^2.11.5", + "react-popper": "^2.3.0" } }, "react-redux": { @@ -17831,9 +17834,9 @@ } }, "typescript": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz", - "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==" + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", + "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==" }, "ua-parser-js": { "version": "0.7.28", diff --git a/package.json b/package.json index 9f16a019ba..0caaf502d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "parse-dashboard", - "version": "4.1.3-beta.1", + "version": "4.2.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/ParsePlatform/parse-dashboard" @@ -42,10 +42,10 @@ "connect-flash": "0.1.1", "cookie-session": "2.0.0", "copy-to-clipboard": "3.3.1", - "core-js": "3.22.7", + "core-js": "3.22.8", "csurf": "1.11.0", "express": "4.18.1", - "graphiql": "1.8.9", + "graphiql": "1.9.7", "graphql": "16.5.0", "history": "4.10.1", "immutable": "4.1.0", @@ -55,7 +55,7 @@ "otpauth": "7.1.3", "package-json": "7.0.0", "parse": "3.4.2", - "passport": "0.6.0", + "passport": "0.5.3", "passport-local": "1.0.0", "prismjs": "1.28.0", "prop-types": "15.8.1", @@ -67,13 +67,13 @@ "react-dom": "16.14.0", "react-helmet": "6.1.0", "react-json-view": "1.21.3", - "react-popper-tooltip": "4.3.1", + "react-popper-tooltip": "4.4.1", "react-redux": "8.0.2", "react-router": "5.2.1", "react-router-dom": "5.3.0", "regenerator-runtime": "0.13.9", "semver": "7.3.7", - "typescript": "4.7.2" + "typescript": "4.7.3" }, "devDependencies": { "@actions/core": "1.2.6", diff --git a/src/components/Sidebar/FooterMenu.react.js b/src/components/Sidebar/FooterMenu.react.js index af09f3abf0..de471f5ce7 100644 --- a/src/components/Sidebar/FooterMenu.react.js +++ b/src/components/Sidebar/FooterMenu.react.js @@ -26,7 +26,7 @@ export default class FooterMenu extends React.Component { toggle() { let pos = Position.inWindow(this.moreRef.current); - pos.x += 24; + pos.x += 95; this.setState({ show: true, position: pos @@ -50,11 +50,7 @@ export default class FooterMenu extends React.Component { position={this.state.position} onExternalClick={() => this.setState({ show: false })}>
- Log Out 👋 - Server Guide 📚 - Code-level Questions - Server Questions - Deployment/Maintenance ⚡️ + ➡️ Log out
); diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js index c3c2c6c806..cc51068214 100644 --- a/src/components/Sidebar/Sidebar.react.js +++ b/src/components/Sidebar/Sidebar.react.js @@ -179,13 +179,6 @@ const Sidebar = ({ {sidebarContent}
- {!collapsed && ( - <> - Open Source Hub - GitHub - Docs - - )}
diff --git a/src/components/Sidebar/Sidebar.scss b/src/components/Sidebar/Sidebar.scss index 65e9bfe414..6281bcaaf2 100644 --- a/src/components/Sidebar/Sidebar.scss +++ b/src/components/Sidebar/Sidebar.scss @@ -363,16 +363,16 @@ a.subitem { content: ''; position: absolute; bottom: -6px; - right: 11px; + right: 94px; } a { @include NotoSansFont; display: block; - height: 30px; - line-height: 31px; + height: 40px; + line-height: 41px; font-size: 13px; - text-align: right; + text-align: center; border-bottom: 1px solid #e0e0ea; color: $mainTextColor; padding-right: 8px; @@ -381,12 +381,12 @@ a.subitem { } &:first-child { - border-radius: 5px 5px 0 0; + border-radius: 5px 5px 5px 5px; } &:last-child { border-bottom: 0; - border-radius: 0 0 5px 5px; + border-radius: 5px 5px 5px 5px; } .emoji{