f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-10 17:52:47 +00:00
Code Wiki Activity

Merge remote-tracking branch 'origin/master' into private/asachkov/v3-markdown-tests

Browse Source
This commit is contained in:
Alexey Sachkov
2022-01-10 18:54:53 +03:00
parent 28793e06fc c06176b3bf
commit 1daa700a1a
3 changed files with 1047 additions and 7040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8069
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@@ -43,10 +43,10 @@
] ]
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.16.5", "@babel/core": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.16.5", "@babel/plugin-transform-runtime": "^7.16.7",
"@babel/preset-env": "^7.16.5", "@babel/preset-env": "^7.16.7",
"@babel/preset-react": "^7.16.5", "@babel/preset-react": "^7.16.7",
"body-parser": "^1.19.1", "body-parser": "^1.19.1",
"classnames": "^2.3.1", "classnames": "^2.3.1",
"codemirror": "^5.65.0", "codemirror": "^5.65.0",
@@ -62,15 +62,15 @@
"jwt-simple": "^0.5.6", "jwt-simple": "^0.5.6",
"less": "^3.13.1", "less": "^3.13.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"marked": "4.0.8", "marked": "4.0.9",
"marked-extended-tables": "^1.0.3", "marked-extended-tables": "^1.0.3",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.1", "moment": "^2.29.1",
"mongoose": "^6.1.4", "mongoose": "^6.1.5",
"nanoid": "3.1.30", "nanoid": "3.1.30",
"nconf": "^0.11.3", "nconf": "^0.11.3",
"prop-types": "15.8.0", "prop-types": "15.8.0",
"query-string": "7.0.1", "query-string": "7.1.0",
"react": "^16.14.0", "react": "^16.14.0",
"react-dom": "^16.14.0", "react-dom": "^16.14.0",
"react-frame-component": "4.1.3", "react-frame-component": "4.1.3",
@@ -80,7 +80,7 @@
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git" "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.5.0", "eslint": "^8.6.0",
"eslint-plugin-react": "^7.28.0", "eslint-plugin-react": "^7.28.0",
"jest": "^27.4.5" "jest": "^27.4.5"
} }

2
server/googleActions.js
View File

@@ -96,7 +96,7 @@ GoogleActions = {
const drive = google.drive({ version: 'v3', auth: oAuth2Client }); const drive = google.drive({ version: 'v3', auth: oAuth2Client });
const obj = await drive.files.list({ const obj = await drive.files.list({
pageSize : 100, pageSize : 1000,
fields : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties)', fields : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties)',
q : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false' q : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false'
}) })