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

Backlog bugs #2268

Merged
merged 2 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/components/ComponentPages/HistoryCard/historyCard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@apply lg:ml-[1.25rem];
.badge-wrapper {
.ch-dot-history {
@apply lg:ml-[-26px];
@apply lg:ml-[-26px] z-[1];
}
}
+ .csh-wrapper {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ComponentPages/Notifications/UI/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const NotificationsListUI = ({
Notifications
</Title>
}
className="bg-white mb-6 border-0 [&_.ant-card-head]:border-0 mb-8 [&_.ant-card-extra]:p-0"
className="bg-white mb-6 border-0 [&_.ant-card-head]:border-0 mb-8 [&_.ant-card-extra]:p-0 [&_.ant-card-head]:p-0 [&_.ant-card-body]:p-0"
id="card-title"
extra={
<div className="flex justify-between items-center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ function Details({ socialLinks, onUnlinkClick, onLinkClick, provider }) {
<Fragment>
{socialLinks[provider] ? (
<Fragment>
<Text strong className={`${styles.name}`}>
{/* <Text strong className={`${styles.name}`}>
{socialLinks[provider + "_name"]}
</Text>
<Text className={`${styles.email}`}>
{socialLinks[provider + "_email"]}
</Text>
</Text> */}

<Popconfirm
title={text}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Fragment } from "react";
import { useSelector } from "react-redux";

import Details from "./details";
import { RootState } from "src/store";
import { useSelector } from "react-redux";

function IconWrapper({
socialLinks,
Expand All @@ -19,41 +18,38 @@ function IconWrapper({
);

return (
<Fragment>
<div className="border border-canGrey2 rounded-lg flex justify-center bg-canGray">
<div className="w-full ">
<div className="px-5 py-5 flex lg:justify-center justify-start items-center shadow-social-icon-shadow bg-white rounded-tl-lg rounded-tr-lg gap-2.5 lg:gap-0 ">
<div className="flex items-center"> {icon}</div>
<div className="lg:hidden flex flex-col justify-start items-start">
<h3 className="mb-1 text-center text-base font-medium text-canBlack">
{globalUserProfileData}
</h3>
<p className=" text-center text-sm font-normal text-canBlack">
{globalUserProfileDataEmail}
</p>
</div>
<div>{provider}</div>
<div className="border border-canGrey2 rounded-lg flex justify-center bg-canGray">
<div className="w-full ">
<div className="px-5 py-5 flex lg:justify-center justify-start items-center shadow-social-icon-shadow bg-white rounded-tl-lg rounded-tr-lg gap-2.5 lg:gap-0 ">
<div className="flex items-center"> {icon}</div>
<div className="lg:hidden flex flex-col justify-start items-start">
<h3 className="mb-1 text-center text-base font-medium text-canBlack">
{globalUserProfileData}
</h3>
<p className=" text-center text-sm font-normal text-canBlack">
{globalUserProfileDataEmail}
</p>
</div>
<div className="px-5 py-5 w-full flex flex-col justify-center items-center rounded-bl-lg rounded-br-lg ">
<div className="lg:flex hidden flex-col">
<h3 className="mb-1 text-center text-base font-medium text-canBlack">
{globalUserProfileData}
</h3>
<p className="mb-5 text-center text-sm font-normal text-canBlack">
{globalUserProfileDataEmail}
</p>
</div>

<Details
socialLinks={socialLinks}
onUnlinkClick={onUnlinkClick}
onLinkClick={onLinkClick}
provider={provider.toLowerCase()}
/>
</div>
<div className="px-5 py-5 w-full flex flex-col justify-center items-center rounded-bl-lg rounded-br-lg ">
<div className="lg:flex hidden flex-col">
<h3 className="mb-1 text-center text-base font-medium text-canBlack">
{globalUserProfileData}
</h3>
<p className="mb-5 text-center text-sm font-normal text-canBlack">
{globalUserProfileDataEmail}
</p>
</div>

<Details
socialLinks={socialLinks}
onUnlinkClick={onUnlinkClick}
onLinkClick={onLinkClick}
provider={provider.toLowerCase()}
/>
</div>
</div>
</Fragment>
</div>
);
}

Expand Down
16 changes: 7 additions & 9 deletions src/components/ComponentPages/socialAuthVerification/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,17 @@ function SocialAuthVerification() {
}, [isUserAuthenticated]);

const onLinkClick = async (provider) => {
let body = { provider };
const res = await socialLogin(body);
const res = await socialLogin({ provider });

if (res && res.status_code === 200) {
// dispatch(
// setValue({ label: "redirect_tab_setting", value: "tab=social" })
// );
localStorage.setItem("redirectTab", "tab=social");
window.location.href = res.data.url;
}
};

const onUnlinkClick = async (provider, id) => {
console.log("provider", provider, id);

const res = await userSocialAccountDelete(id);

if (res && res.status_code === 200) {
Expand All @@ -80,7 +78,7 @@ function SocialAuthVerification() {
onLinkClick={() => {
onLinkClick("google");
}}
provider=" "
provider="google"
icon={
<Image
width={32}
Expand All @@ -97,7 +95,7 @@ function SocialAuthVerification() {
onLinkClick={() => {
onLinkClick("facebook");
}}
provider=""
provider="facebook"
icon={
<Image
width={32}
Expand All @@ -121,7 +119,7 @@ function SocialAuthVerification() {
onLinkClick={() => {
onLinkClick("linkedin");
}}
provider=""
provider="linkedin"
icon={
<Image
width={32}
Expand All @@ -137,7 +135,7 @@ function SocialAuthVerification() {
onLinkClick={() => {
onLinkClick("github");
}}
provider=""
provider="github"
icon={
<Image
width={32}
Expand Down
Loading