Merge pull request #30 from sulianova/VladimirFyodorov/change-hw-imag…

…e-types

Vladimir fyodorov/change hw image types

package.json

@@ -39,6 +39,7 @@
     "react-scripts": "5.0.1",
     "redux": "^4.2.1",
     "redux-saga": "^1.2.3",
+    "rxjs": "^7.8.1",
     "sass": "^1.62.1",
     "typescript": "^4.9.5",
     "uuid": "^9.0.0",

src/assets/images/Svg/Edit.tsx

@@ -0,0 +1,18 @@
+export default Edit;
+
+function Edit() {
+  return (
+    <svg viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clip-path="url(#clip0_2240_49)">
+        <path d="M3.10003 24.32L0.0600304 33.17C-0.20997 33.96 0.54003 34.71 1.33003 34.44L10.17 31.4L3.10003 24.33V24.32Z"/>
+        <path d="M24.5422 2.88216L4.50989 22.9145L11.581 29.9856L31.6133 9.95322L24.5422 2.88216Z"/>
+        <path d="M33.03 1.46C31.08 -0.490002 27.91 -0.490002 25.96 1.46L33.03 8.53C34.98 6.58 34.98 3.41 33.03 1.46Z"/>
+      </g>
+      <defs>
+        <clipPath id="clip0_2240_49">
+          <rect width="34.5" height="34.5" fill="white"/>
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}

src/assets/images/Svg/Trash.tsx

@@ -0,0 +1,16 @@
+export default Trash;
+
+function Trash() {
+  return (
+    <svg viewBox="0 0 19 24" xmlns="http://www.w3.org/2000/svg">
+      <g clip-path="url(#clip0_2235_44)">
+      < path d="M5.98225 6.23489V19.7693M9.14028 6.23489V19.7693M12.2983 6.23489V19.7693M2.12944 3.4107V21.6912C2.12944 22.1875 2.53548 22.5935 3.03174 22.5935L15.2579 22.5484C15.7541 22.5484 16.1601 22.1424 16.1601 21.6461V3.4107M0.451172 3.15806H18.0189M12.181 2.67082V1.35347C12.181 0.857205 11.775 0.451172 11.2787 0.451172H6.88454C6.38828 0.451172 5.98225 0.857205 5.98225 1.35347V2.67082" stroke-linecap="round" stroke-linejoin="round"/>
+      </g>
+      <defs>
+        <clipPath id="clip0_2235_44">
+          <rect width="18.47" height="23.0446"/>
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}

src/assets/images/Svg/Upload.tsx

@@ -0,0 +1,18 @@
+export default Upload;
+
+function Upload() {
+  return (
+    <svg viewBox="0 0 52 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clip-path="url(#clip0_2241_11)">
+        <path d="M30.15 33.22C46.15 33.22 50.23 30.21 49.65 22.72C49.15 16.22 41.65 15.72 41.65 15.72C41.65 15.72 44.63 6.88001 34.65 2.72001C22.65 -2.27999 17.65 9.72001 17.65 9.72001C8.64996 5.72001 7.64996 14.72 7.64996 14.72C0.149957 16.22 0.939957 24.54 2.64996 27.72C5.63996 33.28 11.15 33.22 18.15 33.22" stroke-linecap="round" stroke-linejoin="round"/>
+        <path d="M24.25 16.79V37.91" stroke-linecap="round" stroke-linejoin="round"/>
+        <path d="M18.25 22.22L24.25 16.25L30.12 22.22" stroke-linecap="round" stroke-linejoin="round"/>
+      </g>
+      <defs>
+        <clipPath id="clip0_2241_11">
+          <rect width="51.2" height="39.41" fill="white"/>
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}

src/assets/translations/ru.json

@@ -147,14 +147,23 @@
     "navTubsPractice": "Задание",
     "navTubsResults": "Итоги",
     "deadlineUploadText": "Дедлайн: ",
-    "deadlineUploadTime": " 23:59 по Мск",
+    "deadlineUploadTime": " 23:59\u00A0по\u00A0Мск",
     "deadlineResultsText": "Публикация итогов: ",
+    "uploadBtn": "Загрузить работу",
+    "resultLinkTitle": "Результаты задания",
+    "editTitle": "Редактировать...",
     "upload": {
       "fieldsTitle": "Результаты задания",
       "filesTitle": "Файлы",
       "filesBtn": "Добавить",
       "submitBtn": "Отправить на проверку",
-      "submitDescription": "до дедлайна, чтобы получить обратную связь"
+      "submitDescription": "до дедлайна, чтобы получить обратную связь",
+      "addCaption": "Добавить описание",
+      "contentInputLabel": "Ссылка",
+      "contentTextareaLabel": "Описание",
+      "contentTextareaPlaceholder": "Какой-то плейсхолдер",
+      "filesEmpty1": "Загрузите файлы",
+      "filesEmpty2": "Картинка должна весить меньше 3 мб"
     },
     "homework": {
       "title": "Описание"

src/hooks/behaviourSubjectValue.ts

@@ -0,0 +1,15 @@
+import { useEffect, useState } from 'react';
+import { BehaviorSubject } from 'rxjs';
+
+export function useBehaviourSubjectValue<T>(subject: BehaviorSubject<T>, initialValue?: T) {
+  const [value, setValue] = useState(initialValue !== undefined ? initialValue : subject.getValue());
+
+  useEffect(() => {
+    const s = subject.subscribe(v => {
+      setValue(v);
+    });
+    return () => s.unsubscribe();
+  }, [subject]);
+
+  return value;
+}

src/hooks/index.ts

@@ -1,3 +1,4 @@
+export * from './behaviourSubjectValue';
 export * from './const';
 export * from './fetch';
 export * from './getId';