JohnCosta27/Haystack
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

wip(frontend): adding more information

Browse Source
This commit is contained in:
John Costa
2025-03-21 14:36:03 +00:00
parent ea5802b61b
commit 3541a4755c
9 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/.gen/haystack/haystack/model/events.go
View File

@ -15,5 +15,5 @@ type Events struct {
ID uuid.UUID `sql:"primary_key"`
Name string
Description *string
Location *uuid.UUID
LocationID *uuid.UUID
}

10
backend/.gen/haystack/haystack/table/events.go
View File

@ -20,7 +20,7 @@ type eventsTable struct {
ID postgres.ColumnString
Name postgres.ColumnString
Description postgres.ColumnString
Location postgres.ColumnString
LocationID postgres.ColumnString
AllColumns postgres.ColumnList
MutableColumns postgres.ColumnList
@ -64,9 +64,9 @@ func newEventsTableImpl(schemaName, tableName, alias string) eventsTable {
IDColumn = postgres.StringColumn("id")
NameColumn = postgres.StringColumn("name")
DescriptionColumn = postgres.StringColumn("description")
LocationColumn = postgres.StringColumn("location")
allColumns = postgres.ColumnList{IDColumn, NameColumn, DescriptionColumn, LocationColumn}
mutableColumns = postgres.ColumnList{NameColumn, DescriptionColumn, LocationColumn}
LocationIDColumn = postgres.StringColumn("location_id")
allColumns = postgres.ColumnList{IDColumn, NameColumn, DescriptionColumn, LocationIDColumn}
mutableColumns = postgres.ColumnList{NameColumn, DescriptionColumn, LocationIDColumn}
)
return eventsTable{
@ -76,7 +76,7 @@ func newEventsTableImpl(schemaName, tableName, alias string) eventsTable {
ID: IDColumn,
Name: NameColumn,
Description: DescriptionColumn,
Location: LocationColumn,
LocationID: LocationIDColumn,
AllColumns: allColumns,
MutableColumns: mutableColumns,

6
backend/models/events.go
View File

@ -24,6 +24,12 @@ func getEventValues(event model.Events) []any {
arr = append(arr, nil)
}
if event.LocationID != nil {
arr = append(arr, *event.LocationID)
} else {
arr = append(arr, nil)
}
return arr
}

2
backend/models/user.go
View File

@ -79,7 +79,7 @@ func (m UserModel) ListWithProperties(ctx context.Context, userId uuid.UUID) ([]
LEFT_JOIN(ImageLocations, ImageLocations.ImageID.EQ(UserImages.ImageID)).
LEFT_JOIN(Locations, Locations.ID.EQ(ImageLocations.LocationID)).
LEFT_JOIN(ImageEvents, ImageEvents.ImageID.EQ(UserImages.ImageID)).
LEFT_JOIN(Events, Events.ID.EQ(ImageEvents.ID))).
LEFT_JOIN(Events, Events.ID.EQ(ImageEvents.EventID))).
WHERE(UserImages.UserID.EQ(UUID(userId)))
fmt.Println(listWithPropertiesStmt.DebugSql())

2
backend/schema.sql
View File

@ -74,7 +74,7 @@ CREATE TABLE haystack.events (
name TEXT NOT NULL,
description TEXT,
location UUID REFERENCES haystack.locations (id)
location_id UUID REFERENCES haystack.locations (id)
);
CREATE TABLE haystack.image_events (

3
frontend/src-tauri/src/lib.rs
View File

@ -7,7 +7,7 @@ use std::sync::Arc;
use std::sync::Mutex;
use tauri::AppHandle;
use tauri::Emitter;
use tauri::{TitleBarStyle, WebviewUrl, WebviewWindowBuilder};
use tauri::{WebviewUrl, WebviewWindowBuilder};
struct WatcherState {
watcher: Option<RecommendedWatcher>,
@ -114,7 +114,6 @@ pub fn run() {
.invoke_handler(tauri::generate_handler![handle_selected_folder])
.setup(|app| {
let win_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default())
.hidden_title(true)
.inner_size(480.0, 360.0)
.resizable(true);
// set transparent title bar only when building for macOS

20
frontend/src/App.tsx
View File

@ -5,6 +5,7 @@ import clsx from "clsx";
import Fuse from "fuse.js";
import { createEffect, createResource, createSignal, For } from "solid-js";
import { getUserImages } from "./network";
import { ImageViewer } from "./components/ImageViewer";
type UserImages = Awaited<ReturnType<typeof getUserImages>>;
@ -18,7 +19,6 @@ function App() {
const nav = useNavigate();
let fuze = new Fuse<NonNullable<UserImages[number]["Text"]>[number]>([], {
keys: ["Text.ImageText"],
keys: ["ImageText"],
});
@ -26,7 +26,6 @@ function App() {
createEffect(() => {
const userImages = images();
console.log(userImages);
if (userImages == null) {
return;
}
@ -98,13 +97,7 @@ function App() {
</Search.Indicator>
<Search.Input class="appearance-none inline-flex w-full min-h-[40px] text-base bg-transparent rounded-l-md outline-none placeholder:text-gray-600" />
</Search.Control>
</Search>
</div>
{/* <div class="mt-4 text-base leading-none">
Emoji selected: {emoji()?.emoji} {emoji()?.name}
</div> */}
{/* <ImageViewer /> */}
<div class="px-4 mt-4 bg-white rounded-t-2xl">
<Search.Portal>
<Search.Content
class="h-[254px] overflow-scroll scrollbar-hide"
onCloseAutoFocus={(e) => e.preventDefault()}
@ -114,7 +107,14 @@ function App() {
No results found
</Search.NoResult>
</Search.Content>
</Search.Portal>
</Search>
</div>
{/* <div class="mt-4 text-base leading-none">
Emoji selected: {emoji()?.emoji} {emoji()?.name}
</div> */}
<ImageViewer />
<div class="px-4 mt-4 bg-white rounded-t-2xl">
<div class="col-span-3 row-span-3 bg-red-200 rounded-xl" />
<div class="col-span-3 row-span-3 bg-green-200 rounded-xl" />
<div class="col-span-6 row-span-3 bg-yellow-200 rounded-xl" />

35
frontend/src/ImagePage.tsx
View File

@ -25,10 +25,41 @@ export function ImagePage() {
<Suspense fallback={<>Loading...</>}>
<A href="/">Back</A>
<h1 class="text-2xl font-bold">{image()?.Image.ImageName}</h1>
<img src={`http://localhost:3040/image/${image()?.ID}`} />
<img
src={`http://localhost:3040/image/${image()?.ID}`}
alt="link"
/>
<div class="flex flex-col">
<h2 class="text-xl font-bold">Tags</h2>
<For each={image()?.Tags ?? []}>
{(tag) => <div>{tag.Tag}</div>}
{(tag) => <div>{tag.Tag.Tag}</div>}
</For>
<h2 class="text-xl font-bold">Locations</h2>
<For each={image()?.Locations ?? []}>
{(location) => (
<ul>
<li>{location.Name}</li>
{location.Address && <li>{location.Address}</li>}
{location.Coordinates && (
<li>{location.Coordinates}</li>
)}
{location.Description && (
<li>{location.Description}</li>
)}
</ul>
)}
</For>
<h2 class="text-xl font-bold">Events</h2>
<For each={image()?.Events ?? []}>
{(event) => (
<ul>
<li>{event.Name}</li>
{event.Location && <li>{event.Location.Name}</li>}
{event.Description && <li>{event.Description}</li>}
</ul>
)}
</For>
</div>
</Suspense>

3
frontend/src/network/index.ts
View File

@ -7,6 +7,7 @@ import {
parse,
pipe,
string,
undefinedable,
uuid,
} from "valibot";
@ -82,7 +83,7 @@ const getUserImagesResponseValidator = array(
array(
object({
ID: pipe(string(), uuid()),
Links: string(),
Link: string(),
ImageID: pipe(string(), uuid()),
}),
),