diff --git a/src/assets/user-info-settings/index.css b/src/assets/user-info-settings/index.css index 09ceb5b..cb95c0d 100644 --- a/src/assets/user-info-settings/index.css +++ b/src/assets/user-info-settings/index.css @@ -20,7 +20,6 @@ button:active, header { position: relative; - background: #37A985; color: #FFF; height: 70px; line-height: 70px; @@ -42,8 +41,8 @@ input[type="submit"] { font-family: Poppins, Arial, Helvetica, sans-serif; color: #45297A; min-width: 200px; - box-sizing: content-box; -webkit-box-sizing: content-box; + box-sizing: content-box; -webkit-box-align: center; -webkit-box-pack: center; min-height: 60px; @@ -58,7 +57,7 @@ input[type="submit"] { } .body-content { - margin: 30px 60px 0 200px; + margin: 30px 60px 0 220px; } div.group h2 { @@ -82,6 +81,8 @@ div.group > * { div.group > p.content, div.group > input[type="text"], +div.group > input[type="date"], +div.group > textarea, div.group > select { background: #FFF; color: #6A6C75; @@ -93,17 +94,18 @@ div.group > select { width: 100%; height: 58px; box-sizing: border-box; - appearance: none; - -webkit-appearance: none; -moz-appearance: none; + -webkit-appearance: none; + appearance: none; text-indent: 1px; text-overflow: ''; line-height: 38px; - user-select: none; + resize: none; } -div.group > input[type="text"] { - color: #000; +div.group > input[type="text"], +div.group > input[type="date"] { + color: #9D6FF3; } div.group > select { @@ -126,20 +128,22 @@ div.group > svg { border: none; height: 40px; width: 40px; - box-sizing: border-box; - user-select: none; padding: 0px; margin-bottom: -10px; margin-left: 5px; + -webkit-box-sizing: border-box; + -webkit-user-select: none; + box-sizing: border-box; + user-select: none; } .account-info { float: left; - width: 200px; - box-sizing: content-box; + width: 220px; -webkit-box-sizing: content-box; -webkit-box-align: center; -webkit-box-pack: center; + box-sizing: content-box; } .account-info > img { @@ -149,7 +153,7 @@ div.group > svg { overflow: hidden; border-radius: 100%; background: #E4DBF2; - margin: 30px 30px 0 35px; + margin: 30px 30px 0 46px; box-shadow: 0-1px 2px rgba(0, 0, 0, 0.4); } @@ -208,7 +212,7 @@ div.group > svg { } .account-info .tier-name { - margin: 12px auto; + margin: 5px auto; line-height: 1.2em; border-radius: 1.2em; border-width: 2px; @@ -233,7 +237,7 @@ div.radio { .server-selection input { opacity: 0; position: absolute; - width: 200px; + width: 130px; height: 70px; cursor: pointer; } @@ -241,9 +245,10 @@ div.radio { div.radio label { display: inline-block; color: #6A6C75; - min-width: 200px; - box-sizing: content-box; + padding: 0 10px; + min-width: 110px; -webkit-box-sizing: content-box; + box-sizing: content-box; -webkit-box-align: center; -webkit-box-pack: center; text-align: center; @@ -254,6 +259,11 @@ div.radio label { margin: 5px; font-weight: normal; font-size: 15px; + -o-border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + -ms-border-radius: 10px; + border-radius: 10px; } div.radio label h2 { diff --git a/src/services/nnas/routes/account-settings.ts b/src/services/nnas/routes/account-settings.ts index 58fa669..dc80fb2 100644 --- a/src/services/nnas/routes/account-settings.ts +++ b/src/services/nnas/routes/account-settings.ts @@ -19,6 +19,7 @@ import regionsList from '@/services/nnas/regions.json'; const router = express.Router(); const accountSettingsSchema = z.object({ + birthdate: z.string().regex(/^\d{4}-\d{2}-\d{2}$/), gender: z.enum(['M', 'F']), tz_name: z.string(), region: z.coerce.number(), @@ -99,10 +100,18 @@ router.get('/mii/:pid/:face', async function (request: express.Request, response return; } - const miiImage = await got(`${config.cdn.base_url}/mii/${request.params.pid}/${request.params.face}.png`).buffer(); + try { + const url = `${config.cdn.base_url}/mii/${request.params.pid}/${request.params.face}.png`; + console.log(url); + const miiImage = await got(url).buffer(); - response.set('Content-Type', 'image/png'); - response.send(miiImage); + response.set('Content-Type', 'image/png'); + response.send(miiImage); + } catch (error: any) { + LOG_ERROR(error); + response.sendStatus(404); + return; + } }); /** @@ -163,6 +172,7 @@ router.post('/update', async function (request: express.Request, response: expre return; } + pnid.birthdate = person.data.birthdate; pnid.gender = person.data.gender; pnid.region = region; pnid.country = person.data.country; diff --git a/src/types/services/nnas/account-settings.ts b/src/types/services/nnas/account-settings.ts index 167a08d..7ec832a 100644 --- a/src/types/services/nnas/account-settings.ts +++ b/src/types/services/nnas/account-settings.ts @@ -1,6 +1,7 @@ import { GenderTypes } from '@/types/common/gender-types'; export interface AccountSettings { + birthdate: string; gender: GenderTypes; tz_name: string; region: number; diff --git a/src/views/index.ejs b/src/views/index.ejs index ef35723..16e0795 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -30,7 +30,7 @@

User Settings

Birth Date

-

<%= PNID.birthdate %>

+

Gender

@@ -41,7 +41,7 @@

Country

- <% for (let region of regionsList) { %> <% } %> @@ -90,7 +90,7 @@ -

Production

+

Prod

<% if(PNID.access_level >= 1) { %> checked="" <% } %> <% if(PNID.access_level < 1) { %> disabled <% } %> > @@ -104,8 +104,11 @@ <% if(PNID.access_level === 3) { %> checked="" <% } %> <% if(PNID.access_level < 3) { %> disabled <% } %> > @@ -119,7 +122,7 @@ - checked=""<% } %>> + checked=""<% } %>> @@ -146,12 +149,42 @@ <% } %>