Merge pull request #955 from syucream/feature/login-name

Show login user name on the header
dmm-com · Sep 19, 2023 · 89c8d37 · 89c8d37
2 parents 4e96c9c + cfa9443
commit 89c8d37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
@@ -197,6 +197,11 @@ export const Header: FC = () => {
                 keepMounted
                 disableScrollLock
               >
+                <MenuItem>
+                  {djangoContext?.user?.username ?? "不明なユーザ"}{" "}
+                  としてログイン中
+                </MenuItem>
+                <Divider light />
                 <MenuItem
                   component={Link}
                   to={userPath(djangoContext?.user?.id ?? 0)}

diff --git a/frontend/src/services/DjangoContext.ts b/frontend/src/services/DjangoContext.ts
@@ -1,9 +1,11 @@
 class User {
   id: number;
+  username: string;
   isSuperuser: boolean;
 
   constructor(user: any) {
     this.id = user.id;
+    this.username = user.username;
     this.isSuperuser = user.isSuperuser;
   }
 }

diff --git a/templates/frontend/index.html b/templates/frontend/index.html
@@ -18,6 +18,7 @@
           version: "{{version}}",
           user: {
               id: {{user.id}},
+              username: "{{user.username}}",
               isSuperuser: {{user.is_superuser|yesno:"true,false"}},
           },
       };