Skip to content

Commit 599cc03

Browse files
committed
Ui enhancments 12
1 parent b6a68ba commit 599cc03

4 files changed

Lines changed: 18 additions & 14 deletions

File tree

‎frontend/src/feature/quote/drawer/choose-background.drawer.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function ChooseBackground(props: Props) {
2121
const { onValueUpdate} = props
2222
const { textures, colorPresets, buildStyle } = useBackground()
2323
const [selectedTexture, setSelectedTexture] = useState<TextureKey> ();
24-
const [selectedPreset, setSelectedPreset] = useState<Pri_set>('pri_set_12');
24+
const [selectedPreset, setSelectedPreset] = useState<Pri_set>('pri_set_0');
2525

2626

2727
const handleTextureClick = (key: TextureKey)=>{
@@ -124,14 +124,16 @@ export default function ChooseBackground(props: Props) {
124124
title={value.name}
125125
>
126126
<div
127-
className="w-full flex items-center justify-center h-full rounded-lg"
127+
className="w-full text-xs flex items-center justify-center h-full rounded-lg"
128128
style={{
129129
...(value.overlay
130130
? { backgroundImage: value.overlay, backgroundSize: "cover", backgroundPosition: "center" }
131131
: { backgroundColor: value.color }),
132132
}}
133133
>
134-
{/* {value.name} */}
134+
{value.name}
135+
{/*
136+
*/}
135137
</div>
136138
</button>
137139
);

‎frontend/src/feature/quote/drawer/share.drawer.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import type { QuoteFormData } from "@/model/quote.model";
1414
import { ArrowLeftIcon, CircleArrowDown, LoaderCircle, Save, Share } from "lucide-react";
1515
import useBackground, { type Pri_set, type TextureKey } from "@/hook/use-background.hook";
1616
import { sanitizeHTML } from "@/helper/sanitize-html";
17-
import { sanitizeHTML } from "@/helper/sanitize-html";
1817
import { cn } from "@/lib/utils";
1918
import { ListTags } from "@/feature/quote/list.tags";
2019
import { toPng } from "html-to-image"

‎frontend/src/hook/use-background.hook.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface ColorPresets {
1111
}
1212

1313
const colorPresets = {
14-
pri_set_0: { id: 0, name: "default" } as ColorPresets,
14+
pri_set_0: { id: 0, name: "none" } as ColorPresets,
1515

1616
pri_set_1: { id: 1, name: "red", color: "red" } as ColorPresets,
1717

@@ -69,20 +69,20 @@ export type Pri_set = keyof typeof colorPresets
6969
export type TextureKey = keyof typeof textures
7070

7171
const textures = {
72-
fresh_snow: "src/assets/images/fresh-snow.png",
7372
dark_wood: "src/assets/images/dark-wood.png",
73+
crisp_paper_ruffles: "src/assets/images/crisp-paper-ruffles.png",
74+
brick_wall: "src/assets/images/brick-wall.png",
75+
snow: "src/assets/images/snow.png",
76+
fresh_snow: "src/assets/images/fresh-snow.png",
77+
cartographer: "src/assets/images/cartographer.png",
7478
cardboard: "src/assets/images/cardboard.png",
79+
xv: "src/assets/images/xv.png",
7580
food: "src/assets/images/food.png",
7681
flowers: "src/assets/images/flowers.png",
7782
foggy_birds: "src/assets/images/foggy-birds.png",
78-
crisp_paper_ruffles: "src/assets/images/crisp-paper-ruffles.png",
79-
cartographer: "src/assets/images/cartographer.png",
80-
brick_wall: "src/assets/images/brick-wall.png",
81-
xv: "src/assets/images/xv.png",
82-
snow: "src/assets/images/snow.png",
83+
pink_flowers: "src/assets/images/pink-flowers.webp",
8384
leaves: "src/assets/images/leaves.webp",
8485
watercolor: "src/assets/images/watercolor.webp",
85-
pink_flowers: "src/assets/images/pink-flowers.webp",
8686

8787
};
8888

‎frontend/src/page/quote/quote.page.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { getAllQuotes, addQuote, updateQuote, deleteQuote, getAllQuote } from '@
1818
import { addOrGetTag } from '@/db/tag.db'
1919
import { useBlocker } from "@tanstack/react-router"
2020
import ChooseBackground from "@/feature/quote/drawer/choose-background.drawer"
21+
import {ShareBackground} from "@/feature/quote/dialog/share.dialog"
2122
import { toPng } from "html-to-image"
2223

2324
interface Props {
@@ -46,7 +47,7 @@ const noteRef = useRef<HTMLDivElement>(null)
4647
id: quote?.id,
4748
text: quote?.text || "",
4849
tags: quote?.tags?.map((tag) => tag.name) || [],
49-
texture: quote?.texture,
50+
texture: quote?.texture || "pri_set_12",
5051
pri_set: quote?.pri_set,
5152
}))
5253
console.log({quoteData})
@@ -207,7 +208,8 @@ const exportAsImage = async () => {
207208
<ArrowLeftIcon />
208209
</Button>
209210
</Link>
210-
<div>
211+
<div className="flex gap-2" >
212+
<ShareBackground quoteFormData={quoteData}/>
211213
<ChooseBackground onValueUpdate={onValueUpdate}/>
212214
</div>
213215
</div>
@@ -231,6 +233,7 @@ const exportAsImage = async () => {
231233
<Tiptap
232234
key={quoteData?.id ?? "new"}
233235
value={quoteData?.text}
236+
quoteFormData={quoteData}
234237
onValueUpdate={onValueUpdate} />
235238
</div>
236239
</div>

0 commit comments

Comments
 (0)