Merge branch 'login-type-btn' of WrenchBoard/Users-Wrench into master

This commit is contained in:
2023-07-08 10:22:02 +00:00
committed by Gogs
11 changed files with 42 additions and 56 deletions
+8 -8
View File
@@ -207,11 +207,11 @@ export default function Login() {
</div>
{/* switch login component */}
<div className="flex justify-start items-center gap-3">
<div className="ml-7 flex justify-start items-center gap-3">
<button
name="full"
className={`login-type-btn px-4 py-1 rounded-t-[3px] transition duration-200 ${
loginType=='full' ? "bg-white text-[#000] border-t-[3px] border-[#4687ba]" : "bg-[#4687ba] text-white"
className={`login-type-btn px-4 py-1 rounded-t-2xl transition duration-200 ${
loginType=='full' ? "bg-white text-[#000] border-t-[2px]" : "bg-[#4687ba] text-white"
}`}
onClick={handleLoginType}
>
@@ -219,12 +219,12 @@ export default function Login() {
</button>
<button
name="family"
className={`login-type-btn px-4 py-1 rounded-t-[3px] transition duration-200 ${
loginType=='family' ? "bg-white text-[#000] border-t-[3px] border-[#4687ba]" : "bg-[#4687ba] text-white"
className={`login-type-btn px-4 py-1 rounded-t-2xl transition duration-200 ${
loginType=='family' ? "bg-white text-[#000] border-t-[2px]" : "bg-[#4687ba] text-white"
}`}
onClick={handleLoginType}
>
Family
Family Account
</button>
</div>
@@ -234,7 +234,7 @@ export default function Login() {
{
loginType == 'full' ? (
//user login component
<div className="p-2 input-area login-area border-2 border-[#4687ba]">
<div className="p-2 input-area login-area border-2 rounded-2xl">
<div className="input-item mb-5">
<InputCom
labelClass="tracking-wider"
@@ -322,7 +322,7 @@ export default function Login() {
) : (
// END of user login compoenent
// family login compoenent
<div className="p-2 input-area login-area border-2 border-[#4687ba]">
<div className="p-2 input-area login-area border-2 rounded-2xl">
<div className="input-item mb-5">
<InputCom
labelClass="tracking-wider"
+11
View File
@@ -1,4 +1,5 @@
import React from "react";
import localImgLoad from "../../lib/localImgLoad";
import ATMCard from "../../assets/images/card.svg";
import VisaCard from "../../assets/images/visa.svg";
@@ -508,6 +509,16 @@ export default function Icons({ name }) {
<img className="w-[20px]" src={VisaCard} alt="card" />
) : name === "master-card" ? (
<img className="w-[20px]" src={MasterCard} alt="card" />
) : name === "new-dashboard" ? (
<img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/dashboard.svg')} alt="dashboard" />
) : name === "new-family" ? (
<img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/family.svg')} alt="family" />
) : name === "new-logout" ? (
<img className="w-[45px] rounded-full bg-white p-1" src={localImgLoad('images/icons/logout.svg')} alt="logout" />
) : name === "new-market" ? (
<img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/market.svg')} alt="market" />
) : name === "new-mytask" ? (
<img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/my-task.svg')} alt="task" />
) : (
""
)}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long