Merge branch 'develop' into master

Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/172

.env.development

@@ -1,6 +1,6 @@
-REACT_APP_CMS_BASE_URL=https://cms.techpal.ru/api
-REACT_APP_CMS_APP_NAME=techpal
+REACT_APP_CMS_BASE_URL=http://scipaper.ru
+REACT_APP_CMS_APP_NAME=scipaper
 REACT_APP_OPENID_PROVIDER_URL=http://auth.techpal.ru/auth/realms/master/protocol/openid-connect/auth?client_id=techpal&response_type=code
-REACT_APP_INTEGRATOR_URL=http://integrator.techpal.ru
-REACT_APP_INTEGRATOR_API_VERSION=/api/1
+REACT_APP_INTEGRATOR_URL=http://scipaper.ru
+REACT_APP_INTEGRATOR_API_VERSION=/v1
 REACT_APP_GRAPHQL_URL=/graphql

.env.production

@@ -1,6 +1,6 @@
-REACT_APP_CMS_BASE_URL=EXT_CMS_BASE_URL
-REACT_APP_CMS_APP_NAME=EXT_CMS_APP_NAME
-REACT_APP_OPENID_PROVIDER_URL=EXT_OPENID_PROVIDER_URL
-REACT_APP_INTEGRATOR_URL=EXT_INTEGRATOR_URL
-REACT_APP_INTEGRATOR_API_VERSION=EXT_INTEGRATOR_API_VERSION
-REACT_APP_GRAPHQL_URL=EXT_GRAPHQL_URL
+REACT_APP_CMS_BASE_URL=http://scipaper.ru
+REACT_APP_CMS_APP_NAME=scipaper
+REACT_APP_OPENID_PROVIDER_URL=http://auth.techpal.ru/auth/realms/master/protocol/openid-connect/auth?client_id=techpal&response_type=code
+REACT_APP_INTEGRATOR_URL=http://scipaper.ru
+REACT_APP_INTEGRATOR_API_VERSION=/v1
+REACT_APP_GRAPHQL_URL=/graphql

Dockerfile

@@ -17,22 +17,25 @@ COPY . .
 RUN npm run build
 
 # Bundle static assets with nginx
-FROM nginx:1.21.6 as production
+FROM node:16-alpine as production
 # Copy built assets from builder
-COPY --from=builder /app/build /usr/share/nginx/html
-# Add nginx.config
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-# Expose ports
-EXPOSE 80
+WORKDIR /app
+COPY --from=builder /app/build .
+
+# Expose ports
+EXPOSE 3000
 
-COPY entrypoint.sh .
 COPY .env.production .
 
 ENV NODE_ENV production
+ENV USER_NAME=node_user USER_UID=2000 GROUP_NAME=node_group GROUP_UID=2000
 
-# Execute script
-RUN ["chmod", "+x", "./entrypoint.sh"]
-ENTRYPOINT ["./entrypoint.sh"]
+RUN npm i -g serve \
+    && deluser --remove-home node \
+    && addgroup --g ${GROUP_UID} -S ${GROUP_NAME} \ 
+    && adduser -D -S -s /sbin/nologin -u ${USER_UID} -G ${GROUP_NAME} ${USER_NAME}\
+    && chown -R ${USER_NAME}:${GROUP_NAME} "/app/"
 
-# Start serving
-CMD ["nginx", "-g", "daemon off;"]
+
+USER "${USER_NAME}"
+CMD serve -s .

Makefile

@@ -1,4 +1,4 @@
-PROJECT_NAME=freeland-frontend
+PROJECT_NAME=scipaper-frontend
 
 setup:
 	npm i

entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /bin/bash
 # no verbose
 set +x
 # config

package.json

@@ -3,10 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^6.2.0",
+    "@fortawesome/free-brands-svg-icons": "^6.2.0",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.6.6",
     "@reduxjs/toolkit": "^1.8.3",
     "@types/node": "^16.11.47",
     "@types/react": "^18.0.15",
+    "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.0.6",
     "@uiw/react-md-editor": "^3.18.1",
     "axios": "^0.27.2",
@@ -20,10 +25,12 @@
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "react": "^18.2.0",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.2.0",
     "react-hotkeys": "^2.0.0",
     "react-i18next": "^11.18.3",
     "react-loading-skeleton": "^3.1.0",
+    "react-lottie": "^1.2.3",
     "react-markdown": "^8.0.3",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
@@ -103,6 +110,7 @@
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.5.2",
+    "@types/react-lottie": "^1.2.6",
     "@types/react-syntax-highlighter": "^15.5.5",
     "autoprefixer": "^10.4.8",
     "babel-plugin-named-exports-order": "^0.0.2",
@@ -110,6 +118,7 @@
     "postcss": "^8.4.14",
     "prop-types": "^15.8.1",
     "react-test-renderer": "^18.2.0",
+    "tailwind-scrollbar": "^2.0.1",
     "webpack": "^5.74.0"
   }
 }

public/index.html

@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Freeland</title>
+    <title>Scipaper</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

public/locales/en/translation.json

@@ -1,7 +1,7 @@
 {
   "serv": {
-    "goHome": "Home",
-    "noSuchPath": "We don't have this page"
+    "goHome": "Home page",
+    "noSuchPath": "We don't have such a page"
   },
   "sidemenu": {
     "dashboard": "Dashboard",
@@ -19,45 +19,130 @@
   "hellousr": "Hello, {{username}}",
   "edit": "Edit",
   "language": "Language",
-  "selectLanguage": "Select language",
+  "selectLanguage": "Select a language",
   "save": "Save",
   "cancel": "Cancel",
   "account": {
-    "info": "Personal information",
+    "info": "Personal Information",
     "mail": "Mail",
-    "connect": "Add account",
-    "connectedAccounts_one": "Connected account",
-    "connectedAccounts_other": "Connected accounts",
-    "settings": "Account settings"
+    "connect": "Add Account",
+    "connectedAccounts_one": "Linked Account",
+    "connectedAccounts_other": "Linked Accounts",
+    "settings": "Account Settings"
   },
   "security": {
     "password": {
       "caption": "Password",
-      "twoFactor": "Two factor authentication (2FA)",
-      "description": "Keep your account secure by enabling 2FA via SMS or using a temporary one-time passcode (TOTP) from an authenticator app."
+      "twoFactor": "Two-factor authentication (2FA)",
+      "description": "Protect your account by enabling 2FA via SMS or using a temporary one-time password (OTP) from the authentication app."
     },
     "activity": {
       "caption": "Device activity"
     }
   },
   "search": {
-    "label": "Search for something.."
+    "label": "We will find something.."
   },
   "subscriptions": {
-    "subscribed": "Service have been connected"
+    "subscribed": "The service is attached to the account"
   },
   "viewHistory": "View history",
-  "logOutEverywhere": "log out from all devices",
+  "logOutEverywhere": "Log out from all devices",
   "back": "Back",
-  "logOut": "Log out",
+  "logOut": "Exit",
   "failures": {
     "subscriptions": {
-      "failure": "Failed to connect service",
-      "exists": "Service have already been connected",
-      "confirmation": "Invalid confirmation information provided"
+      "failure": "Failed to attach the service to your account",
+      "exists": "The service was already attached to your account earlier",
+      "confirmation": "Invalid password"
     },
     "services": {
-      "fork": "Failed to authenticate in service"
+      "fork": "Failed to perform authorization in the service"
     }
+  },
+  "articlePage": {
+    "abstract": "Abstract",
+    "keywords": "Keywords",
+    "interactionButtons":{
+      "abstract": "Abstract",
+      "readFile": "Read File",
+      "download" : "Download",
+      "share" : "Share",
+      "cite" : "Cite",
+      "copied": "Copied"
       }
+      
+  },
+  "navbar": {
+    "createNew": "Create New",
+    "about": {
+      "navTitle": "About",
+      "aboutProject": "About Scipaper",
+      "contacts": "Contacts",
+      "help": "Help"
+    },
+    "library": {
+      "navTitle": "My library",
+      "publications": "Publications",
+      "favorites": "Favorites",
+      "collections": "Collections",
+      "recentViewed": "History"
+    },
+    "auth": {
+      "signIn": "Sign In",
+      "signUp": "Sign Up"
+    }
+  },
+  "footer": {
+    "accountSettings": "Account Settings",
+    "about": "About Scipaper",
+    "help": "Help",
+    "contactUs": "Contacts",
+    "allRightsReserved": "All rights reserved",
+    "termsOfUse": "Terms of Use",
+    "privacyPolicy": "Privacy Policy",
+    "coockiesPolicy": "coockies Usage Policy",
+    "supportedBy": "Created"
+  },
+  "mainPage": {
+    "title": "Scientific Library with Free Access",
+    "search": "Search",
+    "article_one": "Articles",
+    "article_few": "Articles",
+    "article_many": "Articles",
+    "advancedSearch": "Advanced search",
+    "featuredArticles": {
+      "title": "Featured articles",
+      "descriptionPart1": "Select the category of science you are interested in",
+      "descriptionPart2": "Scientific category",
+      "categories": {
+        "Medical": "Medical",
+        "TechnicsAndTechlonogies": "Technics and Technology",
+        "Fundamental": "Fundamental",
+        "Humanitarian": "Humanitarian",
+        "Agricultural": "Agricultural",
+        "Social": "Social"
+      }
+    },
+    "featuredAuthors": "Featured authors",
+    "more": "See More ",
+    "showAll": "Show all"
+  },
+  "searchResults": {
+    "title": "Search results",
+    "totalResults":"Total results",
+    "nothingFound": "Nothing found"
+  },
+  "filters": {
+    "authors":"Authors",
+    "publicationsType": "Publications Type",
+    "content":"Content",
+    "publisher":"Publisher",
+    "publicationTopic":"Publication Topic",
+    "appliedFitlers":"Applied Fitlers",
+    "clearAll":"Clear All",
+    "enterAuthorsName":"Enter Author Name",
+    "showAll":"Show All"
+  }
+
 }

public/locales/ru/translation.json

@@ -59,5 +59,87 @@
     "services": {
       "fork": "Не удалось выполнить авторизацию в сервисе"
     }
+  },
+  "articlePage": {
+    "abstract": "Введение",
+    "keywords": "Ключевые слова",
+    "interactionButtons":{
+      "abstract": "Развернуть",
+      "readFile": "Читать",
+      "download" : "Скачать",
+      "share" : "Поделиться",
+      "cite" : "Цитировать",
+      "copied": "Скопировано"
+    }
+  },
+  "navbar": {
+    "createNew": "Создать статью",
+    "about": {
+      "navTitle": "О проекте",
+      "aboutProject": "О Scipaper",
+      "contacts": "Контакты",
+      "help": "Помощь"
+    },
+    "library": {
+      "navTitle": "Моя библиотека",
+      "publications": "Публикации",
+      "favorites": "Избранное",
+      "collections": "Коллекции",
+      "recentViewed": "История"
+    },
+    "auth": {
+      "signIn": "Вход",
+      "signUp": "Регистрация"
+    }
+  },
+  "footer": {
+    "accountSettings": "Настройки аккаунта",
+    "about": "О scipaper",
+    "help": "Помощь",
+    "contactUs": "Контакты",
+    "allRightsReserved": "Все права защищены",
+    "termsOfUse": "Правила использования",
+    "privacyPolicy": "Политика конфиденциальности",
+    "coockiesPolicy": "Политика использования coockies",
+    "supportedBy": "Создано"
+  },
+  "mainPage": {
+    "title": "Библиотека научных статей с бесплатным доступом",
+    "search": "Поиск",
+    "article_one": "статьи",
+    "article_few": "статей",
+    "article_many": "статей",
+    "advancedSearch": "Расширенный поиск",
+    "featuredArticles": {
+      "title": "Популярные статьи",
+      "descriptionPart1": "Выберете интересующую вас ",
+      "descriptionPart2": "научную категорию",
+      "categories": {
+        "Medical": "Медицина",
+        "TechnicsAndTechlonogies": "Техника и технологии",
+        "Fundamental": "Естественые",
+        "Humanitarian": "Гуманитарные",
+        "Agricultural": "Аuрокультурa",
+        "Social": "Социальные"
+      }
+    },
+    "featuredAuthors": "Популярные авторы",
+    "more": "Больше",
+    "showAll": "Показать все"
+  },
+  "searchResults": {
+    "title": "Результаты поиска",
+    "totalResults":"Всего найдено",
+    "nothingFound": "Ничего не найдено"
+  },
+  "filters": {
+    "authors":"Авторы",
+    "publicationsType": "Публикации",
+    "publisher":"Издатель",
+    "publicationTopic":"Тема публикации",
+    "appliedFitlers":"Фильтры",
+    "clearAll":"Очистить всё",
+    "enterAuthorsName":"Введите имя автора",
+    "showAll":"Показать все"
   }
 }

src/App.tsx

@@ -2,6 +2,8 @@
 /*                                  Libraries                                 */
 /* -------------------------------------------------------------------------- */
 import React from "react";
+import MainPage from "pages/MainPage";
+
 /* -------------------------------------------------------------------------- */
 /*                         Application root component                         */
 /* -------------------------------------------------------------------------- */
@@ -10,7 +12,7 @@ import React from "react";
  * @return {JSX.Element}
  */
 function App() {
-  return <div>Hello world!</div>;
+  return <MainPage />;
 }
 
 export default App;

src/article/data/articleAPIService.ts

@@ -3,21 +3,22 @@ import { Article } from "../domain/articleEntity";
 import { create } from "../domain/articleModel";
 import { FetchArticleByIdDTO } from "./dto/fetch_article_by_id_dto";
 import Failure from "core/failure";
+import { integratorApiClient } from "core/httpClient";
+
+const articleEndpoint = "/papers/"
 
 async function getArticle(id: string): Promise<Article> {
   try {
-    // await new Promise((res, _) => {
-    //   setTimeout(() => res(null), 2000);
-    // });
-    const response = await axios.get<FetchArticleByIdDTO>(
-      `https://run.mocky.io/v3/62cd4581-d864-4d46-b1d6-02b45b5d1994/${id}`
+    const response = await integratorApiClient.get<FetchArticleByIdDTO>(
+      // `https://run.mocky.io/v3/62cd4581-d864-4d46-b1d6-02b45b5d1994/${id}`
       // `https://jsonplaceholder.typicode.com/posts/${id}`
-      // `http://scipaper.ru/v1/papers/${id}`
+      // `https://run.mocky.io/v3/066be3d8-0568-439a-8b20-062deed49a97`
+      articleEndpoint + id
     );
     const dto = response.data;
     return create({
       id: dto.id,
-      topic: dto.topic,
+      topic: [dto.topic],
       title: dto.title,
       authors: dto.authors,
       tags: dto.tags,

src/article/data/articleReducer.ts

@@ -1,5 +1,4 @@
 import { AnyAction } from "@reduxjs/toolkit";
-import { Article } from "article/domain/articleEntity";
 import type { ArticleStore } from "../domain/articleStore";
 import * as actionTypes from "./articleActionTypes";
 

src/article/domain/articleEntity.ts

@@ -1,9 +1,9 @@
 export interface Article {
   id: string;
-  topic: string;
   title: string;
-  authors: string[];
-  tags: string[];
-  summary: string;
   content: string;
+  topic?: string[];
+  authors?: string[];
+  tags?: string[];
+  summary?: string;
 }

src/article/domain/articleStore.ts

@@ -1,5 +1,4 @@
-import type { Article } from "./articleEntity";
-
+import { Article } from './articleEntity';
 interface ArticleStore {
   // State
   article: Article | undefined;

src/article/useCases/params/create_article_params.ts

@@ -1,6 +1,6 @@
 export interface CreateArticleParams {
   id: string;
-  topic: string;
+  topic: string[];
   title: string;
   authors: string[];
   tags: string[];