- {error.status} - {error.statusText} -
-{error.data}
-Are you trying malicious login? ๐ค
-© Maximum - Programming Circle at Saitama University.
-
+
)
}
}
-export default function App() {
+export function Layout({ children }: { children: React.ReactNode }) {
return (
@@ -48,8 +60,12 @@ export default function App() {
+
+ + {error.status} - {error.statusText} +
+{error.data}
+Are you trying malicious login? ๐ค
+© Maximum - Programming Circle at Saitama University.
+
+
+ )
+}
diff --git a/webapp/app/routes/_index/route.tsx b/webapp/app/routes/_index/route.tsx
index 1cba906..1ace9cc 100644
--- a/webapp/app/routes/_index/route.tsx
+++ b/webapp/app/routes/_index/route.tsx
@@ -1,5 +1,7 @@
import type { MetaFunction } from '@remix-run/cloudflare'
+import { Announcement } from './_components/announcement'
+
export const meta: MetaFunction = () => {
const TITLE = 'Maximum Auth'
const DESCRIPTION = 'Aggregated Authentication Platform of Maximum'
@@ -15,11 +17,5 @@ export const meta: MetaFunction = () => {
}
export default function Index() {
- return (
-
+
+ + Maximum Auth +
+Aggregated Authentication Platform of Maximum
+่ช่จผใๅฟ ่ฆใชใตใคใใใใขใฏใปในใใฆใใ ใใใ
+Maximum Auth
-Aggregated Authentication Platform of Maximum
-่ช่จผใๅฟ ่ฆใชใตใคใใใใขใฏใปในใใฆใใ ใใใ
-
+
+ )
+}
diff --git a/webapp/app/routes/continue/_components/profile-display.tsx b/webapp/app/routes/continue/_components/profile-display.tsx
new file mode 100644
index 0000000..ba7ad60
--- /dev/null
+++ b/webapp/app/routes/continue/_components/profile-display.tsx
@@ -0,0 +1,138 @@
+import { css } from '@styled-system/css'
+
+import { ButtonVariant } from '~/components/ui/button-variant'
+import { Linkable } from '~/components/ui/linkable'
+
+interface Props {
+ user: {
+ displayName?: string
+ profileImage?: string
+ isMember?: boolean
+ }
+ appName: string
+ continueUrl: URL
+ cancelUrl: URL
+}
+
+export const ProfileDisplay = ({
+ user,
+ continueUrl,
+ cancelUrl,
+ appName,
+}: Props) => {
+ return (
+
+ {children}
+
+
+
+ )
+}
diff --git a/webapp/app/routes/continue/route.tsx b/webapp/app/routes/continue/route.tsx
index eb0ad38..3c74a00 100644
--- a/webapp/app/routes/continue/route.tsx
+++ b/webapp/app/routes/continue/route.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-
import type {
ActionFunction,
LoaderFunctionArgs,
@@ -12,13 +10,13 @@ import {
importKey,
keypairProtectedHeader,
} from '@saitamau-maximum/auth/internal'
-import clsx from 'clsx'
import { SignJWT } from 'jose'
+import cookieSessionStorage from 'utils/session.server'
import pubkeyData from '../../../data/pubkey.json'
-import cookieSessionStorage from '../../../utils/session.server'
-import style from './style.module.css'
+import { CenterCard } from './_components/center-card'
+import { ProfileDisplay } from './_components/profile-display'
export const action: ActionFunction = () =>
new Response('method not allowed', { status: 405 })
@@ -29,13 +27,20 @@ export const loader = async ({ context, request }: LoaderFunctionArgs) => {
const { getSession } = cookieSessionStorage(envvar)
const session = await getSession(request.headers.get('Cookie'))
- const cburl = session.get('continue_to')!
- const cbname = decodeURIComponent(session.get('continue_name')!)
+ const cburl = session.get('continue_to')
+ if (cburl == null) {
+ throw json('invalid request', { status: 400 })
+ }
+ let cbname = session.get('continue_name')
+ if (cbname == null) {
+ throw json('invalid request', { status: 400 })
+ }
+ cbname = decodeURIComponent(cbname)
const registeredData = pubkeyData.find(data => data.name === cbname)
if (registeredData === undefined) {
- throw new Response('invalid request', { status: 400 })
+ throw json('invalid request', { status: 400 })
}
const privkey = await importKey(context.cloudflare.env.PRIVKEY, 'privateKey')
@@ -75,59 +80,17 @@ export default function Continue() {
cancelUrl.searchParams.set('cancel', 'true')
return (
-
+ 
+
+
+
+ 
+
+ {user.displayName}
+
+ {user.isMember ? (
+ <>
+
+ ไปฅไธใฎใตใคใใซใญใฐใคใณใใพใใ
+
+
+ {appName}
+
+ ({continueUrl.origin})
+
+
+
+ ็ถใใ
+
+
+ ใใใ
+
+
+
+ ) : (
+ <>
+
+ Maximum ใกใณใใผใงใฏใชใใใใ
+
+ ็ถ่กใงใใพใใใ
+
ใใฎใฟใใ้ใใฆใใ ใใใ
+ + )} +
-
-
-
-
-
-
- 
-
- {data.userdata.display_name}
-
- {data.userdata.is_member ? (
- <>
-
- ไปฅไธใฎใตใคใใซใญใฐใคใณใใพใใ
-
- {data.appdata.name}
-
- ({continueUrl.origin})
-
- Maximum ใกใณใใผใงใฏใชใใใใ
-
- ็ถ่กใงใใพใใใ
-
ใใฎใฟใใ้ใใฆใใ ใใใ
- - )} -