mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-08 11:52:44 +00:00
Lint everything
Catching up on a bunch of linting so random changes stop showing up on PRs when the linter is run.
This commit is contained in:
@@ -18,7 +18,7 @@ module.exports = {
|
|||||||
try {
|
try {
|
||||||
Boolean(new URL(value));
|
Boolean(new URL(value));
|
||||||
return null;
|
return null;
|
||||||
} catch (e) {
|
} catch {
|
||||||
return 'Must be a valid URL';
|
return 'Must be a valid URL';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ const Nav = require('naturalcrit/nav/nav.jsx');
|
|||||||
|
|
||||||
const ErrorNavItem = ({ error = '', clearError })=>{
|
const ErrorNavItem = ({ error = '', clearError })=>{
|
||||||
const response = error.response;
|
const response = error.response;
|
||||||
const errorCode = error.code
|
const errorCode = error.code;
|
||||||
const status = response?.status;
|
const status = response?.status;
|
||||||
const HBErrorCode = response?.body?.HBErrorCode;
|
const HBErrorCode = response?.body?.HBErrorCode;
|
||||||
const message = response?.body?.message;
|
const message = response?.body?.message;
|
||||||
@@ -15,7 +15,7 @@ const ErrorNavItem = ({error = '', clearError})=>{
|
|||||||
errMsg += `\`\`\`\n${error.stack}\n`;
|
errMsg += `\`\`\`\n${error.stack}\n`;
|
||||||
errMsg += `${JSON.stringify(response?.error, null, ' ')}\n\`\`\``;
|
errMsg += `${JSON.stringify(response?.error, null, ' ')}\n\`\`\``;
|
||||||
console.log(errMsg);
|
console.log(errMsg);
|
||||||
} catch (e){}
|
} catch {}
|
||||||
|
|
||||||
if(status === 409) {
|
if(status === 409) {
|
||||||
return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
|
return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ const NewBrew = ()=>{
|
|||||||
|
|
||||||
const type = file.name.split('.').pop().toLowerCase();
|
const type = file.name.split('.').pop().toLowerCase();
|
||||||
|
|
||||||
alert(`This file is invalid: ${!type ? "Missing file extension" :`.${type} files are not supported`}. Only .txt files exported from the Homebrewery are allowed.`);
|
alert(`This file is invalid: ${!type ? 'Missing file extension' :`.${type} files are not supported`}. Only .txt files exported from the Homebrewery are allowed.`);
|
||||||
|
|
||||||
|
|
||||||
console.log(file);
|
console.log(file);
|
||||||
|
|||||||
@@ -131,8 +131,8 @@ const EditPage = (props)=>{
|
|||||||
if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
|
if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
|
||||||
setHTMLErrors(Markdown.validate(value));
|
setHTMLErrors(Markdown.validate(value));
|
||||||
|
|
||||||
if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
|
if(field == 'metadata') setCurrentBrew((prev)=>({ ...prev, ...value }));
|
||||||
else setCurrentBrew(prev => ({ ...prev, [field]: value }));
|
else setCurrentBrew((prev)=>({ ...prev, [field]: value }));
|
||||||
|
|
||||||
if(useLocalStorage) {
|
if(useLocalStorage) {
|
||||||
if(field == 'text') localStorage.setItem(BREWKEY, value);
|
if(field == 'text') localStorage.setItem(BREWKEY, value);
|
||||||
|
|||||||
@@ -108,8 +108,8 @@ const HomePage =(props)=>{
|
|||||||
if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
|
if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
|
||||||
setHTMLErrors(Markdown.validate(value));
|
setHTMLErrors(Markdown.validate(value));
|
||||||
|
|
||||||
if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
|
if(field == 'metadata') setCurrentBrew((prev)=>({ ...prev, ...value }));
|
||||||
else setCurrentBrew(prev => ({ ...prev, [field]: value }));
|
else setCurrentBrew((prev)=>({ ...prev, [field]: value }));
|
||||||
|
|
||||||
if(useLocalStorage) {
|
if(useLocalStorage) {
|
||||||
if(field == 'text') localStorage.setItem(BREWKEY, value);
|
if(field == 'text') localStorage.setItem(BREWKEY, value);
|
||||||
@@ -218,7 +218,7 @@ const HomePage =(props)=>{
|
|||||||
Create your own <i className='fas fa-magic' />
|
Create your own <i className='fas fa-magic' />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
)
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = HomePage;
|
module.exports = HomePage;
|
||||||
|
|||||||
@@ -126,8 +126,8 @@ const NewPage = (props) => {
|
|||||||
if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
|
if(HTMLErrors.length && (field == 'text' || field == 'snippets'))
|
||||||
setHTMLErrors(Markdown.validate(value));
|
setHTMLErrors(Markdown.validate(value));
|
||||||
|
|
||||||
if(field == 'metadata') setCurrentBrew(prev => ({ ...prev, ...value }));
|
if(field == 'metadata') setCurrentBrew((prev)=>({ ...prev, ...value }));
|
||||||
else setCurrentBrew(prev => ({ ...prev, [field]: value }));
|
else setCurrentBrew((prev)=>({ ...prev, [field]: value }));
|
||||||
|
|
||||||
if(useLocalStorage) {
|
if(useLocalStorage) {
|
||||||
if(field == 'text') localStorage.setItem(BREWKEY, value);
|
if(field == 'text') localStorage.setItem(BREWKEY, value);
|
||||||
@@ -144,7 +144,7 @@ const NewPage = (props) => {
|
|||||||
const save = async ()=>{
|
const save = async ()=>{
|
||||||
setIsSaving(true);
|
setIsSaving(true);
|
||||||
|
|
||||||
let updatedBrew = { ...currentBrew };
|
const updatedBrew = { ...currentBrew };
|
||||||
splitTextStyleAndMetadata(updatedBrew);
|
splitTextStyleAndMetadata(updatedBrew);
|
||||||
|
|
||||||
const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^\\page$/gm;
|
const pageRegex = updatedBrew.renderer === 'legacy' ? /\\page/g : /^\\page$/gm;
|
||||||
@@ -158,7 +158,7 @@ const NewPage = (props) => {
|
|||||||
setError(err);
|
setError(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
setIsSaving(false)
|
setIsSaving(false);
|
||||||
if(!res) return;
|
if(!res) return;
|
||||||
|
|
||||||
const savedBrew = res.body;
|
const savedBrew = res.body;
|
||||||
|
|||||||
@@ -377,7 +377,7 @@ const api = {
|
|||||||
// Patch to a throwaway variable while parallelizing - we're more concerned with error/no error.
|
// Patch to a throwaway variable while parallelizing - we're more concerned with error/no error.
|
||||||
const patchedResult = decodeURI(applyPatches(patches, encodeURI(brewFromServer.text))[0]);
|
const patchedResult = decodeURI(applyPatches(patches, encodeURI(brewFromServer.text))[0]);
|
||||||
if(patchedResult != brewFromClient.text)
|
if(patchedResult != brewFromClient.text)
|
||||||
throw("Patches did not apply cleanly, text mismatch detected");
|
throw ('Patches did not apply cleanly, text mismatch detected');
|
||||||
// brew.text = applyPatches(patches, brewFromServer.text)[0];
|
// brew.text = applyPatches(patches, brewFromServer.text)[0];
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
//debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
|
//debugTextMismatch(brewFromClient.text, brewFromServer.text, `edit/${brewFromClient.editId}`);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ const brewSnippetsToJSON = (menuTitle, userBrewSnippets, themeBundleSnippets=nul
|
|||||||
const mpAsSnippets = [];
|
const mpAsSnippets = [];
|
||||||
// Snippets from Themes first.
|
// Snippets from Themes first.
|
||||||
if(themeBundleSnippets) {
|
if(themeBundleSnippets) {
|
||||||
for (let themes of themeBundleSnippets) {
|
for (const themes of themeBundleSnippets) {
|
||||||
if(typeof themes !== 'string') {
|
if(typeof themes !== 'string') {
|
||||||
const userSnippets = [];
|
const userSnippets = [];
|
||||||
const snipSplit = themes.snippets.trim().split(textSplit).slice(1);
|
const snipSplit = themes.snippets.trim().split(textSplit).slice(1);
|
||||||
@@ -77,8 +77,8 @@ const yamlSnippetsToText = (yamlObj)=>{
|
|||||||
|
|
||||||
let snippetsText = '';
|
let snippetsText = '';
|
||||||
|
|
||||||
for (let snippet of yamlObj) {
|
for (const snippet of yamlObj) {
|
||||||
for (let subSnippet of snippet.subsnippets) {
|
for (const subSnippet of snippet.subsnippets) {
|
||||||
snippetsText = `${snippetsText}\\snippet ${subSnippet.name}\n${subSnippet.gen || ''}\n`;
|
snippetsText = `${snippetsText}\\snippet ${subSnippet.name}\n${subSnippet.gen || ''}\n`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -121,7 +121,7 @@ const fetchThemeBundle = async (setError, setThemeBundle, renderer, theme)=>{
|
|||||||
const res = await request
|
const res = await request
|
||||||
.get(`/api/theme/${renderer}/${theme}`)
|
.get(`/api/theme/${renderer}/${theme}`)
|
||||||
.catch((err)=>{
|
.catch((err)=>{
|
||||||
setError(err)
|
setError(err);
|
||||||
});
|
});
|
||||||
if(!res) {
|
if(!res) {
|
||||||
setThemeBundle({});
|
setThemeBundle({});
|
||||||
@@ -166,7 +166,7 @@ const debugTextMismatch = (clientTextRaw, serverTextRaw, label) => {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
splitTextStyleAndMetadata,
|
splitTextStyleAndMetadata,
|
||||||
|
|||||||
@@ -435,7 +435,7 @@ const replaceVar = function(input, hoist=false, allowUnresolved=false) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
return mathParser.evaluate(replacedLabel);
|
return mathParser.evaluate(replacedLabel);
|
||||||
} catch (error) {
|
} catch {
|
||||||
return undefined; // Return undefined if invalid math result
|
return undefined; // Return undefined if invalid math result
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ const cleanUrl = function (sanitize, base, href) {
|
|||||||
prot = decodeURIComponent(unescape(href))
|
prot = decodeURIComponent(unescape(href))
|
||||||
.replace(nonWordAndColonTest, '')
|
.replace(nonWordAndColonTest, '')
|
||||||
.toLowerCase();
|
.toLowerCase();
|
||||||
} catch (e) {
|
} catch {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if(prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
|
if(prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
|
||||||
@@ -58,7 +58,7 @@ const cleanUrl = function (sanitize, base, href) {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
href = encodeURI(href).replace(/%25/g, '%');
|
href = encodeURI(href).replace(/%25/g, '%');
|
||||||
} catch (e) {
|
} catch {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return href;
|
return href;
|
||||||
|
|||||||
Reference in New Issue
Block a user