ash/WebStudio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #130 from UniversityRadioYork/markspolakovs-reload-showplan

Browse source 
Allow reloading show plan
This commit is contained in:
Marks Polakovs 2020-06-08 17:05:37 +02:00 committed by GitHub
commit 1c290fb76c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/navbar/index.tsx
View file

@ -19,6 +19,7 @@ import "./navbar.scss";
import { closeAlert } from "./state";
import { ConnectionStateEnum } from "../broadcast/streamer";
import { VUMeter } from "../optionsMenu/helpers/VUMeter";
import { getShowplan } from "../showplanner/state";
function nicifyConnectionState(state: ConnectionStateEnum): string {
switch (state) {
@ -183,6 +184,15 @@ export function NavBar() {
>
Switch Timeslot
</a>
<button
className="dropdown-item"
onClick={() =>
sessionState.currentTimeslot !== null &&
dispatch(getShowplan(sessionState.currentTimeslot.timeslot_id))
}
>
Reload Show Plan
</button>
<h6 className="dropdown-header">
{sessionState.currentTimeslot?.title}
</h6>

41
src/navbar/navbar.scss
View file

@ -117,12 +117,12 @@ $dot-color: #fff;
border-top: none;
}
.navbar-ury .navbar-nav > li > .dropdown-menu > a {
.navbar-ury .navbar-nav > li > .dropdown-menu > .dropdown-item {
color: #ffffff;
}
.navbar-ury .navbar-nav > li > .dropdown-menu > a:hover,
.navbar-ury .navbar-nav > li > .dropdown-menu > a:focus {
.navbar-ury .navbar-nav > li > .dropdown-menu > .dropdown-item:hover,
.navbar-ury .navbar-nav > li > .dropdown-menu > .dropdown-item:focus {
color: #e1e1e1;
background-color: #2d425f;
}
@ -131,23 +131,23 @@ $dot-color: #fff;
background-color: #2d425f;
}
.navbar-ury .navbar-nav .open .dropdown-menu > .active > a,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > a:focus {
.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:hover,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:focus {
color: #e1e1e1;
background-color: #2d333c;
}
.navbar-ury .navbar-nav > .active > a,
.navbar-ury .navbar-nav > .active > a:hover,
.navbar-ury .navbar-nav > .active > a:focus {
.navbar-ury .navbar-nav > .active > .dropdown-item,
.navbar-ury .navbar-nav > .active > .dropdown-item:hover,
.navbar-ury .navbar-nav > .active > .dropdown-item:focus {
color: #e1e1e1;
background-color: #2d333c;
}
.navbar-ury .navbar-nav > .open > a,
.navbar-ury .navbar-nav > .open > a:hover,
.navbar-ury .navbar-nav > .open > a:focus {
.navbar-ury .navbar-nav > .open > .dropdown-item,
.navbar-ury .navbar-nav > .open > .dropdown-item:hover,
.navbar-ury .navbar-nav > .open > .dropdown-item:focus {
color: #e1e1e1;
background-color: #2d425f !important;
}
@ -184,16 +184,21 @@ $dot-color: #fff;
}
@media (max-width: 767px) {
.navbar-ury .navbar-nav .open .dropdown-menu > li > a {
.navbar-ury .navbar-nav .open .dropdown-menu > li > .dropdown-item {
color: #ffffff;
}
.navbar-ury .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar-ury .navbar-nav .open .dropdown-menu > li > a:focus {
.navbar-ury .navbar-nav .open .dropdown-menu > li > .dropdown-item:hover,
.navbar-ury .navbar-nav .open .dropdown-menu > li > .dropdown-item:focus {
color: #e1e1e1;
}
.navbar-ury .navbar-nav .open .dropdown-menu > .active > a,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > a:focus {
.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item,
.navbar-ury .navbar-nav .open .dropdown-menu > .active > .dropdown-item:hover,
.navbar-ury
.navbar-nav
.open
.dropdown-menu
> .active
> .dropdown-item:focus {
color: #e1e1e1;
background-color: #2d425f;
}