fix: resolved conflicts (#4)

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run prettyCheck

package.json

@@ -20,7 +20,10 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "pretty": "npx prettier --write \"./**/*.{js,jsx,json,css}\"",
+    "prettyCheck": "npx prettier --check \"./**/*.{js,jsx,json,css}\"",
+    "prepare": "husky install"
   },
   "eslintConfig": {
     "extends": [
@@ -39,5 +42,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "husky": "^7.0.4"
   }
 }

src/App.css

@@ -1,11 +1,11 @@
 .logo {
-    float: left;
-    width: 120px;
-    height: 31px;
-    margin: 16px 24px 16px 0;
-    background: rgba(255, 255, 255, 0.3);
-  }
-  .ant-row-rtl .logo {
-    float: right;
-    margin: 16px 0 16px 24px;
-  }
+  float: left;
+  width: 120px;
+  height: 31px;
+  margin: 16px 24px 16px 0;
+  background: rgba(255, 255, 255, 0.3);
+}
+.ant-row-rtl .logo {
+  float: right;
+  margin: 16px 0 16px 24px;
+}

src/App.js

@@ -100,7 +100,7 @@ const App = () => {
     let location = useLocation()
     return (
       //location.search is the part of url after ? symbol
-      <Contests queryStr={location.search} ContestAPI = {ContestAPI} />
+      <Contests queryStr={location.search} ContestAPI={ContestAPI} />
     )
   }
 
@@ -154,7 +154,6 @@ const App = () => {
                 {/* wise - topic,level | type - ladder,practice | slug is selected series */}
                 <Route path="/problems" element={<ProblemsPage1 />} />
                 {/* Problems page */}
-
                 <Route path="/contests" element={<ContestPage1 />} />
                 {/* Contest page */}
                 <Route
@@ -189,4 +188,4 @@ const App = () => {
   )
 }
 
-export default App
+export default App

src/actions/Contest.js

@@ -6,4 +6,4 @@ export default async function getProblems(creds, queryStr) {
       Authorization: `Bearer ${creds.access}`,
     },
   }).then((data) => data.json())
-}
+}

src/components/AccordionCom.jsx

@@ -1,15 +1,29 @@
 import React from 'react'
-import 'antd/dist/antd.css';
-import { Card } from 'antd';
-import '../styles/Accordion/accordion.css';
+import 'antd/dist/antd.css'
+import { Card } from 'antd'
+import '../styles/Accordion/accordion.css'
 
 export default function SimpleAccordion({ problem }) {
- return (<>
-  <Card className='mainCard'>
-    <Card className='problemName' type="inner" title={problem.name} extra={<a className='solveLink' target="blank" href={`https://codeforces.com/contest/${problem.contestId}`}>Solve</a>}>
-    <strong>Duration</strong> : {problem.duration / 60 / 60} hours
-    </Card>
-  </Card>
-  </>
- )
+  return (
+    <>
+      <Card className="mainCard">
+        <Card
+          className="problemName"
+          type="inner"
+          title={problem.name}
+          extra={
+            <a
+              className="solveLink"
+              target="blank"
+              href={`https://codeforces.com/contest/${problem.contestId}`}
+            >
+              Solve
+            </a>
+          }
+        >
+          <strong>Duration</strong> : {problem.duration / 60 / 60} hours
+        </Card>
+      </Card>
+    </>
+  )
 }

src/index.js

@@ -1,11 +1,10 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import {BrowserRouter} from 'react-router-dom'
+import React from 'react'
+import ReactDOM from 'react-dom'
+import './index.css'
+import App from './App'
 
 ReactDOM.render(
   <React.StrictMode>
       <App />  </React.StrictMode>,
   document.getElementById('root')
-);
+)

src/pages/Contests/Contests.jsx

@@ -16,9 +16,9 @@ function ContestPage({ queryStr, ContestAPI }) {
   const [datap, setDatap] = useState(queryStr.replace(/;/g, '&'))
 
   //for sidenav (for adding a class)
-  const [openSideNav, setOpenSideNav] = useState("");
+  const [openSideNav, setOpenSideNav] = useState('')
   //for blur bckground
-  const [blurBackground, setBlurBackground] = useState("");
+  const [blurBackground, setBlurBackground] = useState('')
 
   // search box
   const { Search } = Input
@@ -137,14 +137,14 @@ function ContestPage({ queryStr, ContestAPI }) {
 
   //opening filter block
   function openNav() {
-    setOpenSideNav('sideNavOpen');
-    setBlurBackground('blur_bckgrnd');
+    setOpenSideNav('sideNavOpen')
+    setBlurBackground('blur_bckgrnd')
   }
 
   //closing filter block
   function closeNav() {
-    setOpenSideNav("sideNavClose");
-    setBlurBackground(null);
+    setOpenSideNav('sideNavClose')
+    setBlurBackground(null)
   }
 
   //rendering contests
@@ -172,7 +172,7 @@ function ContestPage({ queryStr, ContestAPI }) {
   ) : (
     <>
       <div id="contest_nav_id">{/* <Navbar /> */}</div>
-      <h3 className={`page_heading ${blurBackground}`}  id="page_heading_id">
+      <h3 className={`page_heading ${blurBackground}`} id="page_heading_id">
         Contests
       </h3>
       <Button className="filter_buttonnn" type="primary" onClick={openNav}>
@@ -186,9 +186,9 @@ function ContestPage({ queryStr, ContestAPI }) {
         Refresh
       </Button>
 
-      <div id="mySidenav1" className = {`sidenav1 ${openSideNav}`}>
+      <div id="mySidenav1" className={`sidenav1 ${openSideNav}`}>
         {/* modal popup */}
-        <ModalForDivision 
+        <ModalForDivision
           difflev={DIFFICULTY_OBJECT.difficultyLevels}
           display={displayDiff}
           change={changeDifficultyFilter}
@@ -214,35 +214,47 @@ function ContestPage({ queryStr, ContestAPI }) {
           />
         </div>
         <br></br> <br></br>
-        <Button className="sidenav_apply_button" onClick={handleSubmit}> Apply </Button>
-        <Button className="sidenav_close_button" onClick={closeNav}> Close </Button>
+        <Button className="sidenav_apply_button" onClick={handleSubmit}>
+          {' '}
+          Apply{' '}
+        </Button>
+        <Button className="sidenav_close_button" onClick={closeNav}>
+          {' '}
+          Close{' '}
+        </Button>
       </div>
 
       {!problems.result ? (
         // <Loading />
         <h1>hi</h1>
       ) : (
         <>
-          <div className={`contests_page ${blurBackground}`} id="contests_page_id">
+          <div
+            className={`contests_page ${blurBackground}`}
+            id="contests_page_id"
+          >
             <div className="roww">
               <div className="input-group">
-                  {/* search box */}
-                  <Search
-                    placeholder="input search text"
-                    allowClear
-                    enterButton="Search"
-                    size="large"
-                    onChange={(e) => setSearchText(e.target.value)}
-                    onSearch={handleSearch}
-                    className="search_box"
-                  />
+                {/* search box */}
+                <Search
+                  placeholder="input search text"
+                  allowClear
+                  enterButton="Search"
+                  size="large"
+                  onChange={(e) => setSearchText(e.target.value)}
+                  onSearch={handleSearch}
+                  className="search_box"
+                />
               </div>
             </div>
             <Row gutter={[16, 16]}>
               {problems.result.map((playlist, i) => {
                 return (
                   <>
-                    <Col span={screen.width > 768 ? 12 : 25} style={{ marginBottom: '1rem' }} >
+                    <Col
+                      span={screen.width > 768 ? 12 : 25}
+                      style={{ marginBottom: '1rem' }}
+                    >
                       <AccordionCom problem={playlist} />
                     </Col>
                   </>
@@ -257,4 +269,4 @@ function ContestPage({ queryStr, ContestAPI }) {
   )
 }
 
-export default ContestPage
+export default ContestPage