Skip to content

Commit

Permalink
WIP Rename settingspanelcomponent
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp Kuhlmay committed Feb 21, 2024
1 parent 952a377 commit 789c9d9
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
34 changes: 17 additions & 17 deletions Build/Sources/App.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useNodesState, useEdgesState} from 'reactflow';
import {useEffect, useState, useContext, createContext} from "react";
import {LeftContentComponent} from "./components/views/LeftContentComponent";
import {SettingsPanelComponent} from "./components/views/SettingsPanelComponent";
import {RightContentComponent} from "./components/views/RightContentComponent";
import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
import initialProperties from "./initialValues/properties";
Expand All @@ -27,8 +27,8 @@ function App() {
const [modules, setModules] = useState([]);
const [validationErrors, setValidationErrors] = useState(null);

// Zustand für das Ein- und Ausklappen der linken Spalte
const [isLeftColumnVisible, setLeftColumnVisible] = useState(true);
// Zustand für das Ein- und Ausklappen der Settings Spalte
const [isSettingsColumnVisible, setIsSettingsColumnVisible] = useState(true);

// Zustand für das Ein- und Ausklappen der erweiterten Optionen
const [isAdvancedOptionsVisible, setAdvancedOptionsVisible] = useState(false);
Expand All @@ -42,15 +42,15 @@ function App() {
};

useEffect(() => {
const leftColumn = document.getElementById('left-column');
if (leftColumn) {
leftColumn.style.opacity = isLeftColumnVisible ? '1' : '0';
const settingsColumn = document.getElementById('settings-column');
if (settingsColumn) {
settingsColumn.style.opacity = isSettingsColumnVisible ? '1' : '0';
}
}, [isLeftColumnVisible]);
}, [isSettingsColumnVisible]);

// Funktion zum Umschalten der Sichtbarkeit der linken Spalte
const toggleLeftColumn = () => {
setLeftColumnVisible(!isLeftColumnVisible);
const toggleSettingsColumn = () => {
setIsSettingsColumnVisible(!isSettingsColumnVisible);
}

const toggleAdvcancedOptions = () => {
Expand Down Expand Up @@ -265,19 +265,19 @@ function App() {
<button
id="show-advanced-options"
type="button"
className={`btn btn-primary position-fixed ${isLeftColumnVisible ? 'expanded' : 'collapsed'}`}
className={`btn btn-primary position-fixed ${isSettingsColumnVisible ? 'expanded' : 'collapsed'}`}
onClick={toggleAdvcancedOptions}
>
<FontAwesomeIcon className="p-0 m-0" icon="fa-solid fa-cog" />{!isAdvancedOptionsVisible ? 'Show' : 'Hide'} advanced options
</button>
<button
id="btn-sidebar-collapse"
type="button"
className={`btn btn-primary position-fixed ${isLeftColumnVisible ? 'expanded' : 'collapsed'}`}
onClick={toggleLeftColumn}
className={`btn btn-primary position-fixed ${isSettingsColumnVisible ? 'expanded' : 'collapsed'}`}
onClick={toggleSettingsColumn}
>
{isLeftColumnVisible && <FontAwesomeIcon className="p-0 m-0" icon="fa-solid fa-arrow-left" />}
{!isLeftColumnVisible && <FontAwesomeIcon className="p-0 m-0" icon="fa-solid fa-arrow-right" />}
{isSettingsColumnVisible && <FontAwesomeIcon className="p-0 m-0" icon="fa-solid fa-arrow-left" />}
{!isSettingsColumnVisible && <FontAwesomeIcon className="p-0 m-0" icon="fa-solid fa-arrow-right" />}
</button>
<div className="collapse" id="collapseExample">
<div className="card card-body">
Expand All @@ -286,12 +286,12 @@ function App() {
</div>
</div>
<div className="row">
<div id="left-column" className="fs-3 no-padding full-height">
<div id="settings-column" className="fs-3 no-padding full-height">
<div className="p-1">
<EdgesContext.Provider value={{edges, setEdges, onEdgesChange}}>
<NodesContext.Provider value={{nodes, setNodes, onNodesChange}}>
<ValidationErrorsContext.Provider value={{validationErrors, setValidationErrors}}>
<LeftContentComponent
<SettingsPanelComponent
properties={properties}
authors={authors}
plugins={plugins}
Expand All @@ -316,7 +316,7 @@ function App() {
</EdgesContext.Provider>
</div>
</div>
<div style={{left: isLeftColumnVisible ? '400px' : '0', width: isLeftColumnVisible ? 'calc(100vw - 400px)' : '100vw'}} id="right-column" className="no-padding full-height">
<div style={{left: isSettingsColumnVisible ? '400px' : '0', width: isSettingsColumnVisible ? 'calc(100vw - 400px)' : '100vw'}} id="right-column" className="no-padding full-height">
<div >
<CustomModelNodeIndexContext.Provider value={{customModelNodeIndex, setCustomModelNodeIndex}}>
<AdvancedOptionsContext.Provider value={{isAdvancedOptionsVisible}}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Fragment, useContext} from "react";
import {ActionButtonsComponent} from "../ActionButtonsComponent";
import {EdgesContext} from "../../App";

export const LeftContentComponent = (props) => {
export const SettingsPanelComponent = (props) => {
return (
<Fragment>
<div>
Expand Down
6 changes: 3 additions & 3 deletions Build/Sources/helper/helper.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export function resizeLeftSidebar(isRightColumnFullWidth) {
export function resizeSettingsSidebar(isRightColumnFullWidth) {
if (isRightColumnFullWidth) {
document.getElementById('left-column').style.opacity = '0';
document.getElementById('settings-column').style.opacity = '0';
} else {
document.getElementById('left-column').style.opacity = '1';
document.getElementById('settings-column').style.opacity = '1';
}
}
4 changes: 2 additions & 2 deletions Build/Sources/helper/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {resizeLeftSidebar} from "./helper";
import {resizeSettingsSidebar} from "./helper";
import {getExtensionKeyIsValid} from "./validation/getExtensionKeyIsValid";

export {resizeLeftSidebar}
export {resizeSettingsSidebar}
export {getExtensionKeyIsValid}
6 changes: 3 additions & 3 deletions Resources/Public/Css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@
text-align: left;
}

#left-column, #right-column {
#settings-column, #right-column {
height: 100vh;
z-index: 1;
transition: 0.5s ease;
}

#left-column {
#settings-column {
width: 400px;
overflow-y: auto;
scrollbar-width: none;
-ms-overflow-style: none;
}
#left-column::-webkit-scrollbar {
#settings-column::-webkit-scrollbar {
display: none;
}

Expand Down
28 changes: 14 additions & 14 deletions Resources/Public/JavaScript/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Resources/Public/Scss/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ $transition-timing: 0.5s ease;
$btn-background: #F4F4F4;
$generic-z-index: 1;

#left-column, #right-column {
#settings-column, #right-column {
height: 100vh;
z-index: $generic-z-index;
transition: $transition-timing;
}

#left-column {
#settings-column {
width: 400px;
overflow-y: auto;

Expand Down

0 comments on commit 789c9d9

Please sign in to comment.