Skip to content

Css bug Fix #591

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

Merged
hamskid-id merged 3 commits into from
Jan 25, 2023
Merged

Css bug Fix #591

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
24be01a
fix css bugs
hamskid-id Jan 19, 2023
063fd34
Merge pull request #589 from workshopapps/FE/PaystackIntegration
hamskid-id Jan 25, 2023
b86ab3b
Merge pull request #590 from workshopapps/FE/latest-development
hamskid-id Jan 25, 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
151 changes: 96 additions & 55 deletions Apply-For-Me-UI/src/components/nav/Nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,38 @@ import BlueButton from "../buttons/blue_background/BlueButton";
import LightButton from "../buttons/light_button/LightButton";
import { useDispatch, useSelector } from "react-redux";
import { userInfo } from "store/slice/UserSlice";
import { motion } from "framer-motion";

const Nav = ({setSeeMore}) => {

const initState = {
"about": false,
"price": false,
"blog": false,
"contact": false
};

const variants = {
open: { opacity: 1, x: 0, transition: { staggerChildren: 0.07, delayChildren: 0.2 } },
closed: { opacity: 0, x: "-100%",transition: { staggerChildren: 0.05, staggerDirection: -1 } },
}
const Itemvariants = {
open: {
y: 0,
opacity: 1,
transition: {
y: { stiffness: 1000, velocity: -100 }
}
},
closed: {
y: 50,
opacity: 0,
transition: {
y: { stiffness: 1000 }
}
}
};

const [dropDown, setDropDown] = useState(false);
const { user } = useSelector(state => state.user);
const [active, setActiveLink] = useState({ ...initState });
Expand Down Expand Up @@ -157,67 +181,84 @@ const Nav = ({setSeeMore}) => {

/>
</div>

<ul
className={classes.nav_links__mobile}
style={{ display: dropDown ? "flex" : "none" }}
>
<li onClick={() => navigate("/about")}>
<Link to="/about" >About us</Link>
</li>
<li onClick={() => { setSeeMore(false); navigate("/pricing") }}>
<Link to="/pricing" >Pricing plan</Link>
</li>
<li onClick={() => navigate("/faqs")}>
<Link to="/faqs" >FAQs</Link>
</li>
</ul>

<div
className={classes.btn_container__mobile}
style={{ display: dropDown ? "flex" : "none" }}
<motion.div
animate={dropDown ? "open" : "closed"}
variants={variants}
>
{!user ? (
<>
<Link to="/wel2">
<LightButton
text="Sign in"

<ul
className={classes.nav_links__mobile}
style={{ display: dropDown ? "flex" : "none" }}
>
<motion.li
variants={Itemvariants}
whileHover={{ scale: 1.1 }}
whileTap={{ scale: 0.95 }}
onClick={() => navigate("/about")}>
<Link to="/about" >About us</Link>
</motion.li>
<motion.li
variants={Itemvariants}
whileHover={{ scale: 1.1 }}
whileTap={{ scale: 0.95 }}
onClick={() => { setSeeMore(false); navigate("/pricing") }}>
<Link to="/pricing" >Pricing plan</Link>
</motion.li>
<motion.li
variants={Itemvariants}
whileHover={{ scale: 1.1 }}
whileTap={{ scale: 0.95 }}
onClick={() => navigate("/faqs")}>
<Link to="/faqs" >FAQs</Link>
</motion.li>
</ul>

<div
className={classes.btn_container__mobile}
style={{ display: dropDown ? "flex" : "none" }}
>
{!user ? (
<>
<Link to="/wel2">
<LightButton
text="Sign in"
width="185"
func={() => setDropDown(false)}
/>
</Link>
<Link to="/wel1">
<BlueButton
text="Get started"
width="185"
func={() => setDropDown(false)}
/>
</Link>
</>
) : (
<div className={classes.auth__user_btn}>
<BlueButton
text="Dashboard"
width="185"
func={() => setDropDown(false)}
func={() =>
navigate(
user.roles[0] ===
"SuperAdministrator"
? "/user-page"
: user.roles[0] === "Recruiter"
? "/rr_admin"
: "/dashboard/"
)
}
/>
</Link>
<Link to="/wel1">
<BlueButton
text="Get started"
text="Logout"
width="185"
func={() => setDropDown(false)}
func={handleLogout}
/>
</Link>
</>
) : (
<div className={classes.auth__user_btn}>
<BlueButton
text="Dashboard"
width="185"
func={() =>
navigate(
user.roles[0] ===
"SuperAdministrator"
? "/user-page"
: user.roles[0] === "Recruiter"
? "/rr_admin"
: "/dashboard/"
)
}
/>
<BlueButton
text="Logout"
width="185"
func={handleLogout}
/>
</div>
)}
</div>
</div>
)}
</div>
</motion.div>
</nav>
</div>
</section>
Expand Down
17 changes: 13 additions & 4 deletions Apply-For-Me-UI/src/pages/landing_page/Hero.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,13 @@ input[type=file]{
}

.FAQ_content div h3 {
font-size: 1.2rem;
font-family: 'Outfit';
font-style: normal;
font-weight: 300;
font-size: 20px;
line-height: 150%;
letter-spacing: 0.01em;
color: #52515B;
}
.learn_content .bottom {
padding: 80px 40px;
Expand Down Expand Up @@ -782,15 +788,18 @@ input[type=file]{
margin-top: 20px;
}
.reviews_content .bottom div{
margin: 0 0 2rem 0;
margin: 0 0 2rem 0;
}

.reviews_content .bottom .profile{
margin-bottom: -9px;
}
margin-bottom: -9px;
}
}

@media (max-width: 425px) {
.FAQ_content div h3{
font-size: 14px;
}
.figure_text{
font-weight: 500;
font-size: 14px;
Expand Down
11 changes: 10 additions & 1 deletion Apply-For-Me-UI/src/pages/landing_page/question.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@
.minheading {
font-weight: 400;
margin-bottom: 1rem;
font-size: 1rem;
font-family: 'Outfit';
font-style: normal;
font-weight: 300;
font-size: 20px;
line-height: 150%;
letter-spacing: 0.01em;
color: #52515B;
}

.faqicon {
Expand All @@ -69,6 +75,9 @@
.toggle {
display: none;
}
.minheading{
font-size: 14px;
}
}

/*BreakPoints*/
Expand Down