Skip to content

Resolve conflict with deloyment #581

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
Vicdam merged 6 commits into from
Jan 14, 2023
Merged

Resolve conflict with deloyment #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7f0dd1
clean up pricing functionality
hamskid-id Jan 11, 2023
99b213b
resolved merge conflict with deployemnt
hamskid-id Jan 11, 2023
a2a7cd7
Merge pull request #576 from workshopapps/FE/PaystackIntegration
hamskid-id Jan 13, 2023
e5a3069
Merge pull request #577 from workshopapps/FE/latest-development
hamskid-id Jan 13, 2023
f634eb5
Merge pull request #579 from workshopapps/FE/PaystackIntegration
hamskid-id Jan 13, 2023
05d6881
Merge pull request #580 from workshopapps/FE/latest-development
hamskid-id Jan 13, 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
185 changes: 185 additions & 0 deletions Apply-For-Me-UI/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Apply-For-Me-UI/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"atatus-spa": "^4.5.0",
"axios": "^1.2.0",
"formik": "^2.2.9",
"framer-motion": "^8.4.3",
"hamburger-react": "^2.5.0",
"jwt-decode": "^3.1.2",
"react": "^18.2.0",
Expand Down
21 changes: 15 additions & 6 deletions Apply-For-Me-UI/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import ApplicantDetails from "./pages/admin_dashboard/components/applicant_detai
import ApplicationForm from "./pages/admin_dashboard/components/application_form/ApplicationForm";
import DashboardHome from "./pages/admin_dashboard/components/dashboard_home/DashboardHome";
import { pricingPage } from "pages/pricing_plan/pricingData";
import { formData } from "pages/checkout/checkoutData";
// import { formData } from "pages/checkout/checkoutData";
import Pricing from "./pages/pricing_plan/Pricing";
import Checkout from "pages/checkout/Checkout";
// import Checkout from "pages/checkout/Checkout";
import ProtectedRoute from "ProtectedRoute";
//UserDashboard
import NoProfile from "./pages/dashboard_profile/NoProfile/NoProfile";
Expand All @@ -63,7 +63,7 @@ import Verification from "pages/authentication-pages/Verification";
import Password from "pages/authentication-pages/Password";
import NewPass from "pages/authentication-pages/NewPass";
import Registration from "pages/authentication-pages/Registration";
import {RRAdminProfilePage } from "pages/RR_admin_profile/RR_admin_profile";
import { RRAdminProfilePage } from "pages/RR_admin_profile/RR_admin_profile";
import { useEffect } from "react";

import SignIn from "pages/RR_recuiters_page/Sign_In";
Expand All @@ -77,6 +77,9 @@ import * as atatus from "atatus-spa";
import ReactGA from "react-ga4";
import { CreateRecruiter } from "pages/createRecruiter/create_view";
import { SuperApplicantsPage } from "pages/users_page/user_page_applicants";
import { PaystackPage } from "pages/paystack/paystack";

import PaymentVerification from "pages/paystack/verification/Verification";

atatus.config("c626faaef503411ea6216d7b6112de1c").install();

Expand Down Expand Up @@ -112,6 +115,11 @@ function App() {
<Route exact path="/tryout-form" element={<TryoutForm />} />
<Route exact path="/reverse/profile" element={<RRProfile />} />
<Route exact path="/registration" element={<Registration />} />
<Route
exact
path="/checkout/verify-payment"
element={<PaymentVerification />}
/>
<Route
exact
path="/tryout-form/success"
Expand All @@ -124,8 +132,9 @@ function App() {
/>
<Route
exact
path="/checkout"
element={<Checkout {...formData} />}
path="/checkout/:planName/:paymentInterval/:price"
// element={<Checkout {...formData} />}
element={<PaystackPage />}
/>

<Route exact path="blog" element={<Blog />} />
Expand Down Expand Up @@ -226,7 +235,7 @@ function App() {
{/* User Dashboard Profile */}

<Route
path="/dashboard/"
path="/dashboard"
element={<DashboardNothing />}
/>
<Route
Expand Down
30 changes: 22 additions & 8 deletions Apply-For-Me-UI/src/components/footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import classes from "./Footer.module.css";
import { Link } from "react-router-dom";
import Logo from "../../assets/images/footer_logo.svg";
import Facebook from "../../assets/images/footer_facebook_logo.svg";
import Instagram from "../../assets/images/footer_instagram_logo.svg";
// import Instagram from "../../assets/images/footer_instagram_logo.svg";
import Twitter from "../../assets/images/footer_twitter_logo.svg";
import Youtube from "../../assets/images/footer_youtube_logo.svg";
// import Youtube from "../../assets/images/footer_youtube_logo.svg";
import GoogleDownload from "../../assets/images/google_play_download.svg";
import {ImLinkedin2} from "react-icons/im";

const Footer = () => {
return (
Expand All @@ -26,16 +27,29 @@ const Footer = () => {
</p>
<ul className={classes.footer__social_icons}>
<li>
<img src={Facebook} alt="Facebook logo" />
<a href="https://web.facebook.com/profile.php?id=100088838052833">
<img src={Facebook} alt="Facebook logo" />
</a>
</li>
{/* <li>
<a href="#">
<img src={Instagram} alt="Instagram logo" />
</a>
</li> */}
<li>
<img src={Instagram} alt="Instagram logo" />
<a href="https://twitter.com/Applyforme_?s=20&t=WuV5SQ-T8HNPoAEB8VU_mw">
<img src={Twitter} alt="Twitter logo" />
</a>
</li>
{/* <li>
<a href="#">
<img src={Youtube} alt="Youtube logo" />
</a>
</li> */}
<li>
<img src={Twitter} alt="Twitter logo" />
</li>
<li>
<img src={Youtube} alt="Youtube logo" />
<a href="https://www.linkedin.com/company/applyforme1/">
<ImLinkedin2 color="white" size="2rem"/>
</a>
</li>
</ul>
<div className={classes.about__text_google}>
Expand Down
6 changes: 3 additions & 3 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 @@ -9,7 +9,7 @@ import LightButton from "../buttons/light_button/LightButton";
import { useDispatch, useSelector } from "react-redux";
import { userInfo } from "store/slice/UserSlice";

const Nav = () => {
const Nav = ({setSeeMore}) => {
const initState = {
"about": false,
"price": false,
Expand Down Expand Up @@ -67,7 +67,7 @@ const Nav = () => {
</li>

<li>
<NavLink to="/pricing" style={handleActiveLink}>
<NavLink to="/pricing" style={handleActiveLink} onClick={() => setSeeMore(false)}>
Pricing plan
</NavLink>
</li>
Expand Down Expand Up @@ -165,7 +165,7 @@ const Nav = () => {
<li onClick={() => navigate("/about")}>
<Link to="/about" >About us</Link>
</li>
<li onClick={() => navigate("/pricing")}>
<li onClick={() => { setSeeMore(false); navigate("/pricing") }}>
<Link to="/pricing" >Pricing plan</Link>
</li>
<li onClick={() => navigate("/faqs")}>
Expand Down
Loading