added mxing placeholder and tweaked spacing

This commit is contained in:
thekingofjibs 2020-03-18 16:18:14 +00:00 committed by Marks Polakovs
parent 2fff0b7be0
commit 2b73b3e9a3
2 changed files with 22 additions and 6 deletions

View file

@ -25,6 +25,8 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
margin-left: .5%;
margin-right: .5%;
} }
.sp { .sp {
@ -116,3 +118,8 @@ html, body, #root {
button{ button{
background-color: rgb(199, 199, 199); background-color: rgb(199, 199, 199);
} }
.player div {
height: 16%;
overflow-x: hidden;
}

View file

@ -84,9 +84,9 @@ function Player({ id }: { id: number }) {
const dispatch = useDispatch(); const dispatch = useDispatch();
return ( return (
<div style={{height:"16%"}}> <div style={{height:"16%"}} className="player">
{playerState.loadedItem == null && (<div>No Media Selected</div>)} {playerState.loadedItem == null && (<div>No Media Selected</div>)}
{(playerState.loadedItem !== null && playerState.loading == false) && (<div>{playerState.loadedItem.title}</div>)} {(playerState.loadedItem !== null && playerState.loading == false) && (<div>{playerState.loadedItem.title}</div>)}
{playerState.loading && <b>LOADING</b>} {playerState.loading && <b>LOADING</b>}
<div className="mediaButtons" style={{height:"100%"}}> <div className="mediaButtons" style={{height:"100%"}}>
<button <button
@ -184,8 +184,7 @@ function CentralMusicLibrary() {
function LibraryColumn() { function LibraryColumn() {
const [sauce, setSauce] = useState("None"); const [sauce, setSauce] = useState("None");
return ( return (
<div className="sp-main-col"> <div className="sp-col" style={{height:"48%", marginBottom:"1%"}}>
<div className="sp-col" style={{height:"98%"}}>
<select <select
style={{ width: "100%" }} style={{ width: "100%" }}
value={sauce} value={sauce}
@ -198,7 +197,15 @@ function LibraryColumn() {
</select> </select>
{sauce === "CentralMusicLibrary" && <CentralMusicLibrary />} {sauce === "CentralMusicLibrary" && <CentralMusicLibrary />}
</div> </div>
</div> );
}
function MixingInterface(){
const [sauce, setSauce] = useState("None");
return (
<div className="sp-col" style={{height:"48%", overflowY:"visible"}}>
<h1>Mixing Interface</h1>
</div>
); );
} }
@ -282,10 +289,12 @@ const Showplanner: React.FC<{ timeslotId: number }> = function({ timeslotId }) {
<Column id={0} data={showplan} /> <Column id={0} data={showplan} />
<Column id={1} data={showplan} /> <Column id={1} data={showplan} />
<Column id={2} data={showplan} /> <Column id={2} data={showplan} />
<div className="sp-main-col" style={{marginRight:".2%"}}>
<LibraryColumn /> <LibraryColumn />
<MixingInterface />
</div>
</DragDropContext> </DragDropContext>
</div> </div>
<ContextMenu id={TS_ITEM_MENU_ID}> <ContextMenu id={TS_ITEM_MENU_ID}>
<MenuItem onClick={onCtxRemoveClick}>Remove</MenuItem> <MenuItem onClick={onCtxRemoveClick}>Remove</MenuItem>
</ContextMenu> </ContextMenu>