generated from nhcarrigan/template
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6fb6254cb7 |
+1
-1
@@ -25,7 +25,7 @@
|
|||||||
"@types/react-dom": "19.1.2",
|
"@types/react-dom": "19.1.2",
|
||||||
"autoprefixer": "10.4.21",
|
"autoprefixer": "10.4.21",
|
||||||
"eslint": "9.25.1",
|
"eslint": "9.25.1",
|
||||||
"postcss": "8.5.3",
|
"postcss": "8.5.8",
|
||||||
"tailwindcss": "3.4.17",
|
"tailwindcss": "3.4.17",
|
||||||
"typescript": "5.8.3",
|
"typescript": "5.8.3",
|
||||||
"vite": "6.3.2",
|
"vite": "6.3.2",
|
||||||
|
|||||||
Generated
+22
-22
@@ -44,13 +44,13 @@ importers:
|
|||||||
version: 4.4.1(vite@6.3.2(jiti@1.21.7)(yaml@2.8.3))
|
version: 4.4.1(vite@6.3.2(jiti@1.21.7)(yaml@2.8.3))
|
||||||
autoprefixer:
|
autoprefixer:
|
||||||
specifier: 10.4.21
|
specifier: 10.4.21
|
||||||
version: 10.4.21(postcss@8.5.3)
|
version: 10.4.21(postcss@8.5.8)
|
||||||
eslint:
|
eslint:
|
||||||
specifier: 9.25.1
|
specifier: 9.25.1
|
||||||
version: 9.25.1(jiti@1.21.7)
|
version: 9.25.1(jiti@1.21.7)
|
||||||
postcss:
|
postcss:
|
||||||
specifier: 8.5.3
|
specifier: 8.5.8
|
||||||
version: 8.5.3
|
version: 8.5.8
|
||||||
tailwindcss:
|
tailwindcss:
|
||||||
specifier: 3.4.17
|
specifier: 3.4.17
|
||||||
version: 3.4.17
|
version: 3.4.17
|
||||||
@@ -1930,8 +1930,8 @@ packages:
|
|||||||
postcss-value-parser@4.2.0:
|
postcss-value-parser@4.2.0:
|
||||||
resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
|
resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
|
||||||
|
|
||||||
postcss@8.5.3:
|
postcss@8.5.8:
|
||||||
resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
|
resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
|
||||||
engines: {node: ^10 || ^12 || >=14}
|
engines: {node: ^10 || ^12 || >=14}
|
||||||
|
|
||||||
prelude-ls@1.2.1:
|
prelude-ls@1.2.1:
|
||||||
@@ -3283,14 +3283,14 @@ snapshots:
|
|||||||
|
|
||||||
async-function@1.0.0: {}
|
async-function@1.0.0: {}
|
||||||
|
|
||||||
autoprefixer@10.4.21(postcss@8.5.3):
|
autoprefixer@10.4.21(postcss@8.5.8):
|
||||||
dependencies:
|
dependencies:
|
||||||
browserslist: 4.28.2
|
browserslist: 4.28.2
|
||||||
caniuse-lite: 1.0.30001787
|
caniuse-lite: 1.0.30001787
|
||||||
fraction.js: 4.3.7
|
fraction.js: 4.3.7
|
||||||
normalize-range: 0.1.2
|
normalize-range: 0.1.2
|
||||||
picocolors: 1.1.1
|
picocolors: 1.1.1
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
postcss-value-parser: 4.2.0
|
postcss-value-parser: 4.2.0
|
||||||
|
|
||||||
available-typed-arrays@1.0.7:
|
available-typed-arrays@1.0.7:
|
||||||
@@ -4386,28 +4386,28 @@ snapshots:
|
|||||||
|
|
||||||
possible-typed-array-names@1.1.0: {}
|
possible-typed-array-names@1.1.0: {}
|
||||||
|
|
||||||
postcss-import@15.1.0(postcss@8.5.3):
|
postcss-import@15.1.0(postcss@8.5.8):
|
||||||
dependencies:
|
dependencies:
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
postcss-value-parser: 4.2.0
|
postcss-value-parser: 4.2.0
|
||||||
read-cache: 1.0.0
|
read-cache: 1.0.0
|
||||||
resolve: 1.22.11
|
resolve: 1.22.11
|
||||||
|
|
||||||
postcss-js@4.1.0(postcss@8.5.3):
|
postcss-js@4.1.0(postcss@8.5.8):
|
||||||
dependencies:
|
dependencies:
|
||||||
camelcase-css: 2.0.1
|
camelcase-css: 2.0.1
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
|
|
||||||
postcss-load-config@4.0.2(postcss@8.5.3):
|
postcss-load-config@4.0.2(postcss@8.5.8):
|
||||||
dependencies:
|
dependencies:
|
||||||
lilconfig: 3.1.3
|
lilconfig: 3.1.3
|
||||||
yaml: 2.8.3
|
yaml: 2.8.3
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
|
|
||||||
postcss-nested@6.2.0(postcss@8.5.3):
|
postcss-nested@6.2.0(postcss@8.5.8):
|
||||||
dependencies:
|
dependencies:
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
postcss-selector-parser: 6.1.2
|
postcss-selector-parser: 6.1.2
|
||||||
|
|
||||||
postcss-selector-parser@6.1.2:
|
postcss-selector-parser@6.1.2:
|
||||||
@@ -4417,7 +4417,7 @@ snapshots:
|
|||||||
|
|
||||||
postcss-value-parser@4.2.0: {}
|
postcss-value-parser@4.2.0: {}
|
||||||
|
|
||||||
postcss@8.5.3:
|
postcss@8.5.8:
|
||||||
dependencies:
|
dependencies:
|
||||||
nanoid: 3.3.11
|
nanoid: 3.3.11
|
||||||
picocolors: 1.1.1
|
picocolors: 1.1.1
|
||||||
@@ -4757,11 +4757,11 @@ snapshots:
|
|||||||
normalize-path: 3.0.0
|
normalize-path: 3.0.0
|
||||||
object-hash: 3.0.0
|
object-hash: 3.0.0
|
||||||
picocolors: 1.1.1
|
picocolors: 1.1.1
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
postcss-import: 15.1.0(postcss@8.5.3)
|
postcss-import: 15.1.0(postcss@8.5.8)
|
||||||
postcss-js: 4.1.0(postcss@8.5.3)
|
postcss-js: 4.1.0(postcss@8.5.8)
|
||||||
postcss-load-config: 4.0.2(postcss@8.5.3)
|
postcss-load-config: 4.0.2(postcss@8.5.8)
|
||||||
postcss-nested: 6.2.0(postcss@8.5.3)
|
postcss-nested: 6.2.0(postcss@8.5.8)
|
||||||
postcss-selector-parser: 6.1.2
|
postcss-selector-parser: 6.1.2
|
||||||
resolve: 1.22.11
|
resolve: 1.22.11
|
||||||
sucrase: 3.35.1
|
sucrase: 3.35.1
|
||||||
@@ -4884,7 +4884,7 @@ snapshots:
|
|||||||
esbuild: 0.25.12
|
esbuild: 0.25.12
|
||||||
fdir: 6.5.0(picomatch@4.0.4)
|
fdir: 6.5.0(picomatch@4.0.4)
|
||||||
picomatch: 4.0.4
|
picomatch: 4.0.4
|
||||||
postcss: 8.5.3
|
postcss: 8.5.8
|
||||||
rollup: 4.60.1
|
rollup: 4.60.1
|
||||||
tinyglobby: 0.2.16
|
tinyglobby: 0.2.16
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
|
|||||||
+10
-14
@@ -83,26 +83,22 @@ fn build_user_gemini_parts(
|
|||||||
user_image_base64: &Option<String>,
|
user_image_base64: &Option<String>,
|
||||||
user_image_mime: &Option<String>,
|
user_image_mime: &Option<String>,
|
||||||
) -> Vec<Value> {
|
) -> Vec<Value> {
|
||||||
if let Some(image_data) = user_image_base64.as_deref() {
|
if mode == "replace" && user_image_base64.is_some() {
|
||||||
let mime = user_image_mime.as_deref().unwrap_or("image/png");
|
let mime = user_image_mime.as_deref().unwrap_or("image/png");
|
||||||
|
let data = user_image_base64.as_deref().unwrap_or("");
|
||||||
let base_text = user_text.as_deref().unwrap_or("");
|
let base_text = user_text.as_deref().unwrap_or("");
|
||||||
let final_text = if mode == "replace" {
|
let final_text = if base_text.is_empty() {
|
||||||
if base_text.is_empty() {
|
REPLACE_MODE_APPEND.to_string()
|
||||||
REPLACE_MODE_APPEND.to_string()
|
|
||||||
} else {
|
|
||||||
format!("{}\n{}", base_text, REPLACE_MODE_APPEND)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
base_text.to_string()
|
format!("{}\n{}", base_text, REPLACE_MODE_APPEND)
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut parts = vec![json!({"inlineData": {"mimeType": mime, "data": image_data}})];
|
vec![
|
||||||
if !final_text.is_empty() {
|
json!({"inlineData": {"mimeType": mime, "data": data}}),
|
||||||
parts.push(json!({"text": final_text}));
|
json!({"text": final_text}),
|
||||||
}
|
]
|
||||||
parts
|
|
||||||
} else {
|
} else {
|
||||||
// No image: text-only message
|
// Art/avatar mode, or replace mode follow-up correction (text only)
|
||||||
let text = user_text.as_deref().unwrap_or("");
|
let text = user_text.as_deref().unwrap_or("");
|
||||||
vec![json!({"text": text})]
|
vec![json!({"text": text})]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,8 +256,7 @@ const inputArea = ({
|
|||||||
if (isInitialReplace && imageBase64 === undefined) {
|
if (isInitialReplace && imageBase64 === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const hasContent = text.trim().length > 0 || imageBase64 !== undefined;
|
if (!isInitialReplace && text.trim().length === 0) {
|
||||||
if (!isInitialReplace && !hasContent) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,9 +332,6 @@ const inputArea = ({
|
|||||||
: dropZoneInactiveClass,
|
: dropZoneInactiveClass,
|
||||||
].join(" ");
|
].join(" ");
|
||||||
|
|
||||||
const hasNoContent = text.trim().length === 0 && imageBase64 === undefined;
|
|
||||||
const isSendDisabled = isLoading || hasNoContent;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="border-t border-purple-900/30 p-4 bg-[#0f0a1a]">
|
<div className="border-t border-purple-900/30 p-4 bg-[#0f0a1a]">
|
||||||
<div className="flex items-center gap-2 mb-2">
|
<div className="flex items-center gap-2 mb-2">
|
||||||
@@ -401,15 +397,6 @@ const inputArea = ({
|
|||||||
type="file"
|
type="file"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<textarea
|
|
||||||
className={textareaClass}
|
|
||||||
disabled={isLoading}
|
|
||||||
onChange={handleTextChange}
|
|
||||||
placeholder="Add notes to include with the image (optional)..."
|
|
||||||
rows={2}
|
|
||||||
value={text}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<button
|
<button
|
||||||
className={replaceButtonClass}
|
className={replaceButtonClass}
|
||||||
disabled={isLoading || imageBase64 === undefined}
|
disabled={isLoading || imageBase64 === undefined}
|
||||||
@@ -427,40 +414,41 @@ const inputArea = ({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
: <div className="flex flex-col gap-3">
|
: <div className="flex flex-col gap-3">
|
||||||
<div className="flex flex-col gap-2">
|
{mode === "replace"
|
||||||
{imagePreview === undefined
|
? <div className="flex flex-col gap-2">
|
||||||
? <button
|
{imagePreview === undefined
|
||||||
className={pasteButtonClass}
|
? <button
|
||||||
onClick={handlePasteButtonClick}
|
className={pasteButtonClass}
|
||||||
type="button"
|
onClick={handlePasteButtonClick}
|
||||||
>
|
|
||||||
{mode === "replace"
|
|
||||||
? "📋 Paste replacement image (optional)"
|
|
||||||
: "📋 Paste image (optional)"}
|
|
||||||
</button>
|
|
||||||
|
|
||||||
: <div className="relative inline-block">
|
|
||||||
<img
|
|
||||||
alt="Upload preview"
|
|
||||||
className="max-h-32 rounded-lg border border-purple-700/40"
|
|
||||||
src={imagePreview}
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
className={clearButtonClass}
|
|
||||||
onClick={clearImage}
|
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
{"×"}
|
{"📋 Paste replacement image (optional)"}
|
||||||
</button>
|
</button>
|
||||||
</div>}
|
|
||||||
<input
|
: <div className="relative inline-block">
|
||||||
accept="image/*"
|
<img
|
||||||
className="hidden"
|
alt="Upload preview"
|
||||||
onChange={handleFileChange}
|
className="max-h-32 rounded-lg border border-purple-700/40"
|
||||||
ref={fileInputReference}
|
src={imagePreview}
|
||||||
type="file"
|
/>
|
||||||
/>
|
<button
|
||||||
</div>
|
className={clearButtonClass}
|
||||||
|
onClick={clearImage}
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
{"×"}
|
||||||
|
</button>
|
||||||
|
</div>}
|
||||||
|
<input
|
||||||
|
accept="image/*"
|
||||||
|
className="hidden"
|
||||||
|
onChange={handleFileChange}
|
||||||
|
ref={fileInputReference}
|
||||||
|
type="file"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
: null}
|
||||||
|
|
||||||
<div className="flex gap-3 items-end">
|
<div className="flex gap-3 items-end">
|
||||||
<textarea
|
<textarea
|
||||||
@@ -476,7 +464,7 @@ const inputArea = ({
|
|||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
className={sendButtonClass}
|
className={sendButtonClass}
|
||||||
disabled={isSendDisabled}
|
disabled={isLoading || text.trim().length === 0}
|
||||||
onClick={handleSend}
|
onClick={handleSend}
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user