diff --git a/frontend.code-workspace b/frontend.code-workspace
index 6ffbc03118..f2dc8cdcb1 100644
--- a/frontend.code-workspace
+++ b/frontend.code-workspace
@@ -1,34 +1,40 @@
{
- "folders": [
- {
- "name": "root"
- "path": "./"
- },
- {
- "name": "packages"
- "path": "./packages"
- },
- {
- "name": "ASC.Web.Login"
- "path": "./web/ASC.Web.Login"
- },
- {
- "name": "ASC.Web.Client"
- "path": "./web/ASC.Web.Client"
- },
- {
- "name": "ASC.People.Client"
- "path": "./products/ASC.People/Client"
- },
- {
- "name": "ASC.Files.Client"
- "path": "./products/ASC.Files/Client"
- }
- ],
- "settings": {
- "window.zoomLevel": 0,
- "files.autoSave": "afterDelay",
- "editor.formatOnSave": true,
- "editor.defaultFormatter": "esbenp.prettier-vscode"
+ "folders": [
+ {
+ "name": "✨ appserver",
+ "path": "."
+ },
+ {
+ "name": "📦 @appserver/common",
+ "path": "packages\\asc-web-common"
+ },
+ {
+ "name": "📦 @appserver/components",
+ "path": "packages\\asc-web-components"
+ },
+ {
+ "name": "🚀 @appserver/files",
+ "path": "products\\ASC.Files\\Client"
+ },
+ {
+ "name": "🚀 @appserver/people",
+ "path": "products\\ASC.People\\Client"
+ },
+ {
+ "name": "🚀 @appserver/studio",
+ "path": "web\\ASC.Web.Client"
+ },
+ {
+ "name": "🚀 @appserver/login",
+ "path": "web\\ASC.Web.Login"
}
-}
\ No newline at end of file
+ ],
+ "settings": {
+ "window.zoomLevel": 0,
+ "editor.formatOnSave": true,
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "extensions": {
+ "recommendations": ["folke.vscode-monorepo-workspace"]
+ }
+}
diff --git a/package.json b/package.json
index 2e3cbcd251..145d4a362f 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,9 @@
"scripts": {
"wipe": "rimraf node_modules yarn.lock web/**/node_modules products/**/node_modules",
"build": "yarn workspaces run build",
- "start": "concurrently \"wsrun --parallel start\"",
- "sb-components": "yarn workspace @appserver/components storybook"
+ "start": "concurrently \"wsrun --parallel start\"",
+ "test": "yarn workspace @appserver/components test",
+ "sb-components": "yarn workspace @appserver/components storybook"
},
"devDependencies": {
"lerna": "^3.22.1",
diff --git a/packages/asc-web-common/components/ErrorBoundary/ErrorBoundary.js b/packages/asc-web-common/components/ErrorBoundary/ErrorBoundary.js
index 604272a152..fe0f0d2549 100644
--- a/packages/asc-web-common/components/ErrorBoundary/ErrorBoundary.js
+++ b/packages/asc-web-common/components/ErrorBoundary/ErrorBoundary.js
@@ -1,6 +1,6 @@
import React from "react";
import PropTypes from "prop-types";
-import Error520Container from "../../pages/errors/520";
+import Error520 from "studio/Error520";
class ErrorBoundary extends React.Component {
constructor(props) {
@@ -22,7 +22,7 @@ class ErrorBoundary extends React.Component {
render() {
if (this.state.hasError) {
// You can render any custom fallback UI
- return ;
+ return ;
}
return this.props.children;
diff --git a/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js b/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js
index 842b3813da..43aed58c4e 100644
--- a/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js
+++ b/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js
@@ -13,7 +13,7 @@ const CloseButton = (props) => {
color={"#A3A9AE"}
clickColor={"#A3A9AE"}
size={10}
- iconName={"/static/images/cross.react.svg"}
+ iconName="/static/images/cross.react.svg"
isFill={true}
isDisabled={isDisabled}
onClick={!isDisabled ? onClick : undefined}
diff --git a/packages/asc-web-common/components/NavMenu/i18n.js b/packages/asc-web-common/components/NavMenu/i18n.js
deleted file mode 100644
index 0686fc7ba3..0000000000
--- a/packages/asc-web-common/components/NavMenu/i18n.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import i18n from "i18next";
-import en from "./locales/en/translation.json";
-import ru from "./locales/ru/translation.json";
-import { i18nBaseSettings } from "../../constants";
-
-const newInstance = i18n.createInstance();
-
-const resources = {
- en: {
- translation: en,
- },
- ru: {
- translation: ru,
- },
-};
-
-newInstance.init({ ...i18nBaseSettings, resources });
-
-export default newInstance;
diff --git a/packages/asc-web-common/components/PrivateRoute/PrivateRoute.js b/packages/asc-web-common/components/PrivateRoute/PrivateRoute.js
index e78c6d447d..767bdcc6e8 100644
--- a/packages/asc-web-common/components/PrivateRoute/PrivateRoute.js
+++ b/packages/asc-web-common/components/PrivateRoute/PrivateRoute.js
@@ -3,8 +3,8 @@ import React from "react";
import { Redirect, Route } from "react-router-dom";
//import Loader from "@appserver/components/loader";
import PageLayout from "../PageLayout";
-import Error401 from '../../pages/errors/401'
-import Error404 from '../../pages/errors/404'
+import Error401 from "studio/Error401";
+import Error404 from "studio/Error404";
import RectangleLoader from "../Loaders/RectangleLoader/RectangleLoader";
import { inject, observer } from "mobx-react";
import { isMe } from "../../utils";
@@ -76,11 +76,25 @@ const PrivateRoute = ({ component: Component, ...rest }) => {
if (restricted) {
console.log("PrivateRoute render Error401", rest);
- return ;
+ return (
+
+ );
}
console.log("PrivateRoute render Error404", rest);
- return ;
+ return (
+
+ );
};
//console.log("PrivateRoute render", rest);
diff --git a/packages/asc-web-common/components/ProfileMenu/ProfileMenu.stories.js b/packages/asc-web-common/components/ProfileMenu/ProfileMenu.stories.js
deleted file mode 100644
index 878d5a730c..0000000000
--- a/packages/asc-web-common/components/ProfileMenu/ProfileMenu.stories.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from "react";
-import { storiesOf } from "@storybook/react";
-import { withKnobs, text, select } from "@storybook/addon-knobs/react";
-import { BooleanValue } from "react-values";
-import ProfileMenu from ".";
-import Section from "../../../.storybook/decorators/section";
-import withReadme from "storybook-readme/with-readme";
-import Readme from "./README.md";
-import DropDownItem from "@appserver/components/drop-down-item";
-import Avatar from "@appserver/components/avatar";
-
-const roleOptions = ["owner", "admin", "guest", "user"];
-const defaultAvatar =
- "https://static-www.onlyoffice.com/images/team/developers_photos/personal_44_2x.jpg";
-
-storiesOf("Components|ProfileMenu", module)
- .addDecorator(withKnobs)
- .addDecorator(withReadme(Readme))
-
- .add("base", () => {
- const userRole = select("avatarRole", roleOptions, "admin");
- const userAvatar = text("avatarSource", "") || defaultAvatar;
- const userEmail = text("email", "") || "janedoe@gmail.com";
- const userDisplayName = text("displayName", "") || "Jane Doe";
-
- return (
-
-
- {({ value, toggle }) => (
-
-
toggle(!value)}
- />
-
- console.log("Profile click")}
- />
- console.log("Subscriptions click")}
- />
-
- console.log("About click")}
- />
- console.log("Log out click")}
- />
-
-