From eb6faa6cc6c79a044929027033fc0b499b44e902 Mon Sep 17 00:00:00 2001 From: arealclimber Date: Fri, 9 Aug 2024 11:50:07 +0800 Subject: [PATCH 01/13] feat: validate the fee on the add-journal page when there's change in total price or fee #1983 --- package.json | 2 +- .../new_journal_form/new_journal_form.tsx | 24 +++++++++++++++++++ .../numeric_input/numeric_input.tsx | 16 +++++++++++-- src/components/progress_bar/progress_bar.tsx | 2 +- src/locales/cn/common.json | 3 ++- src/locales/en/common.json | 3 ++- src/locales/tw/common.json | 3 ++- 7 files changed, 46 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7ab005930..f408697d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iSunFA", - "version": "0.1.8+165", + "version": "0.1.8+166", "private": false, "scripts": { "dev": "next dev", diff --git a/src/components/new_journal_form/new_journal_form.tsx b/src/components/new_journal_form/new_journal_form.tsx index f403f6589..74f4e4cd9 100644 --- a/src/components/new_journal_form/new_journal_form.tsx +++ b/src/components/new_journal_form/new_journal_form.tsx @@ -157,6 +157,7 @@ const NewJournalForm = () => { const [isPriceValid, setIsPriceValid] = useState(true); const [isInstallmentValid, setIsInstallmentValid] = useState(true); const [isPartialPaidValid, setIsPartialPaidValid] = useState(true); + const [isFeeValid, setIsFeeValid] = useState(true); useEffect(() => { if (selectedOCR !== undefined && hasCompanyId) { @@ -351,6 +352,22 @@ const NewJournalForm = () => { // Info: (20240425 - Julian) 檢查表單內容是否有變動 const formChangedHandler = () => setFormHasChanged(true); + // Info: (20240809 - Shirley) 檢查費用是否小於總金額 + const checkFeeValidity = (fee: number, totalPrice: number) => { + setIsFeeValid(fee <= totalPrice); + }; + + const amountChangeHandler = (value: number, e: React.ChangeEvent) => { + // eslint-disable-next-line no-console + console.log('amountChangeHandler', e.target.name, value); + // 檢查費用是否有效 + if (e.target.name === 'fee-input') { + checkFeeValidity(value, inputTotalPrice); + } else if (e.target.name === 'input-total-price') { + checkFeeValidity(inputFee, value); + } + }; + // Info: (20240423 - Julian) 清空表單的所有欄位 const clearFormHandler = () => { setDatePeriod(default30DayPeriodInSec); @@ -855,6 +872,7 @@ const NewJournalForm = () => { isDecimal required hasComma + onChange={amountChangeHandler} className="h-46px flex-1 rounded-l-sm border border-lightGray3 bg-white p-10px outline-none" />
@@ -935,6 +953,7 @@ const NewJournalForm = () => { isDecimal required={feeToggle} hasComma + onChange={amountChangeHandler} className="h-46px flex-1 rounded-l-sm border border-lightGray3 bg-transparent p-10px outline-none md:w-1/2" />
@@ -948,6 +967,11 @@ const NewJournalForm = () => {

{t('JOURNAL.TWD')}

+ {feeToggle && !isFeeValid && ( +
+

{t('JOURNAL.FEE_EXCEEDS_TOTAL')}

+
+ )} diff --git a/src/components/numeric_input/numeric_input.tsx b/src/components/numeric_input/numeric_input.tsx index 0ffadefc0..3fe8d8206 100644 --- a/src/components/numeric_input/numeric_input.tsx +++ b/src/components/numeric_input/numeric_input.tsx @@ -1,11 +1,12 @@ import React, { useState, useEffect } from 'react'; import { numberWithCommas } from '@/lib/utils/common'; -interface INumericInputProps extends React.InputHTMLAttributes { +interface INumericInputProps extends Omit, 'onChange'> { value: number; setValue: React.Dispatch>; isDecimal?: boolean; hasComma?: boolean; // Info: (20240722 - Liz) 新增逗號顯示 + onChange?: (value: number, e: React.ChangeEvent) => void; } const formatDisplayValue = ( @@ -23,7 +24,14 @@ const formatDisplayValue = ( return hasComma ? numberWithCommas(stringValue) : stringValue; }; -const NumericInput = ({ value, setValue, isDecimal, hasComma, ...props }: INumericInputProps) => { +const NumericInput = ({ + value, + setValue, + isDecimal, + hasComma, + onChange: triggerWhenChanged, + ...props +}: INumericInputProps) => { // Info: (20240723 - Liz) displayValue 是顯示在 input 上的顯示值 const [displayValue, setDisplayValue] = useState(value.toString()); // Info: (20240723 - Liz) dbValue 是存入 DB 的儲存值 @@ -60,6 +68,10 @@ const NumericInput = ({ value, setValue, isDecimal, hasComma, ...props }: INumer setDbValue(validNumericValue); // 更新儲存值 setDisplayValue(formattedDisplayValue); // 更新顯示值 + + if (triggerWhenChanged) { + triggerWhenChanged(validNumericValue, event); + } }; // Info: (20240723 - Liz) 處理 displayValue 為空或僅為點的情況 diff --git a/src/components/progress_bar/progress_bar.tsx b/src/components/progress_bar/progress_bar.tsx index 8a1be24ef..dc8087fff 100644 --- a/src/components/progress_bar/progress_bar.tsx +++ b/src/components/progress_bar/progress_bar.tsx @@ -72,7 +72,7 @@ const ProgressBar = ({ progressRate, setProgressRate }: IProgressBarProps) => { name="input-progress-rate" value={progressRate} setValue={setProgressRate} - onChange={progressRateChangeHandler} + // onChange={progressRateChangeHandler} // TODO: 原先 NumericInput 不接受外部的 onChange 事件，目前看不出來 ProgressBar 沒有 onChange 之後會有什麼問題 (20240809 - Shirley) min={0} max={100} className="flex-1 bg-transparent px-10px outline-none" diff --git a/src/locales/cn/common.json b/src/locales/cn/common.json index 9b13a7702..e968c0a47 100644 --- a/src/locales/cn/common.json +++ b/src/locales/cn/common.json @@ -435,7 +435,8 @@ "GO_BACK_TO_JOURNAL_LIST": "返回日记帐", "DOWNLOAD": "下载", "DEBIT_AMOUNT_BALANCED": "借方金额与总金额平衡", - "CREDIT_AMOUNT_BALANCED": "贷方金额与总金额平衡" + "CREDIT_AMOUNT_BALANCED": "贷方金额与总金额平衡", + "FEE_EXCEEDS_TOTAL": "费用不能大于总金额" }, "PROJECT": { "CHOOSE_TEAM_MEMBERS": "选择团队成员", diff --git a/src/locales/en/common.json b/src/locales/en/common.json index 7c75bdadf..de091b584 100644 --- a/src/locales/en/common.json +++ b/src/locales/en/common.json @@ -435,7 +435,8 @@ "GO_BACK_TO_JOURNAL_LIST": "Go back to journal list", "DOWNLOAD": "Download", "DEBIT_AMOUNT_BALANCED": "Debit amount balanced with total amount", - "CREDIT_AMOUNT_BALANCED": "Credit amount balanced with total amount" + "CREDIT_AMOUNT_BALANCED": "Credit amount balanced with total amount", + "FEE_EXCEEDS_TOTAL": "Fee cannot exceed total amount" }, "PROJECT": { "CHOOSE_TEAM_MEMBERS": "Choose Team Members", diff --git a/src/locales/tw/common.json b/src/locales/tw/common.json index 81ccf5cc7..7e622cf66 100644 --- a/src/locales/tw/common.json +++ b/src/locales/tw/common.json @@ -435,7 +435,8 @@ "GO_BACK_TO_JOURNAL_LIST": "返回日記帳", "DOWNLOAD": "下載", "DEBIT_AMOUNT_BALANCED": "借方金額與總金額平衡", - "CREDIT_AMOUNT_BALANCED": "貸方金額與總金額平衡" + "CREDIT_AMOUNT_BALANCED": "貸方金額與總金額平衡", + "FEE_EXCEEDS_TOTAL": "費用不能大於總金額" }, "PROJECT": { "CHOOSE_TEAM_MEMBERS": "選擇團隊成員", From 3bb27bcac82bce54a7bf291796c5828645408b26 Mon Sep 17 00:00:00 2001 From: arealclimber Date: Fri, 9 Aug 2024 12:23:20 +0800 Subject: [PATCH 02/13] chore: hide missing feat within alpha, adjust the i18n mobile menu, adjust the param for numeric input #1984 #1983 --- package.json | 2 +- src/components/i18n/i18n.tsx | 8 ++++---- src/components/nav_bar/nav_bar.tsx | 10 ++++++---- src/components/new_journal_form/new_journal_form.tsx | 4 ++-- src/components/numeric_input/numeric_input.tsx | 6 +++--- src/components/progress_bar/progress_bar.tsx | 2 +- .../select_company_page_body.tsx | 3 ++- src/components/step_one_tab/step_one_tab.tsx | 12 +++++++++--- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f408697d9..81ce3b0e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iSunFA", - "version": "0.1.8+166", + "version": "0.1.8+167", "private": false, "scripts": { "dev": "next dev", diff --git a/src/components/i18n/i18n.tsx b/src/components/i18n/i18n.tsx index a3785d53c..954e83bdc 100644 --- a/src/components/i18n/i18n.tsx +++ b/src/components/i18n/i18n.tsx @@ -68,18 +68,18 @@ const I18n = ({ langIsOpen, setLangIsOpen }: II18nProps) => {
- {signedIn ? username ?? DEFAULT_DISPLAYED_USER_NAME : ''} + {signedIn ? (username ?? DEFAULT_DISPLAYED_USER_NAME) : ''}
+ {/* Info: edit name button (20240809 - Shirley) */} - -
); - const displayedList = reportItems - // Info: (20240722 - Julian) 依照 createdTimestamp 由新到舊排序 - .sort((a, b) => b.createdAt - a.createdAt) - .map((reportItem, index) => ( - individualCheckHandler(index)} - onReportItemUpdate={handleReportItemUpdate} - onReportItemDelete={handleReportItemDelete} - /> - )); + const displayedList = reportItems.map((reportItem, index) => ( + individualCheckHandler(index)} + onReportItemUpdate={handleReportItemUpdate} + onReportItemDelete={handleReportItemDelete} + /> + )); const displayedCheckbox = isCheckboxVisible ? ( diff --git a/src/components/reports_history_list/reports_history_list.tsx b/src/components/reports_history_list/reports_history_list.tsx index 49e4560a8..e18665f0d 100644 --- a/src/components/reports_history_list/reports_history_list.tsx +++ b/src/components/reports_history_list/reports_history_list.tsx @@ -49,18 +49,15 @@ const ReportsHistoryList = ({ reports }: IReportsHistoryListProps) => { setIndividualChecks(updatedChecks); }; - const displayedList = reports - // Info: (20240722 - Julian) 依照 createdTimestamp 由新到舊排序 - .sort((a, b) => b.createdAt - a.createdAt) - .map((report, index) => ( - individualCheckHandler(index)} - isCheckboxVisible={isCheckboxVisible} - /> - )); + const displayedList = reports.map((report, index) => ( + individualCheckHandler(index)} + isCheckboxVisible={isCheckboxVisible} + /> + )); const displayedStatusButtons = (
{isCheckboxVisible ? ( From bf6e90e1ae95d37c0f33ed29fb569899cf1ab4fd Mon Sep 17 00:00:00 2001 From: arealclimber Date: Fri, 9 Aug 2024 17:00:20 +0800 Subject: [PATCH 08/13] chore: border radius of date picker, visibility of link icon on generated report list --- src/components/date_picker/date_picker.tsx | 4 +- .../reports_history_item.tsx | 38 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/components/date_picker/date_picker.tsx b/src/components/date_picker/date_picker.tsx index 105347945..7bc5456a1 100644 --- a/src/components/date_picker/date_picker.tsx +++ b/src/components/date_picker/date_picker.tsx @@ -387,7 +387,7 @@ const DatePicker = ({ onClick={openCalenderHandler} className={cn( // default style - 'flex w-full items-center space-x-3 rounded-xs border border-lightGray3 bg-white p-3 text-input-text-input-placeholder hover:cursor-pointer', + 'flex w-full items-center space-x-3 rounded-sm border border-lightGray3 bg-white p-3 text-input-text-input-placeholder hover:cursor-pointer', // props control style btnClassName, // variables control style @@ -427,7 +427,7 @@ const DatePicker = ({ variant={'tertiaryOutline'} onClick={openCalenderHandler} className={cn( - 'group flex w-full items-center rounded-xs border border-lightGray3 bg-white px-3 py-3 hover:cursor-pointer', + 'group flex w-full items-center rounded-sm border border-lightGray3 bg-white px-3 py-3 hover:cursor-pointer', btnClassName, { 'border-primaryYellow text-primaryYellow': componentVisible, diff --git a/src/components/reports_history_item/reports_history_item.tsx b/src/components/reports_history_item/reports_history_item.tsx index 116666b9e..778259e54 100644 --- a/src/components/reports_history_item/reports_history_item.tsx +++ b/src/components/reports_history_item/reports_history_item.tsx @@ -107,24 +107,26 @@ const ReportsHistoryItem = ({ {/* Info: (20240514 - Shirley) Blockchain explorer link */} - - - + {blockChainExplorerLink ? ( + + + + ) : null} {/* Info: project (20240528 - Shirley) */} {displayedProject} From 35a69074e51d5ef334219b0c67f93938a6a85e72 Mon Sep 17 00:00:00 2001 From: arealclimber Date: Fri, 9 Aug 2024 17:10:08 +0800 Subject: [PATCH 09/13] feat: type enter to trigger api request and disable filters when data is loading on account page for journal list #2008 --- .../journal_list_body/journal_list_body.tsx | 66 ++++++++++++++----- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/src/components/journal_list_body/journal_list_body.tsx b/src/components/journal_list_body/journal_list_body.tsx index 9c1661208..7f14b807b 100644 --- a/src/components/journal_list_body/journal_list_body.tsx +++ b/src/components/journal_list_body/journal_list_body.tsx @@ -24,6 +24,7 @@ import { IPaginatedData } from '@/interfaces/pagination'; import { useGlobalCtx } from '@/contexts/global_context'; import { MessageType } from '@/interfaces/message_modal'; import { ToastType } from '@/interfaces/toastify'; +import { cn } from '@/lib/utils/common'; // Info: (20240808 - Anna) Alpha版先隱藏(發票列表) // import Toggle from '@/components/toggle/toggle'; @@ -41,9 +42,9 @@ const JournalListBody = () => { const [isLoading, setIsLoading] = useState(undefined); // Info: (20240808 - Anna) Alpha版先隱藏(發票列表) // const [invoiceListToggle, setInvoiceListoggle] = useState(false); - const { trigger } = APIHandler<{ [key: string]: IPaginatedData }>( - APIName.JOURNAL_LIST - ); + const { trigger, isLoading: isJournalListLoading } = APIHandler<{ + [key: string]: IPaginatedData; + }>(APIName.JOURNAL_LIST); const { trigger: deleteJournalById } = APIHandler(APIName.JOURNAL_DELETE); const types = [ @@ -88,16 +89,27 @@ const JournalListBody = () => { const [isTypeSelected, setIsTypeSelected] = useState(false); const [isSortBySelected, setIsSortBySelected] = useState(false); - const toggleTypeMenu = () => setIsTypeMenuOpen(!isTypeMenuOpen); - const toggleSortByMenu = () => setIsSortByMenuOpen(!isSortByMenuOpen); - + const toggleTypeMenu = () => { + if (!isJournalListLoading) { + setIsTypeMenuOpen(!isTypeMenuOpen); + } + }; + const toggleSortByMenu = () => { + if (!isJournalListLoading) { + setIsSortByMenuOpen(!isSortByMenuOpen); + } + }; const tabClickHandler = (event: JOURNAL_EVENT) => { setCurrentTab(event); setJournals(pagenatedJournalListItems?.[event]?.data ?? []); setTotalPages(pagenatedJournalListItems?.[event]?.totalPages ?? 0); }; - const handleInputChange = (e: React.ChangeEvent) => setSearch(e.target.value); + const handleInputChange = (e: React.ChangeEvent) => { + if (!isJournalListLoading) { + setSearch(e.target.value); + } + }; const getJournalList = useCallback( async (query: { @@ -133,7 +145,7 @@ const JournalListBody = () => { endDate: !(period ?? filteredPeriod).endTimeStamp ? undefined : (period ?? filteredPeriod).endTimeStamp, - searchQuery: !(searchString ?? search) ? undefined : searchString ?? search, + searchQuery: !(searchString ?? search) ? undefined : (searchString ?? search), }, }); @@ -204,11 +216,20 @@ const JournalListBody = () => { const displayedTypeDropMenu = (

{t(filteredJournalType)}

@@ -238,11 +259,19 @@ const JournalListBody = () => { const displayedSortByDropMenu = (

{t(filteredJournalSortBy)}

@@ -274,6 +303,7 @@ const JournalListBody = () => { const displayedDatePicker = (
{ const displayedSearchBar = (
{ + if (e.key === 'Enter' && !e.nativeEvent.isComposing) { + getJournalList({ search }); + } + }} /> getJournalList({ search })} + onClick={() => !isJournalListLoading && getJournalList({ search })} />
); From fd128220c5e695c19de0b7c9b961fa855b559ee6 Mon Sep 17 00:00:00 2001 From: arealclimber Date: Fri, 9 Aug 2024 17:14:43 +0800 Subject: [PATCH 10/13] refactor: augment the logic for disabling on my-reports --- .../my_reports_section/my_reports_section.tsx | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/my_reports_section/my_reports_section.tsx b/src/components/my_reports_section/my_reports_section.tsx index 8ae61ba24..18c48c141 100644 --- a/src/components/my_reports_section/my_reports_section.tsx +++ b/src/components/my_reports_section/my_reports_section.tsx @@ -248,21 +248,29 @@ const MyReportsSection = () => { }; const togglePendingSortMenu = () => { - setIsPendingSortSelected(true); - setIsPendingSortMenuOpen(!isPendingSortMenuOpen); + if (!isPendingDataLoading) { + setIsPendingSortSelected(true); + setIsPendingSortMenuOpen(!isPendingSortMenuOpen); + } }; const toggleHistorySortMenu = () => { - setIsHistorySortSelected(true); - setIsHistorySortMenuOpen(!isHistorySortMenuOpen); + if (!isHistoryDataLoading) { + setIsHistorySortSelected(true); + setIsHistorySortMenuOpen(!isHistorySortMenuOpen); + } }; const pendingInputChangeHandler = (e: React.ChangeEvent) => { - setSearchPendingQuery(e.target.value); + if (!isPendingDataLoading) { + setSearchPendingQuery(e.target.value); + } }; const historyInputChangeHandler = (e: React.ChangeEvent) => { - setSearchHistoryQuery(e.target.value); + if (!isHistoryDataLoading) { + setSearchHistoryQuery(e.target.value); + } }; const pendingPaginationHandler = async (newPage: number) => { From 59001b25c8006728e5114f6bf19b12cc4404e933 Mon Sep 17 00:00:00 2001 From: RexBearIU Date: Fri, 9 Aug 2024 17:16:47 +0800 Subject: [PATCH 11/13] fix: list api search error --- package.json | 2 +- src/lib/utils/repo/invoice.beta.repo.ts | 20 ++++++++++--------- src/lib/utils/repo/journal.repo.ts | 12 ++++++----- src/lib/utils/repo/report.repo.ts | 12 +++++------ .../v1/company/[companyId]/payment/index.ts | 4 ++-- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 758a9cb64..0cded3f4f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iSunFA", - "version": "0.1.8+169", + "version": "0.1.8+170", "private": false, "scripts": { "dev": "next dev", diff --git a/src/lib/utils/repo/invoice.beta.repo.ts b/src/lib/utils/repo/invoice.beta.repo.ts index 4ba54d19b..b16635e0d 100644 --- a/src/lib/utils/repo/invoice.beta.repo.ts +++ b/src/lib/utils/repo/invoice.beta.repo.ts @@ -258,15 +258,17 @@ export async function listInvoice({ gte: startDateInSecond, lte: endDateInSecond, }, - OR: [{ deletedAt: 0 }, { deletedAt: null }], - ...(searchQuery - ? [ - { invoice: { number: { contains: searchQuery, mode: 'insensitive' } } }, - { invoice: { vendorTaxId: { contains: searchQuery, mode: 'insensitive' } } }, - { invoice: { vendorOrSupplier: { contains: searchQuery, mode: 'insensitive' } } }, - { invoice: { description: { contains: searchQuery, mode: 'insensitive' } } }, - ] - : {}), + AND: [ + { OR: [{ deletedAt: 0 }, { deletedAt: null }] }, + { + OR: [ + { number: { contains: searchQuery, mode: 'insensitive' } }, + { vendorTaxId: { contains: searchQuery, mode: 'insensitive' } }, + { vendorOrSupplier: { contains: searchQuery, mode: 'insensitive' } }, + { description: { contains: searchQuery, mode: 'insensitive' } }, + ], + }, + ], }; const totalCount = await prisma.invoice.count({ where }); diff --git a/src/lib/utils/repo/journal.repo.ts b/src/lib/utils/repo/journal.repo.ts index 7e943b8c7..2675b9537 100644 --- a/src/lib/utils/repo/journal.repo.ts +++ b/src/lib/utils/repo/journal.repo.ts @@ -112,14 +112,16 @@ export async function listJournal( invoice: { eventType, }, - OR: [{ deletedAt: 0 }, { deletedAt: null }], - ...(searchQuery - ? [ + AND: [ + { OR: [{ deletedAt: 0 }, { deletedAt: null }] }, + { + OR: [ { invoice: { vendorOrSupplier: { contains: searchQuery, mode: 'insensitive' } } }, { invoice: { description: { contains: searchQuery, mode: 'insensitive' } } }, { voucher: { no: { contains: searchQuery, mode: 'insensitive' } } }, - ] - : {}), + ], + }, + ], }; const totalCount = await prisma.journal.count({ where }); diff --git a/src/lib/utils/repo/report.repo.ts b/src/lib/utils/repo/report.repo.ts index 7f9aa2d16..076a49c64 100644 --- a/src/lib/utils/repo/report.repo.ts +++ b/src/lib/utils/repo/report.repo.ts @@ -148,15 +148,15 @@ export async function findManyReports( AND: [ // { from: { gte: startDateInSecond } }, { to: { lte: endDateInSecond } }, - ], - OR: [{ deletedAt: 0 }, { deletedAt: null }], - ...(searchQuery - ? [ + { OR: [{ deletedAt: 0 }, { deletedAt: null }] }, + { + OR: [ { name: { contains: searchQuery, mode: 'insensitive' } }, { type: { contains: searchQuery, mode: 'insensitive' } }, { reportType: { contains: searchQuery, mode: 'insensitive' } }, - ] - : undefined), + ], + }, + ], }; const orderBy: Prisma.ReportOrderByWithRelationInput = { [sortBy]: sortOrder }; diff --git a/src/pages/api/v1/company/[companyId]/payment/index.ts b/src/pages/api/v1/company/[companyId]/payment/index.ts index 3395d5a3f..b486d5c1b 100644 --- a/src/pages/api/v1/company/[companyId]/payment/index.ts +++ b/src/pages/api/v1/company/[companyId]/payment/index.ts @@ -37,8 +37,8 @@ async function handleGetRequest(req: NextApiRequest, res: NextApiResponse) { body: JSON.stringify({ merchantId: oenMerchantId, customId: orderIdNum, // order id - successUrl: `https://www.google.com`, // TODO (20240806 - Jacky): Need to modify in the future - failureUrl: `https://www.bing.com`, // TODO (20240806 - Jacky): Need to modify in the future + successUrl: `https://www.google.com`, + failureUrl: `https://www.bing.com`, }), }); const responseJson = await response.json(); From 93c7781c83b7cc24a77e7ca408beb466f152f960 Mon Sep 17 00:00:00 2001 From: arealclimber Date: Fri, 9 Aug 2024 18:12:37 +0800 Subject: [PATCH 12/13] chore: trivial ui --- src/components/journal_list_body/journal_list_body.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/journal_list_body/journal_list_body.tsx b/src/components/journal_list_body/journal_list_body.tsx index 7f14b807b..752f528ee 100644 --- a/src/components/journal_list_body/journal_list_body.tsx +++ b/src/components/journal_list_body/journal_list_body.tsx @@ -218,7 +218,7 @@ const JournalListBody = () => {
{ 'border-input-stroke-input text-input-text-input-placeholder': !isTypeMenuOpen, } )} - // className={`group relative flex h-44px w-130px cursor-pointer ${isTypeMenuOpen ? 'border-input-stroke-input-hover text-primaryYellow' : 'border-input-stroke-input text-input-text-input-placeholder'} items-center justify-between rounded-sm border bg-white p-10px hover:border-input-stroke-input-hover hover:text-primaryYellow`} >

{

Date: Fri, 9 Aug 2024 19:12:21 +0800 Subject: [PATCH 13/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0cded3f4f..f408697d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iSunFA", - "version": "0.1.8+170", + "version": "0.1.8+166", "private": false, "scripts": { "dev": "next dev",