Skip to content

Hotfix/background timeafterbid #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
veigajoao wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Hotfix/background timeafterbid #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3f8151
fix(contract): increase minimum time after bid to 5 minutes
veigajoao Feb 1, 2023
8a8cbf5
feat(env): add background image to aptomingos
veigajoao Feb 1, 2023
4ce6852
fix(web): typo in pages
veigajoao Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions clients_config/aptosmingos.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ AUCTION_NETWORK=mainnet
AUCTION_MODULE_ADDRESS=0x98937acca8bc2c164dff158156ab06f9c99bbbb050129d7a514a37ccb1b8e49e
AUCTION_INSTANCE_ADDRESS=0x98937acca8bc2c164dff158156ab06f9c99bbbb050129d7a514a37ccb1b8e49e

AUCTION_BACKGROUND_COLOR='#F49BE4'
AUCTION_BACKGROUND_IMAGE='none'
AUCTION_BACKGROUND_COLOR='#FF00FF'
AUCTION_BACKGROUND_IMAGE='url(/aptomingos-background.png)'
AUCTION_BACKGROUND_COVER='#FFFFFF23'
AUCTION_BACKGROUND_BLUR='2px'
AUCTION_BACKGROUND_BLUR='0px'

AUCTION_GENERAL_TITLE=Auctions
AUCTION_GENERAL_FAVICON=/aptomingos-favicon.ico
Expand Down
6 changes: 3 additions & 3 deletions contracts/aptos/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "AuctionHouse"
version = "0.0.2"
version = "0.0.3"

[dependencies]
AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework", rev="main" }
AptosToken = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-token", rev="main" }
AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-framework", rev="120ff1cd8a3bb39c1c68cc70c112fd0e8e117955" }
AptosToken = { git = "https://github.com/aptos-labs/aptos-core.git", subdir = "aptos-move/framework/aptos-token", rev="120ff1cd8a3bb39c1c68cc70c112fd0e8e117955" }

[addresses]
std = "0x1"
Expand Down
2 changes: 1 addition & 1 deletion contracts/aptos/sources/auctionhouse.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module auctionhouse::AuctionHouse {
// System consts

/// Each bid must run for at least 10 minutes before ending the auction
const MINIMUM_TIME_AFTER_BID: u64 = 100000000;
const MINIMUM_TIME_AFTER_BID: u64 = 300000000;

/// Auction representation to be stored
struct Auction has store {
Expand Down
Binary file added web/public/aptomingos-background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/src/components/PageContainer/PageContainer.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PropsWithChildren } from "react";

const PageContainer = (props: PropsWithChildren) => {
return (
<div className="flex pt-7.5 pb-10 box-content flex-col w-full overflow-y-hidden mx-auto max-w-[1280px]">
<div className="bg-cover bg-scroll flex pt-7.5 pb-10 box-content flex-col w-full overflow-y-hidden mx-auto max-w-[1280px]">
{props.children}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Auction/Auction.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ function AuctionComponent(props: AuctionProps) {
<div className="flex gap-1 items-center w-[95%] max-w-[413px] mx-auto mt-[1.1rem] md:ml-6 md:px-2 xl:px-0 xl:mx-[-5px] mb-[.4rem]">
<ChevronLeftIcon className="w-[15px] h-5" />
<a href="/" className="text-black font-semibold text-sm tracking-tight">
Back to all acutions
Back to all auctions
</a>
</div>
<section className="Auction flex flex-col mt-10 items-center m-auto w-[95%] md:grid grid-rows-3 grid-flow-col md:gap-4 xl:gap-20 md:items-start mx-auto md:mt-6 xl:w-full">
Expand Down
5 changes: 5 additions & 0 deletions web/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ module.exports = {
space: useEnv('AUCTION_COLOR_GRADIENT'),
'gd-button': useEnv('AUCTION_COLOR_BUTTON_GRADIENT')
},
backgroundSize: {
'auto': 'auto',
'cover': 'cover',
'contain': 'contain',
},
backdropBlur: {
cover: useEnv('AUCTION_BACKGROUND_BLUR'),
},
Expand Down