small commits? what's that?

This commit is contained in:
Víctor Losada Hernández
2026-10-07 20:17:41 +02:00
parent 9952fcc5f7
commit b3a71fead4
11 changed files with 366 additions and 331 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ import dedent from 'dedent';
import Nav from './nav.jsx'; import Nav from './nav.jsx';
export default function(props){ export default function(props){
return <Nav.dropdown> return <div className='nav-section'>
<Nav.item color='grey' icon='fas fa-question-circle'> <Nav.item color='grey' icon='fas fa-question-circle'>
need help? need help?
</Nav.item> </Nav.item>
@@ -30,5 +30,5 @@ export default function(props){
rel='noopener noreferrer'> rel='noopener noreferrer'>
migrate migrate
</Nav.item> </Nav.item>
</Nav.dropdown>; </div>;
}; };
+4 -1
View File
@@ -25,8 +25,11 @@ const Nav = {
</div>; </div>;
}, },
item : ({ icon, href, newTab, onClick, color, children, className, ...props })=>{ item : ({ icon, href, newTab, onClick, color, children, className, disabled, ...props })=>{
const classes = cx('navItem', color, className); const classes = cx('navItem', color, className);
if(disabled) {
return <button className={classes} disabled>{children}{icon && <i className={icon}></i>}</button>
}
if(href){ if(href){
return <a className={classes} href={href} target={newTab ? '_blank' : '_self'} {...props}> return <a className={classes} href={href} target={newTab ? '_blank' : '_self'} {...props}>
{children} {children}
+72 -17
View File
@@ -1,28 +1,83 @@
import './navbar.less'; import './navbar.less';
import React from 'react'; import React from 'react';
import { Dropdown } from '@components/dropdown/dropdown.jsx';
import NewBrew from './newbrew.navitem';
import PrintNavitem from './print.navitem.jsx';
import ShareNavitem from './share.navitem.jsx';
import HelpNavitem from './help.navitem.jsx';
import RecentNavItems from './recent.navitem.jsx';
const { both: RecentNavItem } = RecentNavItems;
import Nav from './nav.jsx'; import Nav from './nav.jsx';
import PatreonNavItem from './patreon.navitem.jsx';
const Navbar = ({ children })=>{ import useCommonEditPageFunctions from '../../homebrew/utils/commonEditPageFunctions.jsx';
const Navbar = ({ children }) => {
const version = global.version || '0.0.0'; const version = global.version || '0.0.0';
return ( return (
<Nav.base> <nav>
<Nav.section> <ul>
<Nav.logo /> <li className='menu-wrapper'>
<Nav.item href='/' className='homebrewLogo'> <a href='/'>Home</a>
<div>The Homebrewery</div> </li>
</Nav.item> <Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
<Nav.item newTab={true} href='/changelog' color='purple' icon='far fa-file-alt'> <NewBrew />
{`v${version}`} <li className='navItem'>Save document</li>
</Nav.item> <div className='nav-section'>
<PatreonNavItem /> <PrintNavitem />
{/* this.renderChromeWarning() */} <li className='navItem'>Get txt</li>
</Nav.section> </div>
{children} <ShareNavitem />
</Nav.base> <div className='nav-section'>
<li className='navItem'>Delete File</li>
<li className='navItem'>Publish File</li>
<li className='navItem'>Transfer File</li>
</div>
</Dropdown>
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
<div className='nav-section'>
<li className='navItem'>Undo</li>
<li className='navItem'>Redo</li>
<li className='navItem'>Cut</li>
<li className='navItem'>Copy</li>
<li className='navItem'>Paste</li>
<li className='navItem'>Find</li>
<li className='navItem'>Find and Replace</li>
</div>
</Dropdown>
<Dropdown groupName={'Go'} customTrigger={<>Go</>} icon={null} key={'go'}>
<div className='nav-section'>
<Nav.item className='patreon' newTab={true} href='https://www.patreon.com/NaturalCrit' color='green' icon='fas fa-heart'>
Patreon
</Nav.item>
<Nav.item color='purple' icon='fas fa-dungeon' href='/vault' newTab={false} rel='noopener noreferrer'>
Vault
</Nav.item>
<Nav.item color='purple' icon='fas fa-dungeon' href='/changelog' newTab={false} rel='noopener noreferrer'>
Changelog
</Nav.item>
</div>
<HelpNavitem />
<div className='nav-section'>
<Nav.item href={`/user/${encodeURIComponent(global.account.username)}`} color='yellow' icon='fas fa-beer'>
brews
</Nav.item>
<Nav.item className='account' color='orange' icon='fas fa-user' href='/account'>
account
</Nav.item>
</div>
<Dropdown className='navItem' groupName={'Recent Brews'} customTrigger={<>Recent Brews</>} icon={null} key={'recent'}>
<RecentNavItem />
</Dropdown>
</Dropdown>
<li>Help</li>
<li>User</li>
</ul>
</nav>
); );
}; };
export default Navbar; export default Navbar;
+262 -263
View File
@@ -1,330 +1,270 @@
@import '@sharedStyles/core.less'; @import '@sharedStyles/core.less';
@navbarHeight : 28px; @navbarHeight: 28px;
@viewerToolsHeight : 32px; @viewerToolsHeight: 32px;
@keyframes pinkColoring { @keyframes pinkColoring {
0% { color : pink; } 0% {
50% { color : pink; } color: pink;
75% { color : red; } }
100% { color : pink; } 50% {
color: pink;
}
75% {
color: red;
}
100% {
color: pink;
}
} }
@keyframes glideDropDown { @keyframes glideDropDown {
0% { 0% {
background-color : #333333; background-color: #333333;
opacity : 0; opacity: 0;
transform : translate(0px, -100%); transform: translate(0px, -100%);
} }
100% { 100% {
background-color : #333333; background-color: #333333;
opacity : 1; opacity: 1;
transform : translate(0px, 0px); transform: translate(0px, 0px);
} }
} }
.homebrew nav { .homebrew nav {
position : relative; position: relative;
z-index : 2; z-index: 2;
display : flex; display: flex;
justify-content : space-between;
background-color : #333333; justify-content: space-between;
background-color: #333333;
.navSection {
display : flex;
align-items : center;
&:last-child .navItem { border-left : 1px solid #666666; }
&:has(.brewTitle) {
flex-grow : 1;
min-width : 300px;
}
>.brewTitle { cursor : auto; }
}
// "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 { .navItem {
#backgroundColorsHover; display: flex;
.animate(background-color); align-items: center;
display : flex; justify-content: start;
align-items : center; height: 100%;
justify-content : center; padding: 5px;
height : 100%; cursor: pointer;
padding : 8px 12px;
font-size : 10px; &:has(button, a) {
font-weight : 800; padding:0;
line-height : 13px;
color : white;
text-transform : uppercase;
text-decoration : none;
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;
}
} }
&.brewTitle { &.brewTitle {
display : block; display: block;
width : 100%; width: 100%;
overflow : hidden; overflow: hidden;
text-overflow : ellipsis; text-overflow: ellipsis;
font-size : 12px; font-size: 12px;
font-weight : 800; font-weight: 800;
color : white; color: white;
text-align : center; text-align: center;
text-transform : initial; text-transform: initial;
white-space : nowrap; white-space: nowrap;
background-color : transparent; background-color: transparent;
} }
// "The Homebrewery" logo // "The Homebrewery" logo
&.homebrewLogo { &.homebrewLogo {
.animate(color); .animate(color);
font-family : 'CodeBold'; font-family: 'CodeBold';
font-size : 12px; font-size: 12px;
color : white; color: white;
div { div {
margin-top : 2px; margin-top: 2px;
margin-bottom : -2px; margin-bottom: -2px;
}
&:hover {
color: @blue;
} }
&:hover { color : @blue; }
} }
&.metadata { &.metadata {
position : relative; position: relative;
display : flex; display: flex;
flex-grow : 1; flex-grow: 1;
align-items : center; align-items: center;
height : 100%; height: 100%;
padding : 0; padding: 0;
i { margin-right : 10px;} i {
margin-right: 10px;
}
.window { .window {
position : absolute; position: absolute;
bottom : 0; bottom: 0;
left : 50%; left: 50%;
z-index : -1; z-index: -1;
display : flex; display: flex;
flex-flow : row wrap; flex-flow: row wrap;
align-content : baseline; align-content: baseline;
justify-content : flex-start; justify-content: flex-start;
width : 440px; width: 440px;
max-height : ~'calc(100vh - 28px)'; max-height: ~'calc(100vh - 28px)';
padding : 0 10px 5px; padding: 0 10px 5px;
margin : 0 auto; margin: 0 auto;
background-color : #333333; background-color: #333333;
border : 3px solid #444444; border: 3px solid #444444;
border-top : unset; border-top: unset;
border-radius : 0 0 5px 5px; border-radius: 0 0 5px 5px;
box-shadow : inset 0 7px 9px -7px #111111; box-shadow: inset 0 7px 9px -7px #111111;
transition : transform 0.4s, opacity 0.4s; transition:
transform 0.4s,
opacity 0.4s;
&.active { &.active {
opacity : 1; opacity: 1;
transform : translateX(-50%) translateY(100%); transform: translateX(-50%) translateY(100%);
} }
&.inactive { &.inactive {
opacity : 0; opacity: 0;
transform : translateX(-50%) translateY(0%); transform: translateX(-50%) translateY(0%);
} }
.row { .row {
display : flex; display: flex;
flex-flow : row wrap; flex-flow: row wrap;
width : 100%; width: 100%;
h4 { h4 {
box-sizing : border-box; box-sizing: border-box;
display : block; display: block;
flex-grow : 1; flex-grow: 1;
flex-basis : 20%; flex-basis: 20%;
min-width : 76px; min-width: 76px;
padding : 5px 0; padding: 5px 0;
color : #BBBBBB; color: #bbbbbb;
text-align : center; text-align: center;
} }
p { p {
flex-grow : 1; flex-grow: 1;
flex-basis : 80%; flex-basis: 80%;
padding : 5px 0; padding: 5px 0;
font-family : 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
font-size : 10px; font-size: 10px;
font-weight : normal; font-weight: normal;
text-transform : initial; text-transform: initial;
.tag { .tag {
display : inline-block; display: inline-block;
padding : 2px; padding: 2px;
margin : 2px 2px; margin: 2px 2px;
background-color : #444444; background-color: #444444;
border : 2px solid grey; border: 2px solid grey;
border-radius : 5px; border-radius: 5px;
} }
a.userPageLink { a.userPageLink {
color : white; color: white;
text-decoration : none; text-decoration: none;
&:hover { text-decoration : underline; } &:hover {
text-decoration: underline;
}
} }
} }
&:nth-of-type(even) { background-color : #555555; } &:nth-of-type(even) {
background-color: #555555;
}
} }
} }
} }
&.warning { &.warning {
position : relative; position: relative;
color : white; color: white;
background-color : @orange; background-color: @orange;
&:hover > .dropdown { visibility : visible; } &:hover > .dropdown {
visibility: visible;
}
.dropdown { .dropdown {
position : absolute; position: absolute;
top : 28px; top: 28px;
left : 0; left: 0;
z-index : 10000; z-index: 10000;
box-sizing : border-box; box-sizing: border-box;
display : block; display: block;
visibility : hidden; visibility: hidden;
width : 100%; width: 100%;
padding : 13px 5px; padding: 13px 5px;
text-align : center; text-align: center;
background-color : #333333; background-color: #333333;
} }
} }
&.account { &.account {
min-width : 100px; min-width: 100px;
&.username { text-transform : none;} &.username {
} text-transform: none;
}
.navDropdownContainer {
position : relative;
height : 100%;
.navDropdown {
position : absolute;
//top: 28px;
right : 0px;
z-index : 10000;
display : flex;
flex-direction : column;
align-items : flex-end;
width : max-content;
min-width : 100%;
max-height : calc(100vh - 28px);
overflow : hidden auto;
.navItem {
position : relative;
display : flex;
align-items : center;
justify-content : space-between;
width : 100%;
border : 1px solid #888888;
border-bottom : 0;
animation-name : glideDropDown;
animation-duration : 0.4s;
} }
} }
&.recent { &.recent {
position : relative; position: relative;
.navDropdown .navItem { .navDropdown .navItem {
#backgroundColorsHover; #backgroundColorsHover;
.animate(background-color); .animate(background-color);
position : relative; position: relative;
box-sizing : border-box; box-sizing: border-box;
display : block; display: block;
max-width : 15em; max-width: 15em;
max-height : ~'calc(100vh - 28px)'; max-height: ~'calc(100vh - 28px)';
padding : 8px 5px 13px; padding: 8px 5px 13px;
overflow : hidden auto; overflow: hidden auto;
color : white; color: white;
text-decoration : none; text-decoration: none;
scrollbar-color : #666666 #333333; scrollbar-color: #666666 #333333;
scrollbar-width : thin; scrollbar-width: thin;
background-color : #333333; background-color: #333333;
border-top : 1px solid #888888; border-top: 1px solid #888888;
.clear { .clear {
position : absolute; position: absolute;
top : 50%; top: 50%;
right : 0; right: 0;
display : none; display: none;
width : 20px; width: 20px;
height : 100%; height: 100%;
background-color : #333333; background-color: #333333;
border-radius : 3px; border-radius: 3px;
opacity : 70%; opacity: 70%;
transform : translateY(-50%); transform: translateY(-50%);
&:hover { opacity : 100%; } &:hover {
opacity: 100%;
}
i { i {
width : 100%; width: 100%;
height : 100%; height: 100%;
margin : 0; margin: 0;
font-size : 10px; font-size: 10px;
text-align : center; text-align: center;
} }
} }
&:hover { &:hover {
background-color : @blue; background-color: @blue;
.clear { .clear {
display : grid; display: grid;
place-content : center; place-content: center;
} }
} }
.title { .title {
display : inline-block; display: inline-block;
width : 100%; width: 100%;
overflow : hidden auto; overflow: hidden auto;
text-overflow : ellipsis; text-overflow: ellipsis;
white-space : nowrap; white-space: nowrap;
} }
.time { .time {
position : absolute; position: absolute;
right : 2px; right: 2px;
bottom : 2px; bottom: 2px;
font-size : 0.7em; font-size: 0.7em;
color : #888888; color: #888888;
} }
&.header { &.header {
box-sizing : border-box; box-sizing: border-box;
display : block; display: block;
padding : 5px 0; padding: 5px 0;
color : #BBBBBB; color: #bbbbbb;
text-align : center; text-align: center;
background-color : #333333; background-color: #333333;
border-top : 1px solid #888888; border-top: 1px solid #888888;
&:nth-of-type(1) { background-color : darken(@teal, 20%); } &:nth-of-type(1) {
&:nth-of-type(2) { background-color : darken(@purple, 30%); } background-color: darken(@teal, 20%);
}
&:nth-of-type(2) {
background-color: darken(@purple, 30%);
}
} }
} }
} }
@@ -333,12 +273,71 @@
// this should likely be refactored into .navDropdownContainer // this should likely be refactored into .navDropdownContainer
.save-menu { .save-menu {
.dropdown { z-index : 1000; } .dropdown {
z-index: 1000;
}
.navItem i.fa-power-off { .navItem i.fa-power-off {
color : red; color: red;
&.active { &.active {
color : rgb(0, 182, 52); color: rgb(0, 182, 52);
filter : drop-shadow(0 0 2px rgba(0, 182, 52, 0.765)); filter: drop-shadow(0 0 2px rgba(0, 182, 52, 0.765));
}
}
}
.homebrew nav {
color: #ccc;
background: #333;
height: 30px;
font-size: 14px;
font-family:Alata;
button, a {
&:disabled {
color: #777;
}
display: grid;
place-items: center;
height: 100%;
width: 100%;
padding: 5px;
}
a {
color: inherit;
text-decoration: none;
}
.navItem, .menu-wrapper {
&:hover {
background:#555;
}
}
> ul {
display: flex;
gap: 15px;
align-items: center;
height: 100%;
> .menu-wrapper {
height: 100%;
&:first-child {
padding-left: 10px;
}
}
}
> ul ul {
background: #333;
font-size: 12px;
text-transform: capitalize;
.nav-section:not(:last-child) {
border-bottom: 1px solid;
margin-bottom: 10px;
}
li {
margin-block: 2px;
} }
} }
} }
+2 -8
View File
@@ -65,13 +65,7 @@ const NewBrew = ()=>{
return ( return (
<Nav.dropdown> <div className='nav-section'>
<Nav.item
className='new'
color='purple'
icon='fa-solid fa-plus-square'>
new
</Nav.item>
<Nav.item <Nav.item
className='new' className='new'
href='/new' href='/new'
@@ -96,7 +90,7 @@ const NewBrew = ()=>{
<input id='uploadTxt' className='newFromLocal' type='file' onChange={handleFileChange} style={{ display: 'none' }} /> <input id='uploadTxt' className='newFromLocal' type='file' onChange={handleFileChange} style={{ display: 'none' }} />
from file from file
</Nav.item> </Nav.item>
</Nav.dropdown> </div>
); );
}; };
@@ -1,13 +0,0 @@
import React from 'react';
import Nav from './nav.jsx';
export default function(props){
return <Nav.item
className='patreon'
newTab={true}
href='https://www.patreon.com/NaturalCrit'
color='green'
icon='fas fa-heart'>
help out
</Nav.item>;
};
+2 -2
View File
@@ -165,12 +165,12 @@ const RecentItems = createReactClass({
}, },
render : function(){ render : function(){
return <Nav.dropdown className='recent'> return <div className='recent'>
<Nav.item icon='fas fa-history' color='grey' > <Nav.item icon='fas fa-history' color='grey' >
{this.props.text} {this.props.text}
</Nav.item> </Nav.item>
{this.renderDropdown()} {this.renderDropdown()}
</Nav.dropdown>; </div>;
} }
}); });
+22 -4
View File
@@ -17,8 +17,25 @@ const getRedditLink = (brew)=>{
return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`; return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
}; };
export default ({ brew, currentPage })=>( export default ({ brew, currentPage })=> {
<Nav.dropdown> if(!brew) return (
<div className='nav-section'>
<Nav.item icon='fas fa-share-alt' disabled>
share
</Nav.item>
<Nav.item disabled>
view
</Nav.item>
<Nav.item disabled>
copy url
</Nav.item>
<Nav.item disabled>
post to reddit
</Nav.item>
</div>
)
return (
<div className='nav-section'>
<Nav.item color='teal' icon='fas fa-share-alt'> <Nav.item color='teal' icon='fas fa-share-alt'>
share share
</Nav.item> </Nav.item>
@@ -37,5 +54,6 @@ export default ({ brew, currentPage })=>(
<Nav.item color='blue' href={getRedditLink(brew)} newTab rel='noopener noreferrer'> <Nav.item color='blue' href={getRedditLink(brew)} newTab rel='noopener noreferrer'>
post to reddit post to reddit
</Nav.item> </Nav.item>
</Nav.dropdown> </div>
); )
};
-17
View File
@@ -1,17 +0,0 @@
import React from 'react';
import Nav from './nav.jsx';
export default function (props) {
return (
<Nav.item
color='purple'
icon='fas fa-dungeon'
href='/vault'
newTab={false}
rel='noopener noreferrer'
>
Vault
</Nav.item>
);
};
@@ -11,7 +11,6 @@ import Account from '@navbar/account.navitem.jsx';
import NewBrew from '@navbar/newbrew.navitem.jsx'; import NewBrew from '@navbar/newbrew.navitem.jsx';
import HelpNavItem from '@navbar/help.navitem.jsx'; import HelpNavItem from '@navbar/help.navitem.jsx';
import ErrorNavItem from '@navbar/error-navitem.jsx'; import ErrorNavItem from '@navbar/error-navitem.jsx';
import VaultNavitem from '@navbar/vault.navitem.jsx';
const UserPage = (props)=>{ const UserPage = (props)=>{
props = { props = {
@@ -49,7 +48,6 @@ const UserPage = (props)=>{
{error && (<ErrorNavItem error={error} clearError={clearError}></ErrorNavItem>)} {error && (<ErrorNavItem error={error} clearError={clearError}></ErrorNavItem>)}
<NewBrew /> <NewBrew />
<HelpNavItem /> <HelpNavItem />
<VaultNavitem />
<RecentNavItem /> <RecentNavItem />
<Account /> <Account />
</Nav.section> </Nav.section>
@@ -17,7 +17,6 @@ import NewBrewItem from '@navbar/newbrew.navitem.jsx';
import AccountNavItem from '@navbar/account.navitem.jsx'; import AccountNavItem from '@navbar/account.navitem.jsx';
import ErrorNavItem from '@navbar/error-navitem.jsx'; import ErrorNavItem from '@navbar/error-navitem.jsx';
import HelpNavItem from '@navbar/help.navitem.jsx'; import HelpNavItem from '@navbar/help.navitem.jsx';
import VaultNavItem from '@navbar/vault.navitem.jsx';
import PrintNavItem from '@navbar/print.navitem.jsx'; import PrintNavItem from '@navbar/print.navitem.jsx';
import ShareNavItem from '@navbar/share.navitem.jsx'; import ShareNavItem from '@navbar/share.navitem.jsx';
import RecentNavItems from '@navbar/recent.navitem.jsx'; import RecentNavItems from '@navbar/recent.navitem.jsx';
@@ -278,7 +277,6 @@ export default function useCommonEditPageFunctions(dependencies) {
<NewBrewItem /> <NewBrewItem />
<PrintNavItem /> <PrintNavItem />
<HelpNavItem /> <HelpNavItem />
<VaultNavItem />
{(pageName == 'editPage') && <ShareNavItem brew={currentBrew} currentPage={currentBrewRendererPageNum} />} {(pageName == 'editPage') && <ShareNavItem brew={currentBrew} currentPage={currentBrewRendererPageNum} />}
<RecentNavItem brew={currentBrew} storageKey={(pageName == 'editPage') ? 'edit' : undefined} /> <RecentNavItem brew={currentBrew} storageKey={(pageName == 'editPage') ? 'edit' : undefined} />
<AccountNavItem /> <AccountNavItem />