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

Merge branch 'master' into nanoid-fix

Browse Source
This commit is contained in:
David Bolack
2024-10-07 14:32:19 -05:00
parent 5b64052c21 88d36bcf85
commit 5080fd068a
3 changed files with 628 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/homebrew/navbar/recent.navitem.jsx
View File

@@ -36,7 +36,7 @@ const RecentItems = createClass({
//== Add current brew to appropriate recent items list (depending on storageKey) ==// //== Add current brew to appropriate recent items list (depending on storageKey) ==//
if(this.props.storageKey == 'edit'){ if(this.props.storageKey == 'edit'){
let editId = this.props.brew.editId; let editId = this.props.brew.editId;
if(this.props.brew.googleId){ if(this.props.brew.googleId && !this.props.brew.stubbed){
editId = `${this.props.brew.googleId}${this.props.brew.editId}`; editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
} }
edited = _.filter(edited, (brew)=>{ edited = _.filter(edited, (brew)=>{
@@ -51,7 +51,7 @@ const RecentItems = createClass({
} }
if(this.props.storageKey == 'view'){ if(this.props.storageKey == 'view'){
let shareId = this.props.brew.shareId; let shareId = this.props.brew.shareId;
if(this.props.brew.googleId){ if(this.props.brew.googleId && !this.props.brew.stubbed){
shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`; shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
} }
viewed = _.filter(viewed, (brew)=>{ viewed = _.filter(viewed, (brew)=>{
@@ -83,7 +83,7 @@ const RecentItems = createClass({
let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]'); let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
if(this.props.storageKey == 'edit') { if(this.props.storageKey == 'edit') {
let prevEditId = prevProps.brew.editId; let prevEditId = prevProps.brew.editId;
if(prevProps.brew.googleId){ if(prevProps.brew.googleId && !this.props.brew.stubbed){
prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`; prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
} }
@@ -91,7 +91,7 @@ const RecentItems = createClass({
return brew.id !== prevEditId; return brew.id !== prevEditId;
}); });
let editId = this.props.brew.editId; let editId = this.props.brew.editId;
if(this.props.brew.googleId){ if(this.props.brew.googleId && !this.props.brew.stubbed){
editId = `${this.props.brew.googleId}${this.props.brew.editId}`; editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
} }
edited.unshift({ edited.unshift({

1344
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
package.json
View File

@@ -85,10 +85,10 @@
] ]
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.25.2", "@babel/core": "^7.25.7",
"@babel/plugin-transform-runtime": "^7.25.4", "@babel/plugin-transform-runtime": "^7.25.7",
"@babel/preset-env": "^7.25.4", "@babel/preset-env": "^7.25.7",
"@babel/preset-react": "^7.24.7", "@babel/preset-react": "^7.25.7",
"@googleapis/drive": "^8.14.0", "@googleapis/drive": "^8.14.0",
"body-parser": "^1.20.2", "body-parser": "^1.20.2",
"classnames": "^2.5.1", "classnames": "^2.5.1",
@@ -125,8 +125,8 @@
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git" "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
}, },
"devDependencies": { "devDependencies": {
"@stylistic/stylelint-plugin": "^3.1.0", "@stylistic/stylelint-plugin": "^3.1.1",
"eslint": "^9.11.1", "eslint": "^9.12.0",
"eslint-plugin-jest": "^28.8.3", "eslint-plugin-jest": "^28.8.3",
"eslint-plugin-react": "^7.37.1", "eslint-plugin-react": "^7.37.1",
"globals": "^15.10.0", "globals": "^15.10.0",