Merge pull request #179 from Lapkipomoshi/dev

Dev to main
Lapkipomoshi · Aug 30, 2023 · 58816c3 · 58816c3
2 parents d2fa42d + 0f72e3a
commit 58816c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/modules/ShelterVacancies/ShelterVacancies.jsx b/src/modules/ShelterVacancies/ShelterVacancies.jsx
@@ -18,7 +18,7 @@ const ShelterVacancies = () => {
 
   const [isLoading, setIsLoading] = useState(true);
 
-  const { shelter } = useOutletContext();
+  const { shelter, isOwner } = useOutletContext();
 
   useEffect(() => {
     if (!shelter.id) return;
@@ -66,10 +66,11 @@ const ShelterVacancies = () => {
     <section className='shelter-vacancies'>
       <div className='shelter-vacancies__title-container'>
         <h2 className='shelter-vacancies__title standard-font standard-font_type_h2'>Вакансии приюта «{shelter.name}»</h2>
-
-        <Button disabled={isOpenVacancyForm} onClick={toggleVacancyForm}>
-          Добавить вакансию
-        </Button>
+        {isOwner && (
+          <Button disabled={isOpenVacancyForm} onClick={toggleVacancyForm}>
+            Добавить вакансию
+          </Button>
+        )}
       </div>
       <h3 className='standard-font_type_h3 shelter-section__subtitle'>Всего вакансий: {vacanciesList.length}</h3>
       <div className='shelter-vacancies__vacancies-container'>

diff --git a/src/pages/App/App.jsx b/src/pages/App/App.jsx
@@ -199,7 +199,7 @@ const App = () => {
             <Route exact path='/password-recovery' element={<ProtectedRoute condition={!loggedIn} component={PasswordRecovery} />} />
 
             <Route exact path='/activate/:uid/:token/' element={<ActivateUserPage />} />
-            <Route exact path='/password-reset' element={<NewPassword />} />
+            <Route exact path='/password-reset/:uid/:token/' element={<NewPassword />} />
             <Route exact path='/email-reset/:uid/:token/:new_email' element={<ActivateEmailPage onUpdateCurrentUser={setCurrentUser} />} />
 
             <Route path='/profile' element={<ProtectedRoute condition={loggedIn} component={ProfilePage} />} />