zelda
/
bid-tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix login

This commit is contained in:
Admin 2025-05-05 10:32:00 +07:00
parent 65ae7da6e6
commit 8e2f274668
5 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto-bid-admin/src/apis/bid.ts
View File

@ -115,6 +115,6 @@ export const getImagesWorking = async (values: (IBid | IWebBid) & { type: string
return data; return data;
} catch (error) { } catch (error) {
handleError(error); console.log('%csrc/apis/bid.ts:118 error', 'color: #007acc;', error);
} }
}; };

4
auto-bid-admin/src/components/bid/show-histories-bid-pickles-api-modal.tsx
View File

@ -20,11 +20,7 @@ export default function ShowHistoriesBidPicklesApiModal({ data, onUpdated, ...pr
<Table.Tr key={index}> <Table.Tr key={index}>
<Table.Td>{element['bidderAnonName']}</Table.Td> <Table.Td>{element['bidderAnonName']}</Table.Td>
<Table.Td>{element['actualBid']}</Table.Td> <Table.Td>{element['actualBid']}</Table.Td>
<<<<<<< HEAD
<Table.Td>{formatTime(new Date(element['bidTimeInMilliSeconds']).toUTCString())}</Table.Td>
=======
<Table.Td>{formatTime(new Date(element['bidTimeInMilliSeconds']).toUTCString(), 'HH:mm:ss DD/MM/YYYY')}</Table.Td> <Table.Td>{formatTime(new Date(element['bidTimeInMilliSeconds']).toUTCString(), 'HH:mm:ss DD/MM/YYYY')}</Table.Td>
>>>>>>> 26b10a7 (pickxel and fix login)
</Table.Tr> </Table.Tr>
)); ));
}, [histories]); }, [histories]);

6
auto-bid-admin/src/utils/index.ts
View File

@ -3,10 +3,7 @@
import { clsx, type ClassValue } from "clsx"; import { clsx, type ClassValue } from "clsx";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import moment from "moment"; import moment from "moment";
<<<<<<< HEAD
=======
import { IWebBid } from "../system/type"; import { IWebBid } from "../system/type";
>>>>>>> 26b10a7 (pickxel and fix login)
export function cn(...args: ClassValue[]) { export function cn(...args: ClassValue[]) {
return twMerge(clsx(args)); return twMerge(clsx(args));
} }
@ -154,8 +151,6 @@ export function stringToColor(str: string): string {
const hash = hashStringToInt(str); const hash = hashStringToInt(str);
const index = hash % colorPalette.length; const index = hash % colorPalette.length;
return colorPalette[index]; return colorPalette[index];
<<<<<<< HEAD
=======
} }
export function findEarlyLoginTime(webBid: IWebBid): string | null { export function findEarlyLoginTime(webBid: IWebBid): string | null {
@ -180,5 +175,4 @@ export function findEarlyLoginTime(webBid: IWebBid): string | null {
closeTime.setSeconds(closeTime.getSeconds() - (webBid.early_login_seconds || 0)); closeTime.setSeconds(closeTime.getSeconds() - (webBid.early_login_seconds || 0));
return closeTime.toISOString(); return closeTime.toISOString();
>>>>>>> 26b10a7 (pickxel and fix login)
} }

10
auto-bid-server/src/modules/bids/apis/grays.api.ts
View File

@ -21,10 +21,7 @@ export class GraysApi {
switch(bid.web_bid.origin_url){ switch(bid.web_bid.origin_url){
<<<<<<< HEAD
=======
// GRAYS // GRAYS
>>>>>>> 26b10a7 (pickxel and fix login)
case 'https://www.grays.com': { case 'https://www.grays.com': {
const response = await axios({ const response = await axios({
url: `https://www.grays.com/api/LotInfo/GetBiddingHistory?lotId=${lot_id}&currencyCode=AUD`, url: `https://www.grays.com/api/LotInfo/GetBiddingHistory?lotId=${lot_id}&currencyCode=AUD`,
@ -36,11 +33,8 @@ export class GraysApi {
return AppResponse.toResponse([]) return AppResponse.toResponse([])
} }
<<<<<<< HEAD
=======
// PICKLES // PICKLES
>>>>>>> 26b10a7 (pickxel and fix login)
case 'https://www.pickles.com.au': { case 'https://www.pickles.com.au': {
const response = await axios({ const response = await axios({
@ -48,11 +42,7 @@ export class GraysApi {
}); });
if (response.data) { if (response.data) {
<<<<<<< HEAD
return AppResponse.toResponse(response.data);
=======
return AppResponse.toResponse(response.data.Bids); return AppResponse.toResponse(response.data.Bids);
>>>>>>> 26b10a7 (pickxel and fix login)
} }
return AppResponse.toResponse([]) return AppResponse.toResponse([])

8
auto-bid-server/src/modules/bids/controllers/client/bids.controller.ts
View File

@ -79,14 +79,14 @@ export class BidsController {
@Post('test') @Post('test')
async test(@Body('code') code: string) { async test(@Body('code') code: string) {
const webBid = await this.webBidService.webBidRepo.findOne({ const webBid = await this.webBidService.webBidRepo.findOne({
where: { id: 4 }, // where: { id: 4 },
// where: { id: 1 }, where: { id: 1 },
}); });
this.eventEmitter.emit(Event.verifyCode(webBid), { this.eventEmitter.emit(Event.verifyCode(webBid), {
code, code,
name: 'LAWSONS', // name: 'LAWSONS',
// name: 'LANGTONS', name: 'LANGTONS',
web_bid: plainToClass(WebBid, webBid), web_bid: plainToClass(WebBid, webBid),
}); });