refactor: user and session
This commit is contained in:
parent
196d128e83
commit
0b708db7db
|
@ -49,6 +49,7 @@
|
||||||
show: false
|
show: false
|
||||||
quitOnClosed: false
|
quitOnClosed: false
|
||||||
'@flecks/governor': {}
|
'@flecks/governor': {}
|
||||||
|
'@flecks/passport-local-react': {}
|
||||||
'@flecks/react': {}
|
'@flecks/react': {}
|
||||||
'@flecks/react/router': {}
|
'@flecks/react/router': {}
|
||||||
'@flecks/redis': {}
|
'@flecks/redis': {}
|
||||||
|
@ -62,9 +63,6 @@
|
||||||
- '--inspect'
|
- '--inspect'
|
||||||
'@flecks/socket': {}
|
'@flecks/socket': {}
|
||||||
'@flecks/socket/server': {}
|
'@flecks/socket/server': {}
|
||||||
'@flecks/user': {}
|
|
||||||
'@flecks/user/local': {}
|
|
||||||
'@flecks/user/session': {}
|
|
||||||
'@flecks/web': {}
|
'@flecks/web': {}
|
||||||
'@flecks/web/client': {}
|
'@flecks/web/client': {}
|
||||||
'@flecks/web/server':
|
'@flecks/web/server':
|
||||||
|
|
|
@ -43,13 +43,13 @@
|
||||||
"@flecks/dox": "^2.0.3",
|
"@flecks/dox": "^2.0.3",
|
||||||
"@flecks/electron": "^2.0.3",
|
"@flecks/electron": "^2.0.3",
|
||||||
"@flecks/governor": "^2.0.3",
|
"@flecks/governor": "^2.0.3",
|
||||||
|
"@flecks/passport-local-react": "^2.0.3",
|
||||||
"@flecks/react": "^2.0.3",
|
"@flecks/react": "^2.0.3",
|
||||||
"@flecks/redis": "^2.0.3",
|
"@flecks/redis": "^2.0.3",
|
||||||
"@flecks/redux": "^2.0.3",
|
"@flecks/redux": "^2.0.3",
|
||||||
"@flecks/repl": "^2.0.3",
|
"@flecks/repl": "^2.0.3",
|
||||||
"@flecks/server": "^2.0.3",
|
"@flecks/server": "^2.0.3",
|
||||||
"@flecks/socket": "^2.0.3",
|
"@flecks/socket": "^2.0.3",
|
||||||
"@flecks/user": "^2.0.3",
|
|
||||||
"@flecks/web": "^2.0.3",
|
"@flecks/web": "^2.0.3",
|
||||||
"@humus/combat": "^2.1.0",
|
"@humus/combat": "^2.1.0",
|
||||||
"@humus/core": "^2.1.0",
|
"@humus/core": "^2.1.0",
|
||||||
|
|
|
@ -21,6 +21,6 @@ export const hooks = {
|
||||||
await user.save();
|
await user.save();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{after: '@flecks/user/local/server'},
|
{after: '@flecks/passport/server'},
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,9 +26,10 @@
|
||||||
"@avocado/resource": "^3.0.0",
|
"@avocado/resource": "^3.0.0",
|
||||||
"@flecks/core": "^2.0.3",
|
"@flecks/core": "^2.0.3",
|
||||||
"@flecks/db": "^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/react": "^2.0.3",
|
||||||
"@flecks/redux": "^2.0.3",
|
"@flecks/redux": "^2.0.3",
|
||||||
"@flecks/user": "^2.0.3",
|
|
||||||
"express": "^4.17.1",
|
"express": "^4.17.1",
|
||||||
"fast-json-patch": "^3.0.0-1",
|
"fast-json-patch": "^3.0.0-1",
|
||||||
"is-electron": "^2.2.1",
|
"is-electron": "^2.2.1",
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
import {basename} from 'path';
|
import {basename} from 'path';
|
||||||
|
|
||||||
|
import {Context, Resource as ResourceComponent} from '@avocado/resource/persea';
|
||||||
|
import {classnames, PropTypes, React} from '@flecks/react';
|
||||||
import {
|
import {
|
||||||
Tab,
|
Tab,
|
||||||
Tabs,
|
Tabs,
|
||||||
TabList,
|
TabList,
|
||||||
TabPanel,
|
TabPanel,
|
||||||
} from '@avocado/react';
|
} from '@flecks/react/tabs';
|
||||||
import {Context, Resource as ResourceComponent} from '@avocado/resource/persea';
|
|
||||||
import {classnames, PropTypes, React} from '@flecks/react';
|
|
||||||
import {useDispatch, useSelector} from '@flecks/redux';
|
import {useDispatch, useSelector} from '@flecks/redux';
|
||||||
import {userIdSelector} from '@flecks/user';
|
import {userIdSelector} from '@flecks/passport';
|
||||||
import {
|
import {
|
||||||
closeResource,
|
closeResource,
|
||||||
currentResourceSelector,
|
currentResourceSelector,
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
|
import {Login as PassportLogin} from '@flecks/passport-react';
|
||||||
import {React} from '@flecks/react';
|
import {React} from '@flecks/react';
|
||||||
import {UserLocalLogin} from '@flecks/user/local';
|
|
||||||
|
|
||||||
import styles from './index.module.scss';
|
import styles from './index.module.scss';
|
||||||
|
|
||||||
function Login() {
|
function Login() {
|
||||||
return (
|
return (
|
||||||
<div className={styles.login}>
|
<div className={styles.login}>
|
||||||
<UserLocalLogin />
|
<PassportLogin />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,6 @@ export const hooks = {
|
||||||
}
|
}
|
||||||
next();
|
next();
|
||||||
},
|
},
|
||||||
{after: '@flecks/user/server'},
|
{after: '@flecks/passport/server'},
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user