Merge branch 'main' into 233-set-variables-from-envfile

ShotaTanemura · Oct 22, 2024 · 8b252b1 · 8b252b1
2 parents d904316 + 02c4ff7
commit 8b252b1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/pong/pong/static/pong/api/api.js b/pong/pong/static/pong/api/api.js
@@ -6,7 +6,6 @@ export async function getUuid() {
       credentials: "include",
     });
     const data = await response.json();
-    console.log(data);
     if (!response.ok) {
       throw new Error(data.message || "Failed to verify token");
     }
@@ -25,7 +24,6 @@ export async function getUserFromUuid(uuid) {
       credentials: "include",
     });
     const data = await response.json();
-    console.log(data);
     if (!response.ok) {
       throw new Error(data.message || "Failed to fetch user data");
     }
@@ -38,6 +36,9 @@ export async function getUserFromUuid(uuid) {
 
 export async function getUsersDataFromName(name) {
   try {
+    if (!name) {
+      return null;
+    }
     const response = await fetch(`/pong/api/v1/users/search/${name}`, {
       method: "GET",
       headers: { "Content-Type": "application/json" },

diff --git a/pong/pong/static/pong/components/Edit2FA.js b/pong/pong/static/pong/components/Edit2FA.js
@@ -25,7 +25,7 @@ export class Edit2FA extends Component {
     const formHTML = `
             <form class="totp-form">
                 <label for="totp-code">6桁の認証コード:</label>
-                <input type="text" class="totp-code" name="totp-code" maxlength="6" required>
+                <input type="text" id="totp-code" class="totp-code" name="totp-code" maxlength="6" required>
                 <br><br>
                 <button type="submit">送信</button>
             </form>
@@ -106,6 +106,7 @@ export class Edit2FA extends Component {
           <button class="generate-qrcode" type="submit">二要素認証アプリケーション用QRコードを取得する</button>
           <div class="qrcode-container"></div>
           <div class="totp-fom-container"></div>
+          <button class="back-button" type="button" onclick="history.back()">戻る</button>
         `;
   }
 }
diff --git a/pong/pong/static/pong/components/EditProfile.js b/pong/pong/static/pong/components/EditProfile.js
@@ -136,7 +136,7 @@ export class EditProfile extends Component {
         <form class="edit-profile-form">
             <label for="username">Username</label>
             <input type="text" placeholder="username" id="username" name="name"><br/>
-            <label for="Nick">Nickname</label>
+            <label for="nickname">Nickname</label>
             <input type="text" placeholder="nickname" id="nickname" name="nickname"><br/>
             <label for="email">Email</label>
             <input type="email" placeholder="email" id="email" name="email"><br/>

diff --git a/pong/pong/static/pong/components/PongGameHome.js b/pong/pong/static/pong/components/PongGameHome.js
@@ -113,7 +113,7 @@ export class PongGameHome extends Component {
           </div>
           <div class="number-of-players-selector-container p-3">
             <label for="number-of-players-selector">Select Number of Players:  <label>
-            <select name="number-of-players-selector" id="number-of-players-selecor" class="form-select">
+            <select name="number-of-players-selector" id="number-of-players-selector" class="form-select">
               <option value="2" selected>2</option>
               <option value="4">4</option>
             </select>

diff --git a/pong/pong/static/pong/core/router.js b/pong/pong/static/pong/core/router.js
@@ -58,8 +58,7 @@ export class Router {
     }
 
     if (path !== "/signin" && path !== "/signup" && path !== "/totp") {
-      this.verifyAndRefreshToken().catch((error) => {
-        console.log(error);
+      this.verifyAndRefreshToken().catch(() => {
         path = "/signin";
         route = this.searchRouteFromPath("/signin");
         let component = new route.component(

diff --git a/pong/pong/views/users.py b/pong/pong/views/users.py
@@ -169,10 +169,6 @@ def searched_users(request, name):
             )
 
         users = User.objects.filter(name__icontains=name)
-        if not users:
-            return JsonResponse(
-                {"message": "Users not found", "status": "userNotFound"}, status=404
-            )
         hitted_user_list = []
         for user in users:
             friend_status = "stranger"