fix: merge conflicts

Signed-off-by: Shruti3004 <[email protected]>
fossology · Jul 19, 2022 · c35a247 · c35a247
1 parent fee89c8
commit c35a247
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/src/Routes.jsx b/src/Routes.jsx
@@ -125,7 +125,7 @@ const Routes = () => {
           />
           <PrivateLayout
             exact
-            path={`${routes.browseUploads.licenseBrowser}/:uploadID`}
+            path={`${routes.browseUploads.licenseBrowser}/uploadID=:uploadID`}
             component={LicenseBrowse}
           />
           <PrivateLayout

diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx
@@ -51,7 +51,7 @@ const Header = () => {
                   Software Heritage
                 </Link>
                 <Link
-                  to={`${routes.browseUploads.licenseBrowser}/:uploadID`}
+                  to={`${routes.browseUploads.licenseBrowser}/uploadID=:uploadID`}
                   className={
                     location.pathname.includes(
                       routes.browseUploads.licenseBrowser

diff --git a/src/pages/Browse/index.jsx b/src/pages/Browse/index.jsx
@@ -283,7 +283,6 @@ const Browse = () => {
                 </tr>
               </thead>
               <tbody>
-<<<<<<< HEAD
                 {browseDataList
                   ?.filter((post) => {
                     if (query === "") {
@@ -300,23 +299,16 @@ const Browse = () => {
                   ?.map((data) => (
                     <tr key={data?.id} className="text-center">
                       <td>
-                        <div className="font-demi">{data?.uploadname}</div>
-                        <div className="font-size-small">
-                          {data?.description}
-=======
-                {browseDataList?.map((data) => (
-                  <tr key={data?.id} className="text-center">
-                    <td>
-                      <Link
-                        to={`${routes.browseUploads.licenseBrowser}/${data.id}`}
-                      >
-                        <div className="text-primary-color">
-                          <div className="font-demi">{data?.uploadname}</div>
-                          <div className="font-size-small">
-                            {data?.description}
+                        <Link
+                          to={`${routes.browseUploads.licenseBrowser}/uploadID=${data.id}`}
+                        >
+                          <div className="text-primary-color">
+                            <div className="font-demi">{data?.uploadname}</div>
+                            <div className="font-size-small">
+                              {data?.description}
+                            </div>
                           </div>
->>>>>>> fix(route): fixed the route of license browser
-                        </div>
+                        </Link>
                         <InputContainer
                           name="action"
                           type="select"
@@ -350,7 +342,7 @@ const Browse = () => {
                       <td>{data?.uploaddate.split(".")[0]}</td>
                     </tr>
                   ))}
-                <tr className="text-left">
+                <tr>
                   <td colSpan="6">
                     <div className="right-pagination">
                       Page: