Skip to content

Commit 3183200

Browse files
author
Gogs
committed
Fix displaying the delete symbol
1 parent ec4233d commit 3183200

2 files changed

Lines changed: 57 additions & 9 deletions

File tree

resources/css/styles.css

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,28 @@ body {
241241
margin-top: 0;
242242
}
243243

244+
.folder-item {
245+
display: flex;
246+
justify-content: space-between;
247+
padding: 5px;
248+
}
249+
244250
.subfolders {
245-
margin-left: 10px;
251+
margin-left: 25px;
252+
}
253+
254+
.folder-setting,
255+
.person-setting,
256+
.state-setting{
257+
display: none;
246258
}
247259

248260
.person,
249261
.state,
250262
.tag {
251263
display: flex;
252264
justify-content: space-between;
265+
padding: 5px;
253266
}
254267

255268
.pointer {

resources/js/homepage.js

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class State extends React.Component {
77
return (
88
<div className="state">
99
<span style={{cursor: 'pointer'}} onClick={() => filterElement('state_filter', this.props.id)}>{this.props.name}</span>
10-
<span className='pointer' className='pointer' onClick={() => deleteElement(this.props.id, 'states/', 'state')}>🗑️</span>
10+
<span className='state-setting pointer' onClick={() => deleteElement(this.props.id, 'states/', 'state')}>🗑️</span>
1111
</div>
1212
);
1313
}
@@ -37,7 +37,11 @@ class States extends React.Component {
3737
render() {
3838
return (
3939
<div id="states-wrapper">
40-
<h4 className='flex-heading'><span>States</span> <span id="new-state" className='new-span' onClick={() => document.getElementById('create-state').style.display = 'flex'}>➕ New</span></h4>
40+
<h4 className='flex-heading'>
41+
<span>States</span>
42+
<span id="state-settings" className="pointer" onClick={() => showStateSettings()}>⚙️</span>
43+
<span id="new-state" className='state-setting new-span' onClick={() => document.getElementById('create-state').style.display = 'flex'}>➕ New</span>
44+
</h4>
4145
<div id="states">
4246
{this.state.states}
4347
</div>
@@ -51,7 +55,7 @@ class Person extends React.Component {
5155
return (
5256
<div className="person">
5357
<span style={{cursor: 'pointer'}} onClick={() => filterElement('person_filter', this.props.id)}>{this.props.name}</span>
54-
<span className='pointer' onClick={() => deleteElement(this.props.id, 'people/', 'person')}>🗑️</span>
58+
<span className='person-setting pointer' onClick={() => deleteElement(this.props.id, 'people/', 'person')}>🗑️</span>
5559
</div>
5660
);
5761
}
@@ -81,7 +85,11 @@ class Persons extends React.Component {
8185
render() {
8286
return (
8387
<div id="persons-wrapper">
84-
<h4 className='flex-heading'><span>Persons</span> <span id="new-person" className='new-span' onClick={() => document.getElementById('create-person').style.display = 'flex'}>➕ New</span></h4>
88+
<h4 className='flex-heading'>
89+
<span>Persons</span>
90+
<span id="person-settings" className="pointer" onClick={() => showPersonSettings()}>⚙️</span>
91+
<span id="new-person" className='person-setting new-span' onClick={() => document.getElementById('create-person').style.display = 'flex'}>➕ New</span>
92+
</h4>
8593
<div id="persons">
8694
{this.state.persons}
8795
</div>
@@ -138,8 +146,10 @@ class Folder extends React.Component {
138146
render(props) {
139147
return (
140148
<div className="folder">
141-
<span style={{cursor: 'pointer'}} onClick={() => filterElement('folder_filter', this.props.id)}>{this.props.name}</span>
142-
<span className='pointer' onClick={() => deleteElement(this.props.id, 'folders/', 'folder')}>🗑️</span>
149+
<div className="folder-item">
150+
<span style={{cursor: 'pointer'}} onClick={() => filterElement('folder_filter', this.props.id)}>{this.props.name}</span>
151+
<span className='folder-setting pointer' onClick={() => deleteElement(this.props.id, 'folders/', 'folder')}>🗑️</span>
152+
</div>
143153
<div className="subfolders">
144154
{this.props.subfolders.map(f => <Folder key={f.id} id={f.id} name={f.name} subfolders={f.folders}/>)}
145155
</div>
@@ -173,8 +183,9 @@ class Folders extends React.Component {
173183
return (
174184
<div id="folder-wrapper">
175185
<h4 className='flex-heading'>
176-
<span>Folders</span>
177-
<span id="new-folder" className='new-span' onClick={() => {loadFoldersInSelect(); document.getElementById('create-folder').style.display = 'flex'}}>➕ New</span>
186+
<span>Folders</span>
187+
<span id="folder-settings" className="pointer" onClick={() => showFolderSettings()}>⚙️</span>
188+
<span id="new-folder" className='folder-setting new-span' onClick={() => {loadFoldersInSelect(); document.getElementById('create-folder').style.display = 'flex'}}>➕ New</span>
178189
</h4>
179190
<div id="folders">
180191
{this.state.folders}
@@ -450,6 +461,30 @@ function loadFoldersInSelect() {
450461
});
451462
}
452463

464+
function showFolderSettings() {
465+
document.getElementById('folder-settings').style.display = 'none';
466+
var elements = document.getElementsByClassName('folder-setting');
467+
for (var i = 0; i < elements.length; i++) {
468+
elements[i].style.display = 'inline-block';
469+
}
470+
}
471+
472+
function showPersonSettings() {
473+
document.getElementById('person-settings').style.display = 'none';
474+
var elements = document.getElementsByClassName('person-setting');
475+
for (var i = 0; i < elements.length; i++) {
476+
elements[i].style.display = 'inline-block';
477+
}
478+
}
479+
480+
function showStateSettings() {
481+
document.getElementById('state-settings').style.display = 'none';
482+
var elements = document.getElementsByClassName('state-setting');
483+
for (var i = 0; i < elements.length; i++) {
484+
elements[i].style.display = 'inline-block';
485+
}
486+
}
487+
453488
// ========================================
454489

455490
ReactDOM.render(<Homepage/>, document.getElementById("root"));

0 commit comments

Comments
 (0)