Update avatar implementation
This commit is contained in:
parent
03a06bd849
commit
93755dfda4
5 changed files with 37 additions and 19 deletions
|
|
@ -159,8 +159,10 @@ const AccountModal = React.forwardRef<HTMLDivElement, Props>(
|
||||||
const user = response.data
|
const user = response.data
|
||||||
|
|
||||||
const cookieObj = {
|
const cookieObj = {
|
||||||
picture: user.avatar.picture,
|
avatar: {
|
||||||
element: user.avatar.element,
|
picture: user.avatar.picture,
|
||||||
|
element: user.avatar.element,
|
||||||
|
},
|
||||||
gender: user.gender,
|
gender: user.gender,
|
||||||
language: user.language,
|
language: user.language,
|
||||||
theme: user.theme,
|
theme: user.theme,
|
||||||
|
|
@ -173,8 +175,11 @@ const AccountModal = React.forwardRef<HTMLDivElement, Props>(
|
||||||
accountState.account.user = {
|
accountState.account.user = {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
username: user.username,
|
username: user.username,
|
||||||
picture: user.avatar.picture,
|
granblueId: '',
|
||||||
element: user.avatar.element,
|
avatar: {
|
||||||
|
picture: user.avatar.picture,
|
||||||
|
element: user.avatar.element,
|
||||||
|
},
|
||||||
language: user.language,
|
language: user.language,
|
||||||
theme: user.theme,
|
theme: user.theme,
|
||||||
gender: user.gender,
|
gender: user.gender,
|
||||||
|
|
|
||||||
|
|
@ -199,10 +199,10 @@ const Header = () => {
|
||||||
image = (
|
image = (
|
||||||
<img
|
<img
|
||||||
alt={user.username}
|
alt={user.username}
|
||||||
className={`profile ${user.element}`}
|
className={`profile ${user.avatar.element}`}
|
||||||
srcSet={`/profile/${user.picture}.png,
|
srcSet={`/profile/${user.avatar.picture}.png,
|
||||||
/profile/${user.picture}@2x.png 2x`}
|
/profile/${user.avatar.picture}@2x.png 2x`}
|
||||||
src={`/profile/${user.picture}.png`}
|
src={`/profile/${user.avatar.picture}.png`}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -264,7 +264,7 @@ const Header = () => {
|
||||||
<AccountModal
|
<AccountModal
|
||||||
open={settingsModalOpen}
|
open={settingsModalOpen}
|
||||||
username={user.username}
|
username={user.username}
|
||||||
picture={user.picture}
|
picture={user.avatar.picture}
|
||||||
gender={user.gender}
|
gender={user.gender}
|
||||||
language={user.language}
|
language={user.language}
|
||||||
theme={user.theme}
|
theme={user.theme}
|
||||||
|
|
|
||||||
|
|
@ -161,8 +161,10 @@ const LoginModal = (props: Props) => {
|
||||||
setCookie(
|
setCookie(
|
||||||
'user',
|
'user',
|
||||||
{
|
{
|
||||||
picture: user.avatar.picture,
|
avatar: {
|
||||||
element: user.avatar.element,
|
picture: user.avatar.picture,
|
||||||
|
element: user.avatar.element,
|
||||||
|
},
|
||||||
language: user.language,
|
language: user.language,
|
||||||
gender: user.gender,
|
gender: user.gender,
|
||||||
theme: user.theme,
|
theme: user.theme,
|
||||||
|
|
@ -174,8 +176,11 @@ const LoginModal = (props: Props) => {
|
||||||
accountState.account.user = {
|
accountState.account.user = {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
username: user.username,
|
username: user.username,
|
||||||
picture: user.avatar.picture,
|
granblueId: '',
|
||||||
element: user.avatar.element,
|
avatar: {
|
||||||
|
picture: user.avatar.picture,
|
||||||
|
element: user.avatar.element,
|
||||||
|
},
|
||||||
gender: user.gender,
|
gender: user.gender,
|
||||||
language: user.language,
|
language: user.language,
|
||||||
theme: user.theme,
|
theme: user.theme,
|
||||||
|
|
|
||||||
|
|
@ -121,8 +121,10 @@ const SignupModal = (props: Props) => {
|
||||||
setCookie(
|
setCookie(
|
||||||
'user',
|
'user',
|
||||||
{
|
{
|
||||||
picture: user.avatar.picture,
|
avatar: {
|
||||||
element: user.avatar.element,
|
picture: user.avatar.picture,
|
||||||
|
element: user.avatar.element,
|
||||||
|
},
|
||||||
language: user.language,
|
language: user.language,
|
||||||
gender: user.gender,
|
gender: user.gender,
|
||||||
theme: user.theme,
|
theme: user.theme,
|
||||||
|
|
@ -134,8 +136,11 @@ const SignupModal = (props: Props) => {
|
||||||
accountState.account.user = {
|
accountState.account.user = {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
username: user.username,
|
username: user.username,
|
||||||
picture: user.avatar.picture,
|
granblueId: '',
|
||||||
element: user.avatar.element,
|
avatar: {
|
||||||
|
picture: user.avatar.picture,
|
||||||
|
element: user.avatar.element,
|
||||||
|
},
|
||||||
gender: user.gender,
|
gender: user.gender,
|
||||||
language: user.language,
|
language: user.language,
|
||||||
theme: user.theme,
|
theme: user.theme,
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,11 @@ function MyApp({ Component, pageProps }: AppProps) {
|
||||||
accountState.account.user = {
|
accountState.account.user = {
|
||||||
id: cookieData.account.userId,
|
id: cookieData.account.userId,
|
||||||
username: cookieData.account.username,
|
username: cookieData.account.username,
|
||||||
picture: cookieData.user.picture,
|
granblueId: '',
|
||||||
element: cookieData.user.element,
|
avatar: {
|
||||||
|
picture: cookieData.user.avatar.picture,
|
||||||
|
element: cookieData.user.avatar.element,
|
||||||
|
},
|
||||||
gender: cookieData.user.gender,
|
gender: cookieData.user.gender,
|
||||||
language: cookieData.user.language,
|
language: cookieData.user.language,
|
||||||
theme: cookieData.user.theme,
|
theme: cookieData.user.theme,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue