Work done

yandex-praktikum · Sep 25, 2023 · 5758263 · 5758263
1 parent 8332896
commit 5758263
Show file tree

Hide file tree

Showing 77 changed files with 1,314 additions and 763 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -15,6 +15,14 @@
     "no-console": 0,
     "import/extensions": 0,
     "quotes": 0,
-    "semi": 0
+    "semi": 0,
+    "no-underscore-dangle": 0,
+    "no-tabs": 0,
+    "lines-between-class-members": 0,
+    "class-methods-use-this": 0,
+    "no-undef": 0,
+    "no-param-reassign": 0,
+    "import/prefer-default-export": 0,
+    "import/no-extraneous-dependencies": 0
   }
 }
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -1,3 +1,4 @@
 {
-  "extends": "stylelint-config-standard-scss"
+  "extends": "stylelint-config-standard-scss",
+  "ignoreFiles": ["build/*", "node_modules/*", "static/*"]
 }
diff --git a/_proxyProps.js b/_proxyProps.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/pug": "^2.0.6",
+    "@types/uuid": "^9.0.4",
     "@typescript-eslint/eslint-plugin": "^6.7.0",
     "@typescript-eslint/parser": "^6.7.0",
     "concurrently": "^8.2.1",
@@ -25,10 +26,10 @@
     "sass": "^1.66.1",
     "stylelint": "^15.10.3",
     "stylelint-config-standard-scss": "^11.0.0",
-    "uuid": "^9.0.1",
     "vite": "^4.4.5"
   },
   "dependencies": {
-    "pug": "^3.0.2"
+    "pug": "^3.0.2",
+    "uuid": "^9.0.1"
   }
 }
diff --git a/src/404/404.ts b/src/404/404.ts
@@ -0,0 +1,15 @@
+import { render } from "../utils/index";
+import { ErrorPage } from "../pages/index";
+
+import "../scss/index.scss";
+
+const props = {
+  title: '404',
+  text: 'who seeks will always find',
+  linkText: 'go to chats page',
+  linkHref: '/chats-and-chat/',
+}
+
+const page = new ErrorPage(props);
+
+render(page);
diff --git a/src/404/index.html b/src/404/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="page" lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>404 page</title>
+</head>
+<body>
+  <main id="app"></main>
+  <script src="404.ts" type="module"></script>
+</body>
+</html>
diff --git a/src/500/500.ts b/src/500/500.ts
@@ -0,0 +1,15 @@
+import { render } from "../utils/index";
+import { ErrorPage } from "../pages/index";
+
+import "../scss/index.scss";
+
+const props = {
+  title: '500',
+  text: 'something went wrong',
+  linkText: 'go to chats page',
+  linkHref: '/chats-and-chat/',
+}
+
+const page = new ErrorPage(props);
+
+render(page);
diff --git a/src/500/index.html b/src/500/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="page" lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>500 page</title>
+</head>
+<body>
+  <main id="app"></main>
+  <script src="500.ts" type="module"></script>
+</body>
+</html>
diff --git a/src/chats-and-chat/chats-and-chat.ts b/src/chats-and-chat/chats-and-chat.ts
@@ -0,0 +1,8 @@
+import { render } from "../utils/index";
+import { ChatsAndChat } from "../pages/index";
+
+import "../scss/index.scss";
+
+const page = new ChatsAndChat();
+
+render(page);
diff --git a/src/chats-and-chat/index.html b/src/chats-and-chat/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html class="page" lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Chats and chat page</title>
+</head>
+<body>
+  <main id="app"></main>
+  <script src="chats-and-chat.ts" type="module"></script>
+</body>
+</html>
diff --git a/src/components/AuthorizationForm/AuthorizationForm.tmp.pug b/src/components/AuthorizationForm/AuthorizationForm.tmp.pug
@@ -0,0 +1,7 @@
+form.form
+  if (title)
+    h1.form__title= title
+  .form__field!= fieldLogin
+  .form__field!= fieldPassword
+  .form__field.form__field--accent!= sendBtn
+  .form__field.t-right!= link
diff --git a/src/components/AuthorizationForm/AuthorizationForm.ts b/src/components/AuthorizationForm/AuthorizationForm.ts
@@ -0,0 +1,20 @@
+import { Block } from "../../core/index";
+import template from "./AuthorizationForm.tmp.pug";
+import { getValuesFromForm } from "../utils/index";
+
+export default class AuthorizationForm extends Block {
+  constructor(props?: object) {
+    const newProps = {
+      ...props,
+      events: new Map([
+        ['submit', (event: object) => getValuesFromForm(event, this)],
+      ]),
+    }
+
+    super('div', newProps);
+  }
+
+  render() {
+    return this.compile(template, this.props);
+  }
+}
diff --git a/src/components/Button/Button.tmp.pug b/src/components/Button/Button.tmp.pug
@@ -1 +1 @@
-button.btn text
+button(class=className, type=type, form=form)= text
diff --git a/src/components/Button/Button.ts b/src/components/Button/Button.ts
@@ -1,9 +1,11 @@
 import { Block } from "../../core/index";
 import template from "./Button.tmp.pug";
 
+import "./Button.scss";
+
 export default class Button extends Block {
-  constructor(props) {
-    super('button', props);
+  constructor(props?: object) {
+    super('div', props);
   }
 
   render() {

diff --git a/src/components/EditingPasswordForm/EditingPasswordForm.tmp.pug b/src/components/EditingPasswordForm/EditingPasswordForm.tmp.pug
@@ -0,0 +1,5 @@
+form#userSettingsForm.user-settings__form
+  ul.user-settings__list
+    li.user-settings__list-item!= currentPassword
+    li.user-settings__list-item!= newPassword
+    li.user-settings__list-item!= repeatNewPassword
diff --git a/src/components/EditingPasswordForm/EditingPasswordForm.ts b/src/components/EditingPasswordForm/EditingPasswordForm.ts
@@ -0,0 +1,20 @@
+import { Block } from "../../core/index";
+import template from "./EditingPasswordForm.tmp.pug";
+import { getValuesFromForm } from "../utils/index";
+
+export default class EditingPasswordForm extends Block {
+  constructor(props?: object) {
+    const newProps = {
+      ...props,
+      events: new Map([
+        ['submit', (event: object) => getValuesFromForm(event, this)],
+      ]),
+    }
+
+    super('div', newProps);
+  }
+
+  render() {
+    return this.compile(template, this.props);
+  }
+}
diff --git a/src/components/EditingSettingsForm/EditingSettingsForm.tmp.pug b/src/components/EditingSettingsForm/EditingSettingsForm.tmp.pug
@@ -0,0 +1,25 @@
+form#userSettingsForm.user-settings__form
+  ul.user-settings__list
+    li.user-settings__list-item!= nickname
+    li.user-settings__list-item!= firstName
+    li.user-settings__list-item!= secondName
+    li.user-settings__list-item!= email
+    li.user-settings__list-item!= phone
+
+  //ul.user-settings__list
+    li.user-settings__list-item
+      label.user-settings__list-item-name(for="display_name") Nickname:
+      input.user-settings__list-item-value.t-right(id="display_name" type="text" name="display_name" value="user name")
+    li.user-settings__list-item
+      label.user-settings__list-item-name(for="first_name") First name:
+      input.user-settings__list-item-value.t-right(id="first_name" type="text" name="first_name" value="first name")
+    li.user-settings__list-item
+      label.user-settings__list-item-name(for="second_name") Second name:
+      input.user-settings__list-item-value.t-right(id="second_name" type="text" name="second_name" value="second name")
+    li.user-settings__list-item
+      label.user-settings__list-item-name(for="email") Email:
+      input.user-settings__list-item-value.t-right(id="email" type="text" name="email" value="[email protected]")
+    li.user-settings__list-item
+      label.user-settings__list-item-name(for="phone") Phone:
+      input.user-settings__list-item-value.t-right(id="phone" type="text" name="phone" value="+7 (000) 000-00-00")
+  //input(type="file", name="avatar", hidden)
diff --git a/src/components/EditingSettingsForm/EditingSettingsForm.ts b/src/components/EditingSettingsForm/EditingSettingsForm.ts
@@ -0,0 +1,20 @@
+import { Block } from "../../core/index";
+import template from "./EditingSettingsForm.tmp.pug";
+import { getValuesFromForm } from "../utils/index";
+
+export default class EditingSettingsForm extends Block {
+  constructor(props?: object) {
+    const newProps = {
+      ...props,
+      events: new Map([
+        ['submit', (event: object) => getValuesFromForm(event, this)],
+      ]),
+    }
+
+    super('div', newProps);
+  }
+
+  render() {
+    return this.compile(template, this.props);
+  }
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		button.btn text
		button(class=className, type=type, form=form)= text