From db8417b339ba0fe210c26b31468fcb9b1acdc2ac Mon Sep 17 00:00:00 2001 From: Jayasanka Weerasinghe Date: Fri, 10 Apr 2020 16:24:02 +0530 Subject: [PATCH] Change the file structure of APPM Publisher --- .../react-app/src/App.js | 2 +- .../ConfigContext/index.js} | 0 .../index.js} | 0 .../react-app/src/index.js | 26 +++++++++---------- .../Home/components/Logout/index.js} | 4 +-- .../Dashboard.js => scenes/Home/index.js} | 8 +++--- .../components/NewAppDetailsForm/index.js} | 6 ++--- .../components/NewAppUploadForm/index.js} | 0 .../components/AddNewAppForm/index.js} | 10 +++---- .../scenes/AddNewApp/scenes/Custom/index.js} | 4 +-- .../AddNewApp/scenes/Enterprise/index.js} | 4 +-- .../scenes/AddNewApp/scenes/Public/index.js} | 8 +++--- .../scenes/AddNewApp/scenes/WebClip/index.js} | 4 +-- .../Home/scenes/AddNewApp/styles.less} | 0 .../components/AddNewReleaseForm/index.js} | 8 +++--- .../Home/scenes/AddNewRelease/index.js} | 4 +-- .../ManagedConfigurationsIframe/index.js} | 6 ++--- .../ApssTable/AppDetailsDrawer/index.js} | 12 ++++----- .../ApssTable/AppDetailsDrawer/styles.css} | 0 .../AppList/components/ApssTable/index.js} | 10 +++---- .../AppList/components/ApssTable/styles.css} | 0 .../AppList/components/Filters/index.js} | 6 ++--- .../scenes/Apps/components/AppList/index.js} | 10 +++---- .../Apps/components/DetailedRating/index.js} | 8 +++--- .../components/DetailedRating/styles.css} | 0 .../Home/scenes/Apps/index.js} | 6 ++--- .../lifeCycleDetailsModal/index.js} | 2 +- .../Release/components/LifeCycle/index.js} | 10 +++---- .../Release/components/LifeCycle/styles.css} | 0 .../components/EditRelease/index.js} | 4 +-- .../Reviews/components/Review/index.js} | 0 .../ReleaseView/components/Reviews/index.js} | 10 +++---- .../components/Reviews/styles.css} | 0 .../Release/components/ReleaseView/index.js} | 12 ++++----- .../Home/scenes/Apps/scenes/Release/index.js} | 10 +++---- .../Manage/components/Categories/index.js} | 6 ++--- .../scenes/Manage/components/Tags/index.js} | 6 ++--- .../Home/scenes/Manage/index.js} | 6 ++--- .../components/GooglePlayIframe/index.js} | 4 +-- .../Pages/components/AddNewPage/index.js} | 6 ++--- .../components/Pages/index.js} | 10 +++---- .../components/Pages/styles.css} | 0 .../components/SyncAndroidApps/index.js} | 6 ++--- .../Manage/scenes/AndroidEnterprise/index.js} | 10 +++---- .../AddAppsToClusterModal/index.js} | 6 ++--- .../scenes/Page/components/Cluster/index.js} | 10 +++---- .../Page/components/Cluster/styles.css} | 0 .../Page/components/EditLinks/index.js} | 4 +-- .../AndroidEnterprise/scenes/Page/index.js} | 10 +++---- .../Dashboard.css => scenes/Home/styles.css} | 0 .../{pages/Login.js => scenes/Login/index.js} | 8 +++--- .../Login.css => scenes/Login/styles.css} | 0 .../serviceWorkers}/serviceWorker.js | 0 .../utils/errorHandler.js} | 0 54 files changed, 143 insertions(+), 143 deletions(-) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{context/ConfigContext.js => components/ConfigContext/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/{RouteWithSubRoutes.js => RouteWithSubRoutes/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/logout/Logout.js => scenes/Home/components/Logout/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/Dashboard.js => scenes/Home/index.js} (97%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/new-app/subForms/NewAppDetailsForm.js => scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppDetailsForm/index.js} (98%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/new-app/subForms/NewAppUploadForm.js => scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppUploadForm/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/new-app/AddNewAppForm.js => scenes/Home/scenes/AddNewApp/components/AddNewAppForm/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/add-new-app/AddNewCustomApp.js => scenes/Home/scenes/AddNewApp/scenes/Custom/index.js} (94%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/add-new-app/AddNewEnterpriseApp.js => scenes/Home/scenes/AddNewApp/scenes/Enterprise/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/add-new-app/AddNewPublicApp.js => scenes/Home/scenes/AddNewApp/scenes/Public/index.js} (90%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/add-new-app/AddNewWebClip.js => scenes/Home/scenes/AddNewApp/scenes/WebClip/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/add-new-app/Style.less => scenes/Home/scenes/AddNewApp/styles.less} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/new-release/AddReleaseForm.js => scenes/Home/scenes/AddNewRelease/components/AddNewReleaseForm/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/add-new-release/AddNewRelease.js => scenes/Home/scenes/AddNewRelease/index.js} (92%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js => scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/components/ManagedConfigurationsIframe/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js => scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/index.js} (98%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css => scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/list-apps/appsTable/AppsTable.js => scenes/Home/scenes/Apps/components/AppList/components/ApssTable/index.js} (96%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/list-apps/appsTable/AppsTable.css => scenes/Home/scenes/Apps/components/AppList/components/ApssTable/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/list-apps/Filters.js => scenes/Home/scenes/Apps/components/AppList/components/Filters/index.js} (97%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/list-apps/ListApps.js => scenes/Home/scenes/Apps/components/AppList/index.js} (92%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/detailed-rating/DetailedRating.js => scenes/Home/scenes/Apps/components/DetailedRating/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/detailed-rating/DetailedRating.css => scenes/Home/scenes/Apps/components/DetailedRating/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/apps/Apps.js => scenes/Home/scenes/Apps/index.js} (85%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/lifeCycle/lifeCycleDetailsModal/lifeCycleDetailsModal.js => scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/components/lifeCycleDetailsModal/index.js} (97%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/lifeCycle/LifeCycle.js => scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/lifeCycle/LifeCycle.css => scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/edit-release/EditRelease.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/EditRelease/index.js} (99%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/review/SingleReview.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/components/Review/index.js} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/review/Reviews.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/index.js} (93%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/review/Reviews.css => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/apps/release/ReleaseView.js => scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js} (94%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/apps/release/Release.js => scenes/Home/scenes/Apps/scenes/Release/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/categories/ManageCategories.js => scenes/Home/scenes/Manage/components/Categories/index.js} (98%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/categories/ManageTags.js => scenes/Home/scenes/Manage/components/Tags/index.js} (98%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/manage/Manage.js => scenes/Home/scenes/Manage/index.js} (89%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/GooglePlayIframe.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/GooglePlayIframe/index.js} (92%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/AddNewPage/AddNewPage.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/components/AddNewPage/index.js} (92%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/Pages/Pages.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/index.js} (95%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/Pages/Pages.css => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/SyncAndroidApps.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/SyncAndroidApps/index.js} (89%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/manage/android-enterprise/ManageAndroidEnterprise.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/index.js} (81%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/Pages/Cluster/AddAppsToClusterModal/AddAppsToClusterModal.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/components/AddAppsToClusterModal/index.js} (94%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/Pages/Cluster/Cluster.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/index.js} (97%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/Pages/Cluster/Cluster.css => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{components/manage/android-enterprise/Pages/EditLinks/EditLinks.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/EditLinks/index.js} (94%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/manage/android-enterprise/page/Page.js => scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/index.js} (96%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/dashboard/Dashboard.css => scenes/Home/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/Login.js => scenes/Login/index.js} (96%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{pages/Login.css => scenes/Login/styles.css} (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{ => services/serviceWorkers}/serviceWorker.js (100%) rename components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/{js/Utils.js => services/utils/errorHandler.js} (100%) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js index fcb81a1501e..177d362c3ee 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.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/ConfigContext'; const { Content } = Layout; const loadingView = ( diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/context/ConfigContext.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/ConfigContext/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/context/ConfigContext.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/ConfigContext/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js index 431572739fc..fc94e3d68d8 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js @@ -18,21 +18,21 @@ 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 AddNewEnterpriseApp from './pages/dashboard/add-new-app/AddNewEnterpriseApp'; -import Mange from './pages/dashboard/manage/Manage'; +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 AddNewEnterpriseApp from './scenes/Home/scenes/AddNewApp/scenes/Enterprise'; +import Mange from './scenes/Home/scenes/Manage'; import './index.css'; -import AddNewPublicApp from './pages/dashboard/add-new-app/AddNewPublicApp'; -import AddNewWebClip from './pages/dashboard/add-new-app/AddNewWebClip'; -import AddNewRelease from './pages/dashboard/add-new-release/AddNewRelease'; -import AddNewCustomApp from './pages/dashboard/add-new-app/AddNewCustomApp'; -import ManageAndroidEnterprise from './pages/dashboard/manage/android-enterprise/ManageAndroidEnterprise'; -import Page from './pages/dashboard/manage/android-enterprise/page/Page'; +import AddNewPublicApp from './scenes/Home/scenes/AddNewApp/scenes/Public'; +import AddNewWebClip from './scenes/Home/scenes/AddNewApp/scenes/WebClip'; +import AddNewRelease from './scenes/Home/scenes/AddNewRelease'; +import AddNewCustomApp from './scenes/Home/scenes/AddNewApp/scenes/Custom'; +import ManageAndroidEnterprise from './scenes/Home/scenes/Manage/scenes/AndroidEnterprise'; +import Page from './scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page'; const routes = [ { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/components/Logout/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/components/Logout/index.js index c217cdb2028..1d94718fd14 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/logout/Logout.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/components/Logout/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,7 +19,7 @@ import React from 'react'; import { notification, Menu, Icon } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../context/ConfigContext'; +import { withConfigContext } from '../../../../components/ConfigContext'; /* This class for call the logout api by sending request diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/index.js similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/index.js index 57d8ba17ab9..c21ade6196d 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -21,9 +21,9 @@ import { Layout, Menu, Icon, Drawer, Button } from 'antd'; import { Switch, Link } from 'react-router-dom'; import RouteWithSubRoutes from '../../components/RouteWithSubRoutes'; import { Redirect } from 'react-router'; -import './Dashboard.css'; -import { withConfigContext } from '../../context/ConfigContext'; -import Logout from './logout/Logout'; +import './styles.css'; +import { withConfigContext } from '../../components/ConfigContext'; +import Logout from './components/Logout'; const { Header, Content, Footer } = Layout; const { SubMenu } = Menu; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppDetailsForm/index.js similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppDetailsForm/index.js index 689a7436e33..f4e4bababa2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppDetailsForm/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,8 +19,8 @@ import React from 'react'; import { Alert, Button, Col, Form, Input, Row, Select, Spin } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; import debounce from 'lodash.debounce'; const formItemLayout = { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppUploadForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppUploadForm/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppUploadForm.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/components/NewAppUploadForm/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/index.js index 6be5ab16535..2db74a59d7e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/components/AddNewAppForm/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -20,10 +20,10 @@ import React from 'react'; import { Card, Button, Steps, Row, Col, Form, Result, Spin } from 'antd'; import axios from 'axios'; import { withRouter } from 'react-router-dom'; -import NewAppDetailsForm from './subForms/NewAppDetailsForm'; -import NewAppUploadForm from './subForms/NewAppUploadForm'; -import { withConfigContext } from '../../context/ConfigContext'; -import { handleApiError } from '../../js/Utils'; +import NewAppDetailsForm from './components/NewAppDetailsForm'; +import NewAppUploadForm from './components/NewAppUploadForm'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; const { Step } = Steps; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewCustomApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Custom/index.js similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewCustomApp.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Custom/index.js index 7e2c6aa5872..fc296a0527c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewCustomApp.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Custom/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,7 +18,7 @@ import React from 'react'; import { PageHeader, Typography, Breadcrumb, Icon } from 'antd'; -import AddNewAppForm from '../../../components/new-app/AddNewAppForm'; +import AddNewAppForm from '../../components/AddNewAppForm'; import { Link } from 'react-router-dom'; const { Paragraph } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewEnterpriseApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Enterprise/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewEnterpriseApp.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Enterprise/index.js index c499b0ce347..e870daa7a1a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewEnterpriseApp.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Enterprise/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,7 +18,7 @@ import React from 'react'; import { PageHeader, Typography, Breadcrumb, Icon } from 'antd'; -import AddNewAppForm from '../../../components/new-app/AddNewAppForm'; +import AddNewAppForm from '../../components/AddNewAppForm'; import { Link } from 'react-router-dom'; const { Paragraph } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Public/index.js similarity index 90% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Public/index.js index 6d9daa523a0..349089fba7c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewPublicApp.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/Public/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,7 +18,7 @@ import React from 'react'; import { Icon, PageHeader, Typography, Breadcrumb } from 'antd'; -import AddNewAppForm from '../../../components/new-app/AddNewAppForm'; +import AddNewAppForm from '../../components/AddNewAppForm'; import { Link } from 'react-router-dom'; const { Paragraph } = Typography; @@ -38,7 +38,7 @@ const formConfig = { }, }; -class AddNewEnterpriseApp extends React.Component { +class AddNewPublicApp extends React.Component { constructor(props) { super(props); this.state = { @@ -79,4 +79,4 @@ class AddNewEnterpriseApp extends React.Component { } } -export default AddNewEnterpriseApp; +export default AddNewPublicApp; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/WebClip/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/WebClip/index.js index d9998c827c5..388d6a4d149 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewWebClip.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/scenes/WebClip/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,7 +18,7 @@ import React from 'react'; import { Icon, PageHeader, Typography, Breadcrumb } from 'antd'; -import AddNewAppForm from '../../../components/new-app/AddNewAppForm'; +import AddNewAppForm from '../../components/AddNewAppForm'; import { Link } from 'react-router-dom'; const { Paragraph } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/Style.less b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/styles.less similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/Style.less rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewApp/styles.less diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewRelease/components/AddNewReleaseForm/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewRelease/components/AddNewReleaseForm/index.js index ea0ce20b2c1..d531c3c9bf6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewRelease/components/AddNewReleaseForm/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -20,9 +20,9 @@ import React from 'react'; import { Form, notification, Spin, Card, Row, Col } from 'antd'; import axios from 'axios'; import { withRouter } from 'react-router-dom'; -import { withConfigContext } from '../../context/ConfigContext'; -import { handleApiError } from '../../js/Utils'; -import NewAppUploadForm from '../new-app/subForms/NewAppUploadForm'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; +import NewAppUploadForm from '../../../AddNewApp/components/AddNewAppForm/components/NewAppUploadForm'; const formConfig = { specificElements: { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewRelease/index.js similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewRelease/index.js index 74c4a2ad1e4..fc335d84656 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-release/AddNewRelease.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/AddNewRelease/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,7 +18,7 @@ import React from 'react'; import { Icon, PageHeader, Typography, Breadcrumb } from 'antd'; -import AddNewReleaseForm from '../../../components/new-release/AddReleaseForm'; +import AddNewReleaseForm from './components/AddNewReleaseForm'; import { Link } from 'react-router-dom'; const Paragraph = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/components/ManagedConfigurationsIframe/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/components/ManagedConfigurationsIframe/index.js index 3bd26b44dcf..51bcb905cdb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/components/ManagedConfigurationsIframe/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,8 +19,8 @@ import React from 'react'; import { Button, Modal, notification, Spin } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../../services/utils/errorHandler'; class ManagedConfigurationsIframe extends React.Component { constructor(props) { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/index.js similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/index.js index 727a83da551..41fc9f10d97 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -34,16 +34,16 @@ import { Badge, Tooltip, } from 'antd'; -import DetailedRating from '../../detailed-rating/DetailedRating'; +import DetailedRating from '../../../../DetailedRating'; import { Link } from 'react-router-dom'; import axios from 'axios'; import ReactQuill from 'react-quill'; import ReactHtmlParser from 'react-html-parser'; -import './AppDetailsDrawer.css'; +import './styles.css'; import pSBC from 'shade-blend-color'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import ManagedConfigurationsIframe from '../../../manage/android-enterprise/ManagedConfigurationsIframe/ManagedConfigurationsIframe'; -import { handleApiError } from '../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../components/ConfigContext'; +import ManagedConfigurationsIframe from './components/ManagedConfigurationsIframe'; +import { handleApiError } from '../../../../../../../../../services/utils/errorHandler'; const { Meta } = Card; const { Text, Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/AppDetailsDrawer/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/index.js similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/index.js index 50149ef8bba..5010e23e205 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -20,10 +20,10 @@ import React from 'react'; import { Avatar, Table, Tag, Icon, Badge, Alert, Tooltip } from 'antd'; import axios from 'axios'; import pSBC from 'shade-blend-color'; -import './AppsTable.css'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import AppDetailsDrawer from '../AppDetailsDrawer/AppDetailsDrawer'; -import { handleApiError } from '../../../../js/Utils'; +import './styles.css'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; +import AppDetailsDrawer from './AppDetailsDrawer'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; let config = null; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/ApssTable/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/Filters/index.js similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/Filters/index.js index a3f2d7c4675..f81721f6a0b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/components/Filters/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -29,8 +29,8 @@ import { Alert, } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; const { Option } = Select; const { Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/index.js similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/index.js index 411012bc9d4..33ae02dbcb7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/ListApps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/AppList/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,13 +18,13 @@ import React from 'react'; import { Card, Col, Row, Typography, Input, Divider } from 'antd'; -import AppsTable from './appsTable/AppsTable'; -import Filters from './Filters'; +import AppsTable from './components/ApssTable'; +import Filters from './components/Filters'; const { Title } = Typography; const Search = Input.Search; -class ListApps extends React.Component { +class Apps extends React.Component { constructor(props) { super(props); this.state = { @@ -99,4 +99,4 @@ class ListApps extends React.Component { } } -export default ListApps; +export default Apps; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/DetailedRating/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/DetailedRating/index.js index 3bfbc814598..df83a5ab63f 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/DetailedRating/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,10 +19,10 @@ import React from 'react'; import { Row, Typography, Icon } from 'antd'; import StarRatings from 'react-star-ratings'; -import './DetailedRating.css'; +import './styles.css'; import axios from 'axios'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; const { Text } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/DetailedRating/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/components/DetailedRating/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/index.js similarity index 85% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/index.js index 8f9773bf690..55c58e88f46 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -17,7 +17,7 @@ */ import React from 'react'; -import ListApps from '../../../components/apps/list-apps/ListApps'; +import AppList from './components/AppList'; class Apps extends React.Component { routes; @@ -30,7 +30,7 @@ class Apps extends React.Component { return (
- +
); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/lifeCycleDetailsModal/lifeCycleDetailsModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/components/lifeCycleDetailsModal/index.js similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/lifeCycleDetailsModal/lifeCycleDetailsModal.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/components/lifeCycleDetailsModal/index.js index 7d2f1610a78..b2683751bf7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/lifeCycleDetailsModal/lifeCycleDetailsModal.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/components/lifeCycleDetailsModal/index.js @@ -19,7 +19,7 @@ import React from 'react'; import { Modal, Button, Tag, List, Typography } from 'antd'; import pSBC from 'shade-blend-color'; -import { withConfigContext } from '../../../../../context/ConfigContext'; +import { withConfigContext } from '../../../../../../../../../../components/ConfigContext'; const { Text } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js index 2b0526e934c..1ac3deb8663 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -29,10 +29,10 @@ import { import axios from 'axios'; import ReactQuill from 'react-quill'; import 'react-quill/dist/quill.snow.css'; -import './LifeCycle.css'; -import LifeCycleDetailsModal from './lifeCycleDetailsModal/lifeCycleDetailsModal'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; +import './styles.css'; +import LifeCycleDetailsModal from './components/lifeCycleDetailsModal'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; const { Text, Title, Paragraph } = Typography; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/LifeCycle/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/EditRelease/index.js similarity index 99% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/EditRelease/index.js index e40b3b3c3c7..efcc2d0c7de 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/EditRelease/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -35,7 +35,7 @@ import { } from 'antd'; import axios from 'axios'; import '@babel/polyfill'; -import { withConfigContext } from '../../../../context/ConfigContext'; +import { withConfigContext } from '../../../../../../../../../../components/ConfigContext'; const { TextArea } = Input; const InputGroup = Input.Group; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/SingleReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/components/Review/index.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/SingleReview.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/components/Review/index.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/index.js similarity index 93% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/index.js index 0a48ad3b6fd..135a9d3fab3 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -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'; +import SingleReview from './components/Review'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../services/utils/errorHandler'; const limit = 5; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/components/Reviews/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js index fd793ecdbc3..3b7c8a186b4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/components/ReleaseView/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,11 +19,11 @@ import React from 'react'; import { Divider, Row, Col, Typography, Button, Icon, Tooltip } from 'antd'; import StarRatings from 'react-star-ratings'; -import Reviews from './review/Reviews'; -import '../../../App.css'; -import DetailedRating from '../detailed-rating/DetailedRating'; -import EditRelease from './edit-release/EditRelease'; -import { withConfigContext } from '../../../context/ConfigContext'; +import Reviews from './components/Reviews'; +import '../../../../../../../../App.css'; +import DetailedRating from '../../../../components/DetailedRating'; +import EditRelease from './components/EditRelease'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; const { Title, Text, Paragraph } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/index.js index 04f91a54ded..72d1b8abf24 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Apps/scenes/Release/index.js @@ -17,13 +17,13 @@ */ import React from 'react'; -import '../../../../App.css'; +import '../../../../../../App.css'; import { Typography, Row, Col, Card, Skeleton } from 'antd'; import axios from 'axios'; -import ReleaseView from '../../../../components/apps/release/ReleaseView'; -import LifeCycle from '../../../../components/apps/release/lifeCycle/LifeCycle'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import { handleApiError } from '../../../../js/Utils'; +import ReleaseView from './components/ReleaseView'; +import LifeCycle from './components/LifeCycle'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; const { Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/components/Categories/index.js similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/components/Categories/index.js index 03df5c54093..930f115a381 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/components/Categories/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -38,8 +38,8 @@ import { import axios from 'axios'; import { TweenOneGroup } from 'rc-tween-one'; import pSBC from 'shade-blend-color'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; const { Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/components/Tags/index.js similarity index 98% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/components/Tags/index.js index 7123aadf7ec..59a4702bc65 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/components/Tags/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -37,8 +37,8 @@ import { } from 'antd'; import axios from 'axios'; import { TweenOneGroup } from 'rc-tween-one'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../services/utils/errorHandler'; const { Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/index.js similarity index 89% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/index.js index 7d835141e63..d6e406760e6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/Manage.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,8 +18,8 @@ import React from 'react'; import { PageHeader, Typography, Breadcrumb, Row, Col, Icon } from 'antd'; -import ManageCategories from '../../../components/manage/categories/ManageCategories'; -import ManageTags from '../../../components/manage/categories/ManageTags'; +import ManageCategories from './components/Categories'; +import ManageTags from './components/Tags'; import { Link } from 'react-router-dom'; const { Paragraph } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/GooglePlayIframe.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/GooglePlayIframe/index.js similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/GooglePlayIframe.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/GooglePlayIframe/index.js index bbaf49f335a..d4ab696d15b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/GooglePlayIframe.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/GooglePlayIframe/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,7 +18,7 @@ import React from 'react'; import { Modal, Button } from 'antd'; -import { withConfigContext } from '../../../context/ConfigContext'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; class GooglePlayIframe extends React.Component { constructor(props) { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/AddNewPage/AddNewPage.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/components/AddNewPage/index.js similarity index 92% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/AddNewPage/AddNewPage.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/components/AddNewPage/index.js index f241af27ba8..c7ac23da3a2 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/AddNewPage/AddNewPage.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/components/AddNewPage/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,9 +19,9 @@ import React from 'react'; import { Button, Divider, Input, Modal, notification, Spin } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../../context/ConfigContext'; +import { withConfigContext } from '../../../../../../../../../../components/ConfigContext'; import { withRouter } from 'react-router'; -import { handleApiError } from '../../../../js/Utils'; +import { handleApiError } from '../../../../../../../../../../services/utils/errorHandler'; class AddNewPage extends React.Component { state = { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Pages.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/index.js similarity index 95% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Pages.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/index.js index 3a7d6a67f0e..a8b2c9ef378 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Pages.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -29,11 +29,11 @@ import { Button, } from 'antd'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import './Pages.css'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; +import './styles.css'; import { Link } from 'react-router-dom'; -import AddNewPage from '../AddNewPage/AddNewPage'; -import { handleApiError } from '../../../../js/Utils'; +import AddNewPage from './components/AddNewPage'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; const { Text, Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Pages.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Pages.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/Pages/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/SyncAndroidApps.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/SyncAndroidApps/index.js similarity index 89% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/SyncAndroidApps.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/SyncAndroidApps/index.js index 51c35c696c9..85021dd9649 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/SyncAndroidApps.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/components/SyncAndroidApps/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,8 +19,8 @@ import React from 'react'; import { Button, notification } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../context/ConfigContext'; -import { handleApiError } from '../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; class SyncAndroidApps extends React.Component { constructor(props) { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/ManageAndroidEnterprise.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/index.js similarity index 81% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/ManageAndroidEnterprise.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/index.js index ec3986c48d2..cf5608ba1ce 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/ManageAndroidEnterprise.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -19,10 +19,10 @@ import React from 'react'; import { PageHeader, Breadcrumb, Divider, Icon } from 'antd'; import { Link } from 'react-router-dom'; -import SyncAndroidApps from '../../../../components/manage/android-enterprise/SyncAndroidApps'; -import { withConfigContext } from '../../../../context/ConfigContext'; -import GooglePlayIframe from '../../../../components/manage/android-enterprise/GooglePlayIframe'; -import Pages from '../../../../components/manage/android-enterprise/Pages/Pages'; +import SyncAndroidApps from './components/SyncAndroidApps'; +import { withConfigContext } from '../../../../../../components/ConfigContext'; +import GooglePlayIframe from './components/GooglePlayIframe'; +import Pages from './components/Pages'; class ManageAndroidEnterprise extends React.Component { routes; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/AddAppsToClusterModal/AddAppsToClusterModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/components/AddAppsToClusterModal/index.js similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/AddAppsToClusterModal/AddAppsToClusterModal.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/components/AddAppsToClusterModal/index.js index 89fa63c6c63..ad434d9cb7c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/AddAppsToClusterModal/AddAppsToClusterModal.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/components/AddAppsToClusterModal/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -18,8 +18,8 @@ import React from 'react'; import { Modal, Icon, Table, Avatar } from 'antd'; -import '../Cluster.css'; -import { withConfigContext } from '../../../../../../context/ConfigContext'; +import '../../styles.css'; +import { withConfigContext } from '../../../../../../../../../../../../components/ConfigContext'; const columns = [ { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/Cluster.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/index.js similarity index 97% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/Cluster.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/index.js index ffed6d4846a..2a38e0ff6f1 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/Cluster.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -31,11 +31,11 @@ import { Typography, } from 'antd'; -import './Cluster.css'; +import './styles.css'; import axios from 'axios'; -import { withConfigContext } from '../../../../../context/ConfigContext'; -import AddAppsToClusterModal from './AddAppsToClusterModal/AddAppsToClusterModal'; -import { handleApiError } from '../../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../components/ConfigContext'; +import AddAppsToClusterModal from './components/AddAppsToClusterModal'; +import { handleApiError } from '../../../../../../../../../../services/utils/errorHandler'; const { Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/Cluster.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/Cluster/Cluster.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/Cluster/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/EditLinks/EditLinks.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/EditLinks/index.js similarity index 94% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/EditLinks/EditLinks.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/EditLinks/index.js index 189eeecb7e5..07e8487f8ff 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/android-enterprise/Pages/EditLinks/EditLinks.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/components/EditLinks/index.js @@ -19,8 +19,8 @@ import React from 'react'; import { Button, Modal, notification, Select, Spin } from 'antd'; import axios from 'axios'; -import { withConfigContext } from '../../../../../context/ConfigContext'; -import { handleApiError } from '../../../../../js/Utils'; +import { withConfigContext } from '../../../../../../../../../../components/ConfigContext'; +import { handleApiError } from '../../../../../../../../../../services/utils/errorHandler'; const { Option } = Select; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/index.js similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/index.js index efc4a424d5e..cf677990714 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/manage/android-enterprise/page/Page.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/scenes/Manage/scenes/AndroidEnterprise/scenes/Page/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -32,11 +32,11 @@ import { Divider, } from 'antd'; import { Link, withRouter } from 'react-router-dom'; -import { withConfigContext } from '../../../../../context/ConfigContext'; +import { withConfigContext } from '../../../../../../../../components/ConfigContext'; import axios from 'axios'; -import Cluster from '../../../../../components/manage/android-enterprise/Pages/Cluster/Cluster'; -import EditLinks from '../../../../../components/manage/android-enterprise/Pages/EditLinks/EditLinks'; -import { handleApiError } from '../../../../../js/Utils'; +import Cluster from './components/Cluster'; +import EditLinks from './components/EditLinks'; +import { handleApiError } from '../../../../../../../../services/utils/errorHandler'; const { Title } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Home/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Login/index.js similarity index 96% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Login/index.js index dfa83bbe183..8c6c619f432 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Login/index.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. + * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved. * * Entgra (pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -28,10 +28,10 @@ import { message, notification, } from 'antd'; -import './Login.css'; +import './styles.css'; import axios from 'axios'; -import './Login.css'; -import { withConfigContext } from '../context/ConfigContext'; +import './styles.css'; +import { withConfigContext } from '../../components/ConfigContext'; const { Title } = Typography; const { Text } = Typography; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Login/styles.css similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/scenes/Login/styles.css diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/serviceWorker.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/services/serviceWorkers/serviceWorker.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/serviceWorker.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/services/serviceWorkers/serviceWorker.js diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/services/utils/errorHandler.js similarity index 100% rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/Utils.js rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/services/utils/errorHandler.js