Merge branch 'hexlet-rus:main' into main

hexlet-rus · Nov 21, 2023 · a32daea · a32daea
2 parents e47d2fb + cd5dd62
commit a32daea
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -43,7 +43,7 @@
     "@sentry/tracing": "^7.38.0",
     "@sentry/types": "^7.47.0",
     "@types/bcrypt": "^5.0.0",
-    "axios": "^1.3.3",
+    "axios": "^1.6.0",
     "bcrypt": "^5.1.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",

diff --git a/frontend/package.json b/frontend/package.json
@@ -8,7 +8,7 @@
     "@reduxjs/toolkit": "^1.9.5",
     "@sentry/react": "^7.47.0",
     "@sentry/tracing": "^7.38.0",
-    "axios": "^1.4.0",
+    "axios": "^1.6.0",
     "bootstrap": "^5.3.1",
     "clipboard": "^2.0.11",
     "formik": "^2.4.2",

diff --git a/frontend/src/pages/snippet/FileToolbar.jsx b/frontend/src/pages/snippet/FileToolbar.jsx
@@ -91,7 +91,7 @@ function SnippetName({ snippet }) {
             ref={inputRef}
             as={AutowidthInput}
             autoComplete="off"
-            className="transition-padding"
+            className="transition-padding w-auto"
             id="name"
             isInvalid={!!formik.errors.name}
             maxLength={30}

diff --git a/frontend/src/slices/languagesSlice.js b/frontend/src/slices/languagesSlice.js
@@ -4,7 +4,7 @@ import { createSlice } from '@reduxjs/toolkit';
 const slice = createSlice({
   name: 'languages',
   initialState: {
-    supportedLanguages: ['javascript', 'php', 'python', 'html'],
+    supportedLanguages: ['javascript', 'html'],
     currentLanguage: 'javascript',
   },
   reducers: {

diff --git a/yarn.lock b/yarn.lock
@@ -4078,10 +4078,10 @@ axe-core@^4.6.2:
   resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz"
   integrity sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==
 
-axios@^1.3.3, axios@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz"
-  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"