Skip to content

feat(user): update existing links to use InlineLink component #1353

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
suvashvishowkarma merged 4 commits into from
Jan 21, 2025
Merged

feat(user): update existing links to use InlineLink component #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5322d5
feat: use InlineLink component
lamdiki-sherpa Jan 21, 2025
1184e07
feat: remove unwanted imports
lamdiki-sherpa Jan 21, 2025
3def8c8
feat: remove unnecessary classname
lamdiki-sherpa Jan 21, 2025
437c434
feat: update key value
lamdiki-sherpa Jan 21, 2025
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
13 changes: 0 additions & 13 deletions packages/ui/src/assets/css/general.css
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions packages/ui/src/assets/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,3 @@
/* Theme CSS */
@import "./accordion-theme.css";
@import "./tab-theme.css";

@import "./general.css";
15 changes: 4 additions & 11 deletions packages/user/src/components/AuthLinks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Fragment } from "react";
import { Link } from "react-router-dom";
import { InlineLink } from "@dzangolab/react-ui";

import { LinkType } from "@/types/types";

Expand All @@ -18,15 +17,9 @@ export const AuthLinks = ({ className, links }: ILinkProperties) => {
return (
<div className={linksClassName}>
{links.map((link) => {
return (
<Fragment key={link.label}>
{link.display ? (
<Link to={link.to} className={link.className}>
{link.label}
</Link>
) : null}
</Fragment>
);
return link.display ? (
<InlineLink key={link.to} label={link.label} to={link.to} />
) : null;
})}
</div>
);
Expand Down
2 changes: 0 additions & 2 deletions packages/user/src/components/Login/LoginWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ export const LoginWrapper: FC<IProperties> = ({

const links: Array<LinkType> = [
{
className: "native-link",
display: config.features?.signup !== false && showSignupLink,
label: t("login.links.signup"),
to: config.customPaths?.signup || DEFAULT_PATHS.SIGNUP,
},
{
className: "native-link",
display:
config.features?.forgotPassword !== false && showForgotPasswordLink,
label: t("login.links.forgotPassword"),
Expand Down
2 changes: 0 additions & 2 deletions packages/user/src/components/SignupWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@ export const SignupWrapper: React.FC<IProperties> = ({

const links: Array<LinkType> = [
{
className: "native-link",
display: showLoginLink,
label: t("signup.links.login"),
to: loginPath,
},
{
className: "native-link",
display:
showForgotPasswordLink && config.features?.forgotPassword !== false,
label: t("signup.links.forgotPassword"),
Expand Down
1 change: 0 additions & 1 deletion packages/user/src/views/ForgotPassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export const ForgotPassword = ({ centered = true }: { centered?: boolean }) => {

const links: Array<LinkType> = [
{
className: "native-link",
display: true,
label: t("forgotPassword.links.login"),
to: config.customPaths?.login || DEFAULT_PATHS.LOGIN,
Expand Down