f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 23:12:39 +00:00
Code Wiki Activity

Merge branch 'master' into experimentalWinChocolateyInstall

Browse Source
This commit is contained in:
G.Ambatte
2023-01-23 22:50:30 +13:00
committed by GitHub
parent c3936d28d9 1704ef6557
commit 055773b1c3
6 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
changelog.md
View File

@@ -59,9 +59,19 @@ For a full record of development, visit our [Github Page](https://github.com/nat
### v3.6.0 ### v3.6.0
{{taskList {{taskList
##### calculuschild
* [x] Fix Google Drive brews sometimes duplicating
Fixes issues [#2603](https://github.com/naturalcrit/homebrewery/issues/2603)
##### Jeddai ##### Jeddai
* [x] Add unit tests with full coverage for the Homebrewery API * [x] Add unit tests with full coverage for the Homebrewery API
##### G-Ambatte
* [x] Add Themes directory to development server watchlist.
}} }}
### Friday 23/12/2022 - v3.5.0 ### Friday 23/12/2022 - v3.5.0

46
package-lock.json generated
View File

@@ -29,11 +29,11 @@
"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.2.5", "marked": "4.2.12",
"marked-extended-tables": "^1.0.5", "marked-extended-tables": "^1.0.5",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4", "moment": "^2.29.4",
"mongoose": "^6.8.3", "mongoose": "^6.8.4",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^8.10.0", "npm": "^8.10.0",
@@ -47,7 +47,7 @@
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.31.0", "eslint": "^8.31.0",
"eslint-plugin-react": "^7.31.11", "eslint-plugin-react": "^7.32.1",
"jest": "^29.2.2", "jest": "^29.2.2",
"supertest": "^6.3.3" "supertest": "^6.3.3"
}, },
@@ -6201,9 +6201,9 @@
} }
}, },
"node_modules/eslint-plugin-react": { "node_modules/eslint-plugin-react": {
"version": "7.31.11", "version": "7.32.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz",
"integrity": "sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==", "integrity": "sha512-vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"array-includes": "^3.1.6", "array-includes": "^3.1.6",
@@ -6218,7 +6218,7 @@
"object.hasown": "^1.1.2", "object.hasown": "^1.1.2",
"object.values": "^1.1.6", "object.values": "^1.1.6",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"resolve": "^2.0.0-next.3", "resolve": "^2.0.0-next.4",
"semver": "^6.3.0", "semver": "^6.3.0",
"string.prototype.matchall": "^4.0.8" "string.prototype.matchall": "^4.0.8"
}, },
@@ -10097,9 +10097,9 @@
} }
}, },
"node_modules/marked": { "node_modules/marked": {
"version": "4.2.5", "version": "4.2.12",
"resolved": "https://registry.npmjs.org/marked/-/marked-4.2.5.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz",
"integrity": "sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==", "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==",
"bin": { "bin": {
"marked": "bin/marked.js" "marked": "bin/marked.js"
}, },
@@ -10395,9 +10395,9 @@
} }
}, },
"node_modules/mongoose": { "node_modules/mongoose": {
"version": "6.8.3", "version": "6.8.4",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.8.3.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.8.4.tgz",
"integrity": "sha512-qrVWefJK+wFNBH0ALV+oiyJ+FN42O/BqvHFmlFJJ2LKuNmQEOE0JV8FCxnZqtanwbHs4i+k/SkjhtC+C01haaw==", "integrity": "sha512-19Jk2hbSAPcM4u6ErW0UPwaSO2YfP/cXfBS9YEiNgNzZfXd+jkyemqJ+t2aflaicXeU4VdTP33pZYxqjk2hUYw==",
"dependencies": { "dependencies": {
"bson": "^4.7.0", "bson": "^4.7.0",
"kareem": "2.5.1", "kareem": "2.5.1",
@@ -21463,9 +21463,9 @@
} }
}, },
"eslint-plugin-react": { "eslint-plugin-react": {
"version": "7.31.11", "version": "7.32.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz",
"integrity": "sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==", "integrity": "sha512-vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www==",
"dev": true, "dev": true,
"requires": { "requires": {
"array-includes": "^3.1.6", "array-includes": "^3.1.6",
@@ -21480,7 +21480,7 @@
"object.hasown": "^1.1.2", "object.hasown": "^1.1.2",
"object.values": "^1.1.6", "object.values": "^1.1.6",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"resolve": "^2.0.0-next.3", "resolve": "^2.0.0-next.4",
"semver": "^6.3.0", "semver": "^6.3.0",
"string.prototype.matchall": "^4.0.8" "string.prototype.matchall": "^4.0.8"
}, },
@@ -24297,9 +24297,9 @@
} }
}, },
"marked": { "marked": {
"version": "4.2.5", "version": "4.2.12",
"resolved": "https://registry.npmjs.org/marked/-/marked-4.2.5.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz",
"integrity": "sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==" "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw=="
}, },
"marked-extended-tables": { "marked-extended-tables": {
"version": "1.0.5", "version": "1.0.5",
@@ -24533,9 +24533,9 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "6.8.3", "version": "6.8.4",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.8.3.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.8.4.tgz",
"integrity": "sha512-qrVWefJK+wFNBH0ALV+oiyJ+FN42O/BqvHFmlFJJ2LKuNmQEOE0JV8FCxnZqtanwbHs4i+k/SkjhtC+C01haaw==", "integrity": "sha512-19Jk2hbSAPcM4u6ErW0UPwaSO2YfP/cXfBS9YEiNgNzZfXd+jkyemqJ+t2aflaicXeU4VdTP33pZYxqjk2hUYw==",
"requires": { "requires": {
"bson": "^4.7.0", "bson": "^4.7.0",
"kareem": "2.5.1", "kareem": "2.5.1",

15
package.json
View File

@@ -14,6 +14,7 @@
"quick": "node scripts/quick.js", "quick": "node scripts/quick.js",
"build": "node scripts/buildHomebrew.js", "build": "node scripts/buildHomebrew.js",
"buildall": "node scripts/buildHomebrew.js && node scripts/buildAdmin.js", "buildall": "node scripts/buildHomebrew.js && node scripts/buildAdmin.js",
"builddev": "node scripts/buildHomebrew.js --dev",
"lint": "eslint --fix **/*.{js,jsx}", "lint": "eslint --fix **/*.{js,jsx}",
"lint:dry": "eslint **/*.{js,jsx}", "lint:dry": "eslint **/*.{js,jsx}",
"circleci": "npm test && eslint **/*.{js,jsx} --max-warnings=0", "circleci": "npm test && eslint **/*.{js,jsx} --max-warnings=0",
@@ -50,10 +51,10 @@
"lines" : 25 "lines" : 25
}, },
"server/homebrew.api.js" : { "server/homebrew.api.js" : {
"statements" : 71, "statements" : 65,
"branches" : 54, "branches" : 50,
"functions" : 66, "functions" : 60,
"lines" : 73 "lines" : 70
} }
} }
}, },
@@ -86,11 +87,11 @@
"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.2.5", "marked": "4.2.12",
"marked-extended-tables": "^1.0.5", "marked-extended-tables": "^1.0.5",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4", "moment": "^2.29.4",
"mongoose": "^6.8.3", "mongoose": "^6.8.4",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^8.10.0", "npm": "^8.10.0",
@@ -104,7 +105,7 @@
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.31.0", "eslint": "^8.31.0",
"eslint-plugin-react": "^7.31.11", "eslint-plugin-react": "^7.32.1",
"jest": "^29.2.2", "jest": "^29.2.2",
"supertest": "^6.3.3" "supertest": "^6.3.3"
} }

2
scripts/buildHomebrew.js
View File

@@ -136,6 +136,6 @@ fs.emptyDirSync('./build');
if(isDev){ if(isDev){
livereload('./build'); livereload('./build');
watchFile('./server.js', { watchFile('./server.js', {
watch : ['./client', './server'] // Watch additional folders if you want watch : ['./client', './server', './themes'] // Watch additional folders if you want
}); });
} }

13
server/homebrew.api.js
View File

@@ -109,7 +109,7 @@ If you believe you should have access to this brew, ask the file owner to invite
excludePropsFromUpdate : (brew)=>{ excludePropsFromUpdate : (brew)=>{
// Remove undesired properties // Remove undesired properties
const modified = _.clone(brew); const modified = _.clone(brew);
const propsToExclude = ['_id', 'views', 'lastViewed', 'editId', 'shareId', 'googleId']; const propsToExclude = ['_id', 'views', 'lastViewed'];
for (const prop of propsToExclude) { for (const prop of propsToExclude) {
delete modified[prop]; delete modified[prop];
} }
@@ -189,17 +189,18 @@ If you believe you should have access to this brew, ask the file owner to invite
res.status(200).send(saved); res.status(200).send(saved);
}, },
updateBrew : async (req, res)=>{ updateBrew : async (req, res)=>{
// Initialize brew from request and body, destructure query params, set a constant for the google id, and set the initial value for the after-save method // Initialize brew from request and body, destructure query params, and set the initial value for the after-save method
const brewFromClient = api.excludePropsFromUpdate(req.body); const brewFromClient = api.excludePropsFromUpdate(req.body);
if(req.brew.version && brewFromClient.version && req.brew.version > brewFromClient.version) { const brewFromServer = req.brew;
console.log(`Version mismatch on brew ${req.body.editId}`); if(brewFromServer.version && brewFromClient.version && brewFromServer.version > brewFromClient.version) {
console.log(`Version mismatch on brew ${brewFromClient.editId}`);
res.setHeader('Content-Type', 'application/json'); res.setHeader('Content-Type', 'application/json');
return res.status(409).send(JSON.stringify({ message: `The brew has been changed on a different device. Please save your changes elsewhere, refresh, and try again.` })); return res.status(409).send(JSON.stringify({ message: `The brew has been changed on a different device. Please save your changes elsewhere, refresh, and try again.` }));
} }
let brew = _.assign(req.brew, brewFromClient); let brew = _.assign(brewFromServer, brewFromClient);
const { saveToGoogle, removeFromGoogle } = req.query;
const googleId = brew.googleId; const googleId = brew.googleId;
const { saveToGoogle, removeFromGoogle } = req.query;
let afterSave = async ()=>true; let afterSave = async ()=>true;
brew.text = api.mergeBrewText(brew); brew.text = api.mergeBrewText(brew);

3
server/homebrew.api.spec.js
View File

@@ -342,9 +342,6 @@ brew`);
expect(result._id).toBeUndefined(); expect(result._id).toBeUndefined();
expect(result.views).toBeUndefined(); expect(result.views).toBeUndefined();
expect(result.lastViewed).toBeUndefined(); expect(result.lastViewed).toBeUndefined();
expect(result.editId).toBeUndefined();
expect(result.shareId).toBeUndefined();
expect(result.googleId).toBeUndefined();
}); });
it('excludeGoogleProps removes the correct keys', ()=>{ it('excludeGoogleProps removes the correct keys', ()=>{