From f05104088307536eac9413dedba48ef5a9367200 Mon Sep 17 00:00:00 2001 From: Mila Vizelka Date: Mon, 2 Oct 2023 23:40:48 +0300 Subject: [PATCH] fixed tests --- app.js | 1 + src/index.ts | 1 + src/pages/chat/index.ts | 2 +- src/pages/chat/tmpl/content.tmpl.ts | 3 +- src/pages/error/not-found/index.ts | 2 +- .../error/not-found/tmpl/content.tmpl.ts | 2 +- src/pages/error/server-error/index.ts | 2 +- .../error/server-error/tmpl/content.tmpl.ts | 3 +- src/pages/settings/index.ts | 4 +- src/pages/settings/tmpl/settings.tmpl.ts | 41 ++++++++----------- src/pages/sign-in/index.ts | 1 + src/pages/sign-in/tmpl/content.tmpl.ts | 4 +- src/pages/sign-up/index.ts | 3 +- src/pages/sign-up/tmpl/content.tmpl.ts | 2 +- 14 files changed, 33 insertions(+), 38 deletions(-) diff --git a/app.js b/app.js index 15a4a0960..28b7a060c 100644 --- a/app.js +++ b/app.js @@ -14,3 +14,4 @@ app.get("/", (req, res) => { app.listen(process.env.PORT || PORT, () => console.log("success")) + diff --git a/src/index.ts b/src/index.ts index 0d44f46be..315c00a58 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,3 +25,4 @@ window.addEventListener('DOMContentLoaded', () => { } }) + diff --git a/src/pages/chat/index.ts b/src/pages/chat/index.ts index 29a7be8d3..df2da35c2 100644 --- a/src/pages/chat/index.ts +++ b/src/pages/chat/index.ts @@ -28,4 +28,4 @@ export const ChatPage = () => { }), input: Input(chatField), }); -} \ No newline at end of file +} diff --git a/src/pages/chat/tmpl/content.tmpl.ts b/src/pages/chat/tmpl/content.tmpl.ts index d160d8aa7..e713f0837 100644 --- a/src/pages/chat/tmpl/content.tmpl.ts +++ b/src/pages/chat/tmpl/content.tmpl.ts @@ -28,5 +28,4 @@ export const content = `
- -` \ No newline at end of file +` diff --git a/src/pages/error/not-found/index.ts b/src/pages/error/not-found/index.ts index 54376a132..b7b663b7c 100644 --- a/src/pages/error/not-found/index.ts +++ b/src/pages/error/not-found/index.ts @@ -9,4 +9,4 @@ export const NotFoundPage = () => { content: 'назад к чатам' }) }); -} \ No newline at end of file +} diff --git a/src/pages/error/not-found/tmpl/content.tmpl.ts b/src/pages/error/not-found/tmpl/content.tmpl.ts index 9c95d31fa..1a8c58fe8 100644 --- a/src/pages/error/not-found/tmpl/content.tmpl.ts +++ b/src/pages/error/not-found/tmpl/content.tmpl.ts @@ -5,4 +5,4 @@ export const content = ` {{{ chatPageLink }}}
-` \ No newline at end of file +` diff --git a/src/pages/error/server-error/index.ts b/src/pages/error/server-error/index.ts index 20abfc94b..be83892f4 100644 --- a/src/pages/error/server-error/index.ts +++ b/src/pages/error/server-error/index.ts @@ -13,4 +13,4 @@ export const ServerErrorPage = () => { content: 'назад к чатам' }) }); -} \ No newline at end of file +} diff --git a/src/pages/error/server-error/tmpl/content.tmpl.ts b/src/pages/error/server-error/tmpl/content.tmpl.ts index 258a17e89..551ee9019 100644 --- a/src/pages/error/server-error/tmpl/content.tmpl.ts +++ b/src/pages/error/server-error/tmpl/content.tmpl.ts @@ -6,5 +6,4 @@ export const content = ` {{{ chatPageLink }}} - -` \ No newline at end of file +` diff --git a/src/pages/settings/index.ts b/src/pages/settings/index.ts index 8e44f0bef..4a3a123a6 100644 --- a/src/pages/settings/index.ts +++ b/src/pages/settings/index.ts @@ -10,7 +10,6 @@ const signUpFieldList = { placeholder: 'first name', type: 'text' - }, { placeholder: 'second name', @@ -32,7 +31,6 @@ const signUpFieldList = placeholder: 'phone', type: 'phone' }, - ] as InputProps export const SettingsPage = () => { @@ -42,4 +40,4 @@ export const SettingsPage = () => { button: Button({text: 'Save'}), input: Input(signUpFieldList), }) -} \ No newline at end of file +} diff --git a/src/pages/settings/tmpl/settings.tmpl.ts b/src/pages/settings/tmpl/settings.tmpl.ts index 9d81cbba0..836c93ad3 100644 --- a/src/pages/settings/tmpl/settings.tmpl.ts +++ b/src/pages/settings/tmpl/settings.tmpl.ts @@ -1,25 +1,20 @@ export const settings = ` - -
-
- {{{ logo }}} -
-
-
- avatar - empty-avatar - avatar -
-
- {{{ input }}} -
{{{ button }}}
-
- - {{{ authPageLink }}} +
+
+ {{{ logo }}} +
+
+
+ avatar + empty-avatar + avatar +
+
+ {{{ input }}} +
{{{ button }}}
+
+ + {{{ authPageLink }}} +
-
- - - - -` \ No newline at end of file +` diff --git a/src/pages/sign-in/index.ts b/src/pages/sign-in/index.ts index 423a50d4e..6268eebd6 100644 --- a/src/pages/sign-in/index.ts +++ b/src/pages/sign-in/index.ts @@ -28,3 +28,4 @@ export const SignInPage = () => { button: Button({text: 'Enter'}) }); } + diff --git a/src/pages/sign-in/tmpl/content.tmpl.ts b/src/pages/sign-in/tmpl/content.tmpl.ts index 417b5a751..bf83592ea 100644 --- a/src/pages/sign-in/tmpl/content.tmpl.ts +++ b/src/pages/sign-in/tmpl/content.tmpl.ts @@ -14,5 +14,5 @@ {{{ signUpPageLink }}}
- - ` \ No newline at end of file + ` + \ No newline at end of file diff --git a/src/pages/sign-up/index.ts b/src/pages/sign-up/index.ts index b50e4fa91..da902834e 100644 --- a/src/pages/sign-up/index.ts +++ b/src/pages/sign-up/index.ts @@ -43,4 +43,5 @@ export const SignUpPage = () => { input: Input(signUpFieldList), button: Button({text: 'Create account'}) }); -} \ No newline at end of file +} + diff --git a/src/pages/sign-up/tmpl/content.tmpl.ts b/src/pages/sign-up/tmpl/content.tmpl.ts index 32b7027a2..ddf3b904d 100644 --- a/src/pages/sign-up/tmpl/content.tmpl.ts +++ b/src/pages/sign-up/tmpl/content.tmpl.ts @@ -14,4 +14,4 @@ export const content = ` {{{ signUpPageLink }}} -` \ No newline at end of file +`