Skip to content

Commit

Permalink
Update contact us and register pages (#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
ltan02 authored Mar 18, 2024
1 parent 7edeb16 commit f4e411d
Show file tree
Hide file tree
Showing 13 changed files with 308 additions and 314 deletions.
13 changes: 0 additions & 13 deletions frontend/src/components/buttons/NextButton.jsx

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/src/components/buttons/RegisterButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ export default function RegisterButton({ onClick }) {
return (
<button
type="button"
className="bg-transparent border-solid border-2 border-mv-white rounded-[10px] w-full h-[50px] items-center justify-center"
className="bg-transparent border-solid border-2 border-mv-green rounded-[10px] w-full h-[50px] items-center justify-center"
onClick={onClick}
>
<div className="text-mv-white text-xl font-normal">Register</div>
<div className="text-mv-green text-xl font-normal">Register</div>
</button>
);
}
6 changes: 3 additions & 3 deletions frontend/src/components/buttons/ViewAuctionButton.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ export default function ViewAuctionButton() {
const navigate = useNavigate();

const handleClick = () => {
navigate('/listings');
navigate('/');
};

return (
<button
type="button"
className="bg-mv-green rounded-[10px] inline-flex px-[63px] py-[25px] flex-start shrink-0 items-center justify-center h-[60px]"
className="bg-mv-white border-2 border-solid gap-[10px] border-mv-green rounded-[10px] inline-flex px-[94px] py-[17px] flex-start shrink-0 items-center justify-center h-[60px] w-full"
onClick={handleClick}
>
<div className="text-mv-white text-base font-medium">View Auction</div>
<div className="text-mv-green text-xl font-normal">View Auction</div>
</button>
);
}
3 changes: 1 addition & 2 deletions frontend/src/components/inputs/OnboardingInputField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react';

export default function OnboardingInputField({
placeholder,
className,
type,
value,
onChange,
Expand All @@ -11,7 +10,7 @@ export default function OnboardingInputField({
<input
placeholder={placeholder}
type={type}
className={`border-solid rounded-[10px] border-[1px] border-dark-grey pt-[15px] pl-[21px] pb-[11px] text-xl font-normal focus:outline-none ${className}`}
className="border-solid rounded-[10px] border-[2px] border-border-dark-grey pt-[9px] pl-[21px] pb-[10px] text-base font-medium focus:outline-none w-full h-[43px] placeholder:text-onboarding-placeholder text-mv-black"
value={value}
onChange={onChange}
/>
Expand Down
115 changes: 68 additions & 47 deletions frontend/src/pages/ContactUsPage.jsx
Original file line number Diff line number Diff line change
@@ -1,82 +1,103 @@
import React from 'react';
import React, { useState } from 'react';
import NavBar from '../components/navBars/NavBar';
import Footer from '../components/footers/Footer';
import SubmitContactFormButton from '../components/buttons/SubmitContactFormButton';

export default function ContactUsPage() {
const [name, setName] = useState('Lance Tan');
const [email, setEmail] = useState('[email protected]');
const [phoneNumber, setPhoneNumber] = useState('+63 (917) 123 4567');
const [bidderNumber, setBidderNumber] = useState('12345678');
const [message, setMessage] = useState(
"Hello, I'd like to speak with a Microvan employee regarding an issue I'm facing with downloading my statement of account."
);

const handleNameChange = (e) => {
setName(e.target.value);
};

const handleEmailChange = (e) => {
setEmail(e.target.value);
};

const handlePhoneNumberChange = (e) => {
setPhoneNumber(e.target.value);
};

const handleBidderNumberChange = (e) => {
setBidderNumber(e.target.value);
};

const handleMessageChange = (e) => {
setMessage(e.target.value);
};

return (
<div className="flex flex-col min-h-screen">
<div className="flex flex-col min-h-screen w-screen">
<NavBar />

<div className="flex-1">
<div className="flex flex-col px-[5%] py-[5%] w-full justify-center">
<h1 className="text-4xl pb-[1%] font-semibold text-mv-black">
Contact Us
</h1>
<div className="flex flex-col items-start w-[60%] mt-[22px] gap-y-[5px]">
<p className="font-poppins text-2xl font-normal leading-9 tracking-normal text-left">
Name
</p>
<div className="flex items-center w-[50%] h-[56px] px-5 py-4 shrink-0 gap-5 rounded-2xl bg-mv-white shadow-searchBarShadow">
<div className="flex-1 mt-[115px] w-full">
<div className="flex flex-col px-[10%] w-full justify-center text-mv-black gap-y-[45px]">
<h1 className="text-4xl font-semibold">Contact Us</h1>
<div className="flex flex-col items-start w-full mt-[11px] gap-y-[19px]">
<p className="text-2xl font-normal">Name</p>
<div className="flex items-center w-[50%] h-[55px] px-[23px] py-[13px] shrink-0 rounded-[5px] shadow-searchBarShadow">
<input
className="w-full text-base font-poppins text-gray-700 placeholder-dark-grey outline-none"
placeholder=""
className="w-full text-lg font-base outline-none"
value={name}
onChange={handleNameChange}
/>
</div>
</div>
<div className="flex flex-col items-start w-[60%] mt-[22px] gap-y-[5px]">
<p className="font-poppins text-2xl font-normal leading-9 tracking-normal text-left">
Email
</p>
<div className="flex items-center w-[50%] h-[56px] px-5 py-4 shrink-0 gap-5 rounded-2xl bg-mv-white shadow-searchBarShadow">
<div className="flex flex-col items-start w-full mt-[11px] gap-y-[19px]">
<p className="text-2xl font-normal">Email</p>
<div className="flex items-center w-[50%] h-[55px] px-[23px] py-[13px] shrink-0 rounded-[5px] shadow-searchBarShadow">
<input
className="w-full text-base font-poppins text-gray-700 placeholder-dark-grey outline-none"
placeholder=""
className="w-full text-lg font-base outline-none"
value={email}
onChange={handleEmailChange}
/>
</div>
</div>
<div className="flex flex-col items-start w-[60%] mt-[22px] gap-y-[5px]">
<p className="font-poppins text-2xl font-normal leading-9 tracking-normal text-left">
Phone Number
</p>
<div className="flex items-center w-[50%] h-[56px] px-5 py-4 shrink-0 gap-5 rounded-2xl bg-mv-white shadow-searchBarShadow">
<div className="flex flex-col items-start w-full mt-[11px] gap-y-[19px]">
<p className="text-2xl font-normal">Phone Number</p>
<div className="flex items-center w-[50%] h-[55px] px-[23px] py-[13px] shrink-0 rounded-[5px] shadow-searchBarShadow">
<input
className="w-full text-base font-poppins text-gray-700 placeholder-dark-grey outline-none"
placeholder=""
className="w-full text-lg font-base outline-none"
value={phoneNumber}
onChange={handlePhoneNumberChange}
/>
</div>
</div>
<div className="flex flex-col items-start w-[60%] mt-[22px] gap-y-[5px]">
<p className="font-poppins text-2xl font-normal leading-9 tracking-normal text-left">
<div className="flex flex-col items-start w-full mt-[11px] gap-y-[19px]">
<p className="text-2xl font-normal">
Bidder Number (If you have one)
</p>
<div className="flex items-center w-[50%] h-[56px] px-5 py-4 shrink-0 gap-5 rounded-2xl bg-mv-white shadow-searchBarShadow">
<div className="flex items-center w-[50%] h-[55px] px-[23px] py-[13px] shrink-0 rounded-[5px] shadow-searchBarShadow">
<input
className="w-full text-base font-poppins text-gray-700 placeholder-dark-grey outline-none"
placeholder=""
className="w-full text-lg font-base outline-none"
value={bidderNumber}
onChange={handleBidderNumberChange}
/>
</div>
</div>
<div className="flex flex-col items-start w-[60%] mt-[22px] gap-y-[5px]">
<p className="font-poppins text-2xl font-normal leading-9 tracking-normal text-left">
Message
</p>
<div className="flex w-[90%] h-[231px] px-5 py-4 shrink-0 gap-5 rounded-2xl bg-mv-white shadow-searchBarShadow">
<textarea
className="w-full text-base font-poppins text-gray-700 placeholder-dark-grey outline-none align-text-top text-left overflow-hidden"
placeholder=""
/>
</div>
<div className="flex flex-col items-start w-full mt-[11px] gap-y-[19px]">
<p className="text-2xl font-normal">Message</p>
<textarea
className="flex w-full h-[231px] px-[23px] py-7 shrink-0 gap-5 rounded-[5px] shadow-searchBarShadow text-lg font-base outline-none"
value={message}
onChange={handleMessageChange}
/>
</div>
<div className="mt-[3%] w-[315px] items-center justify-center">
<div className="w-[315px] items-center justify-center mt-[11px]">
<SubmitContactFormButton />
</div>
</div>

<div className="flex-grow" />
</div>

<Footer />
<div className="mt-[283px]">
<Footer />
</div>
</div>
);
}
2 changes: 1 addition & 1 deletion frontend/src/pages/VehicleDetailsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function VehicleDetailsPage() {
<h2 className="text-mv-black text-xl font-semibold leading-[35px] tracking-[0.5px]">
Similar vehicles
</h2>
<div className="flex gap-x-[8px]g">
<div className="flex gap-x-[8px]">
<PreviousSimilarVehicleButton onClick={() => {}} isDisabled />
<NextSimilarVehicleButton onClick={() => {}} />
</div>
Expand Down
40 changes: 32 additions & 8 deletions frontend/src/pages/auth/bidders/BidderEmailVerificationPage.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import React from 'react';
import { useNavigate } from 'react-router';
import altlogo from '../../../assets/alt-microvan-logo.svg';
import logo from '../../../assets/microvan_logo.svg';
import ViewAuctionButton from '../../../components/buttons/ViewAuctionButton';

export default function BidderRegisterPage() {
const navigate = useNavigate();

return (
<div className="flex flex-col items-center justify-between min-h-screen min-w-screen bg-mv-green">
<div className="flex flex-col items-center justify-between min-h-screen min-w-screen bg-mv-white">
<div className="self-start pl-[29px] pt-[27px]">
<button
type="button"
Expand All @@ -19,23 +20,46 @@ export default function BidderRegisterPage() {

<div className="flex-grow" />

<div className="flex flex-col w-full items-center justify-center gap-y-[27px]">
<div className="flex w-full items-center justify-center gap-x-[16px]">
<div className="flex flex-col w-[70%] items-center justify-center gap-y-[40px]">
<div className="flex w-full items-center gap-x-[16px]">
<img
src={altlogo}
src={logo}
alt="logo"
className="flex-shrink-0 w-[70px] h-[70px]"
/>
<h1 className="text-mv-white text-[50px] font-normal">
REGISTER AS A NEW BIDDER
<h1 className="text-mv-green text-[50px] font-normal">
CHECK YOUR EMAIL!
</h1>
</div>
<p className="text-mv-black text-xl font-normal">
Thank you for registering with Microvan Inc. Virtual Auctions!
<br />
<br />
To complete your registration and fully activate your account,
it&apos;s essential that you verify your email address. Please check
your email inbox (and the spam/junk folder, just in case) for our
verification email. Click the link provided in the email to verify
your email address.
<br />
<br />
Note that <b>before participating in any auction</b>, you must upload{' '}
<b>proof of a deposit amounting to ₱100,000</b>. Once your deposit is
received and approved by a member of our staff, you will be notified
via email and within our website, confirming your eligibility to
participate in auctions.
<br />
<br />
In the meantime, feel free to take a look at our auctions.
</p>
<div className="flex items-center justify-center w-[60%] mt-[34px]">
<ViewAuctionButton />
</div>
</div>

<div className="flex-grow" />

<div className="self-center pb-[24px]">
<p className="text-mv-white text-lg font-normal">
<p className="text-mv-green text-lg font-normal">
© Microvan Inc. 2024
</p>
</div>
Expand Down
68 changes: 68 additions & 0 deletions frontend/src/pages/auth/bidders/BidderEmailVerifiedPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import React from 'react';
import { useNavigate } from 'react-router';
import logo from '../../../assets/microvan_logo.svg';
import ViewAuctionButton from '../../../components/buttons/ViewAuctionButton';

export default function BidderEmailVerifiedPage() {
const navigate = useNavigate();

return (
<div className="flex flex-col items-center justify-between min-h-screen min-w-screen bg-mv-white">
<div className="self-start pl-[29px] pt-[27px]">
<button
type="button"
className="text-mv-white text-base font-medium"
onClick={() => navigate('/')}
>
Home
</button>
</div>

<div className="flex-grow" />

<div className="flex flex-col w-[70%] items-center justify-center gap-y-[40px]">
<div className="flex w-full items-center gap-x-[16px]">
<img
src={logo}
alt="logo"
className="flex-shrink-0 w-[70px] h-[70px]"
/>
<h1 className="text-mv-green text-[50px] font-normal">
YOUR EMAIL HAS BEEN VERIFIED
</h1>
</div>
<p className="text-mv-black text-xl font-normal">
Your email has been successfully verified, and you&apos;re one step
closer to participating in our exciting virtual auctions.
<br />
<br />
As a reminder, in accordance with the guidelines provided during your
registration, each participant must submit proof of a ₱100,000 deposit
before engaging in any auction activities. This deposit is a
prerequisite for bidding and ensures a secure and fair auction process
for all our users.
<br />
<br />
Upon submission, our team will review your deposit proof. You will be
notified both via email and on our platform once your deposit has been
validated, officially clearing you to participate in the auctions.
<br />
<br />
Feel free to take a look at our auctions. If you have any questions or
require assistance, our support team is here to help.
</p>
<div className="flex items-center justify-center w-[60%] mt-[34px]">
<ViewAuctionButton />
</div>
</div>

<div className="flex-grow" />

<div className="self-center pb-[24px]">
<p className="text-mv-green text-lg font-normal">
© Microvan Inc. 2024
</p>
</div>
</div>
);
}
Loading

0 comments on commit f4e411d

Please sign in to comment.