delete Topic component and route; change name of Resources component …

…to NewResource b00tc4mp#482
juditta99 · Apr 28, 2024 · 62567e7 · 62567e7
1 parent 366820e
commit 62567e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/staff/judy-grayland/project/app/src/App.jsx b/staff/judy-grayland/project/app/src/App.jsx
@@ -8,9 +8,8 @@ import logic from './logic'
 // pages
 import Profile from './pages/Profile'
 import Home from './pages/Home'
-import Resources from './pages/Resources'
+import NewResource from './pages/NewResource'
 import Login from './pages/Login'
-import Topic from './pages/Topic'
 import Register from './pages/Register'
 import { useNavigate } from 'react-router-dom'
 
@@ -48,9 +47,8 @@ function App() {
         <Route element={<ProtectedRoute />}>
           <Route path="profile" element={<Profile />} />
         </Route>
-        <Route path="topic" element={<Topic />} />
         <Route element={<ProtectedRoute />}>
-          <Route path="resources/new" element={<Resources />} />
+          <Route path="resources/new" element={<NewResource />} />
         </Route>
       </Routes>
     </>

diff --git a/staff/judy-grayland/project/app/src/logic/createResource.js b/staff/judy-grayland/project/app/src/logic/createResource.js
@@ -17,8 +17,8 @@ function createResource({
   validate.tagArray(topic, 'topic array')
 
   if (resourceType === 'activity') {
-    validate.text(link, 'link')
     validate.text(image, 'image')
+    validate.text(link, 'link')
   }
   if (resourceType === 'book') {
     validate.text(author, 'author')

diff --git a/...yland/project/app/src/pages/Resources.jsx → ...and/project/app/src/pages/NewResource.jsx b/...yland/project/app/src/pages/Resources.jsx → ...and/project/app/src/pages/NewResource.jsx
@@ -2,7 +2,7 @@ import { Form, Field, Button } from '../components'
 import { useState } from 'react'
 import logic from '../logic'
 
-function Resources() {
+function NewResource() {
   const [resourceType, setResourceType] = useState('activity')
 
   function handleCreateResourceSuccess() {
@@ -299,4 +299,4 @@ function Resources() {
   )
 }
 
-export default Resources
+export default NewResource
diff --git a/staff/judy-grayland/project/app/src/pages/Topic.jsx b/staff/judy-grayland/project/app/src/pages/Topic.jsx