Skip to content

Commit

Permalink
final changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Alien501 committed Dec 12, 2024
1 parent 3e42909 commit 87ff2de
Show file tree
Hide file tree
Showing 10 changed files with 450 additions and 221 deletions.
5 changes: 5 additions & 0 deletions admin/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import FormPage from './pages/FormPage'
import ControlPlanTemplateBuilder from './pages/createControlPlan'
import { RenderSmpForm } from './pages/renderSmpForm'
import SoftwareIntegration from './pages/SoftwareIntegration'
import { RenderShiftTemplateForm } from './pages/renderShiftTemplateForm'


interface ErrorPageProps {
Expand Down Expand Up @@ -360,6 +361,10 @@ function App() {
{
path: '/form/:id',
element: <RenderSmpForm />
},
{
path: '/shift/form/:id',
element: <RenderShiftTemplateForm />
}
])

Expand Down
16 changes: 11 additions & 5 deletions admin/src/components/custom/Navbars.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Avatar, AvatarImage } from "../ui/avatar";
import { Button } from "../ui/button";
import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
import { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupContent, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from "../ui/sidebar"
import { Calendar, FileTextIcon, FolderCog2Icon, ForkliftIcon, Gauge, PickaxeIcon, ReplaceAll, Settings, SunIcon, TriangleAlert, UserRoundCog } from "lucide-react";
import { Calendar, FileTextIcon, FolderCog2Icon, ForkliftIcon, Gauge, LanguagesIcon, PickaxeIcon, ReplaceAll, Settings, SunIcon, TriangleAlert, UserRoundCog } from "lucide-react";
import { Box } from "lucide-react"
import { useTheme } from "./theme";

Expand Down Expand Up @@ -104,10 +104,16 @@ const SideNavbar = () => {
<SidebarMenu>
<SidebarMenuItem>
<SidebarMenuButton asChild>
<Button onClick={toggleTheme} variant={'ghost'} className="flex items-center justify-start">
<SunIcon />
<span className="text-sm font-medium">Change Theme</span>
</Button>
<div>
<Button className="flex items-center justify-start" variant='ghost'>
<LanguagesIcon />
<span className="text-sm font-medium">Change Language</span>
</Button>
<Button onClick={toggleTheme} variant={'ghost'} className="flex items-center justify-start">
<SunIcon />
<span className="text-sm font-medium">Change Theme</span>
</Button>
</div>
</SidebarMenuButton>
</SidebarMenuItem>
</SidebarMenu>
Expand Down
Loading

0 comments on commit 87ff2de

Please sign in to comment.