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.

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

fix(deps): update dependency react-router-dom to v7 #224

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(deps): update dependency react-router-dom to v7 #224

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
f23c6e3
Update dependency react-router-dom to v7
renovate[bot] Dec 14, 2024
04b5459
Update dependency react-router-dom to v7
renovate[bot] Dec 23, 2024
942d512
begin to rewrite to functional components
dfoxg Dec 28, 2024
2385383
Merge branch 'renovate/major-react-router-monorepo' of github.com:dfo…
dfoxg Dec 28, 2024
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
153 changes: 54 additions & 99 deletions kratos-admin-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.

2 changes: 1 addition & 1 deletion kratos-admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@ory/kratos-client": "1.2.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "5.3.4",
"react-router-dom": "7.1.1",
"sass": "1.83.0",
"typescript": "5.7.2"
},
Expand Down
50 changes: 23 additions & 27 deletions kratos-admin-ui/src/components/footer/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
import React from "react";
import { Link, withRouter } from "react-router-dom";
import { Link } from "react-router-dom";
import "./footer.scss";

class FooterComponent extends React.Component<any, any> {
render(): React.ReactNode {
return (
<footer>
<div
style={{
textAlign: "center",
}}>
<p>
Powered by Open Source.&nbsp;
<a
href="https://github.com/dfoxg/kratos-admin-ui"
target="_blank"
rel="noreferrer">
Support the Project on Github
</a>
.&nbsp;
<Link to={"/overview"}>Environment overview</Link>.
</p>
</div>
</footer>
);
}
}

export default withRouter(FooterComponent);
export default function Footer() {
return (
<footer>
<div
style={{
textAlign: "center",
}}>
<p>
Powered by Open Source.&nbsp;
<a
href="https://github.com/dfoxg/kratos-admin-ui"
target="_blank"
rel="noreferrer">
Support the Project on Github
</a>
.&nbsp;
<Link to={"/overview"}>Environment overview</Link>.
</p>
</div>
</footer>
)
}
14 changes: 7 additions & 7 deletions kratos-admin-ui/src/components/header/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ header {
min-height: 56px;
width: 100%;
box-shadow: rgba(0, 0, 0, 0.06) 0px 2px 4px;
}

span {
margin-left: 30px;
line-height: 50px;
font-size: 30px;
color: white;
font-weight: 200;
}
.headerText {
margin-left: 30px;
line-height: 50px;
font-size: 30px;
color: white;
font-weight: 200;
}

header:hover {
Expand Down
25 changes: 9 additions & 16 deletions kratos-admin-ui/src/components/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
import React from "react";
import { withRouter } from "react-router-dom";
import "./header.scss";
import { Link } from "react-router-dom";

class HeaderComponent extends React.Component<any, any> {
render() {
return (
<header>
<span
onClick={() => {
this.props.history.push("/identities");
}}>
kratos-admin-ui
</span>
</header>
);
}
export default function Header() {
return (
<header>
<Link to="/identities">
<span className="headerText">kratos-admin-ui</span>
</Link>
</header>
);
}

export default withRouter(HeaderComponent);
Loading
Loading