Browse Source

Change issues in first task

Bonyant 2 years ago
parent
commit
8517370425
4 changed files with 45 additions and 2 deletions
  1. 0 1
      01/index.html
  2. 14 1
      01/index.js
  3. 11 0
      05/index.html
  4. 20 0
      05/script.js

+ 0 - 1
01/index.html

@@ -7,7 +7,6 @@
     <link rel="shortcut icon" href="https://favicon-generator.org/favicon-generator/htdocs/favicons/2015-01-28/7279ebe8ba6a76623019cc424f6c3ff6.ico" type="image/x-icon">
     <title>Currency converter</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" />
-    <link rel="stylesheet" href="styles.css">
     <script src="index.js"></script>
 </head>
 <body>

+ 14 - 1
01/index.js

@@ -19,6 +19,7 @@ async function renderCurrency() {
   let firstSelect = document.querySelector("#firstSelect");
   for (let i = 0; i < curArray.length; i++) {
     let option = document.createElement("option");
+    option.setAttribute("selected", curArray[0]);
     option.setAttribute("value", curArray[i]);
     option.innerHTML = currencies[curArray[i]]["name"];
     firstSelect.appendChild(option);
@@ -38,10 +39,22 @@ async function convert() {
   let currency2 = document.querySelector("#secondCurrency");
   let value1 = document.querySelector("#firstInput");
   let value2 = document.querySelector("#secondInput");
+  if (!currency1.value) {
+    currency1.value = "btc";
+  }
+  if (!currency2.value) {
+    currency2.value = "usd";
+  }
+  if (value1.value === "" || +value1.value < 0) {
+    alert(
+      "Не введено число / Введено отрицательное число\nПоставлено число по умолчанию - 1"
+    );
+    value1.value = 1;
+  }
   if (currency1.value === currency2.value) {
     value2.value = value1.value;
   }
-  if (currency2.value === "btc"s) {
+  if (currency2.value === "btc") {
     value2.value = objCur[currency1.value]["value"];
   }
   if (currency1.value !== currency2.value) {

+ 11 - 0
05/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script src="script.js"></script>
+    <title>Document</title>
+  </head>
+  <body></body>
+</html>

+ 20 - 0
05/script.js

@@ -0,0 +1,20 @@
+function myMap(arr, f) {
+  let result = [];
+  for (let item of arr) {
+    result.push(f(item));
+  }
+  return result;
+}
+console.log(myMap([1, 2, 3, 4], (x) => x / 2));
+
+function myFilter(arr, f) {
+  let result = [];
+  for (let item of arr) {
+    if (f(item)) {
+      result.push(item);
+    }
+  }
+  return result;
+}
+
+console.log(myFilter([1, 2, 3, 4, 5], (x) => x % 2));