tests fix

yandex-praktikum · Dec 24, 2023 · c6621c8 · c6621c8
1 parent 9c5697e
commit c6621c8
Show file tree

Hide file tree

Showing 9 changed files with 268 additions and 51 deletions.
diff --git a/index.html b/index.html
@@ -9,7 +9,7 @@
   </head>
   <body>
     <div id="nav"></div>
-    <div id="app"></div>
+    <main id="app"></main>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/src/components/avatar/avatar.scss b/src/components/avatar/avatar.scss
@@ -1,4 +1,3 @@
-@import "/src/scss/utils";
 
 .avatar {
   border-radius: 50%;

diff --git a/src/data/chat_list.ts b/src/data/chat_list.ts
@@ -0,0 +1,236 @@
+export const chat_list_data = [
+  {
+    id: 1,
+    avatar: `https://fikiwiki.com/uploads/posts/2022-02/1644885500_22-fikiwiki-com-p-kartinki-dlya-geimerov-na-avu-26.jpg`,
+    type: "dialog",
+    title: "Ivan",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Ivan",
+        second_name: "Ivanov",
+        avatar: `https://fikiwiki.com/uploads/posts/2022-02/1644885500_22-fikiwiki-com-p-kartinki-dlya-geimerov-na-avu-26.jpg`,
+      },
+      time: "12.33",
+      text: "this is message from user"
+    }
+  },
+  {
+    id: 22,
+    title: "Neighbors",
+    type: "chat",
+    unread_msg_count: 6,
+    last_message: {
+      user: {
+        first_name: "Shurum",
+        second_name: "Burum",
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 333,
+    type: "dialog",
+    title: "Shurum",
+    unread_msg_count: 1,
+    last_message: {
+      user: {
+        first_name: "Shurum",
+        second_name: "Burum",
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 7,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    type: "dialog",
+    title: "Alena",
+    unread_msg_count: 8,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Alena",
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+  {
+    id: 4444,
+    avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+    type: "dialog",
+    title: "Nina",
+    unread_msg_count: 4,
+    last_message: {
+      user: {
+        first_name: "Nina",
+        second_name: "Anin",
+        avatar: `https://klike.net/uploads/posts/2023-01/1673594987_3-24.jpg`,
+      },
+      time: "12.34",
+      text: "this is message from user this is message from user this is message from user"
+    }
+  },
+]
diff --git a/src/data/conversation.ts b/src/data/conversation.ts
@@ -0,0 +1,10 @@
+export const conversation =
+{
+    id: 1,
+    user: {
+        first_name: "Ivan",
+        second_name: "Ivanov",
+        avatar: `https://fikiwiki.com/uploads/posts/2022-02/1644885500_22-fikiwiki-com-p-kartinki-dlya-geimerov-na-avu-26.jpg`,
+    },
+}
+
diff --git a/src/data/errors.ts b/src/data/errors.ts
@@ -0,0 +1,11 @@
+export const Error404 = {
+    error: 404,
+    errorText: "Oops! This Page Could Not Be Found",
+    message: "sorry but the page you are looking for does not exist, have been removed. name changed or is temporarily unavailable",
+}
+
+export const Error500 = {
+    error: 500,
+    errorText: "Oops! This Page Could Not Be Found",
+    message: "sorry but the page you are looking for does not exist, have been removed. name changed or is temporarily unavailable",
+}
diff --git a/src/data/index.ts b/src/data/index.ts
@@ -0,0 +1,4 @@
+export { chat_list_data as ChatListData  } from './chat_list';
+export { conversation as ConversationData  } from './conversation';
+export { Error404 as Errors404Data } from './errors';
+export { Error500 as Errors500Data } from './errors';
diff --git a/src/main.ts b/src/main.ts
@@ -1,16 +1,14 @@
 import Handlebars from 'handlebars';
 import * as Components from './components';
 import * as Pages from './pages';
-import { chat_list_data } from "./data/chat_list";
-import * as Errors from "./data/errors";
-import {conversation} from "./data/conversation";
+import * as Data from "./data";
 
 const pages = {
     'signin': [ Pages.SignInPage, ],
     'signup': [ Pages.SignUpPage,  ],
-    'messenger': [ Pages.Messenger, { chat_list: chat_list_data, conversation: conversation }],
-    '404': [ Pages.ErrorPage,  Errors.Error404],
-    '500': [ Pages.ErrorPage, Errors.Error500 ],
+    'messenger': [ Pages.Messenger, { chat_list: Data.ChatListData, conversation: Data.ConversationData }],
+    '404': [ Pages.ErrorPage,  Data.Errors404Data],
+    '500': [ Pages.ErrorPage, Data.Errors500Data],
 };
 
 Object.entries(Components).forEach(([ name, component ]) => {

diff --git a/src/pages/messenger/messenger.hbs b/src/pages/messenger/messenger.hbs
@@ -1,8 +1,8 @@
-<main class="messenger">
+<div class="messenger">
     {{> ChatList list=chat_list}}
     {{#if true}}
         {{> Conversation conversation=conversation}}
     {{^}}
         <span class="messenger__placeholder">Choose a chat to start messaging.</span>
     {{/if}}
-</main>
+</div>
diff --git a/src/scss/utils.scss b/src/scss/utils.scss