Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Report from "./components/Report";
import Bibliotek from "./components/Bibliotek";
import TemplatePicker from "./components/TemplatePicker";
import TemplateSessionEditor from "./components/TemplateSessionEditor";
import Planlegger from "./components/Planlegger";

function App() {
const [session, setSession] = useState(undefined);
Expand Down Expand Up @@ -40,6 +41,7 @@ function App() {
onShowHistoryWithDate: (dateStr) => { setHistoryInitialDate(dateStr); setView("history"); },
onShowTemplatePicker: () => setView("template-picker"),
onShowReportWithPrefill: (prefill) => { setReportPrefill(prefill); setView("report"); },
onShowPlanlegger: () => setView("planlegger"),
};

let content;
Expand Down Expand Up @@ -85,6 +87,8 @@ function App() {
setView("logger");
}}
/>;
else if (view === "planlegger")
content = <Planlegger />;
else
content = <MuscleMap
templatePreload={pendingTemplateExercises}
Expand Down
11 changes: 7 additions & 4 deletions app/src/components/PageShell.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from "react";
import { Camera, RecentlyViewed, Analytics, Book, Asleep, Light, ArrowLeft, Logout } from "@carbon/icons-react";
import { Camera, RecentlyViewed, Analytics, Book, Asleep, Light, ArrowLeft, Logout, EventSchedule } from "@carbon/icons-react";
import { version } from "../../package.json";
import { Button } from "@carbon/react";
import { useTheme } from "../theme";
Expand All @@ -18,8 +18,8 @@ function NavBtn({ onClick, ariaLabel, active, children }) {
borderBottom: active ? "2px solid var(--accent)" : "2px solid transparent",
cursor: "pointer",
color: active ? "var(--accent)" : "var(--cds-icon-primary)",
padding: "0 10px",
width: 48,
padding: "0 4px",
width: 36,
height: 48,
display: "flex",
alignItems: "center",
Expand Down Expand Up @@ -123,7 +123,7 @@ export function BackButton({ onClick }) {

export default function PageShell({ children }) {
const { theme, setTheme } = useTheme();
const { currentView, onShowHome, onShowLogger, onShowHistory, onShowReport, onShowBibliotek } = useNav();
const { currentView, onShowHome, onShowLogger, onShowHistory, onShowReport, onShowBibliotek, onShowPlanlegger } = useNav();
const [changelogOpen, setChangelogOpen] = useState(false);

return (
Expand Down Expand Up @@ -171,6 +171,9 @@ export default function PageShell({ children }) {
<NavBtn ariaLabel="Bibliotek" onClick={onShowBibliotek} active={currentView === "bibliotek"}>
<Book size={20} />
</NavBtn>
<NavBtn ariaLabel="Planlegg uke" onClick={onShowPlanlegger} active={currentView === "planlegger"}>
<EventSchedule size={20} />
</NavBtn>
<NavBtn ariaLabel="Bytt tema" onClick={() => setTheme(theme === "g10" ? "g100" : "g10")}>
{theme === "g10" ? <Asleep size={20} /> : <Light size={20} />}
</NavBtn>
Expand Down
Loading
Loading