aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2020-09-02 23:07:31 +0800
committercrupest <crupest@outlook.com>2020-09-02 23:07:31 +0800
commit817d00d3d26bb30d64b9b103a92cc96cbec14443 (patch)
tree6acdfdc3a87830eb6e7dd92f2298f79e33f9acf4
parentf476135ddb3031e5e3a93739909f98800f565181 (diff)
downloadtimeline-817d00d3d26bb30d64b9b103a92cc96cbec14443.tar.gz
timeline-817d00d3d26bb30d64b9b103a92cc96cbec14443.tar.bz2
timeline-817d00d3d26bb30d64b9b103a92cc96cbec14443.zip
Migrate home page.
-rw-r--r--Timeline/ClientApp/src/app/views/home/BoardWithUser.tsx2
-rw-r--r--Timeline/ClientApp/src/app/views/home/BoardWithoutUser.tsx2
-rw-r--r--Timeline/ClientApp/src/app/views/home/TimelineBoard.tsx4
-rw-r--r--Timeline/ClientApp/src/app/views/home/index.tsx7
4 files changed, 7 insertions, 8 deletions
diff --git a/Timeline/ClientApp/src/app/views/home/BoardWithUser.tsx b/Timeline/ClientApp/src/app/views/home/BoardWithUser.tsx
index 6bff0375..dcd39cbe 100644
--- a/Timeline/ClientApp/src/app/views/home/BoardWithUser.tsx
+++ b/Timeline/ClientApp/src/app/views/home/BoardWithUser.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { Row, Col } from "reactstrap";
+import { Row, Col } from "react-bootstrap";
import { useTranslation } from "react-i18next";
import { UserWithToken } from "@/services/user";
diff --git a/Timeline/ClientApp/src/app/views/home/BoardWithoutUser.tsx b/Timeline/ClientApp/src/app/views/home/BoardWithoutUser.tsx
index 2e5c3a42..ebfddb50 100644
--- a/Timeline/ClientApp/src/app/views/home/BoardWithoutUser.tsx
+++ b/Timeline/ClientApp/src/app/views/home/BoardWithoutUser.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { Row, Col } from "reactstrap";
+import { Row, Col } from "react-bootstrap";
import { TimelineInfo } from "@/services/timeline";
import { getHttpTimelineClient } from "@/http/timeline";
diff --git a/Timeline/ClientApp/src/app/views/home/TimelineBoard.tsx b/Timeline/ClientApp/src/app/views/home/TimelineBoard.tsx
index 8df5ed9d..a3d176e1 100644
--- a/Timeline/ClientApp/src/app/views/home/TimelineBoard.tsx
+++ b/Timeline/ClientApp/src/app/views/home/TimelineBoard.tsx
@@ -1,8 +1,8 @@
import React from "react";
import clsx from "clsx";
import { Link } from "react-router-dom";
-import { Spinner } from "reactstrap";
import { Trans } from "react-i18next";
+import { Spinner } from "react-bootstrap";
import { TimelineInfo } from "@/services/timeline";
import TimelineLogo from "../common/TimelineLogo";
@@ -25,7 +25,7 @@ const TimelineBoard: React.FC<TimelineBoardProps> = (props) => {
if (timelines === "loading") {
return (
<div className="d-flex flex-grow-1 justify-content-center align-items-center">
- <Spinner color="primary" />
+ <Spinner variant="primary" animation="border" />
</div>
);
} else if (timelines === "offline") {
diff --git a/Timeline/ClientApp/src/app/views/home/index.tsx b/Timeline/ClientApp/src/app/views/home/index.tsx
index f62cebca..e2e3e6f9 100644
--- a/Timeline/ClientApp/src/app/views/home/index.tsx
+++ b/Timeline/ClientApp/src/app/views/home/index.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { useHistory } from "react-router";
-import { Row, Container, Button, Col } from "reactstrap";
import { useTranslation } from "react-i18next";
+import { Row, Container, Button, Col } from "react-bootstrap";
import { useUser } from "@/services/user";
import AppBar from "../common/AppBar";
@@ -35,7 +35,7 @@ const HomePage: React.FC = () => {
return (
<>
<AppBar />
- <Container fluid style={{ marginTop: "56px" }}>
+ <Container fluid>
<Row>
<Col>
<SearchInput
@@ -48,8 +48,7 @@ const HomePage: React.FC = () => {
additionalButton={
user != null && (
<Button
- color="success"
- outline
+ variant="outline-success"
onClick={() => {
setDialog("create");
}}