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: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Shell scripts must keep LF: a CRLF shebang makes the kernel look for
# "/bin/sh" and the container dies with "exec ... No such file or directory".
*.sh text eol=lf
Dockerfile text eol=lf
Caddyfile* text eol=lf
entrypoint.sh text eol=lf
Expand Down
9 changes: 6 additions & 3 deletions Caddyfile.local
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
http://localhost:8080 {

@admin_ui {
path /_/admin/ui/*
path /_/admin/ui
# vite's base is /_/admin/ui/ and it won't redirect the bare path itself
@admin_ui_bare path /_/admin/ui
handle @admin_ui_bare {
redir * /_/admin/ui/ 308
}

@admin_ui path /_/admin/ui/*

handle @admin_ui {
reverse_proxy host.docker.internal:3000
}
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<br />

<a href="https://github.com/07prajwal2000/Fluxify">
<a href="https://www.fluxify.rest">
<img src="img/banner.png" width="100%" alt="Fluxify Platform Preview" style="border-radius: 10px;">
</a>

Expand Down
6 changes: 5 additions & 1 deletion apps/ai-gateway/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import path from "path";
import { DOCS_INDEX_FILE_PATH } from "./lib/env";

export const DOCS_INDEX_PATH = path.join(
// resolve, not join: DOCS_INDEX_FILE_PATH is absolute in container images, and
// path.join would append it to dirname instead of honouring it
// (/app/ai-gateway + /app/ai-gateway/docs-index.bin). Relative values still
// resolve against this file's directory, which is what the default expects.
export const DOCS_INDEX_PATH = path.resolve(
import.meta.dirname,
DOCS_INDEX_FILE_PATH,
);
2 changes: 1 addition & 1 deletion apps/portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"type": "module",
"scripts": {
"dev": "vite --port 3001",
"dev": "vite --port 3000",
"build": "vite build",
"preview": "vite preview",
"lint": "tsgo --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion apps/portal/src/components/ai/AiHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { PromptEditor } from "./PromptEditor";
import { STARTERS } from "./starters";
import { useAiModels } from "./useAiModels";

const logo = `/_/admin/ui/public/icons/logo.svg`;
const logo = `${import.meta.env.BASE_URL}icons/logo.webp`;

export function AiHome() {
const { projectId } = useParams({ from: "/_authed/$projectId/ai/" });
Expand Down
2 changes: 1 addition & 1 deletion apps/portal/src/components/ai/ResourceChip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function ResourceChip({ type, identifier, name, data }: ResourceChipProps
let targetUrl = "";
if (projectId) {
if (type === "route") {
targetUrl = `/${projectId}/editor/${identifier}`;
targetUrl = `/${projectId}/canvas/${identifier}`;
} else if (type === "integration") {
targetUrl = `/${projectId}/integrations?group=ai&open=${identifier}`;
} else if (type === "app_config") {
Expand Down
16 changes: 3 additions & 13 deletions apps/portal/src/components/ai/artifacts/ApplyBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,17 @@ import { useArtifactParams } from "./useArtifact";
function Applied({
appliedAt,
routeId,
target,
}: {
appliedAt: string | Date;
routeId?: string;
target: "editor" | "canvas";
}) {
const { projectId } = useArtifactParams();
return (
<div className="flex items-center gap-3">
{routeId && (
<Button size="sm" className="cursor-pointer">
<Link
to={
target === "canvas"
? "/$projectId/canvas/$routeId"
: "/$projectId/editor/$routeId"
}
to="/$projectId/canvas/$routeId"
params={{ projectId, routeId }}
className="flex items-center gap-2"
>
Expand Down Expand Up @@ -65,20 +59,17 @@ export function ApplyBar({
subArtifactId,
appliedAt,
routeId,
target = "editor",
label = "Apply",
}: {
subArtifactId: string;
appliedAt: string | Date | null;
/** live route to link to once applied; omit to only show the applied stamp */
routeId?: string;
target?: "editor" | "canvas";
label?: string;
}) {
const { run, isPending } = useApply();

if (appliedAt)
return <Applied appliedAt={appliedAt} routeId={routeId} target={target} />;
if (appliedAt) return <Applied appliedAt={appliedAt} routeId={routeId} />;

return (
<Button
Expand Down Expand Up @@ -123,8 +114,7 @@ export function RouteApplyBar({
const [open, setOpen] = useState(false);
const verb = VERB[action] ?? "Apply";

if (appliedAt)
return <Applied appliedAt={appliedAt} routeId={routeId} target="editor" />;
if (appliedAt) return <Applied appliedAt={appliedAt} routeId={routeId} />;

if (!canvasSubArtifactId)
return (
Expand Down
1 change: 0 additions & 1 deletion apps/portal/src/components/ai/artifacts/CanvasArtifact.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export function CanvasArtifact({ subArtifactId }: { subArtifactId: string }) {
subArtifactId={detail.id}
appliedAt={detail.appliedAt}
routeId={routeId || undefined}
target="canvas"
/>
) : (
<div className="rounded-lg border border-warning/30 bg-warning/10 p-3 flex flex-col gap-2">
Expand Down
65 changes: 0 additions & 65 deletions apps/portal/src/components/editor/BlockPalette.tsx

This file was deleted.

69 changes: 0 additions & 69 deletions apps/portal/src/components/editor/GenericBlockNode.tsx

This file was deleted.

60 changes: 0 additions & 60 deletions apps/portal/src/components/editor/blockCatalog.ts

This file was deleted.

63 changes: 0 additions & 63 deletions apps/portal/src/components/editor/blocks/BaseBlock.tsx

This file was deleted.

Loading
Loading