RTF-Angular-2021 · loozmax · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="utf-8">
+    <title>Заголовок</title>
+</head>
+<body>
+    <script data-main="../dist/task_2/index.js"
+        src="https://requirejs.org/docs/release/2.3.6/minified/require.js"></script>
+</body>
+</html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/index.html b/src/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="utf-8">
+    <title>Заголовок</title>
+</head>
+<body>
+    <script data-main="../dist/task_2/index.js"
+        src="https://requirejs.org/docs/release/2.3.6/minified/require.js"></script>
+</body>
+</html>
diff --git a/src/task_1/app.ts b/src/task_1/app.ts
@@ -0,0 +1,5 @@
+namespace Custom {
+    let user = new User(5, 'Max');
+    user.upAgeByYear();
+    console.log(user);
+}
diff --git a/src/task_1/typing.d.ts b/src/task_1/typing.d.ts
@@ -0,0 +1,9 @@
+declare namespace Custom {
+    class User {
+        public age: number;
+        public name: string;
+        constructor(a: number, n: string);
+        public upAgeByYear(): void;
+    } 
+    let user: User;
+}
diff --git a/src/task_2/example.ts b/src/task_2/example.ts
@@ -0,0 +1,11 @@
+import { Setting } from './setting'
+
+export class Example {
+    public title: string;
+    public id: number;
+    private _setting: Setting;
+
+    constructor(s: Setting) {
+        this._setting = s;
+    }
+}
diff --git a/src/task_2/index.ts b/src/task_2/index.ts
@@ -6,33 +6,18 @@
  * 	  все остальные файлы должны подгрузиться асинхронно по цепочке, используя requireJS.
 */
 
-class SettingValue {
-    public property1: string;
-    public property2: string;
-
-    constructor(p1: string, p2: string) {
-        this.property1 = p1;
-        this.property2 = p2;
-    }
-}
-
-class Setting {
-    public key: string;
-    public value: SettingValue;
-
-    constructor(k: string, ov: SettingValue) {
-        this.key = k;
-        this.value = ov;
-    }
-}
-
-
-class Example {
-    public title: string;
-    public id: number;
-    private _setting: Setting;
-
-    constructor(s: Setting) {
-        this._setting = s;
+import { Example } from './example';
+import { Setting } from './setting';
+import { SettingValue } from './setting-value';
+
+class Test {
+    public print(a: string, b: number): string {
+        return `${a} and ${b}`;
     }
 }
+
+let test = new Test();
+const example = new Example(new Setting("test", new SettingValue("test", "test")));
+example.id = 5;
+example.title = "test";
+console.log(test.print(example.title, example.id));
diff --git a/src/task_2/setting-value.ts b/src/task_2/setting-value.ts
@@ -0,0 +1,9 @@
+export class SettingValue {
+    public property1: string;
+    public property2: string;
+
+    constructor(p1: string, p2: string) {
+        this.property1 = p1;
+        this.property2 = p2;
+    }
+}
diff --git a/src/task_2/setting.ts b/src/task_2/setting.ts
@@ -0,0 +1,11 @@
+import { SettingValue } from './setting-value'
+
+export class Setting {
+    public key: string;
+    public value: SettingValue;
+
+    constructor(k: string, ov: SettingValue) {
+        this.key = k;
+        this.value = ov;
+    }
+}
diff --git a/src/task_3/index.ts b/src/task_3/index.ts
@@ -16,33 +16,30 @@ class HttpError extends Error {
     }
 }
 
-function req(url: string): Promise<IUser> {
-    return fetch(url)
-        .then((response: Response) => {
-            if (response.status == 200) {
-                return response.json();
-            } else {
-                throw new HttpError(response);
-            }
-        })
+async function req(url: string): Promise<IUser> {
+    const response: Response = await fetch(url);
+    if (response.status == 200) {
+        return response.json();
+    } else {
+        throw new HttpError(response);
+    }
 }
 
 // Запрашивать логин, пока github не вернёт существующего пользователя.
-function getGitHub() {
+async function getGitHub() {
     let name = prompt("Введите логин на GitHub?", "");
-
-    return req(`https://api.github.com/users/${name}`)
-        .then(user => {
-            document.write(`Полное имя: ${user.name}, уникальный номер: ${user.id}.`);
-            return user;
-        })
-        .catch(err => {
-            if (err instanceof HttpError && err.response.status == 404) {
-                document.write("Такого пользователя не существует.");
-            } else {
-                throw err;
-            }
-        });
+    let user;
+    try {
+        user = await req(`https://api.github.com/users/${name}`);
+        document.write(`Полное имя: ${user.name}, уникальный номер: ${user.id}.`);
+        return user;
+    } catch(err) {
+        if (err instanceof HttpError && err.response.status == 404) {
+            document.write("Такого пользователя не существует.");
+        } else {
+            throw err;
+        }
+    }
 }
 
 getGitHub();
diff --git a/src/task_4/index.ts b/src/task_4/index.ts
@@ -3,4 +3,4 @@
  * Использовать: https://docs.github.com/en/rest/reference/git#create-a-blob
  * Не забывайте, что пригодится аутентификация и ключ:
  * https://docs.github.com/en/developers/apps/authenticating-with-github-apps#authenticating-as-an-installation
-*/
+*/
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+      "traceResolution": false,
+      "experimentalDecorators": true,
+      "noImplicitAny": false,
+      "noEmitOnError": true,
+      "removeComments": false,
+      "sourceMap": true,
+      "moduleResolution": "node",
+      "module": "amd",
+      "target": "ES6",
+      "outDir": "dist"
+    },
+    "include": [
+      "src/**/*"]
+  }