diff --git a/build/flecks.yml b/build/flecks.yml index 784f03a..45022de 100644 --- a/build/flecks.yml +++ b/build/flecks.yml @@ -49,6 +49,7 @@ show: false quitOnClosed: false '@flecks/governor': {} +'@flecks/passport-local-react': {} '@flecks/react': {} '@flecks/react/router': {} '@flecks/redis': {} @@ -62,9 +63,6 @@ - '--inspect' '@flecks/socket': {} '@flecks/socket/server': {} -'@flecks/user': {} -'@flecks/user/local': {} -'@flecks/user/session': {} '@flecks/web': {} '@flecks/web/client': {} '@flecks/web/server': diff --git a/package.json b/package.json index 77673c4..d9354ec 100644 --- a/package.json +++ b/package.json @@ -43,13 +43,13 @@ "@flecks/dox": "^2.0.3", "@flecks/electron": "^2.0.3", "@flecks/governor": "^2.0.3", + "@flecks/passport-local-react": "^2.0.3", "@flecks/react": "^2.0.3", "@flecks/redis": "^2.0.3", "@flecks/redux": "^2.0.3", "@flecks/repl": "^2.0.3", "@flecks/server": "^2.0.3", "@flecks/socket": "^2.0.3", - "@flecks/user": "^2.0.3", "@flecks/web": "^2.0.3", "@humus/combat": "^2.1.0", "@humus/core": "^2.1.0", diff --git a/packages/bootstrap/src/server.js b/packages/bootstrap/src/server.js index d1a43df..6531acc 100644 --- a/packages/bootstrap/src/server.js +++ b/packages/bootstrap/src/server.js @@ -21,6 +21,6 @@ export const hooks = { await user.save(); } }, - {after: '@flecks/user/local/server'}, + {after: '@flecks/passport/server'}, ), }; diff --git a/packages/core/package.json b/packages/core/package.json index a37b3e7..78db3e9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -26,9 +26,10 @@ "@avocado/resource": "^3.0.0", "@flecks/core": "^2.0.3", "@flecks/db": "^2.0.3", + "@flecks/passport": "^2.0.3", + "@flecks/passport-react": "^2.0.3", "@flecks/react": "^2.0.3", "@flecks/redux": "^2.0.3", - "@flecks/user": "^2.0.3", "express": "^4.17.1", "fast-json-patch": "^3.0.0-1", "is-electron": "^2.2.1", diff --git a/packages/core/src/components/persea/resource/index.jsx b/packages/core/src/components/persea/resource/index.jsx index 92e30e4..bc45201 100644 --- a/packages/core/src/components/persea/resource/index.jsx +++ b/packages/core/src/components/persea/resource/index.jsx @@ -1,15 +1,15 @@ import {basename} from 'path'; +import {Context, Resource as ResourceComponent} from '@avocado/resource/persea'; +import {classnames, PropTypes, React} from '@flecks/react'; import { Tab, Tabs, TabList, TabPanel, -} from '@avocado/react'; -import {Context, Resource as ResourceComponent} from '@avocado/resource/persea'; -import {classnames, PropTypes, React} from '@flecks/react'; +} from '@flecks/react/tabs'; import {useDispatch, useSelector} from '@flecks/redux'; -import {userIdSelector} from '@flecks/user'; +import {userIdSelector} from '@flecks/passport'; import { closeResource, currentResourceSelector, diff --git a/packages/core/src/components/persea/resource/login/index.jsx b/packages/core/src/components/persea/resource/login/index.jsx index f910bcc..806c178 100644 --- a/packages/core/src/components/persea/resource/login/index.jsx +++ b/packages/core/src/components/persea/resource/login/index.jsx @@ -1,12 +1,12 @@ +import {Login as PassportLogin} from '@flecks/passport-react'; import {React} from '@flecks/react'; -import {UserLocalLogin} from '@flecks/user/local'; import styles from './index.module.scss'; function Login() { return (
- +
); } diff --git a/packages/core/src/electron/server.js b/packages/core/src/electron/server.js index af2919f..e18929e 100644 --- a/packages/core/src/electron/server.js +++ b/packages/core/src/electron/server.js @@ -34,6 +34,6 @@ export const hooks = { } next(); }, - {after: '@flecks/user/server'}, + {after: '@flecks/passport/server'}, ), };