Merge pull request '(feature/complete-develop-merge) Resolving multiple merges' (#138) from feature/complete-develop-merge into develop

Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/138
This commit is contained in:
Daniel Weissmall 2022-10-12 12:15:01 +00:00
commit 50a42955d6
461 changed files with 79728 additions and 77460 deletions

0
.dockerignore Normal file → Executable file
View File

8
.env.development Normal file → Executable file
View File

@ -1,6 +1,6 @@
REACT_APP_CMS_BASE_URL=https://cms.techpal.ru/api REACT_APP_CMS_BASE_URL=http://scipaper.ru
REACT_APP_CMS_APP_NAME=techpal 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_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_URL=http://scipaper.ru
REACT_APP_INTEGRATOR_API_VERSION=/api/1 REACT_APP_INTEGRATOR_API_VERSION=/v1
REACT_APP_GRAPHQL_URL=/graphql REACT_APP_GRAPHQL_URL=/graphql

0
.env.production Normal file → Executable file
View File

0
.gitignore vendored Normal file → Executable file
View File

0
.npmrc Normal file → Executable file
View File

0
.nvmrc Normal file → Executable file
View File

0
.storybook/index.css Normal file → Executable file
View File

0
.storybook/main.js Normal file → Executable file
View File

0
.storybook/main.ts Normal file → Executable file
View File

0
.storybook/preview.js Normal file → Executable file
View File

0
.storybook/preview.ts Normal file → Executable file
View File

0
Dockerfile Normal file → Executable file
View File

0
Makefile Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

0
global.d.ts vendored Normal file → Executable file
View File

0
nginx.conf Normal file → Executable file
View File

6229
package-lock.json generated

File diff suppressed because it is too large Load Diff

1
package.json Normal file → Executable file
View File

@ -110,6 +110,7 @@
"postcss": "^8.4.14", "postcss": "^8.4.14",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react-test-renderer": "^18.2.0", "react-test-renderer": "^18.2.0",
"tailwind-scrollbar": "^2.0.1",
"webpack": "^5.74.0" "webpack": "^5.74.0"
} }
} }

0
postcss.config.js Normal file → Executable file
View File

0
public/favicon.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
public/index.html Normal file → Executable file
View File

0
public/locales/en/translation.json Normal file → Executable file
View File

0
public/locales/ru/translation.json Normal file → Executable file
View File

0
public/logo192.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

0
public/logo512.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

0
public/manifest.json Normal file → Executable file
View File

0
public/robots.txt Normal file → Executable file
View File

0
src/.storybook/main.js Normal file → Executable file
View File

0
src/.storybook/preview.js Normal file → Executable file
View File

0
src/App.css Normal file → Executable file
View File

0
src/App.test.tsx Normal file → Executable file
View File

4
src/App.tsx Normal file → Executable file
View File

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

View File

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

0
src/assets/fonts/Inter-Black.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-Bold.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-ExtraBold.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-ExtraLight.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-Light.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-Medium.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-Regular.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-SemiBold.ttf Normal file → Executable file
View File

0
src/assets/fonts/Inter-Thin.ttf Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Bold.eot Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Bold.ttf Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Bold.woff2 Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Medium.eot Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Medium.ttf Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Medium.woff2 Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Regular.eot Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Regular.ttf Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Regular.woff2 Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Thin.eot Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Thin.ttf Normal file → Executable file
View File

0
src/assets/fonts/Poppins-Thin.woff2 Normal file → Executable file
View File

0
src/assets/svg/agricultural.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
src/assets/svg/arrow-big-right.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 513 B

0
src/assets/svg/arrow-down.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 345 B

0
src/assets/svg/arrow-left.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 345 B

0
src/assets/svg/arrow-right.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 311 B

0
src/assets/svg/arrow-up.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 315 B

0
src/assets/svg/background.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
src/assets/svg/bell-notification.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 735 B

0
src/assets/svg/bell.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 637 B

0
src/assets/svg/bookmark-filled.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 347 B

0
src/assets/svg/bookmark-outlined.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 359 B

0
src/assets/svg/caret-down.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 306 B

0
src/assets/svg/caret-left.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 318 B

0
src/assets/svg/caret-right.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 317 B

0
src/assets/svg/caret-up.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 312 B

0
src/assets/svg/chart.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 345 B

0
src/assets/svg/chevrones-left.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 645 B

0
src/assets/svg/chevrones-right.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 594 B

0
src/assets/svg/circle.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 148 B

0
src/assets/svg/cite.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 906 B

After

Width:  |  Height:  |  Size: 915 B

0
src/assets/svg/copy.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 430 B

0
src/assets/svg/delete.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 537 B

After

Width:  |  Height:  |  Size: 542 B

0
src/assets/svg/download.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 490 B

0
src/assets/svg/duplicate.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 639 B

After

Width:  |  Height:  |  Size: 645 B

0
src/assets/svg/edit1.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 578 B

0
src/assets/svg/edit2.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 725 B

0
src/assets/svg/error.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 480 B

After

Width:  |  Height:  |  Size: 485 B

0
src/assets/svg/eye.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 441 B

After

Width:  |  Height:  |  Size: 445 B

0
src/assets/svg/facebook.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 648 B

After

Width:  |  Height:  |  Size: 651 B

0
src/assets/svg/favorite-filled.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 259 B

0
src/assets/svg/favorite-outlined.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 285 B

0
src/assets/svg/file.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 491 B

0
src/assets/svg/filetext.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 632 B

After

Width:  |  Height:  |  Size: 639 B

0
src/assets/svg/filter.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 508 B

After

Width:  |  Height:  |  Size: 516 B

0
src/assets/svg/flag.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 613 B

0
src/assets/svg/folder.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 783 B

0
src/assets/svg/formula.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
src/assets/svg/fundamental.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
src/assets/svg/grid.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 480 B

After

Width:  |  Height:  |  Size: 487 B

0
src/assets/svg/hamburger.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 311 B

0
src/assets/svg/help.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 693 B

After

Width:  |  Height:  |  Size: 698 B

0
src/assets/svg/horizontal.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 278 B

0
src/assets/svg/humanitarian.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

0
src/assets/svg/image.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 731 B

0
src/assets/svg/info.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 486 B

0
src/assets/svg/instagram.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Some files were not shown because too many files have changed in this diff Show More