From 5a79795e4f3a6a3bc1826e73e21f1de8a2b27299 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 09:33:00 +1300 Subject: [PATCH 01/58] Indicate tags are clickable by cursor --- client/homebrew/pages/basePages/listPage/brewItem/brewItem.less | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index e8c7aa39a..e7a9ad548 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -59,6 +59,7 @@ white-space: nowrap; display: inline-block; font-weight: bold; + cursor : pointer; } &:hover{ .links{ From c6821819c7af88187d68f006e0c99ddfde626c0f Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 09:36:17 +1300 Subject: [PATCH 02/58] Initial functionality pass on BrewItem --- .../pages/basePages/listPage/brewItem/brewItem.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 56c08e2af..41a7f07f8 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -20,7 +20,8 @@ const BrewItem = createClass({ authors : [], stubbed : true }, - reportError : ()=>{} + updateListFilter : ()=>{}, + reportError : ()=>{} }; }, @@ -44,6 +45,11 @@ const BrewItem = createClass({ }); }, + updateFilter : function(type, term){ + console.log(`BrewItem: TYPE: ${type}; TERM: ${term}`); + this.props.updateListFilter(type, term); + }, + renderDeleteBrewLink : function(){ if(!this.props.brew.editId) return; @@ -129,7 +135,7 @@ const BrewItem = createClass({ {brew.tags.map((tag, idx)=>{ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); - return {matches[2]}; + return {this.updateFilter('tag', matches[2]);}}>{matches[2]}; })} : <> From 0762b82c402aed07a71904189841a1816553d441 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 09:46:02 +1300 Subject: [PATCH 03/58] Initial functionality of basic tag filtering --- .../pages/basePages/listPage/brewItem/brewItem.jsx | 2 +- client/homebrew/pages/basePages/listPage/listPage.jsx | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 41a7f07f8..c7f11d621 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -46,7 +46,7 @@ const BrewItem = createClass({ }, updateFilter : function(type, term){ - console.log(`BrewItem: TYPE: ${type}; TERM: ${term}`); + // console.log(`BrewItem: TYPE: ${type}; TERM: ${term}`); this.props.updateListFilter(type, term); }, diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 2696d4e7a..bebd0b002 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -82,7 +82,7 @@ const ListPage = createClass({ if(!brews || !brews.length) return
No Brews.
; return _.map(brews, (brew, idx)=>{ - return ; + return ; }); }, @@ -129,6 +129,7 @@ const ListPage = createClass({ }, handleFilterTextChange : function(e){ + // console.log(e); this.setState({ filterString : e.target.value, }); @@ -136,6 +137,12 @@ const ListPage = createClass({ return; }, + updateListFilter : function(type, term){ + // console.log(`ListPage: TYPE: ${type}; TERM: ${term}`); + const e = { target: { value: term } }; + this.handleFilterTextChange(e); + }, + updateUrl : function(filterTerm, sortType, sortDir){ const url = new URL(window.location.href); const urlParams = new URLSearchParams(url.search); From 6dcc6d36b725fbb3af8488537ace8679eca2f7b8 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 12:23:39 +1300 Subject: [PATCH 04/58] Add separate tag filter --- .../pages/basePages/listPage/listPage.jsx | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index bebd0b002..51af85cdb 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -36,6 +36,7 @@ const ListPage = createClass({ return { filterString : this.props.query?.filter || '', + filterTags : [], sortType : this.props.query?.sort || null, sortDir : this.props.query?.dir || null, query : this.props.query, @@ -138,18 +139,31 @@ const ListPage = createClass({ }, updateListFilter : function(type, term){ - // console.log(`ListPage: TYPE: ${type}; TERM: ${term}`); - const e = { target: { value: term } }; - this.handleFilterTextChange(e); + this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, term); }, - updateUrl : function(filterTerm, sortType, sortDir){ + updateUrl : function(filterTerm, sortType, sortDir, filterTag=''){ const url = new URL(window.location.href); const urlParams = new URLSearchParams(url.search); urlParams.set('sort', sortType); urlParams.set('dir', sortDir); + let filterTags = urlParams.getAll('tag'); + if(filterTag != '') { + if(!filterTags.includes(filterTag)){ + filterTags.push(filterTag); + } else { + filterTags = filterTags.filter((tag)=>{ return tag != filterTag; }); + } + } + urlParams.delete('tag'); + filterTags.forEach((tag)=>{ urlParams.append('tag', tag); }); + + this.setState({ + filterTags + }); + if(!filterTerm) urlParams.delete('filter'); else @@ -201,6 +215,15 @@ const ListPage = createClass({ return brewStrings.includes(testString); }); + + if(this.state.filterTags.length > 0) { + brews = _.filter(brews, (brew)=>{ + return this.state.filterTags.some((tag)=>{ + return brew.tags?.includes(tag); + }); + }); + } + return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir); }, From 041c7ed48f6126ca89f8780a2332952a35129df7 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 12:48:20 +1300 Subject: [PATCH 05/58] Shift to AND operation for multiple tags --- client/homebrew/pages/basePages/listPage/listPage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 51af85cdb..e37fee8e5 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -218,7 +218,7 @@ const ListPage = createClass({ if(this.state.filterTags.length > 0) { brews = _.filter(brews, (brew)=>{ - return this.state.filterTags.some((tag)=>{ + return this.state.filterTags.every((tag)=>{ return brew.tags?.includes(tag); }); }); From 632882d370241fc066fd42a4c752b2cd8974ad4d Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 16:02:36 +1300 Subject: [PATCH 06/58] Use the whole tag in the tag filter --- client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index c7f11d621..eb8909737 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -135,7 +135,7 @@ const BrewItem = createClass({ {brew.tags.map((tag, idx)=>{ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); - return {this.updateFilter('tag', matches[2]);}}>{matches[2]}; + return {this.updateFilter('tag', tag);}}>{matches[2]}; })} : <> From 6c4dad675f608a873bb69f4257b66cf32beac7ad Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 16:34:12 +1300 Subject: [PATCH 07/58] Switch to case-insensitive tag comparison --- .../pages/basePages/listPage/listPage.jsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index e37fee8e5..499bbfb5b 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -207,22 +207,28 @@ const ListPage = createClass({ const testString = _.deburr(this.state.filterString).toLowerCase(); brews = _.filter(brews, (brew)=>{ + // Filter by user entered text const brewStrings = _.deburr([ brew.title, brew.description, brew.tags].join('\n') .toLowerCase()); - return brewStrings.includes(testString); - }); + const filterTextTest = brewStrings.includes(testString); - if(this.state.filterTags.length > 0) { - brews = _.filter(brews, (brew)=>{ - return this.state.filterTags.every((tag)=>{ - return brew.tags?.includes(tag); + // Filter by user selected tags + let filterTagTest = true; + if(this.state.filterTags.length > 0){ + filterTagTest = this.state.filterTags.every((tag)=>{ + if(typeof brew.tags == 'string') return false; + return brew.tags.findIndex((brewTag)=>{ + return brewTag.toLowerCase() == tag.toLowerCase(); + }) >= 0; }); - }); - } + } + + return filterTextTest && filterTagTest; + }); return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir); }, From 875e1023fc9dc596482ac1c15c97f9f95a139fc1 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 17:09:33 +1300 Subject: [PATCH 08/58] Add styling for different tag types --- .../basePages/listPage/brewItem/brewItem.less | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index e7a9ad548..c96732799 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -60,6 +60,26 @@ display: inline-block; font-weight: bold; cursor : pointer; + &.type { + background-color: #0080003b; + color: #008000; + border-color: #008000; + } + &.group { + background-color: #5050503b; + color: #000000; + border-color: #000000; + } + &.meta { + background-color: #0000803b; + color: #000080; + border-color: #000080; + } + &.system { + background-color: #8000003b; + color: #800000; + border-color: #800000; + } } &:hover{ .links{ From 995d1c63d8742734fdc97c58c1ecd542e710dbb6 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 17:17:03 +1300 Subject: [PATCH 09/58] Make tag removal from URL case insensitive --- client/homebrew/pages/basePages/listPage/listPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 499bbfb5b..4cc079e52 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -151,10 +151,10 @@ const ListPage = createClass({ let filterTags = urlParams.getAll('tag'); if(filterTag != '') { - if(!filterTags.includes(filterTag)){ + if(filterTags.findIndex((tag)=>{return tag.toLowerCase()==filterTag.toLowerCase();}) == -1){ filterTags.push(filterTag); } else { - filterTags = filterTags.filter((tag)=>{ return tag != filterTag; }); + filterTags = filterTags.filter((tag)=>{ return tag.toLowerCase() != filterTag.toLowerCase(); }); } } urlParams.delete('tag'); From 9e12ab71f84bde4e05b59bf8c022ca7303d134b3 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 17:46:55 +1300 Subject: [PATCH 10/58] Switch to better brew.tags array check --- client/homebrew/pages/basePages/listPage/listPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 4cc079e52..f5c7e6e5d 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -219,8 +219,8 @@ const ListPage = createClass({ // Filter by user selected tags let filterTagTest = true; if(this.state.filterTags.length > 0){ - filterTagTest = this.state.filterTags.every((tag)=>{ - if(typeof brew.tags == 'string') return false; + filterTagTest = this.state.filterTags?.every((tag)=>{ + if(!Array.isArray(brew.tags)) return false; return brew.tags.findIndex((brewTag)=>{ return brewTag.toLowerCase() == tag.toLowerCase(); }) >= 0; From ab8716d071f4657a645a66ce1b94cedba551665a Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 18:40:20 +1300 Subject: [PATCH 11/58] Add icons before special tags --- .../basePages/listPage/brewItem/brewItem.less | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index c96732799..c634fa2d1 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -64,21 +64,45 @@ background-color: #0080003b; color: #008000; border-color: #008000; + &:before{ + content: '\f0ad'; + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-right: 3px; + } } &.group { background-color: #5050503b; color: #000000; border-color: #000000; + &:before{ + content: '\f500'; + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-right: 3px; + } } &.meta { background-color: #0000803b; color: #000080; border-color: #000080; + &:before{ + content: '\f05a'; + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-right: 3px; + } } &.system { background-color: #8000003b; color: #800000; border-color: #800000; + &:before{ + content: '\f518'; + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-right: 3px; + } } } &:hover{ From cfecc001aa01dfce4c5d6c5b59e9dd069af4b111 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 3 Dec 2023 19:14:20 +1300 Subject: [PATCH 12/58] Add brew tag sorting --- client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index eb8909737..f81d3816b 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -115,6 +115,9 @@ const BrewItem = createClass({ const brew = this.props.brew; if(Array.isArray(brew.tags)) { // temporary fix until dud tags are cleaned brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings + brew.tags.sort((a, b)=>{ + return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.localeCompare(b); + }); } const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; From 7e98f7941650fb728a5e1ff1f0f7a7844a1cb89f Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 4 Dec 2023 07:53:49 +1300 Subject: [PATCH 13/58] Make alphabetical tag sorting case insensitive --- client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index f81d3816b..bdbf269f9 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -116,7 +116,7 @@ const BrewItem = createClass({ if(Array.isArray(brew.tags)) { // temporary fix until dud tags are cleaned brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings brew.tags.sort((a, b)=>{ - return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.localeCompare(b); + return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase()); }); } const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; From 2c997458b29fe620f92fc3c4c4ee4fad54dbb74e Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 4 Dec 2023 07:54:19 +1300 Subject: [PATCH 14/58] Simplify filter tag test --- client/homebrew/pages/basePages/listPage/listPage.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index f5c7e6e5d..475172d5a 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -219,8 +219,7 @@ const ListPage = createClass({ // Filter by user selected tags let filterTagTest = true; if(this.state.filterTags.length > 0){ - filterTagTest = this.state.filterTags?.every((tag)=>{ - if(!Array.isArray(brew.tags)) return false; + filterTagTest = Array.isArray(brew.tags) && this.state.filterTags?.every((tag)=>{ return brew.tags.findIndex((brewTag)=>{ return brewTag.toLowerCase() == tag.toLowerCase(); }) >= 0; From efecfac68afed103452beb04e791f5673f62842a Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 4 Dec 2023 08:10:32 +1300 Subject: [PATCH 15/58] Simplify tag styling --- .../basePages/listPage/brewItem/brewItem.less | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index c634fa2d1..a8bc4473c 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -60,15 +60,17 @@ display: inline-block; font-weight: bold; cursor : pointer; + &:before { + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-right: 3px; + } &.type { background-color: #0080003b; color: #008000; border-color: #008000; &:before{ content: '\f0ad'; - font-family: 'Font Awesome 5 Free'; - font-size: 12px; - margin-right: 3px; } } &.group { @@ -77,9 +79,6 @@ border-color: #000000; &:before{ content: '\f500'; - font-family: 'Font Awesome 5 Free'; - font-size: 12px; - margin-right: 3px; } } &.meta { @@ -88,9 +87,6 @@ border-color: #000080; &:before{ content: '\f05a'; - font-family: 'Font Awesome 5 Free'; - font-size: 12px; - margin-right: 3px; } } &.system { @@ -99,9 +95,6 @@ border-color: #800000; &:before{ content: '\f518'; - font-family: 'Font Awesome 5 Free'; - font-size: 12px; - margin-right: 3px; } } } From d262f586fcfd4b69f28a468425ae3a3c53bd45f1 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 4 Dec 2023 21:45:59 +1300 Subject: [PATCH 16/58] Add basic selected tags display to List Page --- .../pages/basePages/listPage/listPage.jsx | 20 +++++- .../pages/basePages/listPage/listPage.less | 69 ++++++++++++++++++- 2 files changed, 85 insertions(+), 4 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 475172d5a..441fb828f 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -158,7 +158,12 @@ const ListPage = createClass({ } } urlParams.delete('tag'); + // Add tags to URL in the order they were clicked filterTags.forEach((tag)=>{ urlParams.append('tag', tag); }); + // Sort tags before updating state + filterTags.sort((a, b)=>{ + return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase()); + }); this.setState({ filterTags @@ -187,6 +192,17 @@ const ListPage = createClass({ ; }, + renderTagsOptions : function(){ + if(this.state.filterTags?.length == 0) return; + console.log('renderTags'); + return
+ {_.map(this.state.filterTags, (tag, idx)=>{ + const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); + return {this.updateListFilter('tag', tag);}}>{matches[2]}; + })} +
; + }, + renderSortOptions : function(){ return
Sort by :
@@ -197,9 +213,6 @@ const ListPage = createClass({ {/* {this.renderSortOption('Latest', 'latest')} */} {this.renderFilterOption()} - - -
; }, @@ -258,6 +271,7 @@ const ListPage = createClass({ {this.props.navItems} {this.renderSortOptions()} + {this.renderTagsOptions()}
diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index bcffbf3e7..e2e079f24 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -52,7 +52,7 @@ } } } - .sort-container{ + .sort-container { font-family : 'Open Sans', sans-serif; position : sticky; top : 0; @@ -124,4 +124,71 @@ } + .tags-container { + font-family : 'Open Sans', sans-serif; + position : sticky; + top : 0; + left : 0; + width : 100%; + height : 30px; + background-color : #555; + border-top : 1px solid #666; + border-bottom : 1px solid #666; + color : white; + text-align : center; + z-index : 1; + display : flex; + justify-content : center; + align-items : center; + column-gap : 15px; + row-gap : 5px; + flex-wrap : wrap; + span { + text-transform : uppercase; + font-family : 'Open Sans', sans-serif; + font-size : 11px; + font-weight : bold; + border : 1px solid; + border-radius : 3px; + padding : 3px; + cursor : pointer; + &:before { + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-right: 3px; + } + &.type { + background-color: #0080003b; + color: #008000; + border-color: #008000; + &:before{ + content: '\f0ad'; + } + } + &.group { + background-color: #5050503b; + color: #000000; + border-color: #000000; + &:before{ + content: '\f500'; + } + } + &.meta { + background-color: #0000803b; + color: #000080; + border-color: #000080; + &:before{ + content: '\f05a'; + } + } + &.system { + background-color: #8000003b; + color: #800000; + border-color: #800000; + &:before{ + content: '\f518'; + } + } + } + } } From 34be05ac51cb746a8e2791c19d67518563214b4d Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 5 Dec 2023 10:00:25 +1300 Subject: [PATCH 17/58] Add X icon to tag window --- .../pages/basePages/listPage/listPage.less | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index e2e079f24..3b31e7d63 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -157,10 +157,17 @@ font-size: 12px; margin-right: 3px; } + &:after { + content: '\f00d'; + font-family: 'Font Awesome 5 Free'; + font-size: 12px; + margin-left: 3px; + color: #dfdfdf; + } &.type { background-color: #0080003b; - color: #008000; - border-color: #008000; + color: #00d000; + border-color: #00a000; &:before{ content: '\f0ad'; } @@ -175,16 +182,16 @@ } &.meta { background-color: #0000803b; - color: #000080; - border-color: #000080; + color: #0000d0; + border-color: #0000a0; &:before{ content: '\f05a'; } } &.system { background-color: #8000003b; - color: #800000; - border-color: #800000; + color: #d00000; + border-color: #a00000; &:before{ content: '\f518'; } From 2f13b895105dd9d15baff6aca2de6bc22c915de9 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 5 Dec 2023 12:41:27 +1300 Subject: [PATCH 18/58] Styling tweak --- .../pages/basePages/listPage/listPage.less | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index 3b31e7d63..2343141c4 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -152,6 +152,7 @@ border-radius : 3px; padding : 3px; cursor : pointer; + color: #dfdfdf; &:before { font-family: 'Font Awesome 5 Free'; font-size: 12px; @@ -162,35 +163,30 @@ font-family: 'Font Awesome 5 Free'; font-size: 12px; margin-left: 3px; - color: #dfdfdf; } &.type { - background-color: #0080003b; - color: #00d000; + background-color: #008000; border-color: #00a000; &:before{ content: '\f0ad'; } } &.group { - background-color: #5050503b; - color: #000000; + background-color: #505050; border-color: #000000; &:before{ content: '\f500'; } } &.meta { - background-color: #0000803b; - color: #0000d0; + background-color: #000080; border-color: #0000a0; &:before{ content: '\f05a'; } } &.system { - background-color: #8000003b; - color: #d00000; + background-color: #800000; border-color: #a00000; &:before{ content: '\f518'; From 75809a5f425137e3f880e0522019b3b16d2a6153 Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Wed, 6 Dec 2023 08:28:51 +1300 Subject: [PATCH 19/58] Remove forced uppercase --- client/homebrew/pages/basePages/listPage/listPage.less | 1 - 1 file changed, 1 deletion(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index 2343141c4..eb0f11d64 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -144,7 +144,6 @@ row-gap : 5px; flex-wrap : wrap; span { - text-transform : uppercase; font-family : 'Open Sans', sans-serif; font-size : 11px; font-weight : bold; From d5980cba89f7e3403624086f8637459591136c4f Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 19 Dec 2023 17:44:43 +1300 Subject: [PATCH 20/58] Initial DiceFont commit --- themes/fonts/5e/dicefont.less | 118 +++++++++++++++++++++++++++++++++ themes/fonts/5e/dicefont.woff | Bin 0 -> 5436 bytes themes/fonts/5e/dicefont.woff2 | Bin 0 -> 3948 bytes themes/fonts/5e/fonts.less | 2 + 4 files changed, 120 insertions(+) create mode 100644 themes/fonts/5e/dicefont.less create mode 100644 themes/fonts/5e/dicefont.woff create mode 100644 themes/fonts/5e/dicefont.woff2 diff --git a/themes/fonts/5e/dicefont.less b/themes/fonts/5e/dicefont.less new file mode 100644 index 000000000..031fcc600 --- /dev/null +++ b/themes/fonts/5e/dicefont.less @@ -0,0 +1,118 @@ +/* + Icon Font: dicefont +*/ +@font-face { + font-family: 'DiceFont'; + src: url('../../../fonts/5e/dicefont.woff2') format('woff2'), + url('../../../fonts/5e/dicefont.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + +.df { + display: inline-block; + font-family: 'DiceFont'; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smooth: antialiased; + &.df-F:before { content: '\f190'; } + &.df-F-minus:before { content: '\f191'; } + &.df-F-plus:before { content: '\f192'; } + &.df-F-zero:before { content: '\f193'; } + &.df-d10:before { content: '\f194'; } + &.df-d10-0:before { content: '\f100'; } + &.df-d10-1:before { content: '\f101'; } + &.df-d10-10:before { content: '\f102'; } + &.df-d10-2:before { content: '\f103'; } + &.df-d10-3:before { content: '\f104'; } + &.df-d10-4:before { content: '\f105'; } + &.df-d10-5:before { content: '\f106'; } + &.df-d10-6:before { content: '\f107'; } + &.df-d10-7:before { content: '\f108'; } + &.df-d10-8:before { content: '\f109'; } + &.df-d10-9:before { content: '\f10a'; } + &.df-d12:before { content: '\f195'; } + &.df-d12-1:before { content: '\f10b'; } + &.df-d12-10:before { content: '\f10c'; } + &.df-d12-11:before { content: '\f10d'; } + &.df-d12-12:before { content: '\f10e'; } + &.df-d12-2:before { content: '\f10f'; } + &.df-d12-3:before { content: '\f110'; } + &.df-d12-4:before { content: '\f111'; } + &.df-d12-5:before { content: '\f112'; } + &.df-d12-6:before { content: '\f113'; } + &.df-d12-7:before { content: '\f114'; } + &.df-d12-8:before { content: '\f115'; } + &.df-d12-9:before { content: '\f116'; } + &.df-d2:before { content: '\f196'; } + &.df-d2-1:before { content: '\f117'; } + &.df-d2-2:before { content: '\f118'; } + &.df-d20:before { content: '\f197'; } + &.df-d20-1:before { content: '\f119'; } + &.df-d20-10:before { content: '\f11a'; } + &.df-d20-11:before { content: '\f11b'; } + &.df-d20-12:before { content: '\f11c'; } + &.df-d20-13:before { content: '\f11d'; } + &.df-d20-14:before { content: '\f11e'; } + &.df-d20-15:before { content: '\f11f'; } + &.df-d20-16:before { content: '\f120'; } + &.df-d20-17:before { content: '\f121'; } + &.df-d20-18:before { content: '\f122'; } + &.df-d20-19:before { content: '\f123'; } + &.df-d20-2:before { content: '\f124'; } + &.df-d20-20:before { content: '\f125'; } + &.df-d20-3:before { content: '\f126'; } + &.df-d20-4:before { content: '\f127'; } + &.df-d20-5:before { content: '\f128'; } + &.df-d20-6:before { content: '\f129'; } + &.df-d20-7:before { content: '\f12a'; } + &.df-d20-8:before { content: '\f12b'; } + &.df-d20-9:before { content: '\f12c'; } + &.df-d4:before { content: '\f198'; } + &.df-d4-1:before { content: '\f12d'; } + &.df-d4-2:before { content: '\f12e'; } + &.df-d4-3:before { content: '\f12f'; } + &.df-d4-4:before { content: '\f130'; } + &.df-d6:before { content: '\f199'; } + &.df-d6-1:before { content: '\f131'; } + &.df-d6-2:before { content: '\f132'; } + &.df-d6-3:before { content: '\f133'; } + &.df-d6-4:before { content: '\f134'; } + &.df-d6-5:before { content: '\f135'; } + &.df-d6-6:before { content: '\f136'; } + &.df-d8:before { content: '\f19a'; } + &.df-d8-1:before { content: '\f137'; } + &.df-d8-2:before { content: '\f138'; } + &.df-d8-3:before { content: '\f139'; } + &.df-d8-4:before { content: '\f13a'; } + &.df-d8-5:before { content: '\f13b'; } + &.df-d8-6:before { content: '\f13c'; } + &.df-d8-7:before { content: '\f13d'; } + &.df-d8-8:before { content: '\f13e'; } + &.df-dot-d6:before { content: '\f19b'; } + &.df-dot-d6-1:before { content: '\f13f'; } + &.df-dot-d6-2:before { content: '\f140'; } + &.df-dot-d6-3:before { content: '\f141'; } + &.df-dot-d6-4:before { content: '\f142'; } + &.df-dot-d6-5:before { content: '\f143'; } + &.df-dot-d6-6:before { content: '\f18f'; } + &.df-small-dot-d6-1:before { content: '\f183'; } + &.df-small-dot-d6-2:before { content: '\f184'; } + &.df-small-dot-d6-3:before { content: '\f185'; } + &.df-small-dot-d6-4:before { content: '\f186'; } + &.df-small-dot-d6-5:before { content: '\f187'; } + &.df-small-dot-d6-6:before { content: '\f188'; } + &.df-solid-small-dot-d6-1:before { content: '\f189'; } + &.df-solid-small-dot-d6-2:before { content: '\f18a'; } + &.df-solid-small-dot-d6-3:before { content: '\f18b'; } + &.df-solid-small-dot-d6-4:before { content: '\f18c'; } + &.df-solid-small-dot-d6-5:before { content: '\f18d'; } + &.df-solid-small-dot-d6-6:before { content: '\f18e'; } +} \ No newline at end of file diff --git a/themes/fonts/5e/dicefont.woff b/themes/fonts/5e/dicefont.woff new file mode 100644 index 0000000000000000000000000000000000000000..d6f54f38e4ed8cac6ca23368944b9556a4e4f0a4 GIT binary patch literal 5436 zcmZu#cQjm4_nk3X^lp@47=j>-gb+jxqD%A=ql@066J3bj>x8I57$s!%7Bw+yw5ZXd z_g=oq_xt|*oxApXYoD|4J@>7*)_v=3FAW6+01$u;S_uH@zx%86f7kyn6cn`8usSHV z#)t)T%5;dj#w!6K005YW<;qwfG;vJ6SvZ=x001}~Sgwk#y*&7M9&h340mbI9c>wNz zK?#(%F>}XqS}>Lq{=?lJ0A%CfV+{a+L;(PD4FKT9?~&OHBU>voOYAy=Sd9P{B22EY z1Z}ZNYz~3t5G*)AYrsZZM-OjoZu_4GiyuUz_{R>;7FZpQ2bOpL18|XM+tJJ$+ZPyw z<*Zmh0X2YfCo@MY0D$T}mSg7wn_0hdSh+a6W9Lz00W8GsDW{NQqsM#30%3_j0G12w z&|C-CBBl)AGQrY|mG^BVa@KC!!Vh@=$UxIWfqbL@(#3n5fdAPnWS=8HA};C-mIB_K*na3dHOz?chs{olITb(d&xaB6VyNF+Qq zIJg6%{LU)D($)-tFh^Kf2LTm;__%~h?rLVX2+ecR?1T0@5Q%RL0fWD^T|x@Cpdb#w z2t{J@-(FKcp?v_H@}P5E5QrKCV%6=71=#`faS}BlM01IGbd25np`Sy@9olfFMMxDw%}w1- zqd;>?8%KLh7eY@#9|)!c=YfY9zziM?#SDFngpB%(fsD;eI835U(M-F{+|0hr;}9~4 z8zc$R3^`?yW=Ub`VZ~+DX03$MK$D>D&~r9hnp%f&m51Q>r@0bJ#KDaOP*kthFd%li~2SgmrqMoXWdc3%QX*kgX)YPW;#7?35|H>C88@g;aTzG3iI&Z)Hk-NO*WjF z8fBm2Y9!5n8c!=ss8 zFS`qSuKOVtE?xow(W0to%U-DKgJeOi?pI$$V^*G*lk~ZQ-E%mUWJTZsq*S=isi}N1 z#_L+Tixe16s+zvaN%y|KLTcsv?Ru?5$PKfe&J@m8g@hyin;7>-HMV;{Cgd{W6VN17 zAR(G$9yPs37qTL${A1qIVK2scKko~WtR-g^+SK?iOvv2~D2Vk_(nZlNg$C>(Un>|I zsK5;qE&X{zOn)k6SxUdq_LJ|87uI2B&?6co@(r>+e=s#RcHKgiwC9NFxEXdDD%8{O z_RBf{<9cLqM#4`W?f~Z{N~*A-5#!{MeMvzGjLAsj;3JY;-Vx{KDHO^~Nia`j|C|N2 z;jj`bzQbKop}OGei)#O^Cbn}DV=D|BiBkSRNW|W)WS$+J(yk<^tf@4D__0Qet}{$} zNtoELwM`jGUJDk_w>>5$J1KgSB)D=|v;D*8aM^Dkvo9G`Y8t}V7b=W^n33xjTk99= zypS72>B@kZbn)o>DYFYw6bA-re6%{bZ4%rRUdvTz)vFfd8+cVVbs4vy-mQ&xMr7V# z^w%H+m>7tJ=-p%UwjW9KzF9IqaMrIo_ysqbQYRlMx(oN;5}fQ;j%LTtiMHBYS!^N? zo~WmKLT-J0%$L_vDR$&G4CLcnIK#fYYdswJ{ch5#k;e9q3Btx$+%g_f7wrhtrKIZf-lklNc`NK_aatXPMBeJp%V?7_5%!MVEJ>!%Po{`f`a!E#Mp8vu(J< z$Ds!MwhmGo6{pc@uCjwwU%!tw@Mo!NJN4t0L&vw;z=B|2>JD>{*i6p(FSyt~c{~bT;qRVNxzZS*A z8l0_WNrGPFXT1oQyZvIdt_gCHAJElo#W;U=v=E3DeS2+s=X)!)zO;A7w&V`nvB}MnM^HtqP??p~jXqN4JmaSmnO+7thv6{IRTT*PmV~Ioce57yV$FWND8aT*H;SYxc#lGmQXK5JBxfh z%fDK_)btLZPK?C;;^G~wEoxrdIr2TM*bZKbmdfk=+by+=6W?tatu(W5XoJVm$;WPX zCRP?hnfy2Ffr^z9x{Hm>tk2z;WtQ$U4lkjXhJ~pZ&Etz(RjyQwFe!Za z#c#=}WP^tlWYJlL9(q5lgibQ#a>9IgB5EaR{9&I>Vg;%Dw|vXeL-c%Mnr=MutVJ_! zu2L-m3>{vb7a0#uP>a&DhzI45wTqG*O9y5n{<3r-Q=n{oyCn0xzlJ7RqPrdS?AJ|_ zrl-q%aB-xzQtVf7f=mz5*DD-_Bkg(wxVaI&4G~cm@hV`ZbL07v?VIEhfZ6K5I1THO<=7DxN*BuHv1T z+g{*fyx&?5MrZr5E%$vrNjC7^z2Me5Ht=;cLC ztD2y)sf$?=apFu_I6Yp3*i0DoBLz6FVv4=#`0{HXDn-^FB;Y4&OxUN!=V%T`yhj-8BX}{~eC=LcBX^*t<3( zX!bxHv9)DS5j%-VAj2yXfiMc3CWUha6k zgz-!|Ld8P{qpB{dccOCX3fH%U727u&-Sb$z%5Tub@zr!B3*?{iuFd8krDr$Z3j9TEv1y_G0>B_opym!u6`-|(HR#BgGZ`dT(CwfB!G?H(t5pRopj1pRA)WK(@Hg7!*-i>@W((oywQYiR{O zqc#8WsL%{PlJv*-u^jTAF#24%Sz}V3Iio|$YcLDPN0KbLL7Ih?$FErUP99|`BS@20 zG`XDUoT`vni`3D8h7W&nO*P9)#ydZEy5tLz*yQK+fd`{CB~y85gfR5P;p}txW22D_ z<0{49x32wWHS=~_9a+A{;gM4kgtKS*s6zPL@_5new*2g|Lkq8C%v_6tYf(b0OWjIHN`95I3^r4@H%n0t8w`#7N?tfj?ZJgxl0dEY&B%1eG%B<_SwYbZqbmSw| ztNM(2O4+N2FHH30>SLLA?Db03U*WkyGH*7o2HfPOf-44p(Rg&W)^|8Or-lbBv)%pP z1??7>Y@|=TTKN#-JIq3dK?={Dy4Y^{A_UH6Hmat2IRkD!et?PhKEBEZ6b-W|Dvu2# zQLii&CND&8#ZT_esq{2s@Kgcm!L8{lImMN>>(d{XMP;ma3ts=QOcrm zu)!Ds!Ot~b>G37)XoS-^N{mOEm`$^tei5mPyy0(G`SzN?iNNb^cf((qKoE!T&^#XH z8>sp#aiJQE7*bSu{HjN~WB2S>WNeBGOgg3UqglK<9{Ul;p3lg-# z^5hnO&3aEgo1an7(?D^vY^};hz}V&Cxvg4xW$N5O#_O*u14h3pKAZaQ%hFGsb7C^) zRnIUse~$_(^3ULbm<;oJ^X0^7F~HX}8)bvqgJz!3lBm<^Etr(gU#qa^l?T_Q?L1sP zOYx?rQ&Zly$3+|hGx3RJF&~4DuzwW8C|3Lc0DCaC5t8~#tUQFwR{ zr~t!|-7s^hbH9G%X8tCRu&1wCABRq#IEb>bVAk^QFXsu^+O zs{kMm(&ze-)jf`H6q~*iq;e40h*`{-r%Z&dKF0SaKNkr~^BXmleKNez)R|_jls>fei)etc8WgU9NrJ+lXY~GyM z6w{BG01>n=2M2FXV>}aP(skRt_BNXL+CZ$b@KLPK5fCqF*CkC6zOdO_ot<$1%QX9! zv=JinePGNM&2D%N9S*GH>1IG?-J7vBKD6w^1TMed-}XBN7g__FGx7G{3xJI^J~;^X z*1Cldh_2EIi1OGR`}3}QcUB#exF?UjsR=KBJvE&CfGej-TfO>wxtju}#Et9&>ng)Z z8_y;L!ic*K&+8=!ue^7a&()&k1YZtfOq?8!i_Ai4ZH>bq!Dyru)v557$l)hle*u)a z5BB>EjhiN^CjBK|ZSMzBt0>f`eeLh#)dg9746n17jk2{rZ!$BIHKaoBu{3V4n283TxG>m4Pb)7Pk7nOj8f)$0}f0a)( zS{^Av(NQm-S8L%5@z#GfR%ILSd}$k&I!tt9xai#ZHptP*LoUEljjAmo>5)gob-PCbI0GNv#H%HrMT&_sk(Wc stvo9=v(UbR^{9YYKN9DkKZihA0z!;-E^eTg|9rj}e1LQto+JS9AEW9Zm;e9( literal 0 HcmV?d00001 diff --git a/themes/fonts/5e/dicefont.woff2 b/themes/fonts/5e/dicefont.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..342bf7d95d5734c1e1550c568797e7fbcad61707 GIT binary patch literal 3948 zcmV-y50mhBPew8T0RR9101s>c4FCWD08`)q01pxX0RR9100000000000000000000 z0000#Mn+Uk90p(jf>H& z5t7XE@Ng{OzqVV49}VYO9t~b-ZBaa+qTwj{`~H^RkuX1mt{sHp)rbmRTX#xTn`vFA zXw&w9yInZ+(58k>Lc|C)p%7wD>%^eq@hbfgA!?M0sC^LRP;p+dJsl(0t4_QDQEkdn zqoOiC!aQ*G535om;9lM9U9w4bN&(=pjAQR4!&F{YY3q|#a9-UpK->7CfXn786|Trl zxHuP259Oh5Xs+_*Y$kgTKu7s+RfT;(;p$0|O=c6mIat64hGdhO?Ct?(OXLU?AgWf# z7xvZ5N;&0ySyv$|E8ka}m6eqzZ&a_w?ED*KTipP~oHlK*8Ijv5_wZFS5xcyWzG~q7 z5AXH(@KXG1Swqa45))4CKj`4Ox4;&M^|eIP@TC?ffpDsQxAB;d8u2nKLhD;PJMnfesEb?88j6!yD z%mM7}bpbtrY#u6ew+J*D189O_^-?e|c04Z}oGdlUYf}etklEBgd{+T3;Uq9O?Rs6a z$xP;jt)8~%Ofkbf0Rp&z#IAzoa*_h(=@3#%Dvj^3q7?MX3)^|wiC)x4tAQ44y>``D zv^;PJB&0=Aq=8c&2Un-%u$)#t%Na?Nqy!Z7S`c#r3ObsB7GaTdlnzi~2S5gF3IbOU z^9*xH5^ciB%p(y>19P>IC>B#5siWFFTZi?;br9K5{3HZla@rbIo7rbpE3Wofk)aDT zy@OJ50l?gYst}CoIzt2#gd0@}5z&t6M*0Y5c(~vQ6~QgdH&Bfxw2ky59052TrsJCv z+A(YJhxASA`H^UbgF8h#w&KEYFfmH>%~)eo5>mxzfngb&qcO>FxVlVyDt3Zs+AS|) zBawqv+cW7;4(TBp$C4R72dT9frDunZCgFysJin+AcD8B8h(wY#%kiKeqsloIT0Nma zEkS~SUEEHOF+x$+A#n8Sk_0i{WFJc@i0WnbIM7DCc>$h{FIqM75OS91?A&s{2l7XPdfAzjGtl%Rmvs(cRkzpUGvZPZO?Vg3q<~_ z1oiq;eqtp^7p#`o)ElIYRjPjE+xsHdM|8>P=pf%D>VA@qL>>4?*KJ`N zmqOs55U1fE6Ox60Yy&N)MM(HYzjP)}OJ))d&LG~$69F5IwMXxcbCA6b&8y`=%xG2Iu!R))PJ@N-syO!0q ziLEp7Qt0uTr4>NTL2BDs7f$I7@RLnz8h1G!6qo{-D_2r+4B{PDq;7HgT?1k*jhAGgw<;eZ$Gpl5= zL3Tjp-f!AJS2awf+P|EUNoaiIQWyYVlQe(fWE=>tmf1$xkTbZX(9%aJq_(qBI^@oX z`nXdRYWI56{t9(!!S-5-%y)n_%GfbMCc|LRx$7`VB6&>vPj!bVpI5+46UOr?1DEO9 z(_~CmDkUFHFzD6kq(Up2t$o*whOTel>7Tj{6ex3-$e0d9FXu6%6-W6 z!Zc_l;95o*hZ{->Qv}pZxw1;g4b96kWBGc+@@Fy{=hs=9)$Uj$oF8C@!D9(1(`FFy(2Z9uo1gi z#x!pBe}86yaHc|8DdKU1_3XJ^olaH`VL8bBI_QWVn-;Xa%BG*CiJN#QrO`h!vD?wG zwfm~H)dL;&!yB{g-tjdZq1FCDDszE~(abRQpy8A98T=~$f#)L!R_!SB*DYP2wpUn% zx3wL!Jjx-t4SxzTXf;jmMxPNgE9|`n9hD?@Jf?lu%>+>?*Qr@23aF4;jaipT;cc;D zSOVZlpx;>)TSm=p$Z9u9ywkO?^>5WLJH4T`Oca!JXa@_YQ8` zICJJ!P^7xXk58S&^{}`5K^}B$#|IKeIjWpNTr5_vyj44KKuX*byEM1BxP-j}X-|n8 zk+!|3=fQQqYJSmo(A`khI*4Z%3$oE?l#On$K#Jh_mSjysyYQ1V3{fqI|t4`mKZN38_XxK}emMw*iK`g!bpnB?Kk&Sqjj@HS!55Zi=Y zfq+RFVm+tBtBPWIVxDXQn_Qyga5$Pki!y=v?^$s`EYJ(xIIK$=;YPSckjDupi@04w z#;X{+L5wgmDLm3~z5?l1@+BQyt=|Ongd5cAh$Rc^jFe!->F}G81f0^wE35F1&1o+= zDv_{dHPWu5DQW_@i}p&ihNCmeT##@H{?mBgQMV>t(1>eFo4#0;FU&<`s(VM+*Oled zTt?$&4x>T17(yD>Z5JY5F!XSIAgyF;-gbzYYNBuD`sMdk_#Zu#nxvxhTi|C%c4@ubD@}PG1;yxs`eKdu>?-?~VjczQ#K}rWJaTRe%$lin7;+>4R z4~IiMqQgc^qI(iRRKT2Xq~7@mx(VObOh#Cra<>Ke95P4k`G(BQXL~HjOfKn7nzuI} zwyT{RFEBaeHIMK+PY;E~2et2s-b>gson1W^l5&n4N4=yt4JCZAyW*P2L}5IafQ~{c zd2Zi(tgXs6f4JnUCwra@r^D<$ zOZ$V-dyZlB_!`Ne`qLeWWgy&%54(f>tbuoAU_QNqTL>S%>VLf#eTaRhTXs4Lj^#o4 zbeEQrqYse)CN%ZwOC?~4ijxU=3KL z{yE8f{DvKLuIZDnuVc+OotNOag{`@D`Q%nlvCTKuwd>d%RW@>9&olUtFHNfXPMa_g zIKCM&z&q_G0>9ghq|>rs)8Hiz7dO%b_E$qJivhcfu0P{xEWEzo5J>~y-F#ItuYJP~ z$=_ovBa35kC6NMV;J<|RZrmOafY9pbNr2Tpce5;H$Y({!!(NMqEy2grRrk9{A|x0w zL)TEs8q!S1vuLTW#Q-o6l1$iHQLa zFnn}@hO3J}7p}X&z_(1m$sPQT1imi-kZG(8RyLDOk^^KOWLUrZ|HA=DWHnl@3DRT% zf1k%%08Eb|$H>|}*-B0;KoGq1-sJS;D@Mp(#$S&-Q7b4L4E%|aVQ-N&+A7xu1j&2L z`AXfckRbma{y&StyL2J*?kw5HUe3s=oY5315Rf1qes0i?^OXHm9e*;46@cr^+o Date: Tue, 19 Dec 2023 17:48:23 +1300 Subject: [PATCH 21/58] Add DiceFont license file --- themes/fonts/5e/dicefont_license.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 themes/fonts/5e/dicefont_license.md diff --git a/themes/fonts/5e/dicefont_license.md b/themes/fonts/5e/dicefont_license.md new file mode 100644 index 000000000..edfbd926d --- /dev/null +++ b/themes/fonts/5e/dicefont_license.md @@ -0,0 +1,18 @@ +# License + +DiceFont is open source. You can use it for commercial projects, personal +projects or open source projects. + +## Font License + +Applies to all desktop and webfont files: [License: SIL OFL 1.1](http://scripts.sil.org/OFL) + +## Code License + +Applies to all CSS and LESS files: [License: MIT License](http://opensource.org/licenses/mit-license.html) + +## Documentation License + +Applies to all other files [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/) + +Copyright [Franco Ponticelli](https://github.com/fponticelli). From 9e8570c19ba00409d6d26b6a2cdd348752a4c79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 7 Feb 2024 22:42:55 +0100 Subject: [PATCH 22/58] page counter rename --- themes/V3/5ePHB/style.less | 2 +- themes/V3/Blank/style.less | 23 ++++++++++++++++++++++- themes/V3/Journal/style.less | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less index 6c6634ce7..59e010c91 100644 --- a/themes/V3/5ePHB/style.less +++ b/themes/V3/5ePHB/style.less @@ -411,7 +411,7 @@ color : var(--HB_Color_Footnotes); text-align : center; text-indent : 0; - &.auto::after { content : counter(phb-page-numbers); } + &.auto::after { content : counter(page-numbers); } } .footnote { position : absolute; diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index d31919fab..118ce0ef5 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -47,7 +47,7 @@ body { counter-reset : phb-page-numbers; } height : 279.4mm; padding : 1.4cm 1.9cm 1.7cm; overflow : hidden; - counter-increment : phb-page-numbers; + counter-increment : page-numbers; background-color : var(--HB_Color_Background); text-rendering : optimizeLegibility; contain : size; @@ -460,3 +460,24 @@ body { counter-reset : phb-page-numbers; } .homebreweryIcon.red { background-color : red; } .homebreweryIcon.gold { background-image : linear-gradient(to top left, brown 22.5%, gold 40%, white 60%, gold 67.5%, brown 82.5%); } } +//***************************** +//* Page Number +//*****************************/ + +.page { + + + .pageNumber { + position : absolute; + right : 2px; + bottom : 22px; + width : 50px; + font-size : 0.9em; + text-align : center; + &.auto::after { content : counter(page-numbers); } + } + + &:nth-child(even) { + .pageNumber { left : 2px; } + } +} diff --git a/themes/V3/Journal/style.less b/themes/V3/Journal/style.less index 2e2ada5c8..b9d83b3f1 100644 --- a/themes/V3/Journal/style.less +++ b/themes/V3/Journal/style.less @@ -383,7 +383,7 @@ text-align : center; text-indent : 0; &.auto::after { - content : counter(phb-page-numbers); + content : counter(page-numbers); } } .footnote{ From c9fc976c72da39193d6569b58b3fc79a5fa5fd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 7 Feb 2024 22:43:43 +0100 Subject: [PATCH 23/58] counter left --- themes/V3/Blank/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index 118ce0ef5..4a84167ba 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -8,7 +8,7 @@ } @page { margin : 0; } -body { counter-reset : phb-page-numbers; } +body { counter-reset : page-numbers; } * { -webkit-print-color-adjust : exact; } //***************************** From 5e97121e5a567f83a4fa9e7a27472ccdd2c73262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 7 Feb 2024 22:48:32 +0100 Subject: [PATCH 24/58] pageNumber to blank --- themes/V3/5ePHB/style.less | 6 ------ themes/V3/Blank/style.less | 8 +++----- themes/V3/Journal/style.less | 8 -------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less index 59e010c91..bb406b152 100644 --- a/themes/V3/5ePHB/style.less +++ b/themes/V3/5ePHB/style.less @@ -403,15 +403,9 @@ } } .pageNumber { - position : absolute; right : 2px; bottom : 22px; - width : 50px; - font-size : 0.9em; color : var(--HB_Color_Footnotes); - text-align : center; - text-indent : 0; - &.auto::after { content : counter(page-numbers); } } .footnote { position : absolute; diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index 4a84167ba..1d6b1b0aa 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -465,12 +465,10 @@ body { counter-reset : page-numbers; } //*****************************/ .page { - - .pageNumber { position : absolute; - right : 2px; - bottom : 22px; + right : 30px; + bottom : 30px; width : 50px; font-size : 0.9em; text-align : center; @@ -478,6 +476,6 @@ body { counter-reset : page-numbers; } } &:nth-child(even) { - .pageNumber { left : 2px; } + .pageNumber { left : 30px; } } } diff --git a/themes/V3/Journal/style.less b/themes/V3/Journal/style.less index b9d83b3f1..b8ed3ce8f 100644 --- a/themes/V3/Journal/style.less +++ b/themes/V3/Journal/style.less @@ -374,17 +374,9 @@ } .pageNumber{ font-family : FrederickaTheGreat; - position : absolute; right : 3cm; bottom : 1.25cm; - width : 50px; - font-size : 0.9em; color : var(--HB_Color_HeaderText); - text-align : center; - text-indent : 0; - &.auto::after { - content : counter(page-numbers); - } } .footnote{ position : absolute; From 7f8b87bb852280374074d0dc849f6a6dfc69ae52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 7 Feb 2024 22:52:44 +0100 Subject: [PATCH 25/58] watermark now visible --- themes/V3/Blank/style.less | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index 1d6b1b0aa..f8289bbee 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -166,7 +166,6 @@ body { counter-reset : page-numbers; } margin : 0; font-size : 120px; text-transform : uppercase; - mix-blend-mode : overlay; opacity : 30%; transform : rotate(-45deg); p { margin-bottom : none; } From 26a41e6262dfb43a971da8d5e0540a50a68ff8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Thu, 8 Feb 2024 11:33:11 +0100 Subject: [PATCH 26/58] FA to 6.5.1 --- client/homebrew/brewRenderer/brewRenderer.jsx | 2 +- client/template.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 9208a2b90..c32d5fa52 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -20,7 +20,7 @@ const PAGE_HEIGHT = 1056; const INITIAL_CONTENT = dedent` - + diff --git a/client/template.js b/client/template.js index e8ac8e22f..43e17b27d 100644 --- a/client/template.js +++ b/client/template.js @@ -12,7 +12,7 @@ const template = async function(name, title='', props = {}){ - + From 32b5bebbc46e88b4e7e6b1e94032c11201e5b7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 Feb 2024 00:18:39 +0100 Subject: [PATCH 27/58] full functionality --- client/homebrew/navbar/newbrew.navitem.jsx | 100 +++++++++++++++++++-- 1 file changed, 93 insertions(+), 7 deletions(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index cc833013d..94aa9fb85 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -1,12 +1,98 @@ const React = require('react'); +const _ = require('lodash'); const Nav = require('naturalcrit/nav/nav.jsx'); +const yaml = require('js-yaml'); +const { useRef } = React; + +const BREWKEY = 'homebrewery-new'; +const STYLEKEY = 'homebrewery-new-style'; +const METAKEY = 'homebrewery-new-meta'; + +const splitTextStyleAndMetadata = (brew)=>{ + brew.text = brew.text.replaceAll('\r\n', '\n'); + if(brew.text.startsWith('```metadata')) { + const index = brew.text.indexOf('```\n\n'); + const metadataSection = brew.text.slice(12, index - 1); + const metadata = yaml.load(metadataSection); + Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])); + brew.text = brew.text.slice(index + 5); + } + if(brew.text.startsWith('```css')) { + const index = brew.text.indexOf('```\n\n'); + brew.style = brew.text.slice(7, index - 1); + brew.text = brew.text.slice(index + 5); + } +}; + + +const handleFileChange = (e) => { + const file = e.target.files[0]; + if (file) { + const reader = new FileReader(); + reader.onload = (e) => { + const fileContent = e.target.result; + + const brew = { + text :fileContent, + style : '' + } + splitTextStyleAndMetadata(brew); + console.log(brew); + localStorage.setItem(BREWKEY, brew.text); + localStorage.setItem(STYLEKEY, brew.style); + localStorage.setItem(METAKEY, JSON.stringify({ + 'title': brew.title, + 'description': brew.description, + 'tags': brew.tags, + 'systems': brew.systems, + 'renderer': brew.renderer, + 'theme': brew.theme, + 'lang': brew.lang + })); + + //window.location.href = '/new'; + }; + reader.readAsText(file); + } +}; + module.exports = function(props){ - return - new - ; + const inputRef = useRef(null); + + return + + new + + + new + + + { inputRef.current.click(); }}> + + New From Local File + + + ; + }; + +/* + + new cloned + +*/ \ No newline at end of file From 705d170b6e1fa922e1d820370e326e336e60520a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 Feb 2024 10:22:55 +0100 Subject: [PATCH 28/58] alert if wrong file, redirect if good --- client/homebrew/navbar/newbrew.navitem.jsx | 171 ++++++++++----------- 1 file changed, 84 insertions(+), 87 deletions(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 94aa9fb85..6e63e7a8f 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -1,98 +1,95 @@ const React = require('react'); +const { useState, useRef } = React; const _ = require('lodash'); const Nav = require('naturalcrit/nav/nav.jsx'); const yaml = require('js-yaml'); -const { useRef } = React; const BREWKEY = 'homebrewery-new'; const STYLEKEY = 'homebrewery-new-style'; const METAKEY = 'homebrewery-new-meta'; -const splitTextStyleAndMetadata = (brew)=>{ - brew.text = brew.text.replaceAll('\r\n', '\n'); - if(brew.text.startsWith('```metadata')) { - const index = brew.text.indexOf('```\n\n'); - const metadataSection = brew.text.slice(12, index - 1); - const metadata = yaml.load(metadataSection); - Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])); - brew.text = brew.text.slice(index + 5); - } - if(brew.text.startsWith('```css')) { - const index = brew.text.indexOf('```\n\n'); - brew.style = brew.text.slice(7, index - 1); - brew.text = brew.text.slice(index + 5); - } +const NewBrew = () => { + const inputRef = useRef(null); + + const [brew, setBrew] = useState({ + text: '', + style: '' + }); + + const splitTextStyleAndMetadata = (brewContent) => { + let updatedBrew = { ...brewContent }; + updatedBrew.text = updatedBrew.text.replaceAll('\r\n', '\n'); + if (updatedBrew.text.startsWith('```metadata')) { + const index = updatedBrew.text.indexOf('```\n\n'); + const metadataSection = updatedBrew.text.slice(12, index - 1); + const metadata = yaml.load(metadataSection); + updatedBrew = { + ...updatedBrew, + ..._.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']) + }; + updatedBrew.text = updatedBrew.text.slice(index + 5); + } + if (updatedBrew.text.startsWith('```css')) { + const index = updatedBrew.text.indexOf('```\n\n'); + updatedBrew.style = updatedBrew.text.slice(7, index - 1); + updatedBrew.text = updatedBrew.text.slice(index + 5); + } + return updatedBrew; + }; + + + const handleFileChange = (e) => { + const file = e.target.files[0]; + if (file) { + const reader = new FileReader(); + reader.onload = (e) => { + const fileContent = e.target.result; + const newBrew = { + text: fileContent, + style: '' + }; + if(fileContent.startsWith('```metadata')) { + const updatedBrew = splitTextStyleAndMetadata(newBrew); + console.log(updatedBrew); + setBrew(updatedBrew); + localStorage.setItem(BREWKEY, updatedBrew.text); + localStorage.setItem(STYLEKEY, updatedBrew.style); + localStorage.setItem(METAKEY, JSON.stringify(_.pick(updatedBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']))); + + window.location.href = '/new'; + } else { + alert('This file is invalid, please, enter a valid file'); + } + }; + reader.readAsText(file); + } + }; + + return ( + + + new + + + new + + + { inputRef.current.click(); }}> + + New From Local File + + + ); }; - -const handleFileChange = (e) => { - const file = e.target.files[0]; - if (file) { - const reader = new FileReader(); - reader.onload = (e) => { - const fileContent = e.target.result; - - const brew = { - text :fileContent, - style : '' - } - splitTextStyleAndMetadata(brew); - console.log(brew); - localStorage.setItem(BREWKEY, brew.text); - localStorage.setItem(STYLEKEY, brew.style); - localStorage.setItem(METAKEY, JSON.stringify({ - 'title': brew.title, - 'description': brew.description, - 'tags': brew.tags, - 'systems': brew.systems, - 'renderer': brew.renderer, - 'theme': brew.theme, - 'lang': brew.lang - })); - - //window.location.href = '/new'; - }; - reader.readAsText(file); - } -}; - - -module.exports = function(props){ - const inputRef = useRef(null); - - return - - new - - - new - - - { inputRef.current.click(); }}> - - New From Local File - - - ; - -}; - -/* - - new cloned - -*/ \ No newline at end of file +module.exports = NewBrew; From 323d84974c09a72cc151f537f0046686e3d5dfd1 Mon Sep 17 00:00:00 2001 From: Gazook89 Date: Sat, 10 Feb 2024 22:29:16 -0600 Subject: [PATCH 29/58] Combine nav and navbar styles - moves all the nav.less styling to navbar.less in the `client` directory - deletes nav.less - changes the nav.jsx import of styles to navbar.less - stylelint navbar.less - added a couple comments about easy future changes. --- client/homebrew/navbar/navbar.less | 584 ++++++++++++++++------------- shared/naturalcrit/nav/nav.jsx | 2 +- shared/naturalcrit/nav/nav.less | 97 ----- 3 files changed, 332 insertions(+), 351 deletions(-) delete mode 100644 shared/naturalcrit/nav/nav.less diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 036f52cf4..73671abbb 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -1,65 +1,339 @@ @import "naturalcrit/styles/colors.less"; + @navbarHeight : 28px; + @keyframes pinkColoring { - 0% {color : pink;} - 50% {color : pink;} - 75% {color : red;} - 100% {color : pink;} + 0% { color : pink; } + 50% { color : pink; } + 75% { color : red; } + 100% { color : pink; } } -.homebrew nav { - .homebrewLogo { - .animate(color); - font-family : CodeBold; - font-size : 12px; - color : white; - div { - margin-top : 2px; - margin-bottom : -2px; - } - &:hover { - color : @blue; - } + +@keyframes glideDropDown { + 0% { + background-color : #333333; + opacity : 0; + transform : translate(0px, -100%); } - .editTitle.navItem { - padding : 2px 12px; - input { - font-family : "Open Sans", sans-serif; - font-size : 12px; - font-weight : 800; - width : 250px; - margin : 0; - padding : 2px; - text-align : center; - color : white; - border : 1px solid @blue; - outline : none; - background-color : transparent; - } - .charCount { - display : inline-block; - margin-left : 8px; - text-align : right; - vertical-align : bottom; - color : #666; - &.max { - color : @red; + 100% { + background-color : #333333; + opacity : 1; + transform : translate(0px, 0px); + } +} + +.homebrew nav { + background-color : #333333; + .navContent { + position : relative; + z-index : 2; + display : flex; + justify-content : space-between; + .navSection { + display : flex; + align-items : center; + // "NaturalCrit" logo + .navLogo { + display : block; + margin-top : 0px; + margin-right : 8px; + margin-left : 8px; + color : white; + text-decoration : none; + &:hover { + .name { color : @orange; } + svg { fill : @orange; } + } + svg { + height : 13px; + margin-right : 0.2em; + cursor : pointer; + fill : white; + } + span.name { + font-family : 'CodeLight'; + font-size : 15px; + span.crit { font-family : 'CodeBold'; } + small { + font-family : 'Open Sans'; + font-size : 0.3em; + font-weight : 800; + text-transform : uppercase; + } + } + } + &:last-child .navItem { border-left : 1px solid #666666; } + .navItem { + #backgroundColorsHover; + .animate(background-color); + padding : 8px 12px; + font-size : 10px; + font-weight : 800; + line-height : 13px; + color : white; + text-decoration : none; + text-transform : uppercase; + cursor : pointer; + background-color : #333333; + i { + float : right; + margin-left : 5px; + font-size : 13px; + } + &.patreon { + border-right : 1px solid #666666; + border-left : 1px solid #666666; + &:hover i { color : red; } + i { + color : pink; + .animate(color); + animation-name : pinkColoring; + animation-duration : 2s; + } + } + &.editTitle { // this is not needed at all currently - you used to be able to edit the title via the navbar. + padding : 2px 12px; + input { + width : 250px; + padding : 2px; + margin : 0; + font-family : 'Open Sans', sans-serif; + font-size : 12px; + font-weight : 800; + color : white; + text-align : center; + background-color : transparent; + border : 1px solid @blue; + outline : none; + } + .charCount { + display : inline-block; + margin-left : 8px; + color : #666666; + text-align : right; + vertical-align : bottom; + &.max { color : @red; } + } + } + &.brewTitle { + flex-grow : 1; + font-size : 12px; + font-weight : 800; + color : white; + text-align : center; + text-transform : initial; + background-color : transparent; + } + // "The Homebrewery" logo + &.homebrewLogo { + .animate(color); + font-family : 'CodeBold'; + font-size : 12px; + color : white; + div { + margin-top : 2px; + margin-bottom : -2px; + } + &:hover { color : @blue; } + } + &.metadata { + position : relative; + display : flex; + flex-grow : 1; + align-items : center; + height : 100%; + padding : 0; + i { margin-right : 10px;} + .window { + position : absolute; + bottom : 0; + left : 50%; + z-index : -1; + display : flex; + flex-flow : row wrap; + align-content : baseline; + justify-content : flex-start; + width : 440px; + max-height : ~"calc(100vh - 28px)"; + padding : 0 10px 5px; + margin : 0 auto; + background-color : #333333; + border : 3px solid #444444; + border-top : unset; + border-radius : 0 0 5px 5px; + box-shadow : inset 0 7px 9px -7px #111111; + transition : transform 0.4s, opacity 0.4s; + &.active { + opacity : 1; + transform : translateX(-50%) translateY(100%); + } + &.inactive { + opacity : 0; + transform : translateX(-50%) translateY(0%); + } + .row { + display : flex; + flex-flow : row wrap; + width : 100%; + h4 { + box-sizing : border-box; + display : block; + flex-basis : 20%; + flex-grow : 1; + min-width : 76px; + padding : 5px 0; + color : #BBBBBB; + text-align : center; + } + p { + flex-basis : 80%; + flex-grow : 1; + padding : 5px 0; + font-family : 'Open Sans', sans-serif; + font-size : 10px; + font-weight : normal; + text-transform : initial; + .tag { + display : inline-block; + padding : 2px; + margin : 2px 2px; + background-color : #444444; + border : 2px solid grey; + border-radius : 5px; + } + a.userPageLink { + color : white; + text-decoration : none; + &:hover { text-decoration : underline; } + } + } + &:nth-of-type(even) { background-color : #555555; } + } + } + } + &.warning { + position : relative; + color : white; + background-color : @orange; + &:hover > .dropdown { visibility : visible; } + .dropdown { + position : absolute; + top : 28px; + left : 0; + z-index : 10000; + box-sizing : border-box; + display : block; + width : 100%; + padding : 13px 5px; + text-align : center; + visibility : hidden; + background-color : #333333; + } + } + &.account { + min-width : 100px; + &.username { text-transform : none;} + } + } + .navDropdownContainer { + position : relative; + .navDropdown { + position : absolute; + top : 28px; + left : 0px; + z-index : 10000; + width : 100%; + max-height : calc(100vh - 28px); + overflow : hidden auto; + .navItem { + position : relative; + display : block; + width : 100%; + padding : 8px 5px; + border : 1px solid #888888; + border-bottom : 0; + animation-name : glideDropDown; + animation-duration : 0.4s; + } + } + &.recent { + position : relative; + .navDropdown .navItem { + #backgroundColorsHover; + .animate(background-color); + position : relative; + box-sizing : border-box; + display : block; + max-height : ~"calc(100vh - 28px)"; // I don't think is correct syntax, but leaving it in for now... (Gazook89) + padding : 8px 5px 13px; + overflow : hidden auto; + color : white; + text-decoration : none; + background-color : #333333; + border-top : 1px solid #888888; + scrollbar-color : #666666 #333333; + scrollbar-width : thin; + .clear { + position : absolute; + top : 50%; + right : 0; + display : none; + width : 20px; + height : 100%; + background-color : #333333; + border-radius : 3px; + opacity : 70%; + transform : translateY(-50%); + &:hover { opacity : 100%; } + i { + width : 100%; + height : 100%; + margin : 0; + font-size : 10px; + text-align : center; + } + } + &:hover { + background-color : @blue; + .clear { + display : grid; + place-content : center; + } + } + .title { + display : inline-block; + width : 100%; + overflow : hidden auto; + text-overflow : ellipsis; + white-space : nowrap; + } + .time { + position : absolute; + right : 2px; + bottom : 2px; + font-size : 0.7em; + color : #888888; + } + &.header { + box-sizing : border-box; + display : block; + padding : 5px 0; + color : #BBBBBB; + text-align : center; + background-color : #333333; + border-top : 1px solid #888888; + &:nth-of-type(1) { background-color : darken(@teal, 20%); } + &:nth-of-type(2) { background-color : darken(@purple, 30%); } + } + } + } } } } - .brewTitle.navItem { - font-size : 12px; - font-weight : 800; - height : 100%; - text-align : center; - text-transform : initial; - color : white; - background-color : transparent; - flex-grow : 1; - } + + // this should likely be refactored into .navDropdownContainer .save-menu { - .dropdown { - z-index : 1000; - } + .dropdown { z-index : 1000; } .navItem i.fa-power-off { color : red; &.active { @@ -68,205 +342,9 @@ } } } - .patreon.navItem { - border-right : 1px solid #666; - border-left : 1px solid #666; - &:hover i { - color : red; - } - i { - .animate(color); - animation-name : pinkColoring; - animation-duration : 2s; - color : pink; - } - } - .recent.navDropdownContainer { - position : relative; - .navDropdown .navItem { - overflow : hidden auto; - max-height : ~"calc(100vh - 28px)"; - scrollbar-color : #666 #333; - scrollbar-width : thin; - - #backgroundColorsHover; - .animate(background-color); - position : relative; - display : block; - overflow : clip; - box-sizing : border-box; - padding : 8px 5px 13px; - text-decoration : none; - color : white; - border-top : 1px solid #888; - background-color : #333; - .clear { - position : absolute; - top : 50%; - right : 0; - display : none; - width : 20px; - height : 100%; - transform : translateY(-50%); - opacity : 70%; - border-radius : 3px; - background-color : #333; - &:hover { - opacity : 100%; - } - i { - font-size : 10px; - width : 100%; - height : 100%; - margin : 0; - text-align : center; - } - } - &:hover { - background-color : @blue; - .clear { - display : grid; - place-content : center; - } - } - .title { - display : inline-block; - overflow : hidden; - width : 100%; - white-space : nowrap; - text-overflow : ellipsis; - } - .time { - font-size : 0.7em; - position : absolute; - right : 2px; - bottom : 2px; - color : #888; - } - &.header { - display : block; - box-sizing : border-box; - padding : 5px 0; - text-align : center; - color : #BBB; - border-top : 1px solid #888; - background-color : #333; - &:nth-of-type(1) { - background-color : darken(@teal, 20%); - } - &:nth-of-type(2) { - background-color : darken(@purple, 30%); - } - } - } - } - .metadata.navItem { - position : relative; - display : flex; - align-items : center; - height : 100%; - padding : 0; - flex-grow : 1; - i { - margin-right : 10px; - } - .window { - position : absolute; - z-index : -1; - bottom : 0; - left : 50%; - display : flex; - justify-content : flex-start; - width : 440px; - max-height : ~"calc(100vh - 28px)"; - margin : 0 auto; - padding : 0 10px 5px; - transition : transform 0.4s, opacity 0.4s; - border : 3px solid #444; - border-top : unset; - border-radius : 0 0 5px 5px; - background-color : #333; - box-shadow : inset 0 7px 9px -7px #111; - flex-flow : row wrap; - align-content : baseline; - &.active { - transform : translateX(-50%) translateY(100%); - opacity : 1; - } - &.inactive { - transform : translateX(-50%) translateY(0%); - opacity : 0; - } - .row { - display : flex; - width : 100%; - flex-flow : row wrap; - h4 { - display : block; - box-sizing : border-box; - min-width : 76px; - padding : 5px 0; - text-align : center; - color : #BBB; - flex-basis : 20%; - flex-grow : 1; - } - p { - font-family : "Open Sans", sans-serif; - font-size : 10px; - font-weight : normal; - padding : 5px 0; - text-transform : initial; - flex-basis : 80%; - flex-grow : 1; - .tag { - display : inline-block; - margin : 2px 2px; - padding : 2px; - border : 2px solid grey; - border-radius : 5px; - background-color : #444; - } - a.userPageLink { - text-decoration : none; - color : white; - &:hover { - text-decoration : underline; - } - } - } - &:nth-of-type(even) { - background-color : #555; - } - } - } - } - .warning.navItem { - position : relative; - color : white; - background-color : @orange; - &:hover > .dropdown { - visibility : visible; - } - .dropdown { - position : absolute; - z-index : 10000; - top : 28px; - left : 0; - display : block; - visibility : hidden; - box-sizing : border-box; - width : 100%; - padding : 13px 5px; - text-align : center; - background-color : #333; - } - } - .account.navItem { - min-width : 100px; - } - .account.username.navItem { - text-transform : none; - } + + + + } diff --git a/shared/naturalcrit/nav/nav.jsx b/shared/naturalcrit/nav/nav.jsx index 3c7fd7c5e..04b7037dd 100644 --- a/shared/naturalcrit/nav/nav.jsx +++ b/shared/naturalcrit/nav/nav.jsx @@ -1,4 +1,4 @@ -require('./nav.less'); +require('client/homebrew/navbar/navbar.less'); const React = require('react'); const { useState, useRef, useEffect } = React; const createClass = require('create-react-class'); diff --git a/shared/naturalcrit/nav/nav.less b/shared/naturalcrit/nav/nav.less deleted file mode 100644 index e3a58a33a..000000000 --- a/shared/naturalcrit/nav/nav.less +++ /dev/null @@ -1,97 +0,0 @@ -@import '../styles/colors'; -@keyframes glideDropDown { - 0% {transform : translate(0px, -100%); - opacity : 0; - background-color: #333;} - 100% {transform : translate(0px, 0px); - opacity : 1; - background-color: #333;} -} -nav{ - background-color : #333; - .navContent{ - position : relative; - display : flex; - justify-content : space-between; - z-index : 2; - } - .navSection{ - display : flex; - align-items : center; - } - .navLogo{ - display : block; - margin-top : 0px; - margin-right : 8px; - margin-left : 8px; - color : white; - text-decoration : none; - &:hover{ - .name{ color : @orange; } - svg{ fill : @orange } - } - svg{ - height : 13px; - margin-right : 0.2em; - cursor : pointer; - fill : white; - } - span.name{ - font-family : 'CodeLight'; - font-size : 15px; - span.crit{ - font-family : 'CodeBold'; - } - small{ - font-family : 'Open Sans'; - font-size : 0.3em; - font-weight : 800; - text-transform : uppercase; - } - } - } - .navItem{ - #backgroundColorsHover; - .animate(background-color); - padding : 8px 12px; - cursor : pointer; - background-color : #333; - font-size : 10px; - font-weight : 800; - color : white; - text-decoration : none; - text-transform : uppercase; - line-height : 13px; - i{ - margin-left : 5px; - font-size : 13px; - float : right; - } - } - .navSection:last-child .navItem{ - border-left : 1px solid #666; - } - .navDropdownContainer{ - position: relative; - .navDropdown { - position : absolute; - top : 28px; - left : 0px; - z-index : 10000; - width : 100%; - overflow : hidden auto; - max-height : calc(100vh - 28px); - .navItem{ - animation-name: glideDropDown; - animation-duration: 0.4s; - position : relative; - display : block; - width : 100%; - vertical-align : middle; - padding : 8px 5px; - border : 1px solid #888; - border-bottom : 0; - } - } - } -} From 46a0a66fb6ebdf53f74a5bb039463b0835f9c2fe Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 22 Feb 2024 19:20:42 +1300 Subject: [PATCH 30/58] Use currentColor once instead of multiple border-color declarations --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.less | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less index 46a347b3e..9bee4e5eb 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less @@ -63,6 +63,7 @@ white-space: nowrap; display: inline-block; font-weight: bold; + border-color: currentColor; cursor : pointer; &:before { font-family: 'Font Awesome 5 Free'; @@ -72,7 +73,6 @@ &.type { background-color: #0080003b; color: #008000; - border-color: #008000; &:before{ content: '\f0ad'; } @@ -80,7 +80,6 @@ &.group { background-color: #5050503b; color: #000000; - border-color: #000000; &:before{ content: '\f500'; } @@ -88,7 +87,6 @@ &.meta { background-color: #0000803b; color: #000080; - border-color: #000080; &:before{ content: '\f05a'; } @@ -96,7 +94,6 @@ &.system { background-color: #8000003b; color: #800000; - border-color: #800000; &:before{ content: '\f518'; } From 43209186ee52cf71bb9150e05ab8237d6334def9 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 22 Feb 2024 19:27:17 +1300 Subject: [PATCH 31/58] Remove obsolete styling from tags-container --- client/homebrew/pages/basePages/listPage/listPage.less | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.less b/client/homebrew/pages/basePages/listPage/listPage.less index bf2c89e83..0aa4a278d 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.less +++ b/client/homebrew/pages/basePages/listPage/listPage.less @@ -126,18 +126,11 @@ } .tags-container { - font-family : 'Open Sans', sans-serif; - position : sticky; - top : 0; - left : 0; - width : 100%; height : 30px; background-color : #555; border-top : 1px solid #666; - border-bottom : 1px solid #666; + border-bottom : 1px solid #666; color : white; - text-align : center; - z-index : 1; display : flex; justify-content : center; align-items : center; From ad5ad05b7baeb309e1af36c900b0cfa05f692ef8 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 22 Feb 2024 20:02:09 +1300 Subject: [PATCH 32/58] Simplify syntax --- themes/fonts/5e/dicefont.less | 186 +++++++++++++++++----------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/themes/fonts/5e/dicefont.less b/themes/fonts/5e/dicefont.less index 031fcc600..887a7c27c 100644 --- a/themes/fonts/5e/dicefont.less +++ b/themes/fonts/5e/dicefont.less @@ -22,97 +22,97 @@ -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; font-smooth: antialiased; - &.df-F:before { content: '\f190'; } - &.df-F-minus:before { content: '\f191'; } - &.df-F-plus:before { content: '\f192'; } - &.df-F-zero:before { content: '\f193'; } - &.df-d10:before { content: '\f194'; } - &.df-d10-0:before { content: '\f100'; } - &.df-d10-1:before { content: '\f101'; } - &.df-d10-10:before { content: '\f102'; } - &.df-d10-2:before { content: '\f103'; } - &.df-d10-3:before { content: '\f104'; } - &.df-d10-4:before { content: '\f105'; } - &.df-d10-5:before { content: '\f106'; } - &.df-d10-6:before { content: '\f107'; } - &.df-d10-7:before { content: '\f108'; } - &.df-d10-8:before { content: '\f109'; } - &.df-d10-9:before { content: '\f10a'; } - &.df-d12:before { content: '\f195'; } - &.df-d12-1:before { content: '\f10b'; } - &.df-d12-10:before { content: '\f10c'; } - &.df-d12-11:before { content: '\f10d'; } - &.df-d12-12:before { content: '\f10e'; } - &.df-d12-2:before { content: '\f10f'; } - &.df-d12-3:before { content: '\f110'; } - &.df-d12-4:before { content: '\f111'; } - &.df-d12-5:before { content: '\f112'; } - &.df-d12-6:before { content: '\f113'; } - &.df-d12-7:before { content: '\f114'; } - &.df-d12-8:before { content: '\f115'; } - &.df-d12-9:before { content: '\f116'; } - &.df-d2:before { content: '\f196'; } - &.df-d2-1:before { content: '\f117'; } - &.df-d2-2:before { content: '\f118'; } - &.df-d20:before { content: '\f197'; } - &.df-d20-1:before { content: '\f119'; } - &.df-d20-10:before { content: '\f11a'; } - &.df-d20-11:before { content: '\f11b'; } - &.df-d20-12:before { content: '\f11c'; } - &.df-d20-13:before { content: '\f11d'; } - &.df-d20-14:before { content: '\f11e'; } - &.df-d20-15:before { content: '\f11f'; } - &.df-d20-16:before { content: '\f120'; } - &.df-d20-17:before { content: '\f121'; } - &.df-d20-18:before { content: '\f122'; } - &.df-d20-19:before { content: '\f123'; } - &.df-d20-2:before { content: '\f124'; } - &.df-d20-20:before { content: '\f125'; } - &.df-d20-3:before { content: '\f126'; } - &.df-d20-4:before { content: '\f127'; } - &.df-d20-5:before { content: '\f128'; } - &.df-d20-6:before { content: '\f129'; } - &.df-d20-7:before { content: '\f12a'; } - &.df-d20-8:before { content: '\f12b'; } - &.df-d20-9:before { content: '\f12c'; } - &.df-d4:before { content: '\f198'; } - &.df-d4-1:before { content: '\f12d'; } - &.df-d4-2:before { content: '\f12e'; } - &.df-d4-3:before { content: '\f12f'; } - &.df-d4-4:before { content: '\f130'; } - &.df-d6:before { content: '\f199'; } - &.df-d6-1:before { content: '\f131'; } - &.df-d6-2:before { content: '\f132'; } - &.df-d6-3:before { content: '\f133'; } - &.df-d6-4:before { content: '\f134'; } - &.df-d6-5:before { content: '\f135'; } - &.df-d6-6:before { content: '\f136'; } - &.df-d8:before { content: '\f19a'; } - &.df-d8-1:before { content: '\f137'; } - &.df-d8-2:before { content: '\f138'; } - &.df-d8-3:before { content: '\f139'; } - &.df-d8-4:before { content: '\f13a'; } - &.df-d8-5:before { content: '\f13b'; } - &.df-d8-6:before { content: '\f13c'; } - &.df-d8-7:before { content: '\f13d'; } - &.df-d8-8:before { content: '\f13e'; } - &.df-dot-d6:before { content: '\f19b'; } - &.df-dot-d6-1:before { content: '\f13f'; } - &.df-dot-d6-2:before { content: '\f140'; } - &.df-dot-d6-3:before { content: '\f141'; } - &.df-dot-d6-4:before { content: '\f142'; } - &.df-dot-d6-5:before { content: '\f143'; } - &.df-dot-d6-6:before { content: '\f18f'; } - &.df-small-dot-d6-1:before { content: '\f183'; } - &.df-small-dot-d6-2:before { content: '\f184'; } - &.df-small-dot-d6-3:before { content: '\f185'; } - &.df-small-dot-d6-4:before { content: '\f186'; } - &.df-small-dot-d6-5:before { content: '\f187'; } - &.df-small-dot-d6-6:before { content: '\f188'; } - &.df-solid-small-dot-d6-1:before { content: '\f189'; } - &.df-solid-small-dot-d6-2:before { content: '\f18a'; } - &.df-solid-small-dot-d6-3:before { content: '\f18b'; } - &.df-solid-small-dot-d6-4:before { content: '\f18c'; } - &.df-solid-small-dot-d6-5:before { content: '\f18d'; } - &.df-solid-small-dot-d6-6:before { content: '\f18e'; } + &.F:before { content: '\f190'; } + &.F-minus:before { content: '\f191'; } + &.F-plus:before { content: '\f192'; } + &.F-zero:before { content: '\f193'; } + &.d10:before { content: '\f194'; } + &.d10-0:before { content: '\f100'; } + &.d10-1:before { content: '\f101'; } + &.d10-10:before { content: '\f102'; } + &.d10-2:before { content: '\f103'; } + &.d10-3:before { content: '\f104'; } + &.d10-4:before { content: '\f105'; } + &.d10-5:before { content: '\f106'; } + &.d10-6:before { content: '\f107'; } + &.d10-7:before { content: '\f108'; } + &.d10-8:before { content: '\f109'; } + &.d10-9:before { content: '\f10a'; } + &.d12:before { content: '\f195'; } + &.d12-1:before { content: '\f10b'; } + &.d12-10:before { content: '\f10c'; } + &.d12-11:before { content: '\f10d'; } + &.d12-12:before { content: '\f10e'; } + &.d12-2:before { content: '\f10f'; } + &.d12-3:before { content: '\f110'; } + &.d12-4:before { content: '\f111'; } + &.d12-5:before { content: '\f112'; } + &.d12-6:before { content: '\f113'; } + &.d12-7:before { content: '\f114'; } + &.d12-8:before { content: '\f115'; } + &.d12-9:before { content: '\f116'; } + &.d2:before { content: '\f196'; } + &.d2-1:before { content: '\f117'; } + &.d2-2:before { content: '\f118'; } + &.d20:before { content: '\f197'; } + &.d20-1:before { content: '\f119'; } + &.d20-10:before { content: '\f11a'; } + &.d20-11:before { content: '\f11b'; } + &.d20-12:before { content: '\f11c'; } + &.d20-13:before { content: '\f11d'; } + &.d20-14:before { content: '\f11e'; } + &.d20-15:before { content: '\f11f'; } + &.d20-16:before { content: '\f120'; } + &.d20-17:before { content: '\f121'; } + &.d20-18:before { content: '\f122'; } + &.d20-19:before { content: '\f123'; } + &.d20-2:before { content: '\f124'; } + &.d20-20:before { content: '\f125'; } + &.d20-3:before { content: '\f126'; } + &.d20-4:before { content: '\f127'; } + &.d20-5:before { content: '\f128'; } + &.d20-6:before { content: '\f129'; } + &.d20-7:before { content: '\f12a'; } + &.d20-8:before { content: '\f12b'; } + &.d20-9:before { content: '\f12c'; } + &.d4:before { content: '\f198'; } + &.d4-1:before { content: '\f12d'; } + &.d4-2:before { content: '\f12e'; } + &.d4-3:before { content: '\f12f'; } + &.d4-4:before { content: '\f130'; } + &.d6:before { content: '\f199'; } + &.d6-1:before { content: '\f131'; } + &.d6-2:before { content: '\f132'; } + &.d6-3:before { content: '\f133'; } + &.d6-4:before { content: '\f134'; } + &.d6-5:before { content: '\f135'; } + &.d6-6:before { content: '\f136'; } + &.d8:before { content: '\f19a'; } + &.d8-1:before { content: '\f137'; } + &.d8-2:before { content: '\f138'; } + &.d8-3:before { content: '\f139'; } + &.d8-4:before { content: '\f13a'; } + &.d8-5:before { content: '\f13b'; } + &.d8-6:before { content: '\f13c'; } + &.d8-7:before { content: '\f13d'; } + &.d8-8:before { content: '\f13e'; } + &.dot-d6:before { content: '\f19b'; } + &.dot-d6-1:before { content: '\f13f'; } + &.dot-d6-2:before { content: '\f140'; } + &.dot-d6-3:before { content: '\f141'; } + &.dot-d6-4:before { content: '\f142'; } + &.dot-d6-5:before { content: '\f143'; } + &.dot-d6-6:before { content: '\f18f'; } + &.small-dot-d6-1:before { content: '\f183'; } + &.small-dot-d6-2:before { content: '\f184'; } + &.small-dot-d6-3:before { content: '\f185'; } + &.small-dot-d6-4:before { content: '\f186'; } + &.small-dot-d6-5:before { content: '\f187'; } + &.small-dot-d6-6:before { content: '\f188'; } + &.solid-small-dot-d6-1:before { content: '\f189'; } + &.solid-small-dot-d6-2:before { content: '\f18a'; } + &.solid-small-dot-d6-3:before { content: '\f18b'; } + &.solid-small-dot-d6-4:before { content: '\f18c'; } + &.solid-small-dot-d6-5:before { content: '\f18d'; } + &.solid-small-dot-d6-6:before { content: '\f18e'; } } \ No newline at end of file From 7d755fe2a349f646db9dafa4339a8155836f3fe8 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Fri, 23 Feb 2024 11:35:57 -0600 Subject: [PATCH 33/58] Fix syntax highlighting on sub and superscript I did not test this very robustly, it seems. --- client/homebrew/editor/editor.jsx | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index d79d2ce4e..3fa936ab7 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -160,21 +160,25 @@ const Editor = createClass({ } } - // Superscript - if(line.includes('\^')) { - const regex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/g; - let match; - while ((match = regex.exec(line)) != null) { - codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) - 1 }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length + 1 }, { className: 'superscript' }); - } - } - // Subscript if(line.includes('^^')) { + //const regex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/g; const regex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/g; let match; while ((match = regex.exec(line)) != null) { - codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) - 2 }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length + 2 }, { className: 'subscript' }); + if(line.indexOf(match[0]) - 1 != '^') { + codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[0]) }, { line: lineNumber, ch: line.indexOf(match[0]) + match[0].length }, { className: 'subscript' }); + } + } + } + + // Superscript + if(line.includes('^')) { + //const regex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/g; + const regex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/g; + let match; + while ((match = regex.exec(line)) != null) { + codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[0]) }, { line: lineNumber, ch: line.indexOf(match[0]) + match[0].length }, { className: 'superscript' }); } } From bf874c55af870b4d911fb71ad23ada036314c9f6 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Fri, 23 Feb 2024 14:46:13 -0600 Subject: [PATCH 34/58] Add a column break before the Tables header on page 2 Small formatting fix. --- client/homebrew/pages/homePage/welcome_msg.md | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/pages/homePage/welcome_msg.md b/client/homebrew/pages/homePage/welcome_msg.md index 9df769903..c7d46149e 100644 --- a/client/homebrew/pages/homePage/welcome_msg.md +++ b/client/homebrew/pages/homePage/welcome_msg.md @@ -143,6 +143,7 @@ Much nicer than `




` ### Column Breaks Column and page breaks with `\column` and `\page`. +\column ### Tables Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below. From da8836ba9911fe0df4a0e2ce36ca22cd96b5c31d Mon Sep 17 00:00:00 2001 From: Rodrigo Kuerten Date: Fri, 23 Feb 2024 22:07:28 -0300 Subject: [PATCH 35/58] Added new theme --- themes/codeMirror/customThemes/darkvision.css | 111 ++++++++++++++++++ themes/codeMirror/editorThemes.json | 1 + 2 files changed, 112 insertions(+) create mode 100644 themes/codeMirror/customThemes/darkvision.css diff --git a/themes/codeMirror/customThemes/darkvision.css b/themes/codeMirror/customThemes/darkvision.css new file mode 100644 index 000000000..6662202a2 --- /dev/null +++ b/themes/codeMirror/customThemes/darkvision.css @@ -0,0 +1,111 @@ +.CodeMirror { + background: #0C0C0C; + color: #B9BDB6; +} + +/* Brew BG */ +.brewRenderer { + background-color: #0C0C0C; +} + +/* Blinking cursor and selection */ +.cm-s-darkvision .CodeMirror-cursor { + border-left: 1px solid #B9BDB6; +} +.cm-s-darkvision .CodeMirror-selected { + background: #E0E8FF40; +} + +/* Line number stuff */ +.cm-s-darkvision .CodeMirror-gutter-elt { + color: #81969A; +} +.cm-s-darkvision .CodeMirror-linenumber { + background-color: #0C0C0C; +} +.cm-s-darkvision .CodeMirror-gutter { + background-color: #0C0C0C; +} + +/* column splits */ +.cm-s-darkvision .editor .codeEditor .columnSplit { + font-style: italic; + color: inherit; + background-color:#1F5763; + border-bottom: #299 solid 1px; +} + +/* # headings */ +.cm-s-darkvision .cm-header { + color: #C51B1B; + -webkit-text-stroke-width: 0.1px; +} +/* bold points */ +.cm-s-darkvision .cm-strong { + font-weight: bold; + color: #309DD2; +} +/* Link headings */ +.cm-s-darkvision .cm-link { + color: #DD6300; +} +/* links */ +.cm-s-darkvision .cm-string { + color: #5CE638; +} +/*@import*/ +.cm-s-darkvision .cm-def { + color:#2986CC; +} +/* Bullets and such */ +.cm-s-darkvision .cm-variable-2 { + color: #3CBF30; +} +/* blocks */ +.editor .codeEditor .block:not(.cm-comment) { + color: magenta !important; +} + +/* definition lists */ +.editor .codeEditor .define.definition { + color: #FFAA3E !important; +} +.editor .codeEditor .define.term { + color: #7290d9 !important; +} + +/* Tags (divs) */ +.cm-s-darkvision .cm-tag { + color: #E3FF00; +} +.cm-s-darkvision .cm-attribute { + color: #E3FF00; +} +.cm-s-darkvision .cm-atom { + color:#CF7EA9; +} +.cm-s-darkvision .cm-qualifier { + color:#EE1919; +} +.cm-s-darkvision .cm-comment { + color:#BBC700; +} +.cm-s-darkvision .cm-keyword { + color:#CC66FF; +} +.cm-s-darkvision .cm-property.cm-error { + color:#C50202; +} +.cm-s-darkvision .CodeMirror-foldmarker { + color:#F0FF00; +} + +/* New page */ +.editor .codeEditor .pageLine { + background: #000; + color:#000; + border-bottom: 1px solid #FFF; +} +.cm-s-darkvision .cm-builtin { + color:#FFF; +} \ No newline at end of file diff --git a/themes/codeMirror/editorThemes.json b/themes/codeMirror/editorThemes.json index 384ce4602..679c6874b 100644 --- a/themes/codeMirror/editorThemes.json +++ b/themes/codeMirror/editorThemes.json @@ -16,6 +16,7 @@ "colorforth", "darcula", "darkbrewery-v301", +"darkvision", "dracula", "duotone-dark", "duotone-light", From a2b97abb2ed0674471857ba91d810c01e4b06819 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 25 Feb 2024 11:47:34 +1300 Subject: [PATCH 36/58] Remove missed console.log debugging lines --- client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 1 - client/homebrew/pages/basePages/listPage/listPage.jsx | 2 -- 2 files changed, 3 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index e21f6e8a3..869fb3044 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -46,7 +46,6 @@ const BrewItem = createClass({ }, updateFilter : function(type, term){ - // console.log(`BrewItem: TYPE: ${type}; TERM: ${term}`); this.props.updateListFilter(type, term); }, diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 261d6ec6b..096c6bbb7 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -130,7 +130,6 @@ const ListPage = createClass({ }, handleFilterTextChange : function(e){ - // console.log(e); this.setState({ filterString : e.target.value, }); @@ -194,7 +193,6 @@ const ListPage = createClass({ renderTagsOptions : function(){ if(this.state.filterTags?.length == 0) return; - console.log('renderTags'); return
{_.map(this.state.filterTags, (tag, idx)=>{ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); From 254b0852ca993d0dcfeafb596cca4a6a543bd789 Mon Sep 17 00:00:00 2001 From: Rodrigo Kuerten Date: Sat, 24 Feb 2024 20:57:26 -0300 Subject: [PATCH 37/58] Cleaned up css, added missing variables --- themes/codeMirror/customThemes/darkvision.css | 206 +++++++++--------- 1 file changed, 108 insertions(+), 98 deletions(-) diff --git a/themes/codeMirror/customThemes/darkvision.css b/themes/codeMirror/customThemes/darkvision.css index 6662202a2..4c74d105e 100644 --- a/themes/codeMirror/customThemes/darkvision.css +++ b/themes/codeMirror/customThemes/darkvision.css @@ -8,104 +8,114 @@ background-color: #0C0C0C; } -/* Blinking cursor and selection */ -.cm-s-darkvision .CodeMirror-cursor { - border-left: 1px solid #B9BDB6; -} -.cm-s-darkvision .CodeMirror-selected { - background: #E0E8FF40; +.cm-s-darkvision { + /* Blinking cursor and selection */ + .CodeMirror-cursor { + border-left: 1px solid #B9BDB6; + } + .CodeMirror-selected { + background: #E0E8FF40; + } + + /* Line number stuff */ + .CodeMirror-gutter-elt { + color: #81969A; + } + .CodeMirror-linenumber { + background-color: #0C0C0C; + } + .CodeMirror-gutter { + background-color: #0C0C0C; + } + + /* column splits */ + .editor .codeEditor .columnSplit { + font-style: italic; + color: inherit; + background-color:#1F5763; + border-bottom: #299 solid 1px; + } + + /* # headings */ + .cm-header { + color: #C51B1B; + -webkit-text-stroke-width: 0.1px; + } + /* bold points */ + .cm-strong { + font-weight: bold; + color: #309DD2; + } + /* Link headings */ + .cm-link { + color: #DD6300; + } + /* links */ + .cm-string { + color: #5CE638; + } + /*@import*/ + .cm-def { + color: #2986CC; + } + /* Bullets and such */ + .cm-variable-2 { + color: #3CBF30; + } + + /* Tags (divs) */ + .cm-tag { + color: #E3FF00; + } + .cm-attribute { + color: #E3FF00; + } + .cm-atom { + color: #CF7EA9; + } + .cm-qualifier { + color: #EE1919; + } + .cm-comment { + color: #BBC700; + } + .cm-keyword { + color: #CC66FF; + } + .cm-property { + color: aqua; + } + .cm-error { + color: #C50202; + } + .CodeMirror-foldmarker { + color: #F0FF00; + } + /* New page */ + .cm-builtin { + color: #FFF; + } } -/* Line number stuff */ -.cm-s-darkvision .CodeMirror-gutter-elt { - color: #81969A; +.editor .codeEditor { + /* blocks */ + .block:not(.cm-comment) { + color: magenta; + } + /* definition lists */ + .define.definition { + color: #FFAA3E; + } + .define.term { + color: #7290d9; + } + .define:not(.term):not(.definition) { + background: #333; + } + /* New page */ + .pageLine { + background: #000; + color: #000; + border-bottom: 1px solid #FFF; + } } -.cm-s-darkvision .CodeMirror-linenumber { - background-color: #0C0C0C; -} -.cm-s-darkvision .CodeMirror-gutter { - background-color: #0C0C0C; -} - -/* column splits */ -.cm-s-darkvision .editor .codeEditor .columnSplit { - font-style: italic; - color: inherit; - background-color:#1F5763; - border-bottom: #299 solid 1px; -} - -/* # headings */ -.cm-s-darkvision .cm-header { - color: #C51B1B; - -webkit-text-stroke-width: 0.1px; -} -/* bold points */ -.cm-s-darkvision .cm-strong { - font-weight: bold; - color: #309DD2; -} -/* Link headings */ -.cm-s-darkvision .cm-link { - color: #DD6300; -} -/* links */ -.cm-s-darkvision .cm-string { - color: #5CE638; -} -/*@import*/ -.cm-s-darkvision .cm-def { - color:#2986CC; -} -/* Bullets and such */ -.cm-s-darkvision .cm-variable-2 { - color: #3CBF30; -} -/* blocks */ -.editor .codeEditor .block:not(.cm-comment) { - color: magenta !important; -} - -/* definition lists */ -.editor .codeEditor .define.definition { - color: #FFAA3E !important; -} -.editor .codeEditor .define.term { - color: #7290d9 !important; -} - -/* Tags (divs) */ -.cm-s-darkvision .cm-tag { - color: #E3FF00; -} -.cm-s-darkvision .cm-attribute { - color: #E3FF00; -} -.cm-s-darkvision .cm-atom { - color:#CF7EA9; -} -.cm-s-darkvision .cm-qualifier { - color:#EE1919; -} -.cm-s-darkvision .cm-comment { - color:#BBC700; -} -.cm-s-darkvision .cm-keyword { - color:#CC66FF; -} -.cm-s-darkvision .cm-property.cm-error { - color:#C50202; -} -.cm-s-darkvision .CodeMirror-foldmarker { - color:#F0FF00; -} - -/* New page */ -.editor .codeEditor .pageLine { - background: #000; - color:#000; - border-bottom: 1px solid #FFF; -} -.cm-s-darkvision .cm-builtin { - color:#FFF; -} \ No newline at end of file From 26263c0bf876397a339e60197546bf0821ffb4f3 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 26 Feb 2024 13:01:13 +1300 Subject: [PATCH 38/58] Remove unused function parameter `type` --- .../homebrew/pages/basePages/listPage/brewItem/brewItem.jsx | 2 +- client/homebrew/pages/basePages/listPage/listPage.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx index 869fb3044..0369305d5 100644 --- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx @@ -137,7 +137,7 @@ const BrewItem = createClass({ {brew.tags.map((tag, idx)=>{ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); - return {this.updateFilter('tag', tag);}}>{matches[2]}; + return {this.updateFilter(tag);}}>{matches[2]}; })}
: <> diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 096c6bbb7..2717152ec 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -137,7 +137,7 @@ const ListPage = createClass({ return; }, - updateListFilter : function(type, term){ + updateListFilter : function(term){ this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, term); }, @@ -196,7 +196,7 @@ const ListPage = createClass({ return
{_.map(this.state.filterTags, (tag, idx)=>{ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); - return {this.updateListFilter('tag', tag);}}>{matches[2]}; + return {this.updateListFilter(tag);}}>{matches[2]}; })}
; }, From 9d38c937b4d1d925ad4d67a038c941203a74225a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 03:43:17 +0000 Subject: [PATCH 39/58] Bump eslint from 8.56.0 to 8.57.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.56.0...v8.57.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 770ff6716..9f39b3bd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" }, "devDependencies": { - "eslint": "^8.56.0", + "eslint": "^8.57.0", "eslint-plugin-jest": "^27.9.0", "eslint-plugin-react": "^7.33.2", "jest": "^29.7.0", @@ -1958,9 +1958,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", - "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1978,13 +1978,13 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^2.0.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", "minimatch": "^3.0.5" }, "engines": { @@ -2005,9 +2005,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", "dev": true }, "node_modules/@istanbuljs/load-nyc-config": { @@ -5588,16 +5588,16 @@ } }, "node_modules/eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", - "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.56.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", diff --git a/package.json b/package.json index 884d293ec..b44d1cc4d 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" }, "devDependencies": { - "eslint": "^8.56.0", + "eslint": "^8.57.0", "eslint-plugin-jest": "^27.9.0", "eslint-plugin-react": "^7.33.2", "jest": "^29.7.0", From f9d8344dbac3a23bcb1d6d3653add157d5120cd3 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 26 Feb 2024 21:16:37 +1300 Subject: [PATCH 40/58] Remove unnecessary function --- client/homebrew/pages/basePages/listPage/listPage.jsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index 2717152ec..2385b4490 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -83,7 +83,7 @@ const ListPage = createClass({ if(!brews || !brews.length) return
No Brews.
; return _.map(brews, (brew, idx)=>{ - return ; + return { this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, tag); }}/>; }); }, @@ -137,10 +137,6 @@ const ListPage = createClass({ return; }, - updateListFilter : function(term){ - this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, term); - }, - updateUrl : function(filterTerm, sortType, sortDir, filterTag=''){ const url = new URL(window.location.href); const urlParams = new URLSearchParams(url.search); @@ -196,7 +192,7 @@ const ListPage = createClass({ return
{_.map(this.state.filterTags, (tag, idx)=>{ const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/); - return {this.updateListFilter(tag);}}>{matches[2]}; + return { this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, tag); }}>{matches[2]}; })}
; }, From 713865fb406e4347184aec6e14dffa4d54e958c3 Mon Sep 17 00:00:00 2001 From: Rodrigo Kuerten Date: Tue, 27 Feb 2024 10:21:53 -0300 Subject: [PATCH 41/58] Remove background-attachment property --- themes/V3/5ePHB/style.less | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less index 23c3992fd..c155d1c09 100644 --- a/themes/V3/5ePHB/style.less +++ b/themes/V3/5ePHB/style.less @@ -307,7 +307,6 @@ margin-left : -0.16cm; background-color : var(--HB_Color_MonsterStatBackground); background-image : @monsterBlockBackground; - background-attachment : unset; background-blend-mode : overlay; border-style : solid; border-width : 7px 6px; From 774b555a61dc15b3938fde3a35b57f4b5606b496 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 29 Feb 2024 17:17:38 -0500 Subject: [PATCH 42/58] Rework to fix 5eCleric's tests --- client/homebrew/editor/editor.jsx | 32 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 3fa936ab7..4f3ef44f5 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -160,25 +160,21 @@ const Editor = createClass({ } } - // Subscript - if(line.includes('^^')) { - //const regex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/g; - const regex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/g; - let match; - while ((match = regex.exec(line)) != null) { - if(line.indexOf(match[0]) - 1 != '^') { - codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[0]) }, { line: lineNumber, ch: line.indexOf(match[0]) + match[0].length }, { className: 'subscript' }); - } - } - } - - // Superscript + // Subscript & Superscript if(line.includes('^')) { - //const regex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/g; - const regex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/g; - let match; - while ((match = regex.exec(line)) != null) { - codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[0]) }, { line: lineNumber, ch: line.indexOf(match[0]) + match[0].length }, { className: 'superscript' }); + let startIndex = line.indexOf('^'); + const superRegex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/gy; + const subRegex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/gy; + + while (startIndex >= 0) { + superRegex.lastIndex = subRegex.lastIndex = startIndex; + let isSuper = false; + let match = subRegex.exec(line) || superRegex.exec(line); + if (match) { + isSuper = !subRegex.lastIndex; + codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' }); + } + startIndex = line.indexOf('^', Math.max(startIndex + 1, subRegex.lastIndex, superRegex.lastIndex)); } } From 50f069e68896f7e843781db203c85e0973eda3b8 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 1 Mar 2024 01:24:50 -0500 Subject: [PATCH 43/58] Fix some nesting of styles The values from nav.less were mistakenly nested inside each other which was adding too much specificity. --- client/homebrew/navbar/navbar.less | 585 ++++++++++++++--------------- 1 file changed, 290 insertions(+), 295 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 73671abbb..ccbdf1f7a 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -29,322 +29,317 @@ z-index : 2; display : flex; justify-content : space-between; - .navSection { + } + .navSection { + display : flex; + align-items : center; + &:last-child .navItem { border-left : 1px solid #666666; } + } + // "NaturalCrit" logo + .navLogo { + display : block; + margin-top : 0px; + margin-right : 8px; + margin-left : 8px; + color : white; + text-decoration : none; + &:hover { + .name { color : @orange; } + svg { fill : @orange; } + } + svg { + height : 13px; + margin-right : 0.2em; + cursor : pointer; + fill : white; + } + span.name { + font-family : 'CodeLight'; + font-size : 15px; + span.crit { font-family : 'CodeBold'; } + small { + font-family : 'Open Sans'; + font-size : 0.3em; + font-weight : 800; + text-transform : uppercase; + } + } + } + .navItem { + #backgroundColorsHover; + .animate(background-color); + padding : 8px 12px; + font-size : 10px; + font-weight : 800; + line-height : 13px; + color : white; + text-decoration : none; + text-transform : uppercase; + cursor : pointer; + background-color : #333333; + i { + float : right; + margin-left : 5px; + font-size : 13px; + } + &.patreon { + border-right : 1px solid #666666; + border-left : 1px solid #666666; + &:hover i { color : red; } + i { + color : pink; + .animate(color); + animation-name : pinkColoring; + animation-duration : 2s; + } + } + &.editTitle { // this is not needed at all currently - you used to be able to edit the title via the navbar. + padding : 2px 12px; + input { + width : 250px; + padding : 2px; + margin : 0; + font-family : 'Open Sans', sans-serif; + font-size : 12px; + font-weight : 800; + color : white; + text-align : center; + background-color : transparent; + border : 1px solid @blue; + outline : none; + } + .charCount { + display : inline-block; + margin-left : 8px; + color : #666666; + text-align : right; + vertical-align : bottom; + &.max { color : @red; } + } + } + &.brewTitle { + flex-grow : 1; + font-size : 12px; + font-weight : 800; + color : white; + text-align : center; + text-transform : initial; + background-color : transparent; + } + // "The Homebrewery" logo + &.homebrewLogo { + .animate(color); + font-family : 'CodeBold'; + font-size : 12px; + color : white; + div { + margin-top : 2px; + margin-bottom : -2px; + } + &:hover { color : @blue; } + } + &.metadata { + position : relative; display : flex; + flex-grow : 1; align-items : center; - // "NaturalCrit" logo - .navLogo { - display : block; - margin-top : 0px; - margin-right : 8px; - margin-left : 8px; - color : white; - text-decoration : none; - &:hover { - .name { color : @orange; } - svg { fill : @orange; } + height : 100%; + padding : 0; + i { margin-right : 10px;} + .window { + position : absolute; + bottom : 0; + left : 50%; + z-index : -1; + display : flex; + flex-flow : row wrap; + align-content : baseline; + justify-content : flex-start; + width : 440px; + max-height : ~"calc(100vh - 28px)"; + padding : 0 10px 5px; + margin : 0 auto; + background-color : #333333; + border : 3px solid #444444; + border-top : unset; + border-radius : 0 0 5px 5px; + box-shadow : inset 0 7px 9px -7px #111111; + transition : transform 0.4s, opacity 0.4s; + &.active { + opacity : 1; + transform : translateX(-50%) translateY(100%); } - svg { - height : 13px; - margin-right : 0.2em; - cursor : pointer; - fill : white; + &.inactive { + opacity : 0; + transform : translateX(-50%) translateY(0%); } - span.name { - font-family : 'CodeLight'; - font-size : 15px; - span.crit { font-family : 'CodeBold'; } - small { - font-family : 'Open Sans'; - font-size : 0.3em; - font-weight : 800; - text-transform : uppercase; + .row { + display : flex; + flex-flow : row wrap; + width : 100%; + h4 { + box-sizing : border-box; + display : block; + flex-basis : 20%; + flex-grow : 1; + min-width : 76px; + padding : 5px 0; + color : #BBBBBB; + text-align : center; } + p { + flex-basis : 80%; + flex-grow : 1; + padding : 5px 0; + font-family : 'Open Sans', sans-serif; + font-size : 10px; + font-weight : normal; + text-transform : initial; + .tag { + display : inline-block; + padding : 2px; + margin : 2px 2px; + background-color : #444444; + border : 2px solid grey; + border-radius : 5px; + } + a.userPageLink { + color : white; + text-decoration : none; + &:hover { text-decoration : underline; } + } + } + &:nth-of-type(even) { background-color : #555555; } } } - &:last-child .navItem { border-left : 1px solid #666666; } + } + &.warning { + position : relative; + color : white; + background-color : @orange; + &:hover > .dropdown { visibility : visible; } + .dropdown { + position : absolute; + top : 28px; + left : 0; + z-index : 10000; + box-sizing : border-box; + display : block; + width : 100%; + padding : 13px 5px; + text-align : center; + visibility : hidden; + background-color : #333333; + } + } + &.account { + min-width : 100px; + &.username { text-transform : none;} + } + } + .navDropdownContainer { + position : relative; + .navDropdown { + position : absolute; + top : 28px; + left : 0px; + z-index : 10000; + width : 100%; + max-height : calc(100vh - 28px); + overflow : hidden auto; .navItem { + position : relative; + display : block; + width : 100%; + padding : 8px 5px; + border : 1px solid #888888; + border-bottom : 0; + animation-name : glideDropDown; + animation-duration : 0.4s; + } + } + &.recent { + position : relative; + .navDropdown .navItem { #backgroundColorsHover; .animate(background-color); - padding : 8px 12px; - font-size : 10px; - font-weight : 800; - line-height : 13px; + position : relative; + box-sizing : border-box; + display : block; + max-height : ~"calc(100vh - 28px)"; // I don't think is correct syntax, but leaving it in for now... (Gazook89) + padding : 8px 5px 13px; + overflow : hidden auto; color : white; text-decoration : none; - text-transform : uppercase; - cursor : pointer; background-color : #333333; - i { - float : right; - margin-left : 5px; - font-size : 13px; - } - &.patreon { - border-right : 1px solid #666666; - border-left : 1px solid #666666; - &:hover i { color : red; } + border-top : 1px solid #888888; + scrollbar-color : #666666 #333333; + scrollbar-width : thin; + .clear { + position : absolute; + top : 50%; + right : 0; + display : none; + width : 20px; + height : 100%; + background-color : #333333; + border-radius : 3px; + opacity : 70%; + transform : translateY(-50%); + &:hover { opacity : 100%; } i { - color : pink; - .animate(color); - animation-name : pinkColoring; - animation-duration : 2s; + width : 100%; + height : 100%; + margin : 0; + font-size : 10px; + text-align : center; } } - &.editTitle { // this is not needed at all currently - you used to be able to edit the title via the navbar. - padding : 2px 12px; - input { - width : 250px; - padding : 2px; - margin : 0; - font-family : 'Open Sans', sans-serif; - font-size : 12px; - font-weight : 800; - color : white; - text-align : center; - background-color : transparent; - border : 1px solid @blue; - outline : none; - } - .charCount { - display : inline-block; - margin-left : 8px; - color : #666666; - text-align : right; - vertical-align : bottom; - &.max { color : @red; } + &:hover { + background-color : @blue; + .clear { + display : grid; + place-content : center; } } - &.brewTitle { - flex-grow : 1; - font-size : 12px; - font-weight : 800; - color : white; + .title { + display : inline-block; + width : 100%; + overflow : hidden auto; + text-overflow : ellipsis; + white-space : nowrap; + } + .time { + position : absolute; + right : 2px; + bottom : 2px; + font-size : 0.7em; + color : #888888; + } + &.header { + box-sizing : border-box; + display : block; + padding : 5px 0; + color : #BBBBBB; text-align : center; - text-transform : initial; - background-color : transparent; - } - // "The Homebrewery" logo - &.homebrewLogo { - .animate(color); - font-family : 'CodeBold'; - font-size : 12px; - color : white; - div { - margin-top : 2px; - margin-bottom : -2px; - } - &:hover { color : @blue; } - } - &.metadata { - position : relative; - display : flex; - flex-grow : 1; - align-items : center; - height : 100%; - padding : 0; - i { margin-right : 10px;} - .window { - position : absolute; - bottom : 0; - left : 50%; - z-index : -1; - display : flex; - flex-flow : row wrap; - align-content : baseline; - justify-content : flex-start; - width : 440px; - max-height : ~"calc(100vh - 28px)"; - padding : 0 10px 5px; - margin : 0 auto; - background-color : #333333; - border : 3px solid #444444; - border-top : unset; - border-radius : 0 0 5px 5px; - box-shadow : inset 0 7px 9px -7px #111111; - transition : transform 0.4s, opacity 0.4s; - &.active { - opacity : 1; - transform : translateX(-50%) translateY(100%); - } - &.inactive { - opacity : 0; - transform : translateX(-50%) translateY(0%); - } - .row { - display : flex; - flex-flow : row wrap; - width : 100%; - h4 { - box-sizing : border-box; - display : block; - flex-basis : 20%; - flex-grow : 1; - min-width : 76px; - padding : 5px 0; - color : #BBBBBB; - text-align : center; - } - p { - flex-basis : 80%; - flex-grow : 1; - padding : 5px 0; - font-family : 'Open Sans', sans-serif; - font-size : 10px; - font-weight : normal; - text-transform : initial; - .tag { - display : inline-block; - padding : 2px; - margin : 2px 2px; - background-color : #444444; - border : 2px solid grey; - border-radius : 5px; - } - a.userPageLink { - color : white; - text-decoration : none; - &:hover { text-decoration : underline; } - } - } - &:nth-of-type(even) { background-color : #555555; } - } - } - } - &.warning { - position : relative; - color : white; - background-color : @orange; - &:hover > .dropdown { visibility : visible; } - .dropdown { - position : absolute; - top : 28px; - left : 0; - z-index : 10000; - box-sizing : border-box; - display : block; - width : 100%; - padding : 13px 5px; - text-align : center; - visibility : hidden; - background-color : #333333; - } - } - &.account { - min-width : 100px; - &.username { text-transform : none;} - } - } - .navDropdownContainer { - position : relative; - .navDropdown { - position : absolute; - top : 28px; - left : 0px; - z-index : 10000; - width : 100%; - max-height : calc(100vh - 28px); - overflow : hidden auto; - .navItem { - position : relative; - display : block; - width : 100%; - padding : 8px 5px; - border : 1px solid #888888; - border-bottom : 0; - animation-name : glideDropDown; - animation-duration : 0.4s; - } - } - &.recent { - position : relative; - .navDropdown .navItem { - #backgroundColorsHover; - .animate(background-color); - position : relative; - box-sizing : border-box; - display : block; - max-height : ~"calc(100vh - 28px)"; // I don't think is correct syntax, but leaving it in for now... (Gazook89) - padding : 8px 5px 13px; - overflow : hidden auto; - color : white; - text-decoration : none; - background-color : #333333; - border-top : 1px solid #888888; - scrollbar-color : #666666 #333333; - scrollbar-width : thin; - .clear { - position : absolute; - top : 50%; - right : 0; - display : none; - width : 20px; - height : 100%; - background-color : #333333; - border-radius : 3px; - opacity : 70%; - transform : translateY(-50%); - &:hover { opacity : 100%; } - i { - width : 100%; - height : 100%; - margin : 0; - font-size : 10px; - text-align : center; - } - } - &:hover { - background-color : @blue; - .clear { - display : grid; - place-content : center; - } - } - .title { - display : inline-block; - width : 100%; - overflow : hidden auto; - text-overflow : ellipsis; - white-space : nowrap; - } - .time { - position : absolute; - right : 2px; - bottom : 2px; - font-size : 0.7em; - color : #888888; - } - &.header { - box-sizing : border-box; - display : block; - padding : 5px 0; - color : #BBBBBB; - text-align : center; - background-color : #333333; - border-top : 1px solid #888888; - &:nth-of-type(1) { background-color : darken(@teal, 20%); } - &:nth-of-type(2) { background-color : darken(@purple, 30%); } - } - } + background-color : #333333; + border-top : 1px solid #888888; + &:nth-of-type(1) { background-color : darken(@teal, 20%); } + &:nth-of-type(2) { background-color : darken(@purple, 30%); } } } } } - - // this should likely be refactored into .navDropdownContainer - .save-menu { - .dropdown { z-index : 1000; } - .navItem i.fa-power-off { - color : red; - &.active { - color : rgb(0, 182, 52); - filter : drop-shadow(0 0 2px rgba(0, 182, 52, 0.765)); - } - } - } - - - - - +} + +// this should likely be refactored into .navDropdownContainer +.save-menu { + .dropdown { z-index : 1000; } + .navItem i.fa-power-off { + color : red; + &.active { + color : rgb(0, 182, 52); + filter : drop-shadow(0 0 2px rgba(0, 182, 52, 0.765)); + } + } } From 59e87697ff1029c6c843deddea7edcc285e4efea Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 1 Mar 2024 01:27:46 -0500 Subject: [PATCH 44/58] linting --- client/homebrew/navbar/navbar.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index ccbdf1f7a..4983aa696 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -1,4 +1,4 @@ -@import "naturalcrit/styles/colors.less"; +@import 'naturalcrit/styles/colors.less'; @navbarHeight : 28px; @@ -156,7 +156,7 @@ align-content : baseline; justify-content : flex-start; width : 440px; - max-height : ~"calc(100vh - 28px)"; + max-height : ~'calc(100vh - 28px)'; padding : 0 10px 5px; margin : 0 auto; background-color : #333333; @@ -266,7 +266,7 @@ position : relative; box-sizing : border-box; display : block; - max-height : ~"calc(100vh - 28px)"; // I don't think is correct syntax, but leaving it in for now... (Gazook89) + max-height : ~'calc(100vh - 28px)'; padding : 8px 5px 13px; overflow : hidden auto; color : white; From 3314471d731c8176cbb3c3e9d113555126f61805 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 03:47:01 +0000 Subject: [PATCH 45/58] Bump mongoose from 8.2.0 to 8.2.1 Bumps [mongoose](https://github.com/Automattic/mongoose) from 8.2.0 to 8.2.1. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/8.2.0...8.2.1) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9f39b3bd5..faf0deb76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "marked-smartypants-lite": "^1.0.2", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.2.0", + "mongoose": "^8.2.1", "nanoid": "3.3.4", "nconf": "^0.12.1", "react": "^18.2.0", @@ -10459,9 +10459,9 @@ } }, "node_modules/mongoose": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.2.0.tgz", - "integrity": "sha512-la93n6zCYRbPS+c5N9oTDAktvREy5OT9OCljp1Tah0y3+p8UPMTAoabWaLZMdzYruOtF9/9GRf6MasaZjiZP1A==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.2.1.tgz", + "integrity": "sha512-UgZZbXSJH0pdU936qj3FyVI+sBsMoGowFnL5R/RYrA50ayn6+ZYdVr8ehsRgNxRcMYwoNld5XzHIfkFRJTePEw==", "dependencies": { "bson": "^6.2.0", "kareem": "2.5.1", diff --git a/package.json b/package.json index b44d1cc4d..5ffc3c7ea 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "marked-smartypants-lite": "^1.0.2", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.2.0", + "mongoose": "^8.2.1", "nanoid": "3.3.4", "nconf": "^0.12.1", "react": "^18.2.0", From 1e1505c63f0b0aa8c99e32bb020a1402262d557c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 5 Mar 2024 08:27:56 +0100 Subject: [PATCH 46/58] towards a more traditional approach --- client/homebrew/navbar/newbrew.navitem.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 6e63e7a8f..3a941a205 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -9,7 +9,7 @@ const STYLEKEY = 'homebrewery-new-style'; const METAKEY = 'homebrewery-new-meta'; const NewBrew = () => { - const inputRef = useRef(null); + const [brew, setBrew] = useState({ text: '', @@ -84,8 +84,8 @@ const NewBrew = () => { { inputRef.current.click(); }}> - + onClick={() => { document.getElementById('uploadTxt').click(); }}> + New From Local File From cf1617f2a386a3086a49b99602f770c63635a316 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:10:23 +0000 Subject: [PATCH 47/58] Bump eslint-plugin-react from 7.33.2 to 7.34.0 Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.33.2 to 7.34.0. - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.33.2...v7.34.0) --- updated-dependencies: - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 739 ++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 451 insertions(+), 290 deletions(-) diff --git a/package-lock.json b/package-lock.json index faf0deb76..f378aa8f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "devDependencies": { "eslint": "^8.57.0", "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react": "^7.34.0", "jest": "^29.7.0", "jest-expect-message": "^1.1.3", "postcss-less": "^6.0.0", @@ -3371,13 +3371,16 @@ } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3389,15 +3392,15 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -3424,15 +3427,34 @@ "node": ">=0.10.0" } }, + "node_modules/array.prototype.findlast": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.4.tgz", + "integrity": "sha512-BMtLxpV+8BD+6ZPFIWmnUBpQoy+A+ujcg4rhp2iwCRJYA7PEh2MS4NL3lz8EiDlLrJPp2hg9qWihr5pd//jcGw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3442,30 +3464,44 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "node_modules/array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", - "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -3585,10 +3621,13 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -4337,12 +4376,18 @@ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5123,12 +5168,29 @@ "node": ">=0.10.0" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -5452,50 +5514,52 @@ } }, "node_modules/es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", + "version": "1.22.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.5.tgz", + "integrity": "sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "es-set-tostringtag": "^2.0.1", + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.1", - "get-symbol-description": "^1.0.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.1", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.0", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.5", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -5504,49 +5568,72 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-iterator-helpers": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.13.tgz", - "integrity": "sha512-LK3VGwzvaPWobO8xzXXGRUOGw8Dcjyfk62CsY/wfHN75CwsJPbuypOYJxK6g5RyEL8YDjIWcl6jgd8foO6mmrA==", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz", + "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==", "dev": true, "dependencies": { "asynciterator.prototype": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.21.3", - "es-set-tostringtag": "^2.0.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.4", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0", + "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "iterator.prototype": "^1.1.0", - "safe-array-concat": "^1.0.0" + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { @@ -5668,27 +5755,29 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "version": "7.34.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.0.tgz", + "integrity": "sha512-MeVXdReleBTdkz/bvcQMSnCXGi+c9kvy51IpinjnJgutl3YTHWsDdke7Z1ufZpGfDG8xduBDKyjtB9JH1eBKIQ==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", + "array-includes": "^3.1.7", + "array.prototype.findlast": "^1.2.4", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.3", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.12", + "es-iterator-helpers": "^1.0.17", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7", + "object.hasown": "^1.1.3", + "object.values": "^1.1.7", "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", + "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" + "string.prototype.matchall": "^4.0.10" }, "engines": { "node": ">=4" @@ -5710,12 +5799,12 @@ } }, "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -6518,20 +6607,23 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -6597,14 +6689,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6632,13 +6728,14 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -6846,7 +6943,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -6915,21 +7011,20 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" }, @@ -6949,12 +7044,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -7032,6 +7127,17 @@ "minimalistic-assert": "^1.0.1" } }, + "node_modules/hasown": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hexoid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", @@ -7363,13 +7469,13 @@ } }, "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -7407,14 +7513,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7498,11 +7606,11 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7647,9 +7755,9 @@ } }, "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "engines": { "node": ">= 0.4" @@ -7736,12 +7844,15 @@ } }, "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7789,16 +7900,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -7994,16 +8101,16 @@ } }, "node_modules/iterator.prototype": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.0.tgz", - "integrity": "sha512-rjuhAk1AJ1fssphHD0IFV6TWL40CwRZ53FrztKx43yk2v6rguBYsY4Bj1VU4HmoMmKwZUlx7mfnhDf9cOp4YTw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", "dev": true, "dependencies": { - "define-properties": "^1.1.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "has-tostringtag": "^1.0.0", - "reflect.getprototypeof": "^1.0.3" + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" } }, "node_modules/jest": { @@ -11002,9 +11109,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11030,13 +11137,13 @@ } }, "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -11048,28 +11155,28 @@ } }, "node_modules/object.entries": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", - "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -11079,13 +11186,13 @@ } }, "node_modules/object.hasown": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz", - "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, "dependencies": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -11103,14 +11210,14 @@ } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -11482,6 +11589,15 @@ "node": ">=0.10.0" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", @@ -12043,15 +12159,16 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.3.tgz", - "integrity": "sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz", + "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0", + "get-intrinsic": "^1.2.3", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" }, @@ -12127,14 +12244,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -12343,13 +12461,13 @@ } }, "node_modules/safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", + "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -12394,15 +12512,18 @@ } }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -12496,6 +12617,37 @@ "node": ">= 0.8.0" } }, + "node_modules/set-function-length": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", + "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", + "dependencies": { + "define-data-property": "^1.1.2", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -13149,18 +13301,19 @@ } }, "node_modules/string.prototype.matchall": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", - "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.3", - "regexp.prototype.flags": "^1.4.3", + "internal-slot": "^1.0.5", + "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", "side-channel": "^1.0.4" }, "funding": { @@ -13168,14 +13321,14 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -13185,28 +13338,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13950,29 +14103,30 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -13982,16 +14136,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -14001,14 +14156,20 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", + "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -14856,16 +15017,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", + "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.5", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.1" }, "engines": { "node": ">= 0.4" diff --git a/package.json b/package.json index 5ffc3c7ea..91eb1c047 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "devDependencies": { "eslint": "^8.57.0", "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react": "^7.34.0", "jest": "^29.7.0", "jest-expect-message": "^1.1.3", "postcss-less": "^6.0.0", From dbfc1e7d2890ad6240a1e60f4e390f913baea6ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:19:12 +0000 Subject: [PATCH 48/58] Bump react-router-dom from 6.22.1 to 6.22.2 Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.22.1 to 6.22.2. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.22.2/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index f378aa8f3..e48628d1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-frame-component": "^4.1.3", - "react-router-dom": "6.22.1", + "react-router-dom": "6.22.2", "sanitize-filename": "1.6.3", "superagent": "^8.1.2", "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" @@ -2838,9 +2838,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.1.tgz", - "integrity": "sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.2.tgz", + "integrity": "sha512-+Rnav+CaoTE5QJc4Jcwh5toUpnVLKYbpU6Ys0zqbakqbaLQHeglLVHPfxOiQqdNmUy5C2lXz5dwC6tQNX2JW2Q==", "engines": { "node": ">=14.0.0" } @@ -11995,11 +11995,11 @@ "dev": true }, "node_modules/react-router": { - "version": "6.22.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.1.tgz", - "integrity": "sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==", + "version": "6.22.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.2.tgz", + "integrity": "sha512-YD3Dzprzpcq+tBMHBS822tCjnWD3iIZbTeSXMY9LPSG541EfoBGyZ3bS25KEnaZjLcmQpw2AVLkFyfgXY8uvcw==", "dependencies": { - "@remix-run/router": "1.15.1" + "@remix-run/router": "1.15.2" }, "engines": { "node": ">=14.0.0" @@ -12009,12 +12009,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.22.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.1.tgz", - "integrity": "sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==", + "version": "6.22.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.2.tgz", + "integrity": "sha512-WgqxD2qySEIBPZ3w0sHH+PUAiamDeszls9tzqMPBDA1YYVucTBXLU7+gtRfcSnhe92A3glPnvSxK2dhNoAVOIQ==", "dependencies": { - "@remix-run/router": "1.15.1", - "react-router": "6.22.1" + "@remix-run/router": "1.15.2", + "react-router": "6.22.2" }, "engines": { "node": ">=14.0.0" diff --git a/package.json b/package.json index 91eb1c047..6873787e8 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-frame-component": "^4.1.3", - "react-router-dom": "6.22.1", + "react-router-dom": "6.22.2", "sanitize-filename": "1.6.3", "superagent": "^8.1.2", "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" From 1e4a00ce56a1e72e9691656b2eabb63b35e9bc2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:23:13 +0000 Subject: [PATCH 49/58] Bump express from 4.18.2 to 4.18.3 Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.18.3. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.2...4.18.3) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 47 +++++------------------------------------------ package.json | 2 +- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index e48628d1c..9313c67db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "create-react-class": "^15.7.0", "dedent-tabs": "^0.10.3", "expr-eval": "^2.0.2", - "express": "^4.18.2", + "express": "^4.18.3", "express-async-handler": "^1.2.0", "express-static-gzip": "2.1.7", "fs-extra": "11.2.0", @@ -6132,13 +6132,13 @@ "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==" }, "node_modules/express": { - "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "version": "4.18.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz", + "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.1", + "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.5.0", @@ -6185,29 +6185,6 @@ "serve-static": "^1.14.1" } }, - "node_modules/express/node_modules/body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.1", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, "node_modules/express/node_modules/cookie": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", @@ -6229,20 +6206,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/express/node_modules/raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", diff --git a/package.json b/package.json index 6873787e8..81a15d996 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "create-react-class": "^15.7.0", "dedent-tabs": "^0.10.3", "expr-eval": "^2.0.2", - "express": "^4.18.2", + "express": "^4.18.3", "express-async-handler": "^1.2.0", "express-static-gzip": "2.1.7", "fs-extra": "11.2.0", From e472465ce7d637b906b576aa19edee591c444d73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:36:12 +0000 Subject: [PATCH 50/58] Bump @babel/core from 7.23.9 to 7.24.0 Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.9 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 62 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9313c67db..4625107a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.23.9", + "@babel/core": "^7.24.0", "@babel/plugin-transform-runtime": "^7.23.9", "@babel/preset-env": "^7.23.9", "@babel/preset-react": "^7.23.3", @@ -107,20 +107,20 @@ } }, "node_modules/@babel/core": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", - "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz", + "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.9", - "@babel/parser": "^7.23.9", - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/helpers": "^7.24.0", + "@babel/parser": "^7.24.0", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.0", + "@babel/types": "^7.24.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -450,13 +450,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", - "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.0.tgz", + "integrity": "sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==", "dependencies": { - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -476,9 +476,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", - "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz", + "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1746,22 +1746,22 @@ } }, "node_modules/@babel/template": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", - "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dependencies": { "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", - "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.0.tgz", + "integrity": "sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==", "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -1769,8 +1769,8 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1779,9 +1779,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", - "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dependencies": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", diff --git a/package.json b/package.json index 81a15d996..2c2628c86 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ ] }, "dependencies": { - "@babel/core": "^7.23.9", + "@babel/core": "^7.24.0", "@babel/plugin-transform-runtime": "^7.23.9", "@babel/preset-env": "^7.23.9", "@babel/preset-react": "^7.23.3", From cfdc3e68707f8e5c9e44ce482264b445888c5746 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:40:24 +0000 Subject: [PATCH 51/58] Bump @babel/preset-env from 7.23.9 to 7.24.0 Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.9 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4625107a8..b0bda2b8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "dependencies": { "@babel/core": "^7.24.0", "@babel/plugin-transform-runtime": "^7.23.9", - "@babel/preset-env": "^7.23.9", + "@babel/preset-env": "^7.24.0", "@babel/preset-react": "^7.23.3", "@googleapis/drive": "^8.7.0", "body-parser": "^1.20.2", @@ -340,9 +340,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "engines": { "node": ">=6.9.0" } @@ -1242,13 +1242,13 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.23.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz", - "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.0.tgz", + "integrity": "sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==", "dependencies": { - "@babel/compat-data": "^7.23.3", - "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/compat-data": "^7.23.5", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-transform-parameters": "^7.23.3" }, @@ -1605,13 +1605,13 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.9.tgz", - "integrity": "sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz", + "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==", "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-validator-option": "^7.23.5", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", @@ -1664,7 +1664,7 @@ "@babel/plugin-transform-new-target": "^7.23.3", "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", "@babel/plugin-transform-numeric-separator": "^7.23.4", - "@babel/plugin-transform-object-rest-spread": "^7.23.4", + "@babel/plugin-transform-object-rest-spread": "^7.24.0", "@babel/plugin-transform-object-super": "^7.23.3", "@babel/plugin-transform-optional-catch-binding": "^7.23.4", "@babel/plugin-transform-optional-chaining": "^7.23.4", diff --git a/package.json b/package.json index 2c2628c86..75b36082b 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "dependencies": { "@babel/core": "^7.24.0", "@babel/plugin-transform-runtime": "^7.23.9", - "@babel/preset-env": "^7.23.9", + "@babel/preset-env": "^7.24.0", "@babel/preset-react": "^7.23.3", "@googleapis/drive": "^8.7.0", "body-parser": "^1.20.2", From b50353c8c4f3860873f1c9d68ed23b6e774b3c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 14:02:09 +0100 Subject: [PATCH 52/58] rename nav buttons per req --- client/homebrew/navbar/newbrew.navitem.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 3a941a205..642e341e2 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -74,19 +74,21 @@ const NewBrew = () => { new - new + from blank { document.getElementById('uploadTxt').click(); }}> - New From Local File + from file ); From 25945fc0dfae7cdd83104cdf7f12d77bb314b010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 14:06:57 +0100 Subject: [PATCH 53/58] getting rid of state as per req --- client/homebrew/navbar/newbrew.navitem.jsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 642e341e2..d393501cb 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -10,11 +10,7 @@ const METAKEY = 'homebrewery-new-meta'; const NewBrew = () => { - - const [brew, setBrew] = useState({ - text: '', - style: '' - }); + const splitTextStyleAndMetadata = (brewContent) => { let updatedBrew = { ...brewContent }; @@ -50,8 +46,6 @@ const NewBrew = () => { }; if(fileContent.startsWith('```metadata')) { const updatedBrew = splitTextStyleAndMetadata(newBrew); - console.log(updatedBrew); - setBrew(updatedBrew); localStorage.setItem(BREWKEY, updatedBrew.text); localStorage.setItem(STYLEKEY, updatedBrew.style); localStorage.setItem(METAKEY, JSON.stringify(_.pick(updatedBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']))); From 99daaf55374769e9d7789b20411e89c83bdb6a14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:05:23 +0000 Subject: [PATCH 54/58] Bump @babel/plugin-transform-runtime from 7.23.9 to 7.24.0 Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.23.9 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-plugin-transform-runtime) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-runtime" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0bda2b8d..4ab132c11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "MIT", "dependencies": { "@babel/core": "^7.24.0", - "@babel/plugin-transform-runtime": "^7.23.9", + "@babel/plugin-transform-runtime": "^7.24.0", "@babel/preset-env": "^7.24.0", "@babel/preset-react": "^7.23.3", "@googleapis/drive": "^8.7.0", @@ -1456,12 +1456,12 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.23.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.9.tgz", - "integrity": "sha512-A7clW3a0aSjm3ONU9o2HAILSegJCYlEZmOhmBRReVtIpY/Z/p7yIZ+wR41Z+UipwdGuqwtID/V/dOdZXjwi9gQ==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz", + "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==", "dependencies": { "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "babel-plugin-polyfill-corejs2": "^0.4.8", "babel-plugin-polyfill-corejs3": "^0.9.0", "babel-plugin-polyfill-regenerator": "^0.5.5", diff --git a/package.json b/package.json index 75b36082b..9b9b17ca0 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ }, "dependencies": { "@babel/core": "^7.24.0", - "@babel/plugin-transform-runtime": "^7.23.9", + "@babel/plugin-transform-runtime": "^7.24.0", "@babel/preset-env": "^7.24.0", "@babel/preset-react": "^7.23.3", "@googleapis/drive": "^8.7.0", From 6eecd9cee40c08bdaf32de787114ecb237e7ecf6 Mon Sep 17 00:00:00 2001 From: Rodrigo Kuerten Date: Wed, 6 Mar 2024 13:46:13 -0300 Subject: [PATCH 55/58] Updated Table of Contents snippet --- themes/V3/5ePHB/snippets/tableOfContents.gen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/V3/5ePHB/snippets/tableOfContents.gen.js b/themes/V3/5ePHB/snippets/tableOfContents.gen.js index 97d82ed40..03f90d5fa 100644 --- a/themes/V3/5ePHB/snippets/tableOfContents.gen.js +++ b/themes/V3/5ePHB/snippets/tableOfContents.gen.js @@ -78,7 +78,7 @@ module.exports = function(props){ return dedent` {{toc,wide - # Table Of Contents + # Contents ${markdown} }} From f93af38fa6c03590a6d3694d9840de468a89fe68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 18:09:26 +0100 Subject: [PATCH 56/58] split-style-and-metadata moved to helpers.js --- client/homebrew/navbar/newbrew.navitem.jsx | 45 +++++----------------- server/app.js | 17 +------- shared/helpers.js | 22 +++++++++++ 3 files changed, 33 insertions(+), 51 deletions(-) create mode 100644 shared/helpers.js diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index d393501cb..7e5c63101 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -1,39 +1,13 @@ const React = require('react'); -const { useState, useRef } = React; const _ = require('lodash'); const Nav = require('naturalcrit/nav/nav.jsx'); -const yaml = require('js-yaml'); +const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js const BREWKEY = 'homebrewery-new'; const STYLEKEY = 'homebrewery-new-style'; const METAKEY = 'homebrewery-new-meta'; -const NewBrew = () => { - - - - const splitTextStyleAndMetadata = (brewContent) => { - let updatedBrew = { ...brewContent }; - updatedBrew.text = updatedBrew.text.replaceAll('\r\n', '\n'); - if (updatedBrew.text.startsWith('```metadata')) { - const index = updatedBrew.text.indexOf('```\n\n'); - const metadataSection = updatedBrew.text.slice(12, index - 1); - const metadata = yaml.load(metadataSection); - updatedBrew = { - ...updatedBrew, - ..._.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']) - }; - updatedBrew.text = updatedBrew.text.slice(index + 5); - } - if (updatedBrew.text.startsWith('```css')) { - const index = updatedBrew.text.indexOf('```\n\n'); - updatedBrew.style = updatedBrew.text.slice(7, index - 1); - updatedBrew.text = updatedBrew.text.slice(index + 5); - } - return updatedBrew; - }; - - +const NewBrew = () => { const handleFileChange = (e) => { const file = e.target.files[0]; if (file) { @@ -44,14 +18,13 @@ const NewBrew = () => { text: fileContent, style: '' }; - if(fileContent.startsWith('```metadata')) { - const updatedBrew = splitTextStyleAndMetadata(newBrew); - localStorage.setItem(BREWKEY, updatedBrew.text); - localStorage.setItem(STYLEKEY, updatedBrew.style); - localStorage.setItem(METAKEY, JSON.stringify(_.pick(updatedBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']))); - - window.location.href = '/new'; - } else { + if(fileContent.startsWith('```metadata')) { + splitTextStyleAndMetadata(newBrew); // Modify newBrew directly + localStorage.setItem(BREWKEY, newBrew.text); + localStorage.setItem(STYLEKEY, newBrew.style); + localStorage.setItem(METAKEY, JSON.stringify(_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang']))); + window.location.href = '/new'; + } else { alert('This file is invalid, please, enter a valid file'); } }; diff --git a/server/app.js b/server/app.js index fc5d4a035..4c72b4924 100644 --- a/server/app.js +++ b/server/app.js @@ -17,21 +17,8 @@ const asyncHandler = require('express-async-handler'); const { DEFAULT_BREW } = require('./brewDefaults.js'); -const splitTextStyleAndMetadata = (brew)=>{ - brew.text = brew.text.replaceAll('\r\n', '\n'); - if(brew.text.startsWith('```metadata')) { - const index = brew.text.indexOf('```\n\n'); - const metadataSection = brew.text.slice(12, index - 1); - const metadata = yaml.load(metadataSection); - Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])); - brew.text = brew.text.slice(index + 5); - } - if(brew.text.startsWith('```css')) { - const index = brew.text.indexOf('```\n\n'); - brew.style = brew.text.slice(7, index - 1); - brew.text = brew.text.slice(index + 5); - } -}; +const { splitTextStyleAndMetadata } = require('../shared/helpers.js'); + const sanitizeBrew = (brew, accessType)=>{ brew._id = undefined; diff --git a/shared/helpers.js b/shared/helpers.js new file mode 100644 index 000000000..5abb93fea --- /dev/null +++ b/shared/helpers.js @@ -0,0 +1,22 @@ +const _ = require('lodash'); +const yaml = require('js-yaml'); + +const splitTextStyleAndMetadata = (brew) => { + brew.text = brew.text.replaceAll('\r\n', '\n'); + if (brew.text.startsWith('```metadata')) { + const index = brew.text.indexOf('```\n\n'); + const metadataSection = brew.text.slice(12, index - 1); + const metadata = yaml.load(metadataSection); + Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])); + brew.text = brew.text.slice(index + 5); + } + if (brew.text.startsWith('```css')) { + const index = brew.text.indexOf('```\n\n'); + brew.style = brew.text.slice(7, index - 1); + brew.text = brew.text.slice(index + 5); + } +}; + +module.exports = { + splitTextStyleAndMetadata +}; From e494899f8b973bd191acfc6d48e42e6033e15d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 18:12:21 +0100 Subject: [PATCH 57/58] icons --- client/homebrew/navbar/newbrew.navitem.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 7e5c63101..319ef3392 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -37,7 +37,7 @@ const NewBrew = () => { + icon='fa-solid fa-plus-square'> new { href='/new' newTab={true} color='purple' - icon='fas fa-plus-square'> + icon='fa-solid fa-file'> from blank { document.getElementById('uploadTxt').click(); }}> from file From 83d2a604e18b275ce8ac5159d6fec482d659b6ee Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Wed, 6 Mar 2024 12:28:43 -0500 Subject: [PATCH 58/58] Clean up some spacing --- themes/V3/Blank/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less index f8289bbee..3e5b2290f 100644 --- a/themes/V3/Blank/style.less +++ b/themes/V3/Blank/style.less @@ -459,10 +459,10 @@ body { counter-reset : page-numbers; } .homebreweryIcon.red { background-color : red; } .homebreweryIcon.gold { background-image : linear-gradient(to top left, brown 22.5%, gold 40%, white 60%, gold 67.5%, brown 82.5%); } } + //***************************** //* Page Number //*****************************/ - .page { .pageNumber { position : absolute;