Compare commits

...
7 changed files with 29 additions and 18 deletions
@@ -77,6 +77,12 @@ export const Login = () => {
return (
<div className="pegboard fixed flex h-full w-full flex-col items-center justify-center bg-center bg-repeat">
<Button
className="absolute left-4 top-4 px-3 py-2 text-sm"
onClick={() => navigate("/")}
>
Back to Home
</Button>
<div className="mb-7 flex w-10/12 max-w-2xl items-center justify-center gap-4">
<img
src="/brand/artcraft-logo.png"
@@ -126,12 +132,12 @@ export const Login = () => {
)}
</div>
<div className="align-items flex w-full max-w-xl rounded-b-xl bg-ui-controls px-6 py-4">
<a
{/* <a
href="https://storyteller.ai/password-reset"
className="grow text-sm !text-primary-400 transition-all duration-150 hover:!text-primary-300"
>
Forgot your password?
</a>
</a> */}
<div className="flex justify-end gap-1 text-sm">
<p className="opacity-75">Don&apos;t have an account?</p>
<Link to="/signup">Sign Up</Link>
@@ -75,6 +75,12 @@ export const Signup = () => {
return (
<div className="pegboard fixed flex h-full w-full flex-col items-center justify-center bg-center bg-repeat">
<Button
className="absolute left-4 top-4 px-3 py-2 text-sm"
onClick={() => navigate("/")}
>
Back to Home
</Button>
<div className="mb-7 flex w-10/12 max-w-2xl items-center justify-center gap-4">
<img
src="/brand/artcraft-logo.png"
@@ -28,11 +28,11 @@ import { getCanvasRenderBitmap } from "~/signal/canvasRenderBitmap";
import { EncodeImageBitmapToBase64 } from "~/utilities/EncodeImageBitmapToBase64";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { PopoverItem } from "~/components/reusable/Popover";
import { Api } from "~/KonvaApp/Api";
import { useJobContext } from "~/components/JobContext";
import { IsDesktopApp } from "@storyteller/tauri-utils";
import { GalleryItem, GalleryModal } from "@storyteller/ui-gallery-modal";
import { PromptsApi } from "@storyteller/api";
interface ReferenceImage {
id: string;
url: string;
@@ -215,7 +215,7 @@ export const PromptBox = () => {
};
const handleTauriEnqueue = async () => {
const api = new Api();
const api = new PromptsApi();
let image = getCanvasRenderBitmap();
if (image === undefined) {
return;
@@ -261,7 +261,7 @@ export const PromptBox = () => {
};
const handleWebEnqueue = async () => {
const api = new Api();
const api = new PromptsApi();
let image = getCanvasRenderBitmap();
if (image === undefined) {
toast.error(
@@ -52,7 +52,7 @@ export const ToolbarTopLeft = () => {
className="h-[28px] select-none"
/>
<Button
{/* <Button
variant="secondary"
icon={faChevronRight}
iconClassName="text-xs"
@@ -61,7 +61,7 @@ export const ToolbarTopLeft = () => {
className="bg-transparent p-0 text-sm text-white/80 hover:bg-transparent hover:text-white hover:underline hover:underline-offset-2"
>
Go to 3D Stage Editor
</Button>
</Button> */}
{/* <TabSelector
tabs={tabs}
@@ -1,4 +1,5 @@
import { twMerge } from "tailwind-merge";
import { Fragment } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faChevronDown,
@@ -65,18 +66,18 @@ export function ProfileDropdown() {
)}
>
<MenuItem
as="a"
as="button"
href={profileUrl}
target="_blank"
rel="noreferrer"
className={twMerge(
"flex w-full items-center gap-3 rounded-lg px-3 py-2",
"text-md font-medium text-gray-700 hover:bg-gray-100",
"text-md font-medium text-white hover:bg-gray-100 hover:text-gray-700",
"transition-colors duration-150",
)}
>
<FontAwesomeIcon icon={faUser} className="w-4 text-gray-700" />
<span className="text-gray-700">My Profile</span>
<FontAwesomeIcon icon={faUser} className="w-4" />
My Profile
</MenuItem>
{menuOptions.map((option, index) => (
@@ -85,7 +86,7 @@ export function ProfileDropdown() {
as="button"
className={twMerge(
"flex w-full items-center gap-3 rounded-lg px-3 py-2",
"text-md font-medium text-gray-700 hover:bg-gray-100",
"text-md font-medium text-white hover:bg-gray-100 hover:text-gray-700",
"transition-colors duration-150",
)}
onClick={(e) => {
@@ -94,7 +95,7 @@ export function ProfileDropdown() {
option.onClick();
}}
>
<FontAwesomeIcon icon={option.icon} className="w-4 text-gray-700" />
<FontAwesomeIcon icon={option.icon} className="w-4" />
<span>{option.label}</span>
</MenuItem>
))}
@@ -58,7 +58,7 @@ export const TopBar = ({ pageName }: Props) => {
Back to Editor
</ButtonLink>
)}
<Button
{/* <Button
variant="secondary"
icon={faChevronRight}
iconClassName="text-xs"
@@ -67,7 +67,7 @@ export const TopBar = ({ pageName }: Props) => {
className="bg-transparent p-0 text-sm text-white/80 hover:bg-transparent hover:text-white hover:underline hover:underline-offset-2"
>
Go to 2D Canvas
</Button>
</Button> */}
</div>
<div className="flex items-center justify-center gap-2 font-medium">
-2
View File
@@ -2,5 +2,3 @@
set -euxo pipefail
# calls these
./script/desktop/launch_rust_only_3d_for_michael.sh
echo "All scripts completed!"