Skip to content
Merged
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
6 changes: 1 addition & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build Succeeds on PR
on:
pull_request:
branches:
- master
- main

jobs:
build:
Expand All @@ -24,7 +24,3 @@ jobs:

- name: Run build
run: npm run build

- name: Create certificate
run: npm run generate-ssl

5 changes: 2 additions & 3 deletions src/pages/dashboard/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ErrorBoundary from "@/components/error-boundary";

export const AdminDashboardLayout = () => {
const [activeItem, setActiveItem] = useState("dashboard");
console.log(activeItem);

return (
<div className="min-h-screen h-screen bg-background flex flex-col">
Expand All @@ -17,9 +18,7 @@ export const AdminDashboardLayout = () => {
<div className="flex flex-1 overflow-hidden">
{/* Sidebar */}
<ErrorBoundary>
<AdminPortalSidebar
onItemSelect={setActiveItem}
/>
<AdminPortalSidebar onItemSelect={setActiveItem} />
</ErrorBoundary>

{/* Main Content */}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dashboard/setting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const Setting = () => {
className="w-full sm:w-auto cursor-pointer"
type="submit"
>
Save Changes
{isLoading ? "Saving" : "Save Changes"}
</Button>
</form>
</CardContent>
Expand Down
2 changes: 1 addition & 1 deletion src/store/hooks/useAdminData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useRecoilStateLoadable } from "recoil";
import { admin } from "../atoms/admin";

export const useAdminData = () => {
const [adminData, setAdminData] = useRecoilStateLoadable(admin);
const [adminData] = useRecoilStateLoadable(admin);

if (adminData.state === "loading") {
return { loading: true, error: false, adminInfo: null };
Expand Down