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

Jump to bottom

feat(room-detail): add localed time diff between begin and end time #318

Merged
merged 1 commit into from
Feb 22, 2021
Merged

feat(room-detail): add localed time diff between begin and end time #318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 23 additions & 15 deletions src/renderer-app/src/pages/RoomDetailPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import backSVG from "../../assets/image/back.svg";
import homeIconGraySVG from "../../assets/image/home-icon-gray.svg";
import roomTypeSVG from "../../assets/image/room-type.svg";
// import docsIconSVG from "../../assets/image/docs-icon.svg";
import "./RoomDetailPage.less";

import React, { useContext, useEffect } from "react";
import { format } from "date-fns";
import { format, formatDistanceStrict } from "date-fns";
import { Divider } from "antd";
import { observer } from "mobx-react-lite";
import { zhCN } from "date-fns/locale";
import { Link, useParams } from "react-router-dom";
import MainPageLayout from "../../components/MainPageLayout";
import { RoomStatus, RoomType } from "../../apiMiddleware/flatServer/constants";
import { observer } from "mobx-react-lite";
import { generateRoutePath, RouteNameType, RouteParams, usePushHistory } from "../../utils/routes";
import { GlobalStoreContext, RoomStoreContext } from "../../components/StoreProvider";
import LoadingPage from "../../LoadingPage";
import { useComputed } from "../../utils/mobx";
import { RoomDetailFooter } from "./RoomDetailFooter";

import backSVG from "../../assets/image/back.svg";
import homeIconGraySVG from "../../assets/image/home-icon-gray.svg";
import roomTypeSVG from "../../assets/image/room-type.svg";
import docsIconSVG from "../../assets/image/docs-icon.svg";
import "./RoomDetailPage.less";
import { Divider } from "antd";
import { RoomStatusElement } from "../../components/RoomStatusElement/RoomStatusElement";
import { joinRoomHandler } from "../utils/joinRoomHandler";
import { errorTips } from "../../components/Tips/ErrorTips";
import { RoomDetailFooter } from "./RoomDetailFooter";

export type RoomDetailPageProps = {};

Expand Down Expand Up @@ -102,12 +102,20 @@ export const RoomDetailPage = observer<RoomDetailPageProps>(function RoomDetailP
</div>
</div>
)}
<div className="user-room-time-mid">
<div className="user-room-time-during">1 小时</div>
<div className="user-room-time-state">
<RoomStatusElement room={roomInfo} />
{roomInfo.endTime && roomInfo.beginTime && (
<div className="user-room-time-mid">
<div className="user-room-time-during">
{formatDistanceStrict(
roomInfo.endTime,
roomInfo.beginTime,
{ locale: zhCN },
)}
</div>
<div className="user-room-time-state">
<RoomStatusElement room={roomInfo} />
</div>
</div>
</div>
)}
{formattedEndTime && (
<div className="user-room-time-box">
<div className="user-room-time-number">
Expand Down