From 7976ee4e51b0727d37928da6ce511c5e8fac0b91 Mon Sep 17 00:00:00 2001 From: Jayasanka Weerasinghe Date: Mon, 23 Mar 2020 17:34:41 +0530 Subject: [PATCH] Change the file structure of the APIM Store --- .../react-app/src/App.js | 2 +- .../index.js} | 0 .../context/ConfigContext/index.js} | 0 .../react-app/src/index.js | 10 +++++----- .../Home/components/Logout/index.js} | 4 ++-- .../Dashboard.js => scenes/Home/index.js} | 8 ++++---- .../AppList/components/AppCard/index.js} | 2 +- .../AppList/components/AppCard/styles.css} | 0 .../scenes/Apps/components/AppList/index.js} | 6 +++--- .../Home/scenes/Apps/index.js} | 2 +- .../components/ImageViewer/index.js} | 4 ++-- .../components/DeviceInstall/index.js} | 6 +++--- .../Install/components/GroupInstall/index.js} | 6 +++--- .../Install/components/RoleInstall/index.js} | 6 +++--- .../Install/components/UserInstall/index.js} | 6 +++--- .../ReleaseView/components/Install/index.js} | 12 +++++------ .../components/AddReview/index.js} | 4 ++-- .../componets/CurrentUsersReview/index.js} | 6 +++--- .../componets/Rating/index.js} | 8 ++++---- .../componets/Rating/styles.css} | 0 .../Review/components/Edit/index.js} | 10 +++++----- .../Review/components/Edit/styles.css} | 0 .../Reviews/components/Review/index.js} | 12 +++++------ .../Reviews/components/Review/styles.css} | 0 .../componets/Reviews/index.js} | 8 ++++---- .../componets/Reviews/styles.css} | 0 .../components/ReviewContainer/index.js} | 10 +++++----- .../components/SubscriptionDetails/index.js} | 4 ++-- .../components/DeviceUninstall/index.js} | 6 +++--- .../components/GroupUninstall/index.js} | 6 +++--- .../components/RoleUninstall/index.js} | 6 +++--- .../components/UserUninstall/index.js} | 6 +++--- .../components/Uninstall/index.js} | 12 +++++------ .../components/installModalFooter/index.js} | 0 .../Release/components/ReleaseView/index.js} | 20 +++++++++---------- .../Home/scenes/Apps/scenes/Release/index.js} | 8 ++++---- .../Dashboard.css => scenes/Home/styles.css} | 0 .../{pages/Login.js => scenes/Login/index.js} | 4 ++-- .../Login.css => scenes/Login/styles.css} | 0 .../serviceWorkers}/serviceWorker.js | 0 .../utils/errorHandler.js} | 0 41 files changed, 102 insertions(+), 102 deletions(-) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/{RouteWithSubRoutes.js => RouteWithSubRoutes/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{context/ConfigContext.js => components/context/ConfigContext/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/dashboard/logout/Logout.js => scenes/Home/components/Logout/index.js} (92%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/dashboard/Dashboard.js => scenes/Home/index.js} (97%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/AppCard.js => scenes/Home/scenes/Apps/components/AppList/components/AppCard/index.js} (99%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/AppCard.css => scenes/Home/scenes/Apps/components/AppList/components/AppCard/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/AppList.js => scenes/Home/scenes/Apps/components/AppList/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/dashboard/apps/Apps.js => scenes/Home/scenes/Apps/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/images/ImgViewer.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ImageViewer/index.js} (96%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/DeviceInstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/DeviceInstall/index.js} (96%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/GroupInstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/GroupInstall/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/RoleInstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/RoleInstall/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/UserInstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/UserInstall/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/AppInstallModal.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/index.js} (86%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/AddReview.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/components/AddReview/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/CurrentUsersReview.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/DetailedRating.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/index.js} (94%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/DetailedRating.css => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/singleReview/editReview/EditReview.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/singleReview/editReview/EditReview.css => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/singleReview/SingleReview.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/index.js} (91%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/singleReview/SingleReview.css => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/Reviews.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/index.js} (94%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/Reviews.css => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/review/ReviewContainer.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/index.js} (92%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/SubscriptionDetails.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/SubscriptionDetails/index.js} (97%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/DeviceUninstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/DeviceUninstall/index.js} (96%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/GroupUninstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/GroupUninstall/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/RoleUninstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/RoleUninstall/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/UserUninstall.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/UserUninstall/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/AppUninstallModal.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/index.js} (87%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/install/installModalFooter/InstallModalFooter.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/installModalFooter/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{components/apps/release/ReleaseView.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/dashboard/apps/release/Release.js => scenes/Home/scenes/Apps/scenes/Release/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/dashboard/Dashboard.css => scenes/Home/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/Login.js => scenes/Login/index.js} (98%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{pages/Login.css => scenes/Login/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{ => services/serviceWorkers}/serviceWorker.js (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/{js/Utils.js => services/utils/errorHandler.js} (100%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js index 264db3aed8..f4d08b4dea 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/App.js @@ -22,7 +22,7 @@ import RouteWithSubRoutes from './components/RouteWithSubRoutes'; import { BrowserRouter as Router, Redirect, Switch } from 'react-router-dom'; import axios from 'axios'; import { Layout, Spin, Result } from 'antd'; -import ConfigContext from './context/ConfigContext'; +import ConfigContext from './components/context/ConfigContext'; const { Content } = Layout; const loadingView = ( diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/RouteWithSubRoutes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/RouteWithSubRoutes/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/RouteWithSubRoutes.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/RouteWithSubRoutes/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/context/ConfigContext.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/context/ConfigContext/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/context/ConfigContext.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/context/ConfigContext/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/index.js index 11c8700d39..c4249a4206 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/index.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/index.js @@ -18,12 +18,12 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import * as serviceWorker from './serviceWorker'; +import * as serviceWorker from './services/serviceWorkers/serviceWorker'; import App from './App'; -import Login from './pages/Login'; -import Dashboard from './pages/dashboard/Dashboard'; -import Apps from './pages/dashboard/apps/Apps'; -import Release from './pages/dashboard/apps/release/Release'; +import Login from './scenes/Login'; +import Dashboard from './scenes/Home'; +import Apps from './scenes/Home/scenes/Apps'; +import Release from './scenes/Home/scenes/Apps/scenes/Release'; import './index.css'; const routes = [ diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/logout/Logout.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/components/Logout/index.js similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/logout/Logout.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/components/Logout/index.js index 4cc01f9439..a11d1d029a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/logout/Logout.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/components/Logout/index.js @@ -19,8 +19,8 @@ import React from 'react'; import { Menu, Icon } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../services/utils/errorHandler'; /* This class for call the logout api by sending request diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/index.js similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/index.js index c3c57572e7..2c8a8d7d12 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/index.js @@ -24,10 +24,10 @@ import { Link } from 'react-router-dom'; import RouteWithSubRoutes from '../../components/RouteWithSubRoutes'; import { Switch } from 'react-router'; import axios from 'axios'; -import './Dashboard.css'; -import { withConfigContext } from '../../context/ConfigContext'; -import Logout from './logout/Logout'; -import { handleApiError } from '../../js/Utils'; +import './styles.css'; +import { withConfigContext } from '../../components/context/ConfigContext'; +import Logout from './components/Logout'; +import { handleApiError } from '../../services/utils/errorHandler'; const { SubMenu } = Menu; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/AppCard/index.js similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/AppCard/index.js index 37ec0504fa..c0526ba91e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/AppCard/index.js @@ -19,7 +19,7 @@ import { Card, Typography, Col, Row } from 'antd'; import React from 'react'; import { Link } from 'react-router-dom'; -import './AppCard.css'; +import './styles.css'; import StarRatings from 'react-star-ratings'; const { Meta } = Card; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/AppCard/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/AppCard/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/index.js index 4d3f0fd047..48f896b092 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/index.js @@ -17,11 +17,11 @@ */ import React from 'react'; -import AppCard from './AppCard'; +import AppCard from './components/AppCard'; import { Col, Row, Result } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../context/ConfigContext'; -import { handleApiError } from '../../js/Utils'; +import { withConfigContext } from '../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; import InfiniteScroll from 'react-infinite-scroller'; const limit = 30; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/index.js index bd8b2935d2..1edc6691c5 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/Apps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/index.js @@ -17,7 +17,7 @@ */ import React from 'react'; -import AppList from '../../../components/apps/AppList'; +import AppList from './components/AppList'; class Apps extends React.Component { routes; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/images/ImgViewer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ImageViewer/index.js similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/images/ImgViewer.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ImageViewer/index.js index 47edab6623..e4fa6dba15 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/images/ImgViewer.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ImageViewer/index.js @@ -19,7 +19,7 @@ import React, { Component } from 'react'; import RcViewer from 'rc-viewer'; -class ImgViewer extends Component { +class ImageViewer extends Component { render() { const options = { title: false, @@ -59,4 +59,4 @@ class ImgViewer extends Component { } } -export default ImgViewer; +export default ImageViewer; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/DeviceInstall/index.js similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/DeviceInstall/index.js index 94dd414243..19c2b1a76d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/DeviceInstall/index.js @@ -23,9 +23,9 @@ import TimeAgo from 'javascript-time-ago'; // Load locale-specific relative date/time formatting rules. import en from 'javascript-time-ago/locale/en'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const columns = [ diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/GroupInstall/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/GroupInstall/index.js index 0ecdcd8b39..ca17bf6640 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/GroupInstall/index.js @@ -20,9 +20,9 @@ import React from 'react'; import { Typography, Select, Spin, Alert } from 'antd'; import debounce from 'lodash.debounce'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/RoleInstall/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/RoleInstall/index.js index 63f6bfca77..633b6a9c7c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/RoleInstall/index.js @@ -20,9 +20,9 @@ import React from 'react'; import { Typography, Select, Spin, Alert } from 'antd'; import debounce from 'lodash.debounce'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/UserInstall/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/UserInstall/index.js index 9c54d05f56..d0f6533087 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/components/UserInstall/index.js @@ -20,9 +20,9 @@ import React from 'react'; import { Typography, Select, Spin, Alert } from 'antd'; import debounce from 'lodash.debounce'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/index.js similarity index 86% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/index.js index 3f3cac0152..bb8bd66673 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Install/index.js @@ -18,14 +18,14 @@ import React from 'react'; import { Modal, Spin, Tabs } from 'antd'; -import UserInstall from './UserInstall'; -import GroupInstall from './GroupInstall'; -import RoleInstall from './RoleInstall'; -import DeviceInstall from './DeviceInstall'; +import UserInstall from './components/UserInstall'; +import GroupInstall from './components/GroupInstall'; +import RoleInstall from './components/RoleInstall'; +import DeviceInstall from './components/DeviceInstall'; const { TabPane } = Tabs; -class AppInstallModal extends React.Component { +class Install extends React.Component { state = { data: [], }; @@ -65,4 +65,4 @@ class AppInstallModal extends React.Component { } } -export default AppInstallModal; +export default Install; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/components/AddReview/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/components/AddReview/index.js index 4f1c204d72..821cac5465 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/components/AddReview/index.js @@ -31,8 +31,8 @@ import { } from 'antd'; import StarRatings from 'react-star-ratings'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../../../services/utils/errorHandler'; const { Title } = Typography; const { TextArea } = Input; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/CurrentUsersReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/CurrentUsersReview.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/index.js index f861d27e40..87df7e62c0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/CurrentUsersReview.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/CurrentUsersReview/index.js @@ -18,9 +18,9 @@ import React from 'react'; import { List, Typography, Empty, Alert } from 'antd'; -import SingleReview from './singleReview/SingleReview'; -import AddReview from './AddReview'; -import { withConfigContext } from '../../../../context/ConfigContext'; +import SingleReview from '../Reviews/components/Review'; +import AddReview from './components/AddReview'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; const { Text } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/index.js similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/index.js index 3b28f6d1d4..454c88e69e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/index.js @@ -19,12 +19,12 @@ import React from 'react'; import { Row, Typography, Icon } from 'antd'; import StarRatings from 'react-star-ratings'; -import './DetailedRating.css'; -import { withConfigContext } from '../../../context/ConfigContext'; +import './styles.css'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; const { Text } = Typography; -class DetailedRating extends React.Component { +class Rating extends React.Component { render() { const { detailedRating } = this.props; @@ -122,4 +122,4 @@ class DetailedRating extends React.Component { } } -export default withConfigContext(DetailedRating); +export default withConfigContext(Rating); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Rating/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/index.js index a03d80a8a0..13806129d9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/index.js @@ -30,14 +30,14 @@ import { } from 'antd'; import StarRatings from 'react-star-ratings'; import axios from 'axios'; -import './EditReview.css'; -import { withConfigContext } from '../../../../../../context/ConfigContext'; -import { handleApiError } from '../../../../../../js/Utils'; +import './styles.css'; +import { withConfigContext } from '../../../../../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../../../../../services/utils/errorHandler'; const { Title } = Typography; const { TextArea } = Input; -class EditReview extends React.Component { +class Edit extends React.Component { constructor(props) { super(props); this.state = { @@ -195,4 +195,4 @@ class EditReview extends React.Component { } } -export default withConfigContext(EditReview); +export default withConfigContext(Edit); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/editReview/EditReview.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/components/Edit/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/index.js similarity index 91% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/index.js index 7cbbbdc9e7..9722614e05 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/index.js @@ -21,11 +21,11 @@ import { Avatar, notification } from 'antd'; import { List, Typography, Popconfirm } from 'antd'; import StarRatings from 'react-star-ratings'; import Twemoji from 'react-twemoji'; -import './SingleReview.css'; -import EditReview from './editReview/EditReview'; +import './styles.css'; +import EditReview from './components/Edit'; import axios from 'axios'; -import { withConfigContext } from '../../../../../context/ConfigContext'; -import { handleApiError } from '../../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../../../services/utils/errorHandler'; const { Text, Paragraph } = Typography; const colorList = [ @@ -41,7 +41,7 @@ const colorList = [ '#f9ca24', ]; -class SingleReview extends React.Component { +class Review extends React.Component { static defaultProps = { isPersonalReview: false, }; @@ -167,4 +167,4 @@ class SingleReview extends React.Component { } } -export default withConfigContext(SingleReview); +export default withConfigContext(Review); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/singleReview/SingleReview.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/components/Review/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/index.js similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/index.js index eab5ba3e4e..1f6620e118 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/index.js @@ -18,13 +18,13 @@ import React from 'react'; import { List, Spin, Button, Alert } from 'antd'; -import './Reviews.css'; +import './styles.css'; import InfiniteScroll from 'react-infinite-scroller'; -import SingleReview from './singleReview/SingleReview'; +import SingleReview from './components/Review'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; const limit = 5; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/componets/Reviews/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/ReviewContainer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/index.js similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/ReviewContainer.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/index.js index aaae16c01d..0c42aff3e4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/ReviewContainer.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/ReviewContainer/index.js @@ -17,13 +17,13 @@ */ import React from 'react'; -import CurrentUsersReview from './CurrentUsersReview'; +import CurrentUsersReview from './componets/CurrentUsersReview'; import { Col, Divider, Row, Typography } from 'antd'; -import DetailedRating from '../DetailedRating'; -import Reviews from './Reviews'; +import DetailedRating from './componets/Rating'; +import Reviews from './componets/Reviews'; import axios from 'axios'; -import { handleApiError } from '../../../../js/Utils'; -import { withConfigContext } from '../../../../context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../services/utils/errorHandler'; +import { withConfigContext } from '../../../../../../../../../../components/context/ConfigContext'; const { Text } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/SubscriptionDetails/index.js similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/SubscriptionDetails/index.js index 9fb6f3d91a..7bb1358fb0 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/SubscriptionDetails/index.js @@ -23,8 +23,8 @@ import TimeAgo from 'javascript-time-ago'; // Load locale-specific relative date/time formatting rules. import en from 'javascript-time-ago/locale/en'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../services/utils/errorHandler'; const { Text } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/DeviceUninstall/index.js similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/DeviceUninstall/index.js index 303c1ecae0..8e9dc5b0cd 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/DeviceUninstall/index.js @@ -23,9 +23,9 @@ import TimeAgo from 'javascript-time-ago'; // Load locale-specific relative date/time formatting rules. import en from 'javascript-time-ago/locale/en'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const columns = [ diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/GroupUninstall/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/GroupUninstall/index.js index 6205fc239b..d3dce763fe 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/GroupUninstall/index.js @@ -20,9 +20,9 @@ import React from 'react'; import { Typography, Select, Spin, Alert } from 'antd'; import debounce from 'lodash.debounce'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/RoleUninstall/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/RoleUninstall/index.js index 622cbe787a..da999eafdb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/RoleUninstall/index.js @@ -20,9 +20,9 @@ import React from 'react'; import { Typography, Select, Spin, Alert } from 'antd'; import debounce from 'lodash.debounce'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/UserUninstall/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/UserUninstall/index.js index 4b7f824cbc..1d0799bcdb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserUninstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/components/UserUninstall/index.js @@ -20,9 +20,9 @@ import React from 'react'; import { Typography, Select, Spin, Alert } from 'antd'; import debounce from 'lodash.debounce'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; -import InstallModalFooter from './installModalFooter/InstallModalFooter'; +import { withConfigContext } from '../../../../../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../../services/utils/errorHandler'; +import InstallModalFooter from '../../../installModalFooter'; const { Text } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppUninstallModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/index.js similarity index 87% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppUninstallModal.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/index.js index 6b48b7793b..f320eeed53 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppUninstallModal.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Uninstall/index.js @@ -17,14 +17,14 @@ */ import React from 'react'; import { Modal, Spin, Tabs } from 'antd'; -import DeviceUninstall from './DeviceUninstall'; -import UserUninstall from './UserUninstall'; -import RoleUninstall from './RoleUninstall'; -import GroupUninstall from './GroupUninstall'; +import DeviceUninstall from './components/DeviceUninstall'; +import UserUninstall from './components/UserUninstall'; +import RoleUninstall from './components/RoleUninstall'; +import GroupUninstall from './components/GroupUninstall'; const { TabPane } = Tabs; -class AppUninstallModal extends React.Component { +class Uninstall extends React.Component { state = { data: [], }; @@ -74,4 +74,4 @@ class AppUninstallModal extends React.Component { } } -export default AppUninstallModal; +export default Uninstall; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/installModalFooter/InstallModalFooter.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/installModalFooter/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/installModalFooter/InstallModalFooter.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/installModalFooter/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js index 8cad68f77a..d05adf76e7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js @@ -30,17 +30,17 @@ import { Tabs, Tag, } from 'antd'; -import '../../../App.css'; -import ImgViewer from '../../apps/release/images/ImgViewer'; +import '../../../../../../../../App.css'; +import ImageViewer from './components/ImageViewer'; import StarRatings from 'react-star-ratings'; import axios from 'axios'; import pSBC from 'shade-blend-color'; -import AppInstallModal from './install/AppInstallModal'; -import AppUninstallModal from './install/AppUninstallModal'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; -import ReviewContainer from './review/ReviewContainer'; -import SubscriptionDetails from './SubscriptionDetails'; +import AppInstallModal from './components/Install'; +import Uninstall from './components/Uninstall'; +import { withConfigContext } from '../../../../../../../../components/context/ConfigContext'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; +import ReviewContainer from './components/ReviewContainer'; +import SubscriptionDetails from './components/SubscriptionDetails'; const { Title, Text, Paragraph } = Typography; const { TabPane } = Tabs; @@ -175,7 +175,7 @@ class ReleaseView extends React.Component { onClose={this.closeAppOperationModal} onInstall={this.appOperation} /> - - +