Merge branch 'develop' into master

Merge pull request 'the overlay in burger resolved' (#172 ) from fix/burger into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/172
2022-10-31 17:52:31 +00:00 · 2022-10-31 15:03:14 +00:00 · 2022-10-31 15:02:49 +00:00 · 2022-10-31 17:13:43 +03:00 · 2022-10-31 13:28:55 +03:00 · 2022-10-29 16:23:34 +03:00
39 changed files with 1539 additions and 249 deletions
--- a/27
+++ b/27
@ -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 .
--- a/package-lock.json
+++ b/package-lock.json
@ -8,10 +8,15 @@
      "name": "freeland",
      "version": "0.1.0",
      "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",
@ -25,10 +30,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",
@ -63,6 +70,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",
@ -2382,6 +2390,63 @@
        "js-yaml": "bin/js-yaml.js"
      }
    },
+    "node_modules/@fortawesome/fontawesome-common-types": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz",
+      "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==",
+      "hasInstallScript": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@fortawesome/fontawesome-svg-core": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz",
+      "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": "6.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@fortawesome/free-brands-svg-icons": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz",
+      "integrity": "sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": "6.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@fortawesome/free-solid-svg-icons": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz",
+      "integrity": "sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": "6.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@fortawesome/react-fontawesome": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz",
+      "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==",
+      "dependencies": {
+        "prop-types": "^15.8.1"
+      },
+      "peerDependencies": {
+        "@fortawesome/fontawesome-svg-core": "~1 || ~6",
+        "react": ">=16.3"
+      }
+    },
    "node_modules/@gar/promisify": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
@ -11479,6 +11544,14 @@
        "csstype": "^3.0.2"
      }
    },
+    "node_modules/@types/react-copy-to-clipboard": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz",
+      "integrity": "sha512-otTJsJpofYAeaIeOwV5xBUGpo6exXG2HX7X4nseToCB2VgPEBxGBHCm/FecZ676doNR7HCSTVtmohxfG2b3/yQ==",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
    "node_modules/@types/react-dom": {
      "version": "18.0.6",
      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.6.tgz",
@ -11487,6 +11560,15 @@
        "@types/react": "*"
      }
    },
+    "node_modules/@types/react-lottie": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.6.tgz",
+      "integrity": "sha512-fvGJHD7SeUdVESHo7f7erRnXkTWaa/6Mo5TB+R0/ieSftKoFspA4sMlF2qMH6BljXI7ehFJbBtrD5bzDxPCkGg==",
+      "dev": true,
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
    "node_modules/@types/react-syntax-highlighter": {
      "version": "15.5.5",
      "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.5.tgz",
@ -13529,6 +13611,27 @@
        "node": ">=6.9.0"
      }
    },
+    "node_modules/babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "dependencies": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "hasInstallScript": true
+    },
+    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+    },
    "node_modules/bail": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
@ -15021,6 +15124,14 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/copy-to-clipboard": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz",
+      "integrity": "sha512-Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg==",
+      "dependencies": {
+        "toggle-selection": "^1.0.6"
+      }
+    },
    "node_modules/core-js": {
      "version": "3.24.1",
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
@ -25567,6 +25678,11 @@
        "loose-envify": "cli.js"
      }
    },
+    "node_modules/lottie-web": {
+      "version": "5.9.6",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.9.6.tgz",
+      "integrity": "sha512-JFs7KsHwflugH5qIXBpB4905yC1Sub2MZWtl/elvO/QC6qj1ApqbUZJyjzJseJUtVpgiDaXQLjBlIJGS7UUUXA=="
+    },
    "node_modules/loud-rejection": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@ -30025,6 +30141,18 @@
        "node": ">=14"
      }
    },
+    "node_modules/react-copy-to-clipboard": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
+      "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
+      "dependencies": {
+        "copy-to-clipboard": "^3.3.1",
+        "prop-types": "^15.8.1"
+      },
+      "peerDependencies": {
+        "react": "^15.3.0 || 16 || 17 || 18"
+      }
+    },
    "node_modules/react-dev-utils": {
      "version": "12.0.1",
      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
@ -30292,6 +30420,21 @@
        "react": ">=16.8.0"
      }
    },
+    "node_modules/react-lottie": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.3.tgz",
+      "integrity": "sha512-qLCERxUr8M+4mm1LU0Ruxw5Y5Fn/OmYkGfnA+JDM/dZb3oKwVAJCjwnjkj9TMHtzR2U6sMEUD3ZZ1RaHagM7kA==",
+      "dependencies": {
+        "babel-runtime": "^6.26.0",
+        "lottie-web": "^5.1.3"
+      },
+      "engines": {
+        "npm": "^3.0.0"
+      },
+      "peerDependencies": {
+        "react": "^0.14.7 || ^15.0.0 || ^16.0.0"
+      }
+    },
    "node_modules/react-markdown": {
      "version": "8.0.3",
      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.3.tgz",
@ -37574,6 +37717,11 @@
        "node": ">=8.0"
      }
    },
+    "node_modules/toggle-selection": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+      "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
+    },
    "node_modules/toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@ -41454,6 +41602,43 @@
        }
      }
    },
+    "@fortawesome/fontawesome-common-types": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz",
+      "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg=="
+    },
+    "@fortawesome/fontawesome-svg-core": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz",
+      "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "6.2.0"
+      }
+    },
+    "@fortawesome/free-brands-svg-icons": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz",
+      "integrity": "sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "6.2.0"
+      }
+    },
+    "@fortawesome/free-solid-svg-icons": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz",
+      "integrity": "sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "6.2.0"
+      }
+    },
+    "@fortawesome/react-fontawesome": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz",
+      "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==",
+      "requires": {
+        "prop-types": "^15.8.1"
+      }
+    },
    "@gar/promisify": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
@ -48448,6 +48633,14 @@
        "csstype": "^3.0.2"
      }
    },
+    "@types/react-copy-to-clipboard": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz",
+      "integrity": "sha512-otTJsJpofYAeaIeOwV5xBUGpo6exXG2HX7X4nseToCB2VgPEBxGBHCm/FecZ676doNR7HCSTVtmohxfG2b3/yQ==",
+      "requires": {
+        "@types/react": "*"
+      }
+    },
    "@types/react-dom": {
      "version": "18.0.6",
      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.6.tgz",
@ -48456,6 +48649,15 @@
        "@types/react": "*"
      }
    },
+    "@types/react-lottie": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.6.tgz",
+      "integrity": "sha512-fvGJHD7SeUdVESHo7f7erRnXkTWaa/6Mo5TB+R0/ieSftKoFspA4sMlF2qMH6BljXI7ehFJbBtrD5bzDxPCkGg==",
+      "dev": true,
+      "requires": {
+        "@types/react": "*"
+      }
+    },
    "@types/react-syntax-highlighter": {
      "version": "15.5.5",
      "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.5.tgz",
@ -50064,6 +50266,27 @@
        }
      }
    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+        },
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        }
+      }
+    },
    "bail": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
@ -51233,6 +51456,14 @@
      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
      "dev": true
    },
+    "copy-to-clipboard": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz",
+      "integrity": "sha512-Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg==",
+      "requires": {
+        "toggle-selection": "^1.0.6"
+      }
+    },
    "core-js": {
      "version": "3.24.1",
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
@ -59181,6 +59412,11 @@
        "js-tokens": "^3.0.0 || ^4.0.0"
      }
    },
+    "lottie-web": {
+      "version": "5.9.6",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.9.6.tgz",
+      "integrity": "sha512-JFs7KsHwflugH5qIXBpB4905yC1Sub2MZWtl/elvO/QC6qj1ApqbUZJyjzJseJUtVpgiDaXQLjBlIJGS7UUUXA=="
+    },
    "loud-rejection": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@ -62246,6 +62482,15 @@
        "whatwg-fetch": "^3.6.2"
      }
    },
+    "react-copy-to-clipboard": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
+      "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
+      "requires": {
+        "copy-to-clipboard": "^3.3.1",
+        "prop-types": "^15.8.1"
+      }
+    },
    "react-dev-utils": {
      "version": "12.0.1",
      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
@ -62445,6 +62690,15 @@
      "resolved": "https://registry.npmjs.org/react-loading-skeleton/-/react-loading-skeleton-3.1.0.tgz",
      "integrity": "sha512-j1U1CWWs68nBPOg7tkQqnlFcAMFF6oEK6MgqAo15f8A5p7mjH6xyKn2gHbkcimpwfO0VQXqxAswnSYVr8lWzjw=="
    },
+    "react-lottie": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.3.tgz",
+      "integrity": "sha512-qLCERxUr8M+4mm1LU0Ruxw5Y5Fn/OmYkGfnA+JDM/dZb3oKwVAJCjwnjkj9TMHtzR2U6sMEUD3ZZ1RaHagM7kA==",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "lottie-web": "^5.1.3"
+      }
+    },
    "react-markdown": {
      "version": "8.0.3",
      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-8.0.3.tgz",
@ -67797,6 +68051,11 @@
        "is-number": "^7.0.0"
      }
    },
+    "toggle-selection": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
+      "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="
+    },
    "toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
--- a/package.json
+++ b/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",
--- a/public/index.html
+++ b/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>
--- a/public/locales/en/translation.json
+++ b/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"
  }
-}
+
+}
--- a/public/locales/ru/translation.json
+++ b/public/locales/ru/translation.json
@ -62,18 +62,26 @@
  },
  "articlePage": {
    "abstract": "Введение",
-    "keywords": "Ключевые слова"
+    "keywords": "Ключевые слова",
+    "interactionButtons":{
+      "abstract": "Развернуть",
+      "readFile": "Читать",
+      "download" : "Скачать",
+      "share" : "Поделиться",
+      "cite" : "Цитировать",
+      "copied": "Скопировано"
+    }
  },
  "navbar": {
-    "createNew": "Создать статью",
+    "createNew": "Создать статью",
    "about": {
-      "navTitle": "О проекте",
+      "navTitle": "О проекте",
      "aboutProject": "О Scipaper",
      "contacts": "Контакты",
      "help": "Помощь"
    },
    "library": {
-      "navTitle": "Моя библиотека",
+      "navTitle": "Моя библиотека",
      "publications": "Публикации",
      "favorites": "Избранное",
      "collections": "Коллекции",
@ -123,6 +131,15 @@
    "title": "Результаты поиска",
    "totalResults":"Всего найдено",
    "nothingFound": "Ничего не найдено"
+  },
+  "filters": {
+    "authors":"Авторы",
+    "publicationsType": "Публикации",
+    "publisher":"Издатель",
+    "publicationTopic":"Тема публикации",
+    "appliedFitlers":"Фильтры",
+    "clearAll":"Очистить всё",
+    "enterAuthorsName":"Введите имя автора",
+    "showAll":"Показать все"
  }
-
 }
--- a/src/article/data/articleAPIService.ts
+++ b/src/article/data/articleAPIService.ts
@ -3,16 +3,17 @@ 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({
--- a/src/assets/lotties/notFoundAnimation.json
+++ b/src/assets/lotties/notFoundAnimation.json
--- a/src/components/Article/ArticleParts/InteractionButtons/ArticleInteractionButtons.tsx
+++ b/src/components/Article/ArticleParts/InteractionButtons/ArticleInteractionButtons.tsx
@ -13,14 +13,10 @@ import {
 import classNames from "classnames";
 import { Transition } from "@headlessui/react";
 import Link from "components/typography/Link";
+import { useTranslation } from "react-i18next";
+import { ShareButton } from "./ArticleShareButton";

 const interactionButtonsStore = [
-  {
-    icon: <SVGFiletext />,
-    title: "Read file",
-    buttonEmphasis: "high",
-    iconClassName: "h-6 fill-white stroke-white",
-  },
  {
    icon: <SVGDownload />,
    title: "Download",
@ -47,18 +43,22 @@ type ArticleButtonProps = {
  children?: React.ReactNode;
  className?: string;
  emphasis?: "high" | "low";
-  articleID?: string,
+  articleID?: string;
 } & Omit<React.ComponentPropsWithoutRef<"button">, "">;

 export function ArticleInteractionButtons({
  isAbstractOpen = false,
  children,
-  openAbstract = () => { },
+  openAbstract = () => {},
  className,
  articleID,
  emphasis = "high", //to change displaying of component
  ...props
 }: ArticleButtonProps) {
+  const [t, i18next] = useTranslation("translation", {
+    keyPrefix: "articlePage.interactionButtons",
+  });
+  /* ----------------------------- Abstract Button ---------------------------- */
  const abstractButton = (
    <Button
      emphasis="medium"
@ -66,45 +66,66 @@ export function ArticleInteractionButtons({
      onClick={openAbstract}
    >
      <Typography fontWeightVariant="bold" className="pr-2">
-        Abstract
+        {t("abstract")}
      </Typography>
      <Button.Icon>
-        {!isAbstractOpen ? <SVGArrowDown className="w-4 fill-blue-700 stroke-blue-700" /> : <SVGArrowUp className="w-4 fill-blue-700 stroke-blue-700" />}
+        {!isAbstractOpen ? (
+          <SVGArrowDown className="w-4 fill-blue-700 stroke-blue-700" />
+        ) : (
+          <SVGArrowUp className="w-4 fill-blue-700 stroke-blue-700" />
+        )}
      </Button.Icon>
    </Button>
  );
-  const fileInteractionButtons = interactionButtonsStore.map((button) => {
-    return (
-      button.title === 'Read file' ?
-        <Link
-          to={`/article/content/${articleID}`}>
-          <Button
-            emphasis={button.buttonEmphasis === "high" ? "high" : "low"}
-            className="h-max px-2 mr-2"
-          >
-            <Button.Icon>
-              {React.cloneElement(button.icon, { className: button.iconClassName })}
-            </Button.Icon>
-            {emphasis === "high" ? <Typography>{button.title}</Typography> : null}
-          </Button>
-        </Link>
-        :
-        <Button
-          emphasis={button.buttonEmphasis === "high" ? "high" : "low"}
-          className="h-max px-2 mr-2"
-        >
-          <Button.Icon>
-            {React.cloneElement(button.icon, { className: button.iconClassName })}
-          </Button.Icon>
-          {emphasis === "high" ? <Typography>{button.title}</Typography> : null}
-        </Button>
-    );
-  });
+
+  /* ---------------------------- Read file button ---------------------------- */
+  const readFileButton = (
+    <Link
+      to={`/article/content/${articleID}`}
+      className="rounded active:outline focus:outline focus:outline-blue-400/10 outline-8 active:outline-blue-400/10"
+    >
+      <div
+        className="bg-blue-600
+                  hover:bg-blue-500
+                  active:bg-blue-700    
+                  focus:shadow-lg shadow-blue-500
+                  p-2 rounded
+                  flex flex-row space-x-2
+                  "
+      >
+        <SVGFiletext className="w-6 fill-white stroke-white" />
+        {emphasis === "high" && <Typography fontWeightVariant="semibold" className="text-white">{t("readFile")}</Typography>}
+      </div>
+    </Link>
+  );
+  /* ----------------------------- Download button ---------------------------- */
+  const downLoadButton = (
+    <Button emphasis="low" className="px-2 space-x-2">
+      <Button.Icon>
+        <SVGDownload className="w-6 fill-gray-900 stroke-gray-900" />
+      </Button.Icon>
+      {emphasis === "high" && <Typography fontWeightVariant="semibold" className="text-gray-900">{t("download")}</Typography>}
+    </Button>
+  );
+
+  /* ------------------------------- Cite button ------------------------------ */
+
+  const citeButton = (
+    <Button emphasis="low" className="px-2 space-x-2">
+      <Button.Icon>
+        <SVGCite className="w-6 fill-gray-900 stroke-gray-900" />
+      </Button.Icon>
+      {emphasis === "high" && <Typography fontWeightVariant="semibold" className="text-gray-900">{t("cite")}</Typography>}
+    </Button>
+  );

  return (
-    <div className="flex flex-row">
-      {emphasis === "low" && !children ? abstractButton : null}
-      {children ? children : fileInteractionButtons}
+    <div className="flex flex-row space-x-2">
+      {emphasis != "high" && abstractButton}
+      {readFileButton}
+      {downLoadButton}
+      {citeButton}
+      <ShareButton emphasis={emphasis} linktoCopy={`/article/content/${articleID}`} />
    </div>
  );
 }
--- a/src/components/Article/ArticleParts/InteractionButtons/ArticleShareButton.tsx
+++ b/src/components/Article/ArticleParts/InteractionButtons/ArticleShareButton.tsx
@ -0,0 +1,87 @@
+import { BASE_URL } from "core/httpClient";
+import { useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button } from "../../../Button/Button";
+import { SVGCopy, SVGShare, SVGXmark } from "../../../icons";
+import Typography from "../../../typography/Typography";
+import { CopyToClipboard } from "react-copy-to-clipboard";
+import { Popover } from "@headlessui/react";
+
+type Props = {
+  emphasis?: "high" | "low";
+  linktoCopy?: string;
+};
+
+export function ShareButton({ emphasis, linktoCopy }: Props) {
+  const [t, i18next] = useTranslation("translation", {
+    keyPrefix: "articlePage.interactionButtons",
+  });
+  const [copied, setCopied] = useState(false);
+
+  const copyValue =
+    BASE_URL != undefined && linktoCopy != undefined
+      ? BASE_URL + linktoCopy
+      : t("searchResults.nothingFound");
+
+  function onCopy() {
+    setCopied(true);
+    setTimeout(() => {
+      setCopied(false);
+    }, 1500);
+  };
+
+  const handleFocus = (event: any) => event.target.select();
+
+  return (
+    <Popover className="relative">
+      <Popover.Button>
+        <Button emphasis="low" className="px-2 space-x-2">
+          <Button.Icon>
+            <SVGShare className="w-6 fill-gray-900 stroke-gray-900" />
+          </Button.Icon>
+          {emphasis === "high" && <Typography fontWeightVariant="semibold" className="text-gray-900">{t("share")}</Typography>}
+        </Button>
+      </Popover.Button>
+
+      <Popover.Panel className="absolute z-10 -right-3/4  mt-3 pl-2 bg-white border-2 border-gray-300 shadow-lg rounded">
+        <div className="flex flex-row">
+          <input
+            className="focus:outline-none active:outline-none p-1 mr-1"
+            type="text"
+            readOnly
+            value={copyValue}
+            onFocus={handleFocus}
+          />
+          <div className="relative">
+            <CopyToClipboard text={copyValue} onCopy={onCopy}>
+              <Button
+                emphasis="low"
+                className="items-center border-l-2  rounded-none  "
+              >
+                <Button.Icon>
+                  <SVGCopy className="w-5 fill-gray-900 stroke-gray-900" />
+                </Button.Icon>
+              </Button>
+            </CopyToClipboard>
+
+            {copied && (
+              <div className="absolute z-11 -bottom-full bg-gray-900 text-white px-2 py-1 rounded before:content[''] before:absolute before:bg-gray-900 before:rotate-45 before:w-3 before:h-3 before:-top-1 before:left-4 before:block">
+                {t("copied")}
+              </div>
+            )}
+          </div>
+          <Popover.Button>
+            <Button
+              emphasis="low"
+              className="items-center border-l-2  rounded-none  "
+            >
+              <Button.Icon>
+                <SVGXmark className="w-5 fill-gray-900 stroke-gray-900" />
+              </Button.Icon>
+            </Button>
+          </Popover.Button>
+        </div>
+      </Popover.Panel>
+    </Popover>
+  );
+}
--- a/src/components/ArticleSearchResult.tsx
+++ b/src/components/ArticleSearchResult.tsx
@ -47,10 +47,11 @@ export const ArticleSearchResult = ({ searchItem }: Props) => {
        {searchItem.tags}
      </Article.Keywords>
      <Article.InteractionButtons
-        className="py-2 "
+        className="py-2"
        emphasis="low"
        openAbstract={open}
        isAbstractOpen={openAbstract}
+        articleID={searchItem.id}
      />
      <Article.Description
        emphasis="low"
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@ -5,6 +5,7 @@
 import classNames from "classnames";
 import { StyleType } from "core/_variants";
 import React from "react";
+import { ReactComponent as DeleteIcon } from "../assets/svg/xmark.svg";

 /* -------------------------------------------------------------------------- */
 /*                               Component props                              */
@ -15,7 +16,8 @@ type Props = {
  children: React.ReactNode;
  className?: string;
  iconed?: boolean;
-  onClick?: () => void;
+  onClick?: (element: any) => void;
+  closeOption?: Boolean;
 } & Omit<React.MouseEventHandler<HTMLSpanElement>, "">;

 /* -------------------------------------------------------------------------- */
@ -27,17 +29,18 @@ function Badge({
  children,
  onClick,
  emphasis = "low",
+  closeOption = false,
  ...props
 }: Props): JSX.Element {
  return (
+    <>
      <span
-        onClick={onClick}
        className={classNames(
-          "border p-2 rounded-sm text-xs text-center",
+          "border-none p-2 rounded-md text-xs text-center",
          {
            "cursor-pointer": onClick,
            "border-transparent": emphasis == "low",
-            "bg-blue-400 text-white": emphasis == "high",
+            "bg-blue-400 text-white rounded-xs": emphasis == "high",
            "border-gray-400 background-gray-200": emphasis == "medium",
          },
          className
@ -45,7 +48,18 @@ function Badge({
        {...props}
      >
        {children}
+        {closeOption && (
+          <button onClick={onClick} className="h-4 w-5">
+            <div>
+              <DeleteIcon
+                className="relative top-1 left-1 h-4 w-5 fill-white hover:fill-white stroke-white
+            "
+              />
+            </div>
+          </button>
+        )}
      </span>
+    </>
  );
 }
 export default Badge;
--- a/src/components/Burger.tsx
+++ b/src/components/Burger.tsx
@ -0,0 +1,198 @@
+import { Menu, Transition } from "@headlessui/react";
+import React, { Fragment } from "react";
+import classNames from "classnames";
+import { Disclosure } from "@headlessui/react";
+
+/* -------------------------------------------------------------------------- */
+/*                                 Components                                 */
+/* -------------------------------------------------------------------------- */
+import ContextMenuAction from "./drop-down-menu/ContextMenuAction";
+import ContextMenu from "./drop-down-menu/ContextMenu";
+import { Button } from "./Button/Button";
+import Link from "./typography/Link";
+
+/* -------------------------------------------------------------------------- */
+/*                                    Icons                                   */
+/* -------------------------------------------------------------------------- */
+import { ReactComponent as SVGFavoriteOutlined } from "assets/svg/favorite-outlined.svg";
+import { ReactComponent as SVGHamburger } from "assets/svg/hamburger.svg";
+import { ReactComponent as SVGFolder } from "assets/svg/folder.svg";
+import { ReactComponent as SVGFile } from "assets/svg/file.svg";
+import { ReactComponent as SVGEye } from "assets/svg/eye.svg";
+import { ReactComponent as SVGArrowUp } from "assets/svg/arrow-up.svg";
+import { ReactComponent as SVGCaretDown } from "assets/svg/caret-down.svg";
+
+type Props = React.ComponentPropsWithoutRef<"div">;
+
+const Burger = (props: Props) => {
+  return (
+    <div {...props}>
+      <Menu as="div" className="relative inline-block text-left z-30">
+        <div>
+          <Menu.Button as={Button} emphasis="low">
+            <Button.Icon>
+              <SVGHamburger className="h-6 w-6" />
+            </Button.Icon>
+          </Menu.Button>
+        </div>
+
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >
+          <Menu.Items
+            className="origin-top-right absolute right-0 mt-5 w-44 rounded-md 
+          shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none"
+          >
+            <div className="py-1">
+              <Disclosure>
+                <Disclosure.Button className="uppercase text-base	 px-2 py-1">
+                  <Link className="text-[#096DD9]">create new</Link>
+                </Disclosure.Button>
+              </Disclosure>
+              <hr />
+              <Disclosure>
+                {({ open }) => (
+                  <>
+                    <Disclosure.Button
+                      className="uppercase px-2 flex justify-between w-full items-center
+                      py-1
+                      hover:bg-gray-100
+                      text-base	
+                     "
+                    >
+                      my library
+                      <SVGArrowUp
+                        className={`${
+                          open ? "rotate-180 transform" : "rotate-360"
+                        } h-5 w-5 `}
+                      />
+                    </Disclosure.Button>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                        rounded
+                        hover:bg-gray-200
+                        text-base	
+                        "
+                      >
+                        <SVGFile className="stroke-black w-4 h-4" />
+                        My Publications
+                      </Disclosure.Panel>
+                    </Link>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                        rounded
+                        hover:bg-gray-200
+                        text-base	
+                        "
+                      >
+                        <SVGFavoriteOutlined className="stroke-black w-4 h-4" />
+                        My Favorites
+                      </Disclosure.Panel>
+                    </Link>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                        rounded
+                        hover:bg-gray-200
+                        text-base	
+                        "
+                      >
+                        <SVGFolder className="stroke-black fill-black w-4 h-4" />
+                        My Collections
+                      </Disclosure.Panel>
+                    </Link>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                         rounded
+                         hover:bg-gray-200
+                         text-base	
+                         "
+                      >
+                        <SVGEye className="stroke-black w-4 h-4" />
+                        Recent Viewed
+                      </Disclosure.Panel>
+                    </Link>
+                  </>
+                )}
+              </Disclosure>
+              <hr />
+              {/* Third list - start */}
+              <Disclosure>
+                {({ open }) => (
+                  <>
+                    <Disclosure.Button
+                      className="uppercase px-2 flex justify-between w-full items-center
+                      py-1
+                      hover:bg-gray-100
+                      text-base	
+                     "
+                    >
+                      About
+                      <SVGArrowUp
+                        className={`${
+                          open ? "rotate-180 transform" : "rotate-360"
+                        } h-5 w-5 `}
+                      />
+                    </Disclosure.Button>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                        rounded
+                        hover:bg-gray-200
+                        text-base	
+                        "
+                      >
+                        About Freeland
+                      </Disclosure.Panel>
+                    </Link>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                        rounded
+                        hover:bg-gray-200
+                        text-base	
+                        "
+                      >
+                        Contact Us
+                      </Disclosure.Panel>
+                    </Link>
+
+                    <Link to="#" className="w-full">
+                      <Disclosure.Panel
+                        className="px-2 flex items-center font-normal	gap-1 py-1 w-full ease-in-out duration-300
+                        rounded
+                        hover:bg-gray-200
+                        text-base	
+                        "
+                      >
+                        Help
+                      </Disclosure.Panel>
+                    </Link>
+                  </>
+                )}
+              </Disclosure>
+              {/* Third list - end */}
+            </div>
+          </Menu.Items>
+        </Transition>
+      </Menu>
+    </div>
+  );
+};
+
+export default Burger;
--- a/src/components/Cards/CategoryCard.tsx
+++ b/src/components/Cards/CategoryCard.tsx
@ -13,7 +13,7 @@ type Props = {
 } & Omit<React.ComponentPropsWithoutRef<"div">, "">;

 function CategoryCard({ count, title, iconChild, className, ...props }: Props) {
-  const [t,  i18next] = useTranslation()
+  const [t, i18next] = useTranslation();
  const iconChildStyle =
    "h-7 fill-gray-500 stroke-gray-500 group-focus:fill-blue-600 group-active:fill-blue-600 group-focus:stroke-blue-600 group-active:stroke-blue-600";

@ -43,7 +43,8 @@ function CategoryCard({ count, title, iconChild, className, ...props }: Props) {
                fontWeightVariant="normal"
                className="text-xs text-gray-500 group-active:text-blue-600 group-focus:text-blue-600"
              >
-                {count} {t("mainPage.article", {count: count}).toString()}
+                {count}{" "}
+                {t("mainPage.article_many", { count: count }).toString()}
              </Typography>
            </div>
          </div>
--- a/src/components/Checkbox.tsx
+++ b/src/components/Checkbox.tsx
@ -1,12 +1,12 @@
 import React from "react";
 import classNames from "classnames";
-import { ReactComponent as Checkmark } from "assets/svg/check.svg";
+import { ReactComponent as Checkmark } from "../assets/svg/arrow-down.svg";

 export type Props = {
  /**
   * Control the state of checkbox
   */
-  isChecked: boolean;
+  isChecked?: boolean;
  /**
   * An Element next to the checkbox
   */
@ -22,7 +22,7 @@ const Checkbox = ({ children, className, isChecked, ...props }: Props) => {
      )}
      htmlFor={props.id}
    >
-      <div className="w-6 h-6 relative">
+      <div className="w-5 h-5 relative">
        <input
          className="peer appearance-none transition-colors bg-transparent border-2 border-gray-300 w-6 h-6 
                      rounded checked:bg-blue-500 checked:border-blue-500 
@ -33,12 +33,8 @@ const Checkbox = ({ children, className, isChecked, ...props }: Props) => {
          checked={isChecked}
          {...props}
        />
-        <div //
-          className=" w-4 h-3 leading-[0] absolute top-1.5 left-1 opacity-0 
-                      pointer-events-none focus:pointer-events-auto flex items-center justify-center 
-                      fill-white peer-disabled:fill-gray-500 "
-        >
-          <Checkmark className="fill-inherit" />
+        <div className="h-2 w-2 absolute top-0.5 left-0.5">
+          <Checkmark className="h-5 w-5 fill-white hover:fill-white stroke-white" />
        </div>
      </div>
      {children}
--- a/src/components/Disclosure.tsx
+++ b/src/components/Disclosure.tsx
@ -0,0 +1,55 @@
+/* -------------------------------------------------------------------------- */
+/*                                   Imports                                  */
+/* -------------------------------------------------------------------------- */
+import React from "react";
+import { Disclosure as Disclose } from "@headlessui/react";
+import { ReactComponent as SelectIcon } from "../assets/svg/arrow-down.svg";
+import classNames from "classnames";
+/* -------------------------------------------------------------------------- */
+/*                               Component props                              */
+/* -------------------------------------------------------------------------- */
+type Props = {
+  children?: React.ReactNode;
+  className?: string;
+  caption?: string;
+};
+/* -------------------------------------------------------------------------- */
+/*                                 styles                                     */
+/* -------------------------------------------------------------------------- */
+const ButtonStyle = `
+flex w-full
+justify-between
+items-center
+py-2 text-left
+text-base
+font-medium
+text-black-400
+`;
+/* -------------------------------------------------------------------------- */
+/*                          Component implementation                          */
+/* -------------------------------------------------------------------------- */
+export default function Disclosure({ children, className, caption }: Props) {
+  return (
+    <div className={classNames("top-16 ", className)}>
+      <div className="mx-auto w-full bg-white py-2">
+        <Disclose as="div">
+          {({ open }) => (
+            <>
+              <Disclose.Button className={`${ButtonStyle}`}>
+                <span>{caption}</span>
+                <SelectIcon
+                  className={`${
+                    open ? "rotate-180 transform" : ""
+                  } h-4 w-5 fill-black hover:fill-black stroke-black`}
+                />
+              </Disclose.Button>
+              <Disclose.Panel className="py-2 text-sm text-gray-500 ">
+                {children}
+              </Disclose.Panel>
+            </>
+          )}
+        </Disclose>
+      </div>
+    </div>
+  );
+}
--- a/src/components/Filters/AppiledFilters.tsx
+++ b/src/components/Filters/AppiledFilters.tsx
@ -0,0 +1,69 @@
+/* -------------------------------------------------------------------------- */
+/*                                   Imports                                  */
+/* -------------------------------------------------------------------------- */
+import React from "react";
+import Badge from "components/Badge";
+import { IProduct } from "./IProdutct";
+import classNames from "classnames";
+import { useTranslation } from "react-i18next";
+
+/* -------------------------------------------------------------------------- */
+/*                               Component props                              */
+/* -------------------------------------------------------------------------- */
+type Props = {
+  hints?: IProduct[];
+  delFilter: (element: IProduct) => void;
+  clearAll: () => void;
+  className?: string;
+};
+/* -------------------------------------------------------------------------- */
+/*                          Component implementation                          */
+/* -------------------------------------------------------------------------- */
+export default function AppiledFilters({
+  hints,
+  delFilter,
+  clearAll,
+  className,
+}: Props) {
+
+  const [t, i18next] = useTranslation()
+
+  return (
+    <>
+      <div
+        className={classNames(
+          "w-full py-3 h-36 max-h-36 overflow-hidden ",
+          className
+        )}
+      >
+        <div className="flex flex-row items-center justify-between space-x-3 ">
+          <div className="font-medium">{t("filters.appliedFitlers")}</div>
+          <div>
+            <button
+              onClick={clearAll}
+              className="font-normal text-sm text-gray-400"
+            >
+              {t("filters.clearAll")}
+            </button>
+          </div>
+        </div>
+        <ul className="list-none mt-2 h-24 max-h-32 overflow-auto">
+          {hints &&
+            hints.length > 0 &&
+            hints.map((item: IProduct) => (
+              <li className="mt-1" key={item.id}>
+                <Badge
+                  className="py-1 cursor-default"
+                  emphasis="high"
+                  closeOption={true}
+                  onClick={() => delFilter(item)}
+                >
+                  {item.brand}
+                </Badge>
+              </li>
+            ))}
+        </ul>
+      </div>
+    </>
+  );
+}
--- a/src/components/Filters/Filter.tsx
+++ b/src/components/Filters/Filter.tsx
@ -0,0 +1,112 @@
+import React from "react";
+import Disclosure from "components/Disclosure";
+import AppiledFilters from "./AppiledFilters";
+import SearchFilterBar from "./SearchFilterBar";
+import axios from "axios";
+import { useDebounce } from "./functions/debounce";
+import { IProduct } from "./IProdutct";
+import { useTranslation } from "react-i18next";
+
+type Props = {
+  className?: string;
+};
+
+export default function Fiter({ className }: Props) {
+  const [checkedId, setCheckedId] = React.useState<Array<number>>([]);
+  const [activeFilter, setActiveFilter] = React.useState<Array<IProduct>>([]);
+
+  /* -------------------------------------------------------------------------- */
+  /*      Test request to demonstrate the basic functionality of the filter     */
+  /* -------------------------------------------------------------------------- */
+
+  const [query, setQuery] = React.useState("");
+  const [hints, setHints] = React.useState<Array<IProduct>>([]);
+
+  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(e.target.value);
+  };
+  const debounced = useDebounce(query);
+
+  const [t, i18next] = useTranslation();
+
+  async function fetchProducts() {
+    const response = await axios.get(
+      `https://dummyjson.com/products/search?q=${debounced}`
+    );
+    setHints(response.data.products);
+  }
+  React.useEffect(() => {
+    fetchProducts();
+  }, [debounced, query]);
+
+  const isChecked = (item: number) => (checkedId.includes(item) ? true : false);
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const selectedId = parseInt(e.target.value);
+
+    /* -------------  Check if "checkedId" contains "selectedIds" ------------- */
+    /* -------------- If true, this checkbox is already checked -------------- */
+
+    if (checkedId.includes(selectedId)) {
+      setCheckedId(checkedId.filter((id) => id !== selectedId));
+      setActiveFilter(activeFilter.filter((item) => item.id !== selectedId));
+    } else {
+      const newId = [...checkedId];
+      newId.push(selectedId);
+      setCheckedId(newId);
+
+      /* ---------------  Adding checked filters to AppliedFilters component -------------- */
+
+      hints.forEach((hint) => {
+        if (hint.id === selectedId)
+          activeFilter.push({ id: selectedId, brand: hint.brand });
+        setActiveFilter(activeFilter);
+      });
+    }
+  };
+
+  /* ------------- Delete filter from AppliedFilters component ------------- */
+
+  const DelFilter = (e: IProduct) => {
+    setActiveFilter(activeFilter.filter((item) => item.id !== e.id));
+    setCheckedId(checkedId.filter((id) => id !== e.id));
+  };
+  const clearAll = () => {
+    setActiveFilter([]);
+    setCheckedId([]);
+    setQuery("");
+  };
+  //console.log(activeFilter)
+  return (
+    <>
+      <div className="pl-2">
+        <div className="max-w-[268px] mx-auto divide-y divide-solid">
+          <AppiledFilters
+            hints={activeFilter}
+            delFilter={DelFilter}
+            clearAll={clearAll}
+          ></AppiledFilters>
+          <Disclosure caption={t("filters.authors")}>
+            <SearchFilterBar
+              hints={hints}
+              isChecked={isChecked}
+              handleChange={handleChange}
+              onChange={onChange}
+              query={query}
+              placeHolder={t("filters.enterAuthorsName")}
+            />
+          </Disclosure>
+          <Disclosure caption={t("filters.publicationsType")}>
+            <p>{t("filters.content")}</p>
+          </Disclosure>
+          <Disclosure caption={t("filters.publisher")}>
+            <p>{t("filters.content")}</p>
+          </Disclosure>
+          <Disclosure caption={t("filters.publicationTopic")}>
+            <p>{t("filters.content")}</p>
+          </Disclosure>
+        </div>
+      </div>
+    </>
+  );
+}
--- a/src/components/Filters/IProdutct.ts
+++ b/src/components/Filters/IProdutct.ts
@ -0,0 +1,23 @@
+    export interface IProduct {
+        id?: number;
+        title?: string;
+        description?: string;
+        price?: number;
+        discountPercentage?: number;
+        rating?: number;
+        stock?: number;
+        brand?: string;
+        category?: string;
+        thumbnail?: string;
+        images?: string[];
+    }
+
+    export interface serverResponse<T> {
+        products: T[];
+        total: number;
+        skip: number;
+        limit: number;
+    }
+
+
+
--- a/src/components/Filters/SearchFilterBar.tsx
+++ b/src/components/Filters/SearchFilterBar.tsx
@ -0,0 +1,120 @@
+import { useState, useCallback, Fragment } from "react";
+import { Combobox, Transition } from "@headlessui/react";
+import { IProduct } from "./IProdutct";
+import Checkbox from "components/Checkbox";
+import { ReactComponent as SearchIcon } from "assets/svg/search.svg";
+import classNames from "classnames";
+import { useTranslation } from "react-i18next";
+
+
+type Props = {
+  hints: IProduct[];
+  handleChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  isChecked: (item: number) => boolean;
+  className?: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  placeHolder: string;
+  query: string;
+};
+
+export default function SearchFilterBar({
+  hints,
+  isChecked,
+  handleChange,
+  className,
+  onChange,
+  placeHolder,
+  query,
+}: Props): JSX.Element {
+  const [checkList, setCheckList] = useState(hints);
+  const [showFilters, SetShowFilters] = useState(false);
+  const [t, i18next] = useTranslation()
+
+  const ShowAllFilters = useCallback(() => {
+    SetShowFilters((prev) => !prev);
+  }, [SetShowFilters]);
+
+  return (
+    <>
+      <Combobox value={checkList} onChange={setCheckList}>
+        {({ open }) => (
+          <div>
+            <div
+              className={classNames(
+                "flex flex-row w-full items-center border border-solid rounded border-gray-200",
+                className
+              )}
+            >
+              <div className="basis-6 ">
+                <Combobox.Button>
+                  <div className="pl-1 pt-1.5">
+                    <SearchIcon className="h-5 w-6 fill-gray-400 hover:fill-gray-400 stroke-gray-400" />
+                  </div>
+                </Combobox.Button>
+              </div>
+              <div className="grow">
+                <Combobox.Input
+                  onChange={onChange}
+                  placeholder={placeHolder}
+                  className="w-full text-sm py-1 focus:outline-none"
+                />
+              </div>
+            </div>
+            <div className="mt-4">
+              <Transition
+                as={Fragment}
+                leave="transition ease-in duration-100"
+                leaveFrom="opacity-100"
+                leaveTo="opacity-0"
+              >
+                <Combobox.Options static={true}>
+                  {open && (
+                    <ul
+                      className={classNames([
+                        "w-[276px] relative h-40 top-0 right-2",
+                        [
+                          {
+                            "max-h-60 h-60 overflow-auto": showFilters === true,
+                            "max-h-40 h-40 overflow-hidden":
+                              showFilters === false || hints.length <= 5,
+                          },
+                        ],
+                      ])}
+                    >
+                      <li className="">
+                        {hints.length >= 6 && query !== "" && (
+                          <button
+                            onClick={ShowAllFilters}
+                            className="text-right text-blue-500 pl-2 text-sm font-medium"
+                          >
+                            {t("filters.showAll")}({hints.length})
+                          </button>
+                        )}
+                      </li>
+                      {hints.length > 0 ? (
+                        hints.map((item) => (
+                          <li key={item.id} className="mt-1 pl-2">
+                            <Checkbox
+                              className="z-10 mt-1 w-full max-h-56"
+                              value={item.id}
+                              isChecked={item.id ? isChecked(item.id) : false}
+                              onChange={handleChange}
+                            >
+                              <p>{item.brand}</p>
+                            </Checkbox>
+                          </li>
+                        ))
+                      ) : (
+                        <p className="text-blue-300 pl-2">Ничего не найдено</p>
+                      )}
+                    </ul>
+                  )}
+                </Combobox.Options>
+              </Transition>
+            </div>
+          </div>
+        )}
+      </Combobox>
+    </>
+  );
+}
--- a/src/components/Filters/functions/debounce.ts
+++ b/src/components/Filters/functions/debounce.ts
@ -0,0 +1,11 @@
+import React from "react";
+
+export function useDebounce(value: string, delay: number = 300) {
+  const [debounced, setDebouced] = React.useState(value);
+  React.useEffect(() => {
+    const handler = setTimeout(() => setDebouced(value), delay);
+    return () => clearTimeout(handler);
+  }, [value, delay]);
+
+  return debounced;
+}
--- a/src/components/LocalizationButton.tsx
+++ b/src/components/LocalizationButton.tsx
@ -0,0 +1,89 @@
+import React, { Fragment, useState } from "react";
+import { Trans, useTranslation } from "react-i18next";
+
+import { Button } from "./Button/Button";
+import { Menu, Transition } from "@headlessui/react";
+import classNames from "classnames";
+
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faLanguage } from "@fortawesome/free-solid-svg-icons";
+
+type Props = React.ComponentPropsWithoutRef<"div">;
+
+const LocalizationButton = (props: Props) => {
+  const { t, i18n } = useTranslation();
+  const changeLanguage = (lng: string) => {
+    i18n.changeLanguage(lng);
+    setLanguage(lng);
+  };
+  const [language, setLanguage] = useState("en");
+  return (
+    <div {...props}>
+      <Menu as="div" className="relative inline-block text-left">
+        <div>
+          <Menu.Button
+            as={Button}
+            emphasis="low"
+            className="flex items-center gap-2 border"
+          >
+            <div className=" w-4">
+              <FontAwesomeIcon icon={faLanguage} />
+            </div>
+            {/* {language} */}
+          </Menu.Button>
+        </div>
+
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >
+          <Menu.Items
+            className="origin-top-right absolute right-0 mt-5 w-12 rounded-md 
+          shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none"
+          >
+            <div className="py-1">
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                    onClick={() => {
+                      changeLanguage("en");
+                    }}
+                    className={classNames(
+                      active ? "bg-gray-100 text-gray-900" : "text-gray-700",
+                      "block px-4 py-2 text-sm"
+                    )}
+                  >
+                    En
+                  </a>
+                )}
+              </Menu.Item>
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                    onClick={() => {
+                      changeLanguage("ru");
+                    }}
+
+                    className={classNames(
+                      active ? "bg-gray-100 text-gray-900" : "text-gray-700",
+                      "block px-4 py-2 text-sm"
+                    )}
+                  >
+                    Ru
+                  </a>
+                )}
+              </Menu.Item>
+            </div>
+          </Menu.Items>
+        </Transition>
+      </Menu>
+    </div>
+  );
+};
+
+export default LocalizationButton;
--- a/src/components/LogoScipaper.tsx
+++ b/src/components/LogoScipaper.tsx
--- a/src/components/Logofreeland.tsx
+++ b/src/components/Logofreeland.tsx
--- a/src/components/MainPage/sections/FeaturedArticlesCards.tsx
+++ b/src/components/MainPage/sections/FeaturedArticlesCards.tsx
@ -98,10 +98,10 @@ const FeaturedArticlesCards = () => {
  const navigationPrevRef = useRef(null);
  const navigationNextRef = useRef(null);
  const paginationRef = useRef(null);
-  const [t, i18next] = useTranslation()
+  const [t, i18next] = useTranslation();

  return (
-    <div className="slider-wrapper articles">
+    <div className="slider-wrapper articles px-8">
      <div className="flex justify-end gap-2 my-2">
        <div
          className="prev inline-flex  justify-center items-center 
@ -168,11 +168,12 @@ const FeaturedArticlesCards = () => {
              </Card.CardContent>

              <Card.CardAction href={Articale.Link}>
-                <Link to="*">
-                  <Typography className="text-blue-500 font-bold">
-                    {t("mainPage.more")}
-                  </Typography>
-                </Link>
+                <Typography
+                  className="text-blue-500 font-bold"
+                  fontWeightVariant="bold"
+                >
+                  {t("mainPage.more")}
+                </Typography>
                <SVGCaretRight className="fill-blue-500 w-4 h-4" />
              </Card.CardAction>
            </Card>
--- a/src/components/MainPage/sections/MainSection.tsx
+++ b/src/components/MainPage/sections/MainSection.tsx
@ -2,16 +2,14 @@
 /*                                   Imports                                  */
 /* -------------------------------------------------------------------------- */
 import React from "react";
-import {t as nextT} from "i18next";
+import { t as nextT } from "i18next";
 import { useTranslation } from "react-i18next";
 import { SearchBar } from "../../search/SearchBar";
 import { formatNumber } from "core/helpers";

 export default function MainSection() {
  const { t, i18n } = useTranslation();
-  const amountArticles = 4202020
- 
- 
+  const amountArticles = 4202020;

  return (
    <section className="bg-main bg-center bg-cover bg-origin-border bg-no-repeat min-h-[100vh] py-32 px-2 sm:px-6 md:px-6 lg:px-0 items-center flex justify-center ">
@ -21,8 +19,14 @@ export default function MainSection() {
        </div>
        <div className="flex flex-row items-center justify-center space-x-3 pt-2">
          <div className=" text-2xl text-gray-400">{t("mainPage.search")}</div>
-          <div className=" text-3xl text-blue-500">{formatNumber(amountArticles)}</div>
-          <div className=" text-2xl text-gray-400">{nextT("mainPage.article", {count: amountArticles}).toString()}</div>
+          <div className=" text-3xl text-blue-500">
+            {formatNumber(amountArticles)}
+          </div>
+          <div className=" text-2xl text-gray-400">
+            {nextT("mainPage.article_many", {
+              count: amountArticles,
+            }).toString()}
+          </div>
        </div>
        <div className="max-w-xl m-auto pt-16 ">
          <SearchBar />
--- a/src/components/Markdown.tsx
+++ b/src/components/Markdown.tsx
@ -1,5 +1,3 @@
-import React from "react";
-
 /* -------------------------------------------------------------------------- */
 /*                                  MarkDown                                  */
 /* -------------------------------------------------------------------------- */
@ -18,33 +16,137 @@ import Heading from "./typography/Heading";
 import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
 import { dark } from "react-syntax-highlighter/dist/esm/styles/prism";
 import Link from "./typography/Link";
-import { indexOf } from "lodash";
+import style from "react-syntax-highlighter/dist/esm/styles/hljs/a11y-dark";

 export type Props = {
  markdown: string;
 };

 const Markdown = ({ markdown }: Props) => {
-  let newMarkdown = markdown.replace(/\n/g, "  \n");
-
  return (
    <ReactMarkdown
      remarkPlugins={[remarkGfm]}
-      children={newMarkdown}
+      children={markdown}
      components={{
-        h1: Heading,
-        h2: Typography,
-        a: (props) => {
-          return (
-            <Link
-              href={props.href}
-              className="text-sky-600 font-bold text-base"
-              {...props}
-            >
-              {props.children}
-            </Link>
-          );
-        },
+        ul: ({ node, ...props }) => (
+          <ul
+            style={{
+              listStyleType: "disc",
+            }}
+            className="mx-8"
+            {...props}
+          />
+        ),
+
+        ol: ({ node, ...props }) => (
+          <ol className="list-decimal mx-8" {...props} />
+        ),
+
+        h1: ({ node, ...props }) => (
+          <h1
+            style={{
+              fontWeight: "bold",
+              marginInlineEnd: 0,
+              marginInlineStart: 0,
+              marginBlockStart: 11,
+              marginBlockEnd: 11,
+
+              fontSize: 32,
+            }}
+            {...props}
+          />
+        ),
+
+        h2: ({ node, ...props }) => (
+          <h1
+            style={{
+              fontWeight: "bold",
+
+              marginInlineEnd: 0,
+              marginInlineStart: 0,
+
+              marginBlockStart: 13.28,
+              marginBlockEnd: 13.28,
+
+              fontSize: 24,
+            }}
+            {...props}
+          />
+        ),
+
+        h3: ({ node, ...props }) => (
+          <h1
+            style={{
+              fontWeight: "bold",
+
+              marginInlineEnd: 0,
+              marginInlineStart: 0,
+
+              marginBlockStart: 16,
+              marginBlockEnd: 16,
+
+              fontSize: 18.72,
+            }}
+            {...props}
+          />
+        ),
+
+        h4: ({ node, ...props }) => (
+          <h1
+            style={{
+              fontWeight: "bold",
+
+              marginInlineEnd: 0,
+              marginInlineStart: 0,
+
+              marginBlockStart: 21.28,
+              marginBlockEnd: 21.28,
+            }}
+            {...props}
+          />
+        ),
+
+        h5: ({ node, ...props }) => (
+          <h1
+            style={{
+              fontWeight: "bold",
+
+              marginInlineEnd: 0,
+              marginInlineStart: 0,
+
+              marginBlockStart: 26.72,
+              marginBlockEnd: 26.72,
+
+              fontSize: 13.28,
+            }}
+            {...props}
+          />
+        ),
+
+        h6: ({ node, ...props }) => (
+          <h1
+            style={{
+              fontWeight: "bold",
+
+              marginInlineEnd: 0,
+              marginInlineStart: 0,
+
+              marginBlockStart: 37.28,
+              marginBlockEnd: 37.28,
+
+              fontSize: 10.72,
+            }}
+            {...props}
+          />
+        ),
+        p: Typography,
+
+        a: ({ node, ...props }) => (
+          <Link
+            className=" inline-flex text-sm font-bold text-blue-500"
+            {...props}
+          />
+        ),

        code({ node, inline, className, children, ...props }) {
          const match = /language-(\w+)/.exec(className || "");
--- a/src/components/SearchResultsSection.tsx
+++ b/src/components/SearchResultsSection.tsx
@ -36,7 +36,7 @@ export const SearchResultSection = () => {
          {t("searchResults.title")}
        </Typography>
        <Typography className="text-gray-300 text-sm">
-        {t("searchResults.totalResults")}: {searchResults?.meta.total}
+          {t("searchResults.totalResults")}: {searchResults?.meta.total}
        </Typography>
      </div>
      <hr className="w-full border-gray-100" />
--- a/src/components/fetchAnArticle/AnArticle.tsx
+++ b/src/components/fetchAnArticle/AnArticle.tsx
@ -33,7 +33,7 @@ const AnArticle = () => {
          <AskeletonArticle />
        ) : (
          <>
-            <ArticlePart.Article.Breadcumbs>
+            <ArticlePart.Article.Breadcumbs className="py-4">
              {article?.topic}
            </ArticlePart.Article.Breadcumbs>
            <div className="flex flex-col gap-4 pb-4">
@ -52,25 +52,18 @@ const AnArticle = () => {
            />
            {article?.tags && (
              <div className="keywords my-10 flex flex-col gap-2">
-                <Typography
-                  className="text-2xl"
-                  fontWeightVariant="semibold"
-                >
-                  {t('articlePage.keywords')}
+                <Typography className="text-2xl" fontWeightVariant="semibold">
+                  {t("articlePage.keywords")}
                </Typography>

-
                <ArticlePart.Article.Keywords className="transition ease-in-out delay-50">
                  {article?.tags}
                </ArticlePart.Article.Keywords>
              </div>
            )}
            <div className="abstract my-10 flex flex-col gap-2">
-              <Typography
-                className="text-2xl"
-                fontWeightVariant="semibold"
-              >
-                {t('articlePage.abstract')}
+              <Typography className="text-2xl" fontWeightVariant="semibold">
+                {t("articlePage.abstract")}
              </Typography>
              <ArticlePart.Article.Description>
                {article?.summary !== undefined ? (
--- a/src/components/fetchAnArticle/AnArticleBody.tsx
+++ b/src/components/fetchAnArticle/AnArticleBody.tsx
@ -12,6 +12,7 @@ import * as ArticlePart from "../../components/Article/Article";
 import BaseLayout from "components/BaseLayout";
 import Container from "components/Container";
 import NotFound from "./NotFound";
+import Markdown from "components/Markdown";

 const AnArticleBody = () => {
  const store = useArticleStore();
@ -27,7 +28,7 @@ const AnArticleBody = () => {
      <Container variant="straight">
        {shouldShowLoading ? (
          <>
-            <Skeleton count={1} />
+            <Skeleton count={1} className="my-4" />
            <div className="gap-4 py-12 px-20">
              <Skeleton
                count={1}
@ -39,14 +40,19 @@ const AnArticleBody = () => {
          </>
        ) : (
          <>
-            <ArticlePart.Article.Breadcumbs>
+            <ArticlePart.Article.Breadcumbs className="py-4">
              {article?.topic}
            </ArticlePart.Article.Breadcumbs>
            <div className="gap-4 py-12 px-20">
              <ArticlePart.Article.Title className="text-3xl">
                {article?.title}
              </ArticlePart.Article.Title>
-              <div className="py-6">{article?.content}</div>
+
+              <div className="py-6">
+                <Markdown
+                  markdown={article?.content ?? ''}
+                />
+              </div>
            </div>
          </>
        )}
--- a/src/components/fetchAnArticle/AskeletonArticle.tsx
+++ b/src/components/fetchAnArticle/AskeletonArticle.tsx
@ -3,7 +3,7 @@ import "react-loading-skeleton/dist/skeleton.css";
 const AskeletonArticle = () => {
  return (
    <>
-      <Skeleton count={1} />
+      <Skeleton count={1} className="my-4" />
      <div className="flex flex-col gap-4 pb-4">
        <Skeleton count={1} containerClassName="title w-3/4 text-2xl" />
        <Skeleton count={1} containerClassName="authors w-1/4" />
--- a/src/components/fetchAnArticle/NotFound.tsx
+++ b/src/components/fetchAnArticle/NotFound.tsx
@ -3,7 +3,19 @@ import Container from "components/Container";
 import { Button } from "components/Button/Button";
 import Link from "components/typography/Link";

+import Lottie from "react-lottie";
+import animationData from "../../assets/lotties/notFoundAnimation.json";
+
 const NotFound = () => {
+  const defaultOptions = {
+    loop: true,
+    autoplay: true,
+    animationData: animationData,
+    rendererSettings: {
+      preserveAspectRatio: "xMidYMid slice",
+    },
+  };
+
  return (
    <Container
      variant="straight"
@ -11,13 +23,8 @@ const NotFound = () => {
      font-serif h-screen my-auto
      "
    >
-      <div
-        className="bg-[url('https://cdn.dribbble.com/users/285475/screenshots/2083086/dribbble_1.gif')] 
-        h-[450px]
-        w-full text-center text-7xl "
-      >
-        404
-      </div>
+      <Lottie options={defaultOptions} height={200} width={200} />
+      <span className="font-bold text-5xl ">404</span>
      <h3 className="font-bold text-2xl text-center">Page does not exist</h3>
      <h4 className="text-center">
        Maybe you got a broken link, or maybe you made a misprint in the address
--- a/src/components/parts/Header.tsx
+++ b/src/components/parts/Header.tsx
@ -5,7 +5,6 @@ import { useState, useTransition } from "react";
 /* -------------------------------------------------------------------------- */
 import ContextMenuAction from "../drop-down-menu/ContextMenuAction";
 import ContextMenu from "../drop-down-menu/ContextMenu";
-import Logofreeland from "../Logofreeland";
 import { Button } from "../Button/Button";
 import Avatar from "../Avatar";
 import Navbar from "../Navbar";
@ -25,6 +24,10 @@ import {
 } from "components/icons";
 import i18n from "localization/i18n";
 import { useTranslation } from "react-i18next";
+import Link from "components/typography/Link";
+import LocalizationButton from "components/LocalizationButton";
+import LogoScipaper from "components/LogoScipaper";
+import Burger from "components/Burger";

 const Header = () => {
  const [authenticated, setAuthenticated] = useState(false);
@ -49,14 +52,14 @@ const Header = () => {
      {/* Logo and Menu */}
      <div className="flex gap-8 xl:gap-x-16">
        {/* Logo  - start - className="w-7 sm:w-10  " /> */}
-        <a className="Logo flex items-center gap-1  sm:gap-2 " href="/">
+        <Link className="Logo flex items-center gap-1  sm:gap-2 " to="/">
          <Logo
            className={classNames(authenticated ? "w-10" : "w-7 sm:w-10")}
          />
-          <Logofreeland
+          <LogoScipaper
            className={classNames(authenticated ? "w-28" : "w-20 sm:w-28")}
          />
-        </a>
+        </Link>
        {/* Logo  - end - */}

        {/* Menu( Create new - My library - About ) Start */}
@ -69,36 +72,36 @@ const Header = () => {
            className="text-blue-500 px-4 font-bold uppercase"
            to="/create-new"
          >
-            {t('navbar.createNew')}
+            {t("navbar.createNew")}
          </RouterLink>
          {/* Link Create now - end -  */}

          {/* Dropdown Menu My library - start - */}
          <ContextMenu
            emphasis="high"
-            button={t('navbar.library.navTitle')}
+            button={t("navbar.library.navTitle")}
            className="border-none uppercase"
          >
            <ContextMenuAction
-              caption={t('navbar.library.publications')}
+              caption={t("navbar.library.publications")}
              action={() => console.log("My publications")}
              icon={<SVGFile className="stroke-black " />}
            ></ContextMenuAction>

            <ContextMenuAction
-              caption={t('navbar.library.favorites')}
+              caption={t("navbar.library.favorites")}
              action={() => console.log("My Favorites")}
              icon={<SVGFavoriteOutlined className="stroke-black" />}
            ></ContextMenuAction>

            <ContextMenuAction
-              caption={t('navbar.library.collections')}
+              caption={t("navbar.library.collections")}
              action={() => console.log("My Collections")}
              icon={<SVGFolder className="stroke-black fill-black" />}
            ></ContextMenuAction>

            <ContextMenuAction
-              caption={t('navbar.library.recentViewed')}
+              caption={t("navbar.library.recentViewed")}
              action={() => console.log("Recent Viewed")}
              icon={<SVGEye className="stroke-black " />}
            ></ContextMenuAction>
@ -108,21 +111,21 @@ const Header = () => {
          {/* Dropdown Menu About - start - */}
          <ContextMenu
            emphasis="high"
-            button={t('navbar.about.navTitle')}
+            button={t("navbar.about.navTitle")}
            className="border-none uppercase"
          >
            <ContextMenuAction
-              caption={t('navbar.about.aboutProject')}
+              caption={t("navbar.about.aboutProject")}
              action={() => console.log("About Freeland")}
            ></ContextMenuAction>

            <ContextMenuAction
-              caption={t('navbar.about.contacts')}
+              caption={t("navbar.about.contacts")}
              action={() => console.log("Contact Us")}
            ></ContextMenuAction>

            <ContextMenuAction
-              caption={t('navbar.about.help')}
+              caption={t("navbar.about.help")}
              action={() => console.log("Help")}
            ></ContextMenuAction>
          </ContextMenu>
@ -135,40 +138,43 @@ const Header = () => {
      <div className="flex items-center font-bold text-sm gap-1 md:gap-2 ">
        {!authenticated
          ? [
-            <Button
-              emphasis="low"
-              onClick={onClick}
-              className="text-xs sm:px-4 sm:text-sm  "
-            >
-              {t('navbar.auth.signIn')}
-            </Button>,
-            <Button
-              emphasis="medium"
-              className="hidden md:flex"
-              onClick={onClick}
-            >
-              {t('navbar.auth.signUp')}
-            </Button>,
-          ]
+              <>
+                <LocalizationButton className="hidden md:flex" />
+                <Button
+                  emphasis="low"
+                  onClick={onClick}
+                  className="text-xs sm:px-4 sm:text-sm  "
+                >
+                  {t("navbar.auth.signIn")}
+                </Button>
+              </>,
+              <Button
+                emphasis="medium"
+                className="hidden md:flex"
+                onClick={onClick}
+              >
+                {t("navbar.auth.signUp")}
+              </Button>,
+            ]
          : [
-            <Button emphasis="low">
-              <Button.Icon>
-                {!notification ? (
-                  <SVGBell className="h-6 w-6 fill-gray-900 stroke-gray-900" />
-                ) : (
-                  <SVGBellNotification className="h-6 w-6 fill-gray-900 stroke-gray-900" />
-                )}
-              </Button.Icon>
-            </Button>,
+              <Button emphasis="low">
+                <Button.Icon>
+                  {!notification ? (
+                    <SVGBell className="h-6 w-6 fill-gray-900 stroke-gray-900" />
+                  ) : (
+                    <SVGBellNotification className="h-6 w-6 fill-gray-900 stroke-gray-900" />
+                  )}
+                </Button.Icon>
+              </Button>,

-            <Button emphasis="low" className="hidden lg:flex">
-              <Button.Icon>
-                <Avatar className="bg-[rgb(255,122,69)] text-white">K</Avatar>
-              </Button.Icon>
-            </Button>,
-          ]}
+              <Button emphasis="low" className="hidden lg:flex">
+                <Button.Icon>
+                  <Avatar className="bg-[rgb(255,122,69)] text-white">K</Avatar>
+                </Button.Icon>
+              </Button>,
+            ]}
        {/* Burger component will be shown for the small screens */}
-        <Navbar className="block lg:hidden" />
+        <Burger className="block lg:hidden" />
      </div>
    </header>
  );
--- a/src/components/typography/Link.tsx
+++ b/src/components/typography/Link.tsx
@ -51,10 +51,11 @@ export default function Link({
            : style
        }
        aria-disabled={disabled}
+        className={classNames("flex items-center", className)}
        {...props}
      >
        {children}
      </a>
    );
-  return <div>{link}</div>;
+  return link;
 }
--- a/src/core/httpClient.ts
+++ b/src/core/httpClient.ts
@ -1,5 +1,5 @@
 import axios from "axios";
-const BASE_URL = process.env.REACT_APP_INTEGRATOR_URL;
+export const BASE_URL = process.env.REACT_APP_INTEGRATOR_URL;
 export const GRAPHQL_URL = process.env.REACT_APP_GRAPHQL_URL ?? "";

 const instance = axios.create({
--- a/src/index.tsx
+++ b/src/index.tsx
@ -42,7 +42,8 @@ root.render(
          <Route path="/account">
            <Route path="settings" element={<AccountSettings />} />
          </Route>
-          <Route path="/search-results" element={<SearchResultsPage />}></Route>
+          <Route path="/search-results" element={<SearchResultsPage />} />
+          <Route path="/*" element={<NotFound />}></Route>
        </Routes>
      </BrowserRouter>
    </React.StrictMode>
--- a/src/localization/i18n.ts
+++ b/src/localization/i18n.ts
@ -22,7 +22,7 @@ const fallbackLng: Langs = "ru";

 i18n
  .use(Backend)
-  // .use(LanguageDetector)
+  .use(LanguageDetector)
  .use(initReactI18next)
  .init({
    debug: process.env.NODE_ENV === "development" ? true : false,
--- a/src/pages/SearchResultsPage.tsx
+++ b/src/pages/SearchResultsPage.tsx
@ -3,9 +3,7 @@ import BaseLayout from "components/BaseLayout";
 import { SearchSection } from "components/SearchSection";
 import { ColumnLayout } from "components/layouts/ThreeColumn/ColumnLayout";
 import { SearchResultSection } from "components/SearchResultsSection";
-import { useSearchStoreImplementation } from "searchResults/data/searchStoreImplementation";
-import { useSearchViewModel } from "searchResults/controller/searchResultsViewModel";
-import { Loader } from "components/Loader/Loader";
+import Fiter from "components/Filters/Filter";

 export const SearchResultsPage = () => {
  return (
@ -13,7 +11,7 @@ export const SearchResultsPage = () => {
      <SearchSection />
      <ColumnLayout>
        <ColumnLayout.Left>
-          <div className="h-98 w-[300px]"></div>
+          <div className="h-98 w-[300px] border rounded my-5"><Fiter /></div>
        </ColumnLayout.Left>
        <ColumnLayout.Main>
          <SearchResultSection />
--- a/src/searchResults/data/searchService.ts
+++ b/src/searchResults/data/searchService.ts
@ -10,8 +10,8 @@ const searchEndpoint = "/papers/search";
 async function search(request: string): Promise<SearchResults> {
  try {
    const response = await integratorApiClient.get<SearchResultsDTO>(
-      // searchEndpoint + `?query=` + request + `&limit=10&offset=0`
-      "https://run.mocky.io/v3/ea705665-2479-4039-8b81-412e011fc145"
+      searchEndpoint + `?query=` + request 
+      // "https://run.mocky.io/v3/ea705665-2479-4039-8b81-412e011fc145"
    );
    const dto = response.data;
    return create({
Author	SHA1	Message	Date
moeidtopcoder	e9e9611f80	Merge branch 'develop' into master	2022-10-31 17:52:31 +00:00
danysmall	0c054687ba	Merge pull request 'the overlay in burger resolved' (#172 ) from fix/burger into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/172	2022-10-31 15:03:14 +00:00
danysmall	3b147e50a1	Merge pull request 'resolve animation - resolve responsive' (#171 ) from fix/404-page into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/171	2022-10-31 15:02:49 +00:00
“Salar	e94514ed02	the overlay in burger resolved	2022-10-31 17:13:43 +03:00
“Salar	0032e51858	resolve animation - resolve responsive	2022-10-31 13:28:55 +03:00
danysmall	8d6a9ab74c	Dockerfile changes	2022-10-29 16:23:34 +03:00
danysmall	07c4ae8cbd	Fixed # on localization button	2022-10-26 16:00:45 +03:00
danysmall	a782930d3d	Replace mocks to real APIs	2022-10-21 18:12:15 +03:00
danysmall	4c1877caa5	Merge pull request 'feature/markdown-styling' (#169 ) from feature/markdown-styling into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/169	2022-10-21 15:10:44 +00:00
danysmall	e9324f6c14	Merge pull request 'classnames resolved' (#170 ) from fix/link into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/170	2022-10-21 15:10:28 +00:00
“Salar	9fcee44e0c	classnames resolved	2022-10-21 18:03:17 +03:00
“Salar	9939b1c824	resolve headers, lists, link, paragraph..	2022-10-21 17:57:55 +03:00
danysmall	00deb05850	Merge branch 'develop' into feature/markdown-styling	2022-10-21 14:44:09 +03:00
danysmall	b8849945b9	Merge pull request 'resolve no break space in the english localization' (#164 ) from fix/english-localization into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/164	2022-10-21 11:42:39 +00:00
danysmall	08f5ee272b	Merge pull request 'resolve no break space in the russian localization' (#165 ) from fix/russian-localization into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/165	2022-10-21 11:42:25 +00:00
danysmall	35aa957b35	Merge pull request 'content hardcoded resolved' (#166 ) from fix/filter into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/166	2022-10-21 11:42:10 +00:00
danysmall	472e8c2ea5	Merge pull request 'the translation in the main section has been resolved' (#167 ) from fix/main-section into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/167	2022-10-21 11:41:50 +00:00
danysmall	f17d5f3079	Merge pull request 'resolve article translation' (#168 ) from fix/category-card into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/168	2022-10-21 11:41:33 +00:00
“Salar	4f9b33e5b9	resolve article translation	2022-10-21 14:21:26 +03:00
“Salar	753223c7a9	the translation of interaction buttons has been added	2022-10-21 14:07:48 +03:00
“Salar	28cc9b1a71	the translation in the main section has been resolved	2022-10-21 13:46:47 +03:00
“Salar	47472868e1	content hardcoded resolved	2022-10-21 13:29:08 +03:00
“Salar	f965eaddbc	content and filter were added	2022-10-21 13:26:23 +03:00
“Salar	2075426ff7	resolve no break space in the russian localization	2022-10-21 13:08:21 +03:00
“Salar	209507833e	resolve no break space in the english localization	2022-10-21 13:00:25 +03:00
danysmall	eff20ae459	Mocked correct article body	2022-10-21 12:08:29 +03:00
danysmall	dcfe260f0e	Merge pull request 'resolve english translation' (#161 ) from fix/english-localization into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/161	2022-10-20 10:02:12 +00:00
danysmall	1af206c360	Merge pull request 'remove additional link' (#162 ) from fix/featured-articles-cards into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/162	2022-10-20 10:01:39 +00:00
“Salar	932d23befa	remove additional link	2022-10-19 18:12:32 +03:00
“Salar	e52026cf86	resolve english translation	2022-10-19 17:46:33 +03:00
danysmall	033a1f31ad	Merge pull request 'resolve localization button in the header' (#160 ) from fix/header into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/160	2022-10-19 14:31:03 +00:00
danysmall	9c79f449c5	Manually merge	2022-10-19 17:30:50 +03:00
danysmall	24652d0908	Merge branch 'develop' into fix/header	2022-10-19 17:29:26 +03:00
danysmall	944baced6c	Merge pull request 'localization button feature' (#159 ) from feature/localization-button into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/159	2022-10-19 14:24:01 +00:00
“Salar	01a873477b	resolve localization button in the header	2022-10-19 16:58:19 +03:00
“Salar	d1b17592c3	localization button feature	2022-10-19 16:52:46 +03:00
danysmall	1475d2db27	Merge pull request 'feature/add-filters' (#157 ) from feature/add-filters into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/157	2022-10-18 16:50:53 +00:00
danysmall	1ba9dc28b5	Merge branch 'develop' into feature/add-filters	2022-10-18 19:50:13 +03:00
danysmall	1817946fe6	Merge pull request 'changed query to our api' (#156 ) from fix/search-request into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/156	2022-10-18 16:49:16 +00:00
danysmall	de5b6ad60c	Merge pull request 'fixed logo to actual' (#158 ) from fix/scipaper-logo into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/158	2022-10-18 16:48:47 +00:00
maximus	31706ca4e8	fixed logo to actual	2022-10-18 19:26:29 +03:00
filantrop	969749c0c0	Merge branch 'feature/add-filters' of http://85.143.176.51:3000/free-land/front-end into feature/add-filters	2022-10-18 17:50:31 +03:00
filantrop	5667f30a92	add translate	2022-10-18 17:34:10 +03:00
maximus	d77c1c6388	fixed article endpoint	2022-10-18 17:13:46 +03:00
maximus	bd6fbbebfd	changed query to our api	2022-10-18 16:51:27 +03:00
filantrop	2ffce71e74	fix styles	2022-10-18 14:59:38 +03:00
danysmall	35900bec5d	Merge pull request 'fix/article-interaction-buttons' (#155 ) from fix/article-interaction-buttons into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/155	2022-10-18 10:43:30 +00:00
maximus	c63c19e1c7	finished styling, added filters to main page	2022-10-18 12:06:21 +03:00
maximus	b5443aa033	Merge branch 'develop' into fix/article-interaction-buttons	2022-10-18 11:07:40 +03:00
maximus	18d02945f3	add functionality to share button and localize it	2022-10-18 09:40:34 +03:00
danysmall	558a1fd5a7	Merge pull request 'bold style for the link resolved' (#154 ) from fix/featured-articles-cards into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/154	2022-10-17 15:14:59 +00:00
“Salar	bee5499816	bold style for the link resolved	2022-10-17 15:27:28 +03:00
danysmall	8a2a7f0c53	Merge pull request 'added filter (beta version)' (#147 ) from feature/add-filters into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/147	2022-10-17 11:58:02 +00:00
danysmall	15b9ed1f20	Merge branch 'develop' into feature/add-filters	2022-10-17 14:57:33 +03:00
danysmall	cad2174bc5	Merge pull request 'English localization' (#152 ) from feature/english-localization into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/152	2022-10-17 11:56:01 +00:00
danysmall	0c0a79d81d	Merge pull request 'resolve padding of featured authors' (#149 ) from fix/featured-authors into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/149	2022-10-17 11:55:47 +00:00
danysmall	df4b4d5c32	Merge pull request 'resolve not found page' (#148 ) from fix/404-page into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/148	2022-10-17 11:54:25 +00:00
danysmall	92dddab82a	Merge pull request 'the padding of featured articles cards has been resolved' (#150 ) from fix/featured-articles-cards into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/150	2022-10-17 11:53:58 +00:00
danysmall	93cefd9ce3	Merge pull request 'resolve the margin of topic in the article info and article content pages' (#151 ) from fix/fetch-article into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/151	2022-10-17 11:53:40 +00:00
danysmall	373d55a543	Merge pull request 'resolve the style of link' (#153 ) from fix/link into develop Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/153	2022-10-17 11:52:57 +00:00
“Salar	8a075e926e	resolve the style of link	2022-10-17 14:47:21 +03:00
“Salar	705ae6471f	English localization	2022-10-17 14:15:13 +03:00
“Salar	64a6e6ab20	resolve the margin of topic in the article info and article content pages	2022-10-17 13:08:24 +03:00
“Salar	3cac7c7d04	the padding of featured articles cards has been resolved	2022-10-17 12:49:21 +03:00
“Salar	b390ae7a2e	resolve not found page	2022-10-17 12:26:23 +03:00
filantrop	3c739247d2	added filter (beta version)	2022-10-17 12:17:14 +03:00