(Chore): Moved mui components under primitives/mui (#7795)

* (Chore): Moved mui components under primitives/mui

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): updated imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* Use > on number only (#7798)

* add condition to allow guests to log in while not having any identity provider (#7797)

* add condition to allow guests to log in while not having any identity provider

* tests

* Fixed issue of branch-build being running twice on a PR.

* Added branch-build action for push on dev

* (Chore): updated imports left over imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): updated imports left over imports

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* (Chore): Fixed path imports for tailwind

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

* resolved conflicts

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>

---------

Signed-off-by: Abhijay Jain <Abhijay007j@gmail.com>
Co-authored-by: lonedevr <102248647+AidanCaruso@users.noreply.github.com>
Co-authored-by: Josh Field <joshfield999@gmail.com>
Co-authored-by: hanzlamateen <hanzlamateen@live.com>

.env.local.default

@@ -83,7 +83,7 @@ LOCAL_STORAGE_PROVIDER_PORT=8642
 GOOGLE_ANALYTICS_TRACKING_ID=
 HUB_ENDPOINT=https://etherealengine.io
 INSTANCESERVER_UNREACHABLE_TIMEOUT_SECONDS=10
-CLONE_STATIC_RESOURCES=false
+
 
 
 MATCHMAKER_EMULATION_MODE=true

.github/workflows/documentation.yml

@@ -57,9 +57,8 @@ jobs:
         env:
           NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Release to GitHub Pages
-        timeout-minutes: 200
         env:
-          NODE_OPTIONS: --max_old_space_size=16384
+          NODE_OPTIONS: --max_old_space_size=8192
           USE_SSH: true
           GIT_USER: git
           DEPLOYMENT_BRANCH: gh-pages

.vscode/launch.json

@@ -29,7 +29,7 @@
             "type": "chrome",
             "request": "launch",
             "name": "Chrome",
-            "url": "https://localhost:3000",
+            "url": "https://localhost:3000/admin",
             "runtimeArgs": [
                 "--ignore-certificate-errors",
                 "--unsafely-treat-insecure-origin-as-secure=https://localhost:3000"
@@ -96,12 +96,6 @@
             "request": "launch",
             "type": "node-terminal",
         },
-        {
-            "command": "npm run prepare-database",
-            "name": "npm run prepare-database",
-            "request": "launch",
-            "type": "node-terminal",
-        },
         {
             "command": "npm run dev-taskserver",
             "name": "npm run dev-taskserver",

.vscode/settings.json

@@ -12,8 +12,7 @@
   "scm.alwaysShowRepositories": true,
   "scm.repositories.visible": 0,
   "i18n-ally.localesPaths": [
-    "packages/client-core/i18n",
-    "packages/client/i18n"
+    "packages/client-core/i18n"
   ],
   "i18n-ally.keystyle": "nested",
   "i18n-ally.namespace": true

dockerfiles/builder/Dockerfile-builder

@@ -22,8 +22,6 @@ RUN npm install --loglevel notice --legacy-peer-deps
 
 COPY . .
 
-CMD ["scripts/strip-engine.sh"]
-
 # copy then compile the code
 
 ENV APP_ENV=production

package.json

@@ -73,6 +73,7 @@
     "postinstall": "patch-package",
     "precommit": "no-master-commits -b master",
     "prepare-database": "cross-env APP_ENV=production PREPARE_DATABASE=true EXIT_ON_DB_INIT=true ts-node --swc packages/server/src/index.ts",
+    "pretest": "cross-env TEST=true npm run dev-reinit",
     "publish": "lerna publish from-package --yes --registry https://registry.npmjs.org",
     "publish-npm": "lerna publish from-package --yes --no-verify-access --ignore-scripts --registry https://registry.npmjs.org",
     "publish-github": "lerna publish from-package --yes --no-verify-access --ignore-scripts --registry https://npm.pkg.github.com",
@@ -144,7 +145,6 @@
     "@feathersjs/feathers": "5.0.0",
     "app-root-path": "3.0.0",
     "cli": "1.0.1",
-    "daisyui": "^2.51.4",
     "dotenv": "14.3.2",
     "fix-esm": "^1.0.1",
     "lerna": "4.0.0",
@@ -154,7 +154,6 @@
     "postcss": "^8.4.16",
     "qrcode.react": "^3.1.0",
     "react-json-view": "^1.21.3",
-    "tailwindcss": "^3.2.7",
     "three": "0.150.1",
     "ts-node": "10.8.2",
     "typescript": "4.9.5",

packages/client-core/src/admin/adminRoutes.tsx

@@ -6,7 +6,7 @@ import { Engine } from '@etherealengine/engine/src/ecs/classes/Engine'
 import { EngineActions } from '@etherealengine/engine/src/ecs/classes/EngineState'
 import { initSystems } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
 import { dispatchAction } from '@etherealengine/hyperflux'
-import Dashboard from '@etherealengine/ui/src/Dashboard'
+import Dashboard from '@etherealengine/ui/src/primitives/mui/Dashboard'
 
 import { LoadingCircle } from '../components/LoadingCircle'
 import AdminSystem from '../systems/AdminSystem'

packages/client-core/src/admin/common/AddCommand.tsx

@@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next'
 
 import InputText from '@etherealengine/client-core/src/common/components/InputText'
 import { BotCommands } from '@etherealengine/common/src/interfaces/AdminBot'
-import Button from '@etherealengine/ui/src/Button'
-import Grid from '@etherealengine/ui/src/Grid'
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
-import List from '@etherealengine/ui/src/List'
-import ListItem from '@etherealengine/ui/src/ListItem'
-import ListItemSecondaryAction from '@etherealengine/ui/src/ListItemSecondaryAction'
-import ListItemText from '@etherealengine/ui/src/ListItemText'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Grid from '@etherealengine/ui/src/primitives/mui/Grid'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
+import List from '@etherealengine/ui/src/primitives/mui/List'
+import ListItem from '@etherealengine/ui/src/primitives/mui/ListItem'
+import ListItemSecondaryAction from '@etherealengine/ui/src/primitives/mui/ListItemSecondaryAction'
+import ListItemText from '@etherealengine/ui/src/primitives/mui/ListItemText'
 
 import styles from '../styles/admin.module.scss'
 

packages/client-core/src/admin/common/Search.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
-import InputBase from '@etherealengine/ui/src/InputBase'
-import Paper from '@etherealengine/ui/src/Paper'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
+import InputBase from '@etherealengine/ui/src/primitives/mui/InputBase'
+import Paper from '@etherealengine/ui/src/primitives/mui/Paper'
 
 import { SxProps, Theme } from '@mui/material/styles'
 

packages/client-core/src/admin/common/SketchColorPicker.tsx

@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react'
 import { SketchPicker } from 'react-color'
 
-import Button from '@etherealengine/ui/src/Button'
-import Popover from '@etherealengine/ui/src/Popover'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Popover from '@etherealengine/ui/src/primitives/mui/Popover'
 
 interface SketchColorPickerProps {
   name: string

packages/client-core/src/admin/common/SubmitDialog.tsx

@@ -1,14 +1,14 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import Box from '@etherealengine/ui/src/Box'
-import Button from '@etherealengine/ui/src/Button'
-import Dialog from '@etherealengine/ui/src/Dialog'
-import DialogActions from '@etherealengine/ui/src/DialogActions'
-import DialogContent from '@etherealengine/ui/src/DialogContent'
-import DialogContentText from '@etherealengine/ui/src/DialogContentText'
-import DialogTitle from '@etherealengine/ui/src/DialogTitle'
-import TextField from '@etherealengine/ui/src/TextField'
+import Box from '@etherealengine/ui/src/primitives/mui/Box'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Dialog from '@etherealengine/ui/src/primitives/mui/Dialog'
+import DialogActions from '@etherealengine/ui/src/primitives/mui/DialogActions'
+import DialogContent from '@etherealengine/ui/src/primitives/mui/DialogContent'
+import DialogContentText from '@etherealengine/ui/src/primitives/mui/DialogContentText'
+import DialogTitle from '@etherealengine/ui/src/primitives/mui/DialogTitle'
+import TextField from '@etherealengine/ui/src/primitives/mui/TextField'
 
 import ProfileMenu from '../../user/components/UserMenu/menus/ProfileMenu'
 import SettingMenu from '../../user/components/UserMenu/menus/SettingMenu'

packages/client-core/src/admin/common/Table.tsx

@@ -1,14 +1,14 @@
 import React from 'react'
 
-import Box from '@etherealengine/ui/src/Box'
-import Table from '@etherealengine/ui/src/Table'
-import TableBody from '@etherealengine/ui/src/TableBody'
-import TableCell from '@etherealengine/ui/src/TableCell'
-import TableContainer from '@etherealengine/ui/src/TableContainer'
-import TableHead from '@etherealengine/ui/src/TableHead'
-import TablePagination from '@etherealengine/ui/src/TablePagination'
-import TableRow from '@etherealengine/ui/src/TableRow'
-import TableSortLabel from '@etherealengine/ui/src/TableSortLabel'
+import Box from '@etherealengine/ui/src/primitives/mui/Box'
+import Table from '@etherealengine/ui/src/primitives/mui/Table'
+import TableBody from '@etherealengine/ui/src/primitives/mui/TableBody'
+import TableCell from '@etherealengine/ui/src/primitives/mui/TableCell'
+import TableContainer from '@etherealengine/ui/src/primitives/mui/TableContainer'
+import TableHead from '@etherealengine/ui/src/primitives/mui/TableHead'
+import TablePagination from '@etherealengine/ui/src/primitives/mui/TablePagination'
+import TableRow from '@etherealengine/ui/src/primitives/mui/TableRow'
+import TableSortLabel from '@etherealengine/ui/src/primitives/mui/TableSortLabel'
 
 import { visuallyHidden } from '@mui/utils'
 

packages/client-core/src/admin/components/Analytics/ApiLinks.tsx

@@ -1,21 +1,21 @@
 import clsx from 'clsx'
 import React from 'react'
 
-import Checkbox from '@etherealengine/ui/src/Checkbox'
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
-import Paper from '@etherealengine/ui/src/Paper'
-import Table from '@etherealengine/ui/src/Table'
-import TableBody from '@etherealengine/ui/src/TableBody'
-import TableCell from '@etherealengine/ui/src/TableCell'
-import TableContainer from '@etherealengine/ui/src/TableContainer'
-import TableHead from '@etherealengine/ui/src/TableHead'
-import TablePagination from '@etherealengine/ui/src/TablePagination'
-import TableRow from '@etherealengine/ui/src/TableRow'
-import TableSortLabel from '@etherealengine/ui/src/TableSortLabel'
-import Toolbar from '@etherealengine/ui/src/Toolbar'
-import Tooltip from '@etherealengine/ui/src/Tooltip'
-import Typography from '@etherealengine/ui/src/Typography'
+import Checkbox from '@etherealengine/ui/src/primitives/mui/Checkbox'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
+import Paper from '@etherealengine/ui/src/primitives/mui/Paper'
+import Table from '@etherealengine/ui/src/primitives/mui/Table'
+import TableBody from '@etherealengine/ui/src/primitives/mui/TableBody'
+import TableCell from '@etherealengine/ui/src/primitives/mui/TableCell'
+import TableContainer from '@etherealengine/ui/src/primitives/mui/TableContainer'
+import TableHead from '@etherealengine/ui/src/primitives/mui/TableHead'
+import TablePagination from '@etherealengine/ui/src/primitives/mui/TablePagination'
+import TableRow from '@etherealengine/ui/src/primitives/mui/TableRow'
+import TableSortLabel from '@etherealengine/ui/src/primitives/mui/TableSortLabel'
+import Toolbar from '@etherealengine/ui/src/primitives/mui/Toolbar'
+import Tooltip from '@etherealengine/ui/src/primitives/mui/Tooltip'
+import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import { lighten, Theme } from '@mui/material/styles'
 import createStyles from '@mui/styles/createStyles'

packages/client-core/src/admin/components/Analytics/CardNumber.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 
-import Card from '@etherealengine/ui/src/Card'
-import CardContent from '@etherealengine/ui/src/CardContent'
-import Typography from '@etherealengine/ui/src/Typography'
+import Card from '@etherealengine/ui/src/primitives/mui/Card'
+import CardContent from '@etherealengine/ui/src/primitives/mui/CardContent'
+import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import styles from '../../styles/admin.module.scss'
 

packages/client-core/src/admin/components/Analytics/index.tsx

@@ -3,10 +3,10 @@ import moment from 'moment'
 import React, { useEffect } from 'react'
 
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Box from '@etherealengine/ui/src/Box'
-import TextField from '@etherealengine/ui/src/TextField'
-import ToggleButton from '@etherealengine/ui/src/ToggleButton'
-import ToggleButtonGroup from '@etherealengine/ui/src/ToggleButtonGroup'
+import Box from '@etherealengine/ui/src/primitives/mui/Box'
+import TextField from '@etherealengine/ui/src/primitives/mui/TextField'
+import ToggleButton from '@etherealengine/ui/src/primitives/mui/ToggleButton'
+import ToggleButtonGroup from '@etherealengine/ui/src/primitives/mui/ToggleButtonGroup'
 
 import DateAdapter from '@mui/lab/AdapterMoment'
 import LocalizationProvider from '@mui/lab/LocalizationProvider'

packages/client-core/src/admin/components/Avatars/AvatarDrawer.tsx

@@ -22,16 +22,16 @@ import { AssetLoader } from '@etherealengine/engine/src/assets/classes/AssetLoad
 import { AvatarRigComponent } from '@etherealengine/engine/src/avatar/components/AvatarAnimationComponent'
 import { getOptionalComponent } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
 import { dispatchAction, getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Box from '@etherealengine/ui/src/Box'
-import Button from '@etherealengine/ui/src/Button'
-import Container from '@etherealengine/ui/src/Container'
-import DialogActions from '@etherealengine/ui/src/DialogActions'
-import DialogTitle from '@etherealengine/ui/src/DialogTitle'
-import FormControl from '@etherealengine/ui/src/FormControl'
-import FormHelperText from '@etherealengine/ui/src/FormHelperText'
-import Icon from '@etherealengine/ui/src/Icon'
-import Tooltip from '@etherealengine/ui/src/Tooltip'
-import Typography from '@etherealengine/ui/src/Typography'
+import Box from '@etherealengine/ui/src/primitives/mui/Box'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Container from '@etherealengine/ui/src/primitives/mui/Container'
+import DialogActions from '@etherealengine/ui/src/primitives/mui/DialogActions'
+import DialogTitle from '@etherealengine/ui/src/primitives/mui/DialogTitle'
+import FormControl from '@etherealengine/ui/src/primitives/mui/FormControl'
+import FormHelperText from '@etherealengine/ui/src/primitives/mui/FormHelperText'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import Tooltip from '@etherealengine/ui/src/primitives/mui/Tooltip'
+import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import { NotificationService } from '../../../common/services/NotificationService'
 import { loadAvatarForPreview, resetAnimationLogic } from '../../../user/components/Panel3D/helperFunctions'

packages/client-core/src/admin/components/Avatars/AvatarTable.tsx

@@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next'
 import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog'
 import { AvatarInterface } from '@etherealengine/common/src/interfaces/AvatarInterface'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Box from '@etherealengine/ui/src/Box'
-import Checkbox from '@etherealengine/ui/src/Checkbox'
+import Box from '@etherealengine/ui/src/primitives/mui/Box'
+import Checkbox from '@etherealengine/ui/src/primitives/mui/Checkbox'
 
 import { AuthState } from '../../../user/services/AuthService'
 import TableComponent from '../../common/Table'

packages/client-core/src/admin/components/Avatars/index.tsx

@@ -9,11 +9,11 @@ import { RendererModule } from '@etherealengine/engine/src/renderer/RendererModu
 import { SceneClientModule } from '@etherealengine/engine/src/scene/SceneClientModule'
 import { SceneCommonModule } from '@etherealengine/engine/src/scene/SceneCommonModule'
 import { TransformModule } from '@etherealengine/engine/src/transform/TransformModule'
-import Box from '@etherealengine/ui/src/Box'
-import Button from '@etherealengine/ui/src/Button'
-import Grid from '@etherealengine/ui/src/Grid'
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
+import Box from '@etherealengine/ui/src/primitives/mui/Box'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Grid from '@etherealengine/ui/src/primitives/mui/Grid'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
 
 import Search from '../../common/Search'
 import { AdminAvatarService } from '../../services/AvatarService'

packages/client-core/src/admin/components/Benchmarking/index.tsx

@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next'
 
 import multiLogger from '@etherealengine/common/src/logger'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Button from '@etherealengine/ui/src/Button'
-import Grid from '@etherealengine/ui/src/Grid'
-import Typography from '@etherealengine/ui/src/Typography'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Grid from '@etherealengine/ui/src/primitives/mui/Grid'
+import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import { AdminTestBotState, TestBotService } from '../../services/TestBotService'
 import styles from '../../styles/admin.module.scss'

packages/client-core/src/admin/components/Bots/CreateBot.tsx

@@ -8,13 +8,13 @@ import { BotCommands, CreateBotAsAdmin } from '@etherealengine/common/src/interf
 import { Instance } from '@etherealengine/common/src/interfaces/Instance'
 import capitalizeFirstLetter from '@etherealengine/common/src/utils/capitalizeFirstLetter'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Button from '@etherealengine/ui/src/Button'
-import Card from '@etherealengine/ui/src/Card'
-import CardContent from '@etherealengine/ui/src/CardContent'
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
-import Paper from '@etherealengine/ui/src/Paper'
-import Typography from '@etherealengine/ui/src/Typography'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Card from '@etherealengine/ui/src/primitives/mui/Card'
+import CardContent from '@etherealengine/ui/src/primitives/mui/CardContent'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
+import Paper from '@etherealengine/ui/src/primitives/mui/Paper'
+import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import { NotificationService } from '../../../common/services/NotificationService'
 import { AuthState } from '../../../user/services/AuthService'

packages/client-core/src/admin/components/Bots/DisplayBots.tsx

@@ -4,13 +4,13 @@ import { useTranslation } from 'react-i18next'
 import ConfirmDialog from '@etherealengine/client-core/src/common/components/ConfirmDialog'
 import { AdminBot, BotCommands, CreateBotCammand } from '@etherealengine/common/src/interfaces/AdminBot'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Accordion from '@etherealengine/ui/src/Accordion'
-import AccordionDetails from '@etherealengine/ui/src/AccordionDetails'
-import AccordionSummary from '@etherealengine/ui/src/AccordionSummary'
-import Grid from '@etherealengine/ui/src/Grid'
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
-import Typography from '@etherealengine/ui/src/Typography'
+import Accordion from '@etherealengine/ui/src/primitives/mui/Accordion'
+import AccordionDetails from '@etherealengine/ui/src/primitives/mui/AccordionDetails'
+import AccordionSummary from '@etherealengine/ui/src/primitives/mui/AccordionSummary'
+import Grid from '@etherealengine/ui/src/primitives/mui/Grid'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
+import Typography from '@etherealengine/ui/src/primitives/mui/Typography'
 
 import { NotificationService } from '../../../common/services/NotificationService'
 import { AuthState } from '../../../user/services/AuthService'

packages/client-core/src/admin/components/Bots/UpdateBot.tsx

@@ -7,13 +7,13 @@ import { CreateBotAsAdmin } from '@etherealengine/common/src/interfaces/AdminBot
 import { AdminBot } from '@etherealengine/common/src/interfaces/AdminBot'
 import { Instance } from '@etherealengine/common/src/interfaces/Instance'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
-import Button from '@etherealengine/ui/src/Button'
-import Dialog from '@etherealengine/ui/src/Dialog'
-import DialogActions from '@etherealengine/ui/src/DialogActions'
-import DialogContent from '@etherealengine/ui/src/DialogContent'
-import DialogTitle from '@etherealengine/ui/src/DialogTitle'
-import Icon from '@etherealengine/ui/src/Icon'
-import IconButton from '@etherealengine/ui/src/IconButton'
+import Button from '@etherealengine/ui/src/primitives/mui/Button'
+import Dialog from '@etherealengine/ui/src/primitives/mui/Dialog'
+import DialogActions from '@etherealengine/ui/src/primitives/mui/DialogActions'
+import DialogContent from '@etherealengine/ui/src/primitives/mui/DialogContent'
+import DialogTitle from '@etherealengine/ui/src/primitives/mui/DialogTitle'
+import Icon from '@etherealengine/ui/src/primitives/mui/Icon'
+import IconButton from '@etherealengine/ui/src/primitives/mui/IconButton'
 
 import { NotificationService } from '../../../common/services/NotificationService'
 import { AuthState } from '../../../user/services/AuthService'