Skip to content

feat: add functional title bar #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2024
Merged

feat: add functional title bar #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions app/edit/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
export default function RunLayout({
children,
}: {
children: React.ReactNode;
}) {
export default function EditLayout({children}: {children: React.ReactNode}) {
return (
<section className="absolute left-0 top-16">
<div className="border-t-1 border-gray-300 dark:border-zinc-900"
style={{width: `100vw`, height: `calc(100vh - 64px)`}}
>
<section className="absolute left-0 top-[90px]">
<div className="border-t-1 border-gray-300 dark:border-zinc-900" style={{width: `100vw`, height: `calc(100vh - 90px)`}}>
{children}
</div>
</section>
Expand Down
12 changes: 5 additions & 7 deletions app/explore/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
export default function RunLayout({
children,
}: {
children: React.ReactNode;
}) {
export default function ExploreLayout({children}: {children: React.ReactNode}) {
return (
<section>
{children}
<section className="absolute left-0 top-[90px]">
<div className="border-t-1 dark:border-zinc-800" style={{width: `100vw`, height: `calc(100vh - 90px)`}}>
{children}
</div>
</section>
);
}
2 changes: 1 addition & 1 deletion app/explore/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default function Explore() {
useEffect(() => { refresh() }, [authenticated]);

return (
<div className="w-full h-full">
<div className="w-3/4 px-10 h-full overflow-y-scroll mx-auto pt-10">
<div>
<div className="flex space-x-4 mb-4">
<Select radius="lg" label="Owners" color="primary" isDisabled={!owners.length} size="sm" aria-label="owners" selectionMode="multiple" className="w-1/6" variant="bordered" classNames={{label: 'text-gray-500 dark:text-gray-400', value:'text-black dark:text-white'}}
Expand Down
8 changes: 3 additions & 5 deletions app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {fontSans} from "@/config/fonts";
import {Providers} from "./providers";
import {Navbar} from "@/components/navbar";
import clsx from "clsx";
import TitleBar from "@/components/titlebar";

export const metadata: Metadata = {
title: {
Expand All @@ -24,11 +25,7 @@ export const viewport: Viewport = {
],
}

export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
export default function RootLayout({children}: {children: React.ReactNode}) {
return (
<html lang="en" suppressHydrationWarning>
<head/>
Expand All @@ -40,6 +37,7 @@ export default function RootLayout({
>
<Providers themeProps={{attribute: "class", defaultTheme: "dark"}}>
<div className="relative flex flex-col h-screen overflow-auto order-transparent">
<TitleBar/>
<Navbar/>
<main className="container mx-auto max-w-7xl pt-16 px-6 flex-grow">
{children}
Expand Down
10 changes: 3 additions & 7 deletions app/run/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
export default function RunLayout({
children,
}: {
children: React.ReactNode;
}) {
export default function RunLayout({children}: {children: React.ReactNode}) {
return (
<section className="absolute left-0 top-16">
<div className="border-t-1 dark:border-zinc-800" style={{width: `100vw`, height: `calc(100vh - 66px)`}}>
<section className="absolute left-0 top-[90px]">
<div className="border-t-1 dark:border-zinc-800" style={{width: `100vw`, height: `calc(100vh - 90px)`}}>
{children}
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion components/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {Logo} from "@/components/icons";

export const Navbar = () => {
return (
<NextUINavbar maxWidth="xl" position="sticky">
<NextUINavbar maxWidth="xl" height="10px" position="sticky">
<NavbarContent className="basis-1/5 sm:basis-full" justify="start">
<NavbarBrand as="li" className="gap-3 max-w-fit">
<NextLink className="flex justify-start items-center gap-1" href="/">
Expand Down
12 changes: 12 additions & 0 deletions components/titlebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use client";
import React, { useEffect } from 'react';

const TitleBar: React.FC = () => {
useEffect(() => {
document.getElementById("drag-bar")?.style.setProperty("-webkit-app-region", "drag");
}, []);

return <div id="drag-bar" className="w-full h-10"/>
};

export default TitleBar;
2 changes: 2 additions & 0 deletions electron/main.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ function createWindow(url) {
}
});

win.setWindowButtonVisibility(true)

win.loadURL(url);
win.webContents.on("did-fail-load", () => win.webContents.reloadIgnoringCache());
}
Expand Down