From ad303b12be1cda430f1f9d9cabd15f15123ed415 Mon Sep 17 00:00:00 2001
From: CHEYNE <contact@ch3yne.com>
Date: Wed, 24 Apr 2024 21:01:21 +0800
Subject: [PATCH 1/3] improve web logo font

---
 web/src/app/login/page.js        |  9 ++++++++-
 web/src/app/rootLayout/AppBar.js | 14 ++++++++++----
 web/src/lib/styles/globals.css   |  6 ------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/web/src/app/login/page.js b/web/src/app/login/page.js
index d6efd0eff7f..54200918008 100644
--- a/web/src/app/login/page.js
+++ b/web/src/app/login/page.js
@@ -7,9 +7,11 @@
 
 import { useRouter } from 'next/navigation'
 import Image from 'next/image'
+import { Alata } from 'next/font/google'
 
 import { Box, Card, Grid, Button, CardContent, Typography, TextField, FormControl, FormHelperText } from '@mui/material'
 
+import clsx from 'clsx'
 import * as yup from 'yup'
 import { useForm, Controller } from 'react-hook-form'
 import { yupResolver } from '@hookform/resolvers/yup'
@@ -17,6 +19,8 @@ import { yupResolver } from '@hookform/resolvers/yup'
 import { useAppDispatch } from '@/lib/hooks/useStore'
 import { loginAction } from '@/lib/store/auth'
 
+const fonts = Alata({ subsets: ['latin'], weight: ['400'], display: 'swap' })
+
 const defaultValues = {
   grant_type: 'client_credentials',
   client_id: '',
@@ -68,7 +72,10 @@ const LoginPage = () => {
                 height={24}
                 alt='logo'
               />
-              <Typography variant='h6' className={`twc-ml-2 twc-font-semibold twc-text-[1.5rem] logoText`}>
+              <Typography
+                variant='h6'
+                className={clsx('twc-ml-2 twc-font-semibold twc-text-[1.5rem]', fonts.className)}
+              >
                 Gravitino
               </Typography>
             </Box>
diff --git a/web/src/app/rootLayout/AppBar.js b/web/src/app/rootLayout/AppBar.js
index 47b45c4e389..eaf4ef4a25b 100644
--- a/web/src/app/rootLayout/AppBar.js
+++ b/web/src/app/rootLayout/AppBar.js
@@ -7,6 +7,9 @@
 
 import Link from 'next/link'
 import Image from 'next/image'
+import { Alata } from 'next/font/google'
+
+import { useState, useEffect } from 'react'
 
 import {
   Box,
@@ -20,6 +23,8 @@ import {
   MenuItem
 } from '@mui/material'
 
+import clsx from 'clsx'
+
 import VersionView from './VersionView'
 import LogoutButton from './Logout'
 import { useSearchParams } from 'next/navigation'
@@ -27,7 +32,7 @@ import { useRouter } from 'next/navigation'
 import { useAppSelector, useAppDispatch } from '@/lib/hooks/useStore'
 import { fetchMetalakes } from '@/lib/store/metalakes'
 
-import { useState, useEffect } from 'react'
+const fonts = Alata({ subsets: ['latin'], weight: ['400'], display: 'swap' })
 
 const AppBar = () => {
   const searchParams = useSearchParams()
@@ -72,9 +77,10 @@ const AppBar = () => {
               />
               <Typography
                 variant='h5'
-                className={
-                  'logoText twc-ml-2 twc-leading-none twc-font-bold twc-tracking-[-0.45px] twc-normal-case twc-text-[1.75rem]'
-                }
+                className={clsx(
+                  'twc-ml-2 twc-leading-none twc-tracking-[-0.45px] twc-normal-case twc-text-[1.75rem]',
+                  fonts.className
+                )}
               >
                 Gravitino
               </Typography>
diff --git a/web/src/lib/styles/globals.css b/web/src/lib/styles/globals.css
index f8e6edce5a4..9cb2eeaf62d 100644
--- a/web/src/lib/styles/globals.css
+++ b/web/src/lib/styles/globals.css
@@ -7,8 +7,6 @@
 @tailwind components;
 @tailwind utilities;
 
-@import url('https://fonts.googleapis.com/css2?family=Alata&display=swap');
-
 html,
 body {
   min-height: 100%;
@@ -17,7 +15,3 @@ body {
 a {
   -webkit-user-drag: none;
 }
-
-.logoText {
-  font-family: 'Alata' !important;
-}

From a71ead4dd8b48e19902cc7e31ee857dc9801fbd5 Mon Sep 17 00:00:00 2001
From: CHEYNE <contact@ch3yne.com>
Date: Tue, 14 May 2024 15:45:23 +0800
Subject: [PATCH 2/3] add license

---
 web/LICENSE | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/LICENSE b/web/LICENSE
index 2f135a0dd4a..28d3111e34a 100644
--- a/web/LICENSE
+++ b/web/LICENSE
@@ -215,3 +215,6 @@
    ./src/types/axios.d.ts
    ./src/lib/enums/httpEnum.ts
    ./src/lib/utils/index.js (parts of)
+
+   Third party SIL Open Font License v1.1 (OFL-1.1)
+   (SIL OPEN FONT LICENSE Version 1.1) The Alata font family (https://github.com/SorkinType/Alata)

From 9a977126ad3e0b4967b3ba03cdaee4c4f9a6c921 Mon Sep 17 00:00:00 2001
From: CHEYNE <contact@ch3yne.com>
Date: Tue, 14 May 2024 18:55:15 +0800
Subject: [PATCH 3/3] fix undefined process.env variables

---
 web/src/app/login/page.js        | 2 +-
 web/src/app/rootLayout/AppBar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/app/login/page.js b/web/src/app/login/page.js
index 54200918008..6d914d0b657 100644
--- a/web/src/app/login/page.js
+++ b/web/src/app/login/page.js
@@ -67,7 +67,7 @@ const LoginPage = () => {
           <CardContent className={`twc-p-12`}>
             <Box className={`twc-mb-8 twc-flex twc-items-center twc-justify-center`}>
               <Image
-                src={`${process.env.NEXT_PUBLIC_BASE_PATH}/icons/gravitino.svg`}
+                src={`${process.env.NEXT_PUBLIC_BASE_PATH ?? ''}/icons/gravitino.svg`}
                 width={24}
                 height={24}
                 alt='logo'
diff --git a/web/src/app/rootLayout/AppBar.js b/web/src/app/rootLayout/AppBar.js
index eaf4ef4a25b..b734f983809 100644
--- a/web/src/app/rootLayout/AppBar.js
+++ b/web/src/app/rootLayout/AppBar.js
@@ -70,7 +70,7 @@ const AppBar = () => {
           >
             <Link href='/metalakes' className={'twc-flex twc-items-center twc-no-underline twc-mr-8'}>
               <Image
-                src={process.env.NEXT_PUBLIC_BASE_PATH + '/icons/gravitino.svg'}
+                src={process.env.NEXT_PUBLIC_BASE_PATH ?? '' + '/icons/gravitino.svg'}
                 width={32}
                 height={32}
                 alt='logo'