IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
Elyor Djalilov 2024-01-15 16:21:12 +05:00
parent bdf70481af
commit 273658448f
9 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
View File

@ -14,7 +14,7 @@ import { IconButton } from "@docspace/shared/components/icon-button";
import { TableGroupMenu } from "@docspace/shared/components/table";
import { DropDownItem } from "@docspace/shared/components/drop-down-item";
import LoaderSectionHeader from "../loaderSectionHeader";
import { tablet, desktop } from "@docspace/shared/utils";
import { mobile, tablet, desktop } from "@docspace/shared/utils";
import withLoading from "SRC_DIR/HOCs/withLoading";
import { Badge } from "@docspace/shared/components/badge";
import {

11
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRow.js
View File

@ -1,13 +1,13 @@
import { useCallback } from "react";
import { isMobile } from "react-device-detect";
import { Base } from "@docspace/components/themes";
import { tablet } from "@docspace/components/utils/device";
import { Base } from "@docspace/shared/themes";
import { tablet } from "@docspace/shared/utils";
import { Row } from "@docspace/shared/components/row";
import styled, { css } from "styled-components";
import withContent from "SRC_DIR/HOCs/withPeopleContent";
import SessionsRowContent from "./SessionsRowContent";
import Row from "@docspace/components/row";
import HistoryFinalizedReactSvgUrl from "PUBLIC_DIR/images/history-finalized.react.svg?url";
import RemoveSvgUrl from "PUBLIC_DIR/images/remove.session.svg?url";
import TrashReactSvgUrl from "PUBLIC_DIR/images/trash.react.svg?url";
@ -143,11 +143,6 @@ const SessionsRow = (props) => {
},
];
// const handleSessionToggle = (checked) => {
// toggleSession(checked);
// console.log("checked", checked);
// };
return (
<Wrapper
className={`user-item row-wrapper ${

8
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRowContent.js
View File

@ -1,8 +1,8 @@
import styled, { css } from "styled-components";
import Text from "@docspace/components/text";
import Box from "@docspace/components/box";
import RowContent from "@docspace/components/row-content";
import { tablet, mobile } from "@docspace/components/utils/device";
import { Text } from "@docspace/shared/components/text";
import { Box } from "@docspace/shared/components/box";
import { RowContent } from "@docspace/shared/components/row-content";
import { tablet, mobile } from "@docspace/shared/utils";
const StyledRowContent = styled(RowContent)`
.rowMainContainer {

5
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/index.js
View File

@ -1,8 +1,9 @@
import { inject, observer } from "mobx-react";
import { tablet } from "@docspace/components/utils/device";
import { tablet } from "@docspace/shared/utils";
import styled, { css } from "styled-components";
import RowContainer from "@docspace/components/row-container";
import { RowContainer } from "@docspace/shared/components/row-container";
import SessionsRow from "./SessionsRow";
const marginStyles = css`

2
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableHeader.js
View File

@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import TableHeader from "@docspace/components/table-container/TableHeader";
import { TableHeader } from "@docspace/shared/components/table";
const TABLE_VERSION = "5";
const TABLE_COLUMNS = `SessionsColumns_ver-${TABLE_VERSION}`;

10
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js
View File

@ -1,12 +1,12 @@
import { useCallback } from "react";
import { Base } from "@docspace/components/themes";
import { Base } from "@docspace/shared/themes";
import styled, { css } from "styled-components";
import withContent from "SRC_DIR/HOCs/withPeopleContent";
import TableRow from "@docspace/components/table-container/TableRow";
import TableCell from "@docspace/components/table-container/TableCell";
import Text from "@docspace/components/text";
import Checkbox from "@docspace/components/checkbox";
import { TableRow } from "@docspace/shared/components/table";
import { TableCell } from "@docspace/shared/components/table";
import { Text } from "@docspace/shared/components/text";
import { Checkbox } from "@docspace/shared/components/checkbox";
import HistoryFinalizedReactSvgUrl from "PUBLIC_DIR/images/history-finalized.react.svg?url";
import RemoveSvgUrl from "PUBLIC_DIR/images/remove.session.svg?url";

6
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/index.js
View File

@ -1,13 +1,13 @@
import { useState, useRef } from "react";
import { inject, observer } from "mobx-react";
import { Base } from "@docspace/components/themes";
import { Base } from "@docspace/shared/themes";
import styled, { css } from "styled-components";
import SessionsTableHeader from "./SessionsTableHeader";
import SessionsTableRow from "./SessionsTableRow";
import TableContainer from "@docspace/components/table-container/TableContainer";
import TableBody from "@docspace/components/table-container/TableBody";
import { TableContainer } from "@docspace/shared/components/table";
import { TableBody } from "@docspace/shared/components/table";
const TABLE_VERSION = "5";
const COLUMNS_SIZE = `sessionsColumnsSize_ver-${TABLE_VERSION}`;

2
packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/index.js
View File

@ -1,6 +1,6 @@
import { useEffect } from "react";
import { inject, observer } from "mobx-react";
import { Consumer } from "@docspace/components/utils/context";
import { Consumer } from "@docspace/shared/utils";
import TableView from "./TableView";
import RowView from "./RowView";

8
packages/client/src/pages/PortalSettings/categories/security/sessions/index.js
View File

@ -1,17 +1,17 @@
import { useEffect } from "react";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import { mobile, tablet } from "@docspace/components/utils/device";
import { mobile, tablet } from "@docspace/shared/utils";
import styled from "styled-components";
import { MainContainer } from "../StyledSecurity";
import { Text } from "@docspace/shared/components/text";
import { Button } from "@docspace/shared/components/button";
import useViewEffect from "SRC_DIR/Hooks/useViewEffect";
import SessionsTable from "./SessionsTable";
import mockData from "./mockData";
import Text from "@docspace/components/text";
import Button from "@docspace/components/button";
const DownLoadWrapper = styled.div`
display: flex;
align-items: center;