Skip to content
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.

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

UI Improvement #662

Merged
merged 3 commits into from
Aug 3, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
7 changes: 5 additions & 2 deletions src/Components/RateUs.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,23 @@
border-radius: 10px;
/* Slightly increased border radius for a softer look */
background-color: #322a5e;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
border: 2px solid #6052ff;
box-shadow: 7px 7px 32px 0 #6052ff;
/* Added box shadow for depth */
display: flex;
flex-direction: column;
align-items: center;
transition: box-shadow 0.3s, transform 0.3s;
position: relative;
overflow: hidden;

}

.rate-us-container:hover {
box-shadow: 0 0 30px rgba(139, 92, 246, 0.5);
/* Adjusted shadow for hover */
transform: scale(1.05);
background-color: #ff21bc; /* Changed background color on hover */
border: 2px solid #ff21bc; /* Adjusted border color to match hover background */
}

.rate-us-heading {
Expand Down
6 changes: 6 additions & 0 deletions src/Components/RateUs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React, { useState } from "react";
import "./RateUs.css";
import TopContainer from "./TopContainer";
import Menu from "./Menu";
import { Link } from 'react-router-dom';
import homeIcon from '../img/homeicon.png';

function RateUsComponent({ previousContent }) {
const [emoji, setEmoji] = useState("");
Expand Down Expand Up @@ -31,6 +33,10 @@ function RateUsComponent({ previousContent }) {
return (
<div>
<div className="header">
<Link to="/">
<img src={homeIcon} alt="Home" className="home-icon" style={{ marginTop: '130px' }} />
</Link>

<TopContainer /></div>
<div className="rateUsContainer">
<Menu />
Expand Down
10 changes: 10 additions & 0 deletions src/Components/wallet/Wallet.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
margin-bottom: 50px;
display: flex;
}
.infoWallet:hover {
background-color: #ff21bc; /* Change background color on hover */
border: 2px solid #ff21bc; /* Adjust border color to match hover background */
box-shadow: 0 0 30px rgba(139, 92, 246, 0.5); /* Adjust shadow for hover effect */
}


.feedbackTopic {
width: 30%;
Expand Down Expand Up @@ -91,6 +97,10 @@
border-radius: 30px;
transition: transform 0.15s ease-in-out;
}
.detailsPayment:hover {
background-color: #ff21bc;
}


.detailsPayment:hover {
transform: scale(1.08);
Expand Down
92 changes: 62 additions & 30 deletions src/Components/wallet/Wallet.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,53 @@
import React from 'react'
import './Wallet.css'
import React from 'react';
import { Link } from "react-router-dom";
import homeIcon from '../../img/homeicon.png';
import './Wallet.css';

const Wallet = () => {
const pointsHistory = [
{
description: "Purchase of StockIT subscription",
date: "12-07-2024",
points: 100
},
{
description: "Refer a friend to UniCollab",
date: "05-07-2024",
points: 50
},
{
description: "Participation in UniCollab survey",
date: "01-07-2024",
points: 30
},
{
description: "Weekly login bonus",
date: "28-06-2024",
points: 20
},
{
description: "Achievement unlocked: Complete 10 tasks",
date: "20-06-2024",
points: 150
},
{
description: "User feedback reward",
date: "15-06-2024",
points: 40
},
{
description: "Referral bonus for new user",
date: "10-06-2024",
points: 70
}
];

return (
<div>
<div className="heading1Wallet">Balance and Rewards</div>
<Link to="/">
<img src={homeIcon} alt="Home" className="home-icon" />
</Link>
<div className='pointsandrupees'>
<div className='iconsWallet'>
<div className='quantity'>5000</div>
Expand All @@ -19,36 +62,25 @@ const Wallet = () => {
</div>
</div>
<div className='infoWallet'>
<div className='topic_head feedbackTopic'>UniCollab <span className='Pro'>Pro</span></div>
<div className='descWallet1'>
<div className='quantity'>Now, UniCollab Pro members will earn 50 ppoints</div>
<div className='value'>On every ₹100 spent on UniCollab</div>
</div>
</div>
<div className='topic_head feedbackTopic'>UniCollab <span className='Pro'>Pro</span></div>
<div className='descWallet1'>
<div className='quantity'>Now, UniCollab Pro members will earn 50 points</div>
<div className='value'>On every ₹100 spent on UniCollab</div>
</div>
</div>

<div className="heading2Wallet">Points History</div>
<div className='detailsPayment'>
<div className='detailsCardWallet'>
<div>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sequi, cumque eum. </div>
<div>Credited On XX-XX-XXXX</div>
{pointsHistory.map((entry, index) => (
<div className='detailsPayment' key={index}>
<div className='detailsCardWallet'>
<div>{entry.description}</div>
<div>Credited On {entry.date}</div>
</div>
<div className='amountWallet'>+ {entry.points} points</div>
</div>
<div className='amountWallet'>+ 100 points</div>
</div>
<div className='detailsPayment'>
<div className='detailsCardWallet'>
<div>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sequi, cumque eum. </div>
<div>Credited On XX-XX-XXXX</div>
</div>
<div className='amountWallet'>+ 100 points</div>
</div>
<div className='detailsPayment'>
<div className='detailsCardWallet'>
<div>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sequi, cumque eum. </div>
<div>Credited On XX-XX-XXXX</div>
</div>
<div className='amountWallet'>+ 100 points</div>
</div>
))}
</div>
)
);
}

export default Wallet
export default Wallet;