Skip to content

Commit

Permalink
Merge pull request #59 from zwenie-tech/resultpage
Browse files Browse the repository at this point in the history 
dashboard button change and coordinator button change
  • Loading branch information
@Rohith272
Rohith272 authored Aug 15, 2024
2 parents 0b2265b + c01c7cb commit fe66133
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 44 deletions.
2 changes: 1 addition & 1 deletion src/app/dashboard/dialog-add-user.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Follow the link to join GreenCleanEarth mission.
<Dialog>
<DialogTrigger asChild>

<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}} >
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}} >
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center',}}
>
Expand Down
92 changes: 53 additions & 39 deletions src/app/dashboard/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,76 +56,90 @@ const Dashboard=()=>{
<h1 className='text-xl mb-6 mt-2 font-bold '>in Association with Green Clean Kerala Mission</h1>
</div>
{/*uploading button .......... */}
<div className="flex justify-center items-center p-2 gap-2 md:gap-6 mb-3">
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width: '300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}}
onClick={PlantUploadsButton}>
<div className="flex justify-center items-center p-2 gap-2 md:gap-6 mb-3">
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"
style={{ width: '300px', height: '70px', boxShadow: '1px 4px 5px 3px #00000040' }}
onClick={PlantUploadsButton}>
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center',}}
style={{ width: '60px', height: '70px', backgroundColor: 'white', borderRadius: '20px', borderWidth: '1px', borderColor: '#3C6E1F', display: 'flex', justifyContent: 'center', alignItems: 'center' }}
>
<FaUpload />
</div>
<FaUpload />
</div>
<div className="pt-2 p-1 text-lg md:text-2xl md:py-5 md:pr-3">Plant Uploads</div>
<input type="submit" style={{ display: 'none' }} />
</label>
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}} onClick={ActivitiesButton}>

<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"
style={{ width: '300px', height: '70px', boxShadow: '1px 4px 5px 3px #00000040' }}
onClick={ActivitiesButton}>
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center',}}
style={{ width: '60px', height: '70px', backgroundColor: 'white', borderRadius: '20px', borderWidth: '1px', borderColor: '#3C6E1F', display: 'flex', justifyContent: 'center', alignItems: 'center' }}
>
<FaUpload />
</div>
<FaUpload />
</div>
<div className="pt-5 p-1 text-lg md:text-2xl md:py-5 md:pr-3">Activities</div>
<input type="submit" style={{ display: 'none' }} />
</label>
</div>
{/**2..... */}
<div className="flex justify-center items-center p-2 gap-2 md:gap-6 mb-3">
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}} onClick={YouTubeEarningsButton}>
</div>

{/** 2nd Row */}
<div className="flex justify-center items-center p-2 gap-2 md:gap-6 mb-3">
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"
style={{ width: '300px', height: '70px', boxShadow: '1px 4px 5px 3px #00000040' }}
onClick={YouTubeEarningsButton}>
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center',}}
style={{ width: '60px', height: '70px', backgroundColor: 'white', borderRadius: '20px', borderWidth: '1px', borderColor: '#3C6E1F', display: 'flex', justifyContent: 'center', alignItems: 'center' }}
>
<FaUpload />
</div>
<FaUpload />
</div>
<div className="pt-2 p-1 text-lg md:text-2xl md:pt-5 md:pr-3">YouTube Earnings</div>
<input type="submit" style={{ display: 'none' }} />
</label>
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}} onClick={OurTeamButton}>

<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"
style={{ width: '300px', height: '70px', boxShadow: '1px 4px 5px 3px #00000040' }}
onClick={OurTeamButton}>
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center',}}
style={{ width: '60px', height: '70px', backgroundColor: 'white', borderRadius: '20px', borderWidth: '1px', borderColor: '#3C6E1F', display: 'flex', justifyContent: 'center', alignItems: 'center' }}
>
<FaUpload />
</div>
<FaUpload />
</div>
<div className="pt-5 p-1 text-lg md:text-2xl md:pt-5 md:pr-3">Our Team</div>
<input type="submit" style={{ display: 'none' }} />
</label>
</div>
{/**3..... */}
<div className="flex justify-center items-center p-2 gap-2 md:gap-6
mb-3">
<DialogAddUser />
</div>

<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}} onClick={InviteInstitutionsButton} >
{/** 3rd Row */}
<div className="flex justify-center items-center p-2 gap-2 md:gap-6 mb-3">
<DialogAddUser />
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"
style={{ width: '300px', height: '70px', boxShadow: '1px 4px 5px 3px #00000040' }}
onClick={InviteInstitutionsButton}>
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center',}}
style={{ width: '60px', height: '70px', backgroundColor: 'white', borderRadius: '20px', borderWidth: '1px', borderColor: '#3C6E1F', display: 'flex', justifyContent: 'center', alignItems: 'center' }}
>
<FaUpload />
</div>
<FaUpload />
</div>
<div className="pt-2 p-1 text-lg md:text-2xl md:pt-5 md:pr-3">Invite Institutions</div>
<input type="submit" style={{ display: 'none' }} />
</label>
</div>
{/*4th */}
<div className="flex justify-center items-center gap-5 ">
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg"style={{width:'300px',height: '70px',boxShadow:'1px 4px 5px 3px #00000040'}}
onClick={OurUserButton}>
</div>

{/** 4th Row */}
<div className="flex justify-center items-center gap-5">
<label className="btn btn-primary flex align-items-center bg-light-green rounded-lg cursor-pointer transform transition-all duration-300 hover:scale-110 hover:bg-light-gray hover:z-10"
style={{ width: '300px', height: '70px', boxShadow: '1px 4px 5px 3px #00000040' }}
onClick={OurUserButton}>
<div
style={{ width: '60px',height: '70px',backgroundColor: 'white',borderRadius: '20px',borderWidth: '1px',borderColor: '#3C6E1F',display:'flex',justifyContent: 'center',alignItems: 'center'}}
style={{ width: '60px', height: '70px', backgroundColor: 'white', borderRadius: '20px', borderWidth: '1px', borderColor: '#3C6E1F', display: 'flex', justifyContent: 'center', alignItems: 'center' }}
>
<FaUpload />
</div>
<FaUpload />
</div>
<div className="pt-5 p-1 text-lg md:text-2xl md:pt-5 md:pr-3">Our Users</div>
<input type="submit" style={{ display: 'none' }} />
</label>
</div>
</div>

<Footer/>
</>
)
Expand Down
8 changes: 4 additions & 4 deletions src/app/loginform/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ const LoginForm = () => {
<div className="w-full bg-[#E4EBF7] lg:w-1/3 rounded-lg shadow dark:border dark:bg-gray-800 dark:border-gray-700 flex items-center justify-center">
<Container>
<Row className="justify-content-end">
<Col md={4} className="p-4 rounded shadow opacity-80" style={{ borderRadius: '20px' }}>
<div className="flex flex-row bg-[#E4EBF7] gap-2 rounded mb-5 justify-center items-center w-3/4 mx-auto">
<Col md={4} className="p-2 rounded shadow opacity-80" style={{ borderRadius: '20px' }}>
<div className="flex flex-row bg-[#E4EBF7] rounded mb-5 justify-center items-center w-3/4 mx-auto">
<button
onClick={() => setIsUserLogin(true)}
className={`w-1/2 text-center rounded-xl font-bold bg-[#E4EBF7] py-3 text-[#3C6E1F] hover:bg-primary/15 border-b-2 ${
className={`w-2/5 text-center rounded-xl font-bold bg-[#E4EBF7] py-3 text-http://localhost:3000[#3C6E1F] hover:bg-primary/15 border-b-2 ${
isUserLogin
? 'shadow-lg border-[#3C6E1F]' // Apply shadow and border color when active
: 'border-transparent' // No shadow and border when inactive
Expand All @@ -185,7 +185,7 @@ const LoginForm = () => {
</button>
<button
onClick={() => setIsUserLogin(false)}
className={`w-1/2 text-center rounded-xl px-2 font-bold bg-[#E4EBF7] py-3 text-[#3C6E1F] hover:bg-primary/15 border-b-2 ${
className={`w-3/5 text-center rounded-xl font-bold bg-[#E4EBF7] py-3 text-[#3C6E1F] hover:bg-primary/15 border-b-2 ${
!isUserLogin
? 'shadow-lg border-[#3C6E1F]' // Apply shadow and border color when active
: 'border-transparent' // No shadow and border when inactive
Expand Down

0 comments on commit fe66133

Please sign in to comment.