Fixed 2021

src/pages/AdminHomePage/AdminCategoriesPage/AdminCategoriesPage.js

@@ -62,6 +62,14 @@ const AdminCategoriesPage = () => {
           handleSearch={handleSearch}
           placeholder={t("admin.categories.placeholder")}
         />
+        <NewCategoryButton
+          variant="contained"
+          buttoncolor={selectedTheme.colors.iconYellowColor}
+          textcolor={selectedTheme.colors.messageText}
+          onClick={showAddCategoryModal}
+        >
+          {t("admin.categories.addCategory")}
+        </NewCategoryButton>
         <AdminCategoriesHeader
           myOffers
           categories
@@ -80,14 +88,6 @@ const AdminCategoriesPage = () => {
             />
           ))}
         </CategoriesList>
-        <NewCategoryButton
-          variant="contained"
-          buttoncolor={selectedTheme.colors.iconYellowColor}
-          textcolor={selectedTheme.colors.messageText}
-          onClick={showAddCategoryModal}
-        >
-          {t("admin.categories.addCategory")}
-        </NewCategoryButton>
       </AdminCategoriesPageContainer>
     </>
   );

src/pages/AdminHomePage/AdminCategoriesPage/AdminCategoriesPage.styled.js

@@ -44,9 +44,8 @@ export const AdminCategoriesSearchField = styled(SearchField)`
   }
 `;
 export const NewCategoryButton = styled(PrimaryButton)`
-  position: absolute;
-  bottom: 18px;
-  right: 37px;
+  position: relative;
+  margin-left: auto;
   height: 48px;
   width: 224px;
   & button {

src/pages/AdminHomePage/AdminLocationsPage/AdminLocationsPage.js

@@ -59,6 +59,14 @@ const AdminLocationsPage = () => {
           handleSearch={handleSearch}
           placeholder={t("admin.locations.placeholder")}
         />
+        <NewLocationButton
+          variant="contained"
+          buttoncolor={selectedTheme.colors.iconYellowColor}
+          textcolor={selectedTheme.colors.messageText}
+          onClick={showAddCategoryModal}
+        >
+          {t("admin.locations.addLocation")}
+        </NewLocationButton>
         <AdminLocationsHeader
           myOffers
           location
@@ -79,14 +87,6 @@ const AdminLocationsPage = () => {
             />
           ))}
         </LocationsList>
-        <NewLocationButton
-          variant="contained"
-          buttoncolor={selectedTheme.colors.iconYellowColor}
-          textcolor={selectedTheme.colors.messageText}
-          onClick={showAddCategoryModal}
-        >
-          {t("admin.locations.addLocation")}
-        </NewLocationButton>
       </AdminLocationsPageContainer>
     </>
   );

src/pages/AdminHomePage/AdminLocationsPage/AdminLocationsPage.styled.js

@@ -47,9 +47,8 @@ export const AdminLocationsSearchField = styled(SearchField)`
   }
 `;
 export const NewLocationButton = styled(PrimaryButton)`
-  position: absolute;
-  bottom: 18px;
-  right: 33px;
+  position: relative;
+  margin-left: auto;
   height: 48px;
   width: 224px;
   & button {