Skip to content

Commit

Permalink
Merge pull request #109 from Jibesh10101011/bugfix/108-add-images-folder
Browse files Browse the repository at this point in the history
Added images folder
  • Loading branch information
Pranav0-0Aggarwal authored Dec 18, 2024
2 parents 1d5f78c + 141e0aa commit 8ca8b08
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
1 change: 1 addition & 0 deletions frontend/src/components/AITagging/FilterControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export default function FilterControls({
)}
<div className="flex items-center gap-4 overflow-auto">
<FolderPicker setFolderPath={handleFolderPick} />

<Button onClick={() => setIsVisibleSelectedImage(false)} variant="outline">
Delete Image
</Button>
Expand Down
20 changes: 11 additions & 9 deletions frontend/src/components/Navigation/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
export function Navbar(props: { title?: string }) {
return (
<>
<header className="flex w-full flex-row items-center justify-center align-middle">
<div className="flex h-16 items-center justify-between bg-[#333333] px-16 w-[50%] mt-3 rounded-3xl ">
<div className="flex justify-center mt-4">
<header className="flex h-16 w-1/2 rounded-full items-center justify-between bg-[#333333] px-6">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2">
<img src="/tauri.svg" height={"20px"} width={"20px"} alt="" />
<img src="/tauri.svg" height="20px" width="20px" alt="" />
<span className="font-sans text-lg font-bold text-gray-50">
Pictopy
<div className="flex items-center gap-4">
<span className="font-sans text-lg font-medium text-gray-50">
Welcome {props.title || 'User'}
</span>
</div>
</div>
<div className="flex items-center gap-4">
<span className="font-sans text-lg font-medium text-gray-50">
Welcome {props.title || 'User'}
</span>
</div>
</header>
</>
</div>
);
}
}
3 changes: 2 additions & 1 deletion frontend/src/layout/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Sidebar from '@/components/Navigation/Sidebar/Sidebar';
const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
return (
<div className="flex w-full flex-col bg-gray-900">
<Navbar />
<div className="sidebar flex" style={{ height: 'calc(100vh - 64px)' }}>
<Sidebar />
<div className="flex flex-1 overflow-x-auto p-4 text-white">
Expand All @@ -14,4 +15,4 @@ const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
);
};

export default Layout;
export default Layout;
Binary file added images/imag1.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8ca8b08

Please sign in to comment.