fix: fix merge conflicts

ReCoded-Org · Apr 21, 2022 · a98bf5f · a98bf5f
2 parents c7442f5 + 827c4aa
commit a98bf5f
Show file tree

Hide file tree

Showing 18 changed files with 4,973 additions and 4,166 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "react-redux": "^7.2.3",
     "react-router-dom": "^6.3.0",
     "react-scripts": "5.0.0",
+    "tw-elements": "^1.0.0-alpha12",
     "yup": "^0.32.11"
   },
   "scripts": {

diff --git a/src/App.jsx b/src/App.jsx
@@ -1,9 +1,16 @@
+/* import { Route, Routes } from 'react-router-dom'; */
+import Navbar from './components/Navbar/Navbar/Navbar';
 import Home from './pages/Home';
 import Footer from './components/Footer/Footer';
 
 function App() {
   return (
     <div>
+      <Navbar />
+      {/* <Routes>
+        <Route path="" element={} />
+        <Route path="" element={} />
+      </Routes> */}
       <Home />
       <Footer />
     </div>

diff --git a/src/components/Accordions/GeneralAccordion/GeneralAccordion.jsx b/src/components/Accordions/GeneralAccordion/GeneralAccordion.jsx
@@ -0,0 +1,168 @@
+function GeneralAccordion() {
+  return (
+    <div
+      className="accordion w-2/3 text-left mt-10"
+      id="accordionExample"
+      data-testid="valid-generalAccordion"
+    >
+      <div className="flex flex-row justify-start align-center">
+        <div className="p-2">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            className="h-7 w-7"
+            viewBox="0 0 20 20"
+            fill="currentColor"
+          >
+            <path
+              fillRule="evenodd"
+              d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
+              clipRule="evenodd"
+            />
+          </svg>
+        </div>
+        <p
+          className="text-2xl font-semibold p-2"
+          data-testid="valid-generalAccordionTitle"
+        >
+          General
+        </p>
+      </div>
+      <div className="accordion-item bg-[#FEEEEE] border-b-2 border-pink-200">
+        <h2 className="accordion-header mb-0" id="headingOne">
+          <button
+            className="
+            accordion-button
+            collapsed
+            relative
+            flex
+            items-center
+            w-full
+            py-4
+            px-5
+            font-semibold
+            text-base text-[#6A2C70] text-left
+            rounded-none
+            transition
+            focus:outline-none
+      "
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseOne"
+            aria-expanded="true"
+            aria-controls="collapseOne"
+          >
+            Lorem ipsum dolor sit amet 1... ?
+          </button>
+        </h2>
+        <div
+          id="collapseOne"
+          className="accordion-collapse collapse show"
+          aria-labelledby="headingOne"
+          data-bs-parent="#accordionExample"
+        >
+          <div className="accordion-body py-4 px-5 bg-[#FEEEEE]">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+            aliquip ex ea commodo consequat. Duis aute irure dolor in
+            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+            culpa qui officia deserunt mollit anim id est laborum
+          </div>
+        </div>
+      </div>
+      <div className="accordion-item bg-white border-b-2 border-pink-200">
+        <h2 className="accordion-header mb-0" id="headingTwo">
+          <button
+            className="
+            accordion-button
+            collapsed
+            relative
+            flex
+            items-center
+            w-full
+            py-4
+            px-5
+            font-semibold
+            text-base text-[#6A2C70] text-left
+            bg-[#FEEEEE]
+            rounded-none
+            transition
+            focus:outline-none
+      "
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseTwo"
+            aria-expanded="false"
+            aria-controls="collapseTwo"
+          >
+            Lorem ipsum dolor sit amet 2... ?
+          </button>
+        </h2>
+        <div
+          id="collapseTwo"
+          className="accordion-collapse collapse"
+          aria-labelledby="headingTwo"
+          data-bs-parent="#accordionExample"
+        >
+          <div className="accordion-body py-4 px-5 bg-[#FEEEEE]">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+            aliquip ex ea commodo consequat. Duis aute irure dolor in
+            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+            culpa qui officia deserunt mollit anim id est laborum
+          </div>
+        </div>
+      </div>
+      <div className="accordion-item bg-white border-b-2 border-pink-200">
+        <h2 className="accordion-header mb-0" id="headingThree">
+          <button
+            className="
+            accordion-button
+            collapsed
+            relative
+            flex
+            items-center
+            w-full
+            py-4
+            px-5
+            font-semibold
+            text-base text-[#6A2C70] text-left
+            bg-[#FEEEEE]
+            rounded-none
+            transition
+            focus:outline-none            
+      "
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseThree"
+            aria-expanded="false"
+            aria-controls="collapseThree"
+          >
+            Lorem ipsum dolor sit amet 3... ?
+          </button>
+        </h2>
+        <div
+          id="collapseThree"
+          className="accordion-collapse collapse"
+          aria-labelledby="headingThree"
+          data-bs-parent="#accordionExample"
+        >
+          <div className="accordion-body py-4 px-5 bg-[#FEEEEE]">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+            aliquip ex ea commodo consequat. Duis aute irure dolor in
+            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+            culpa qui officia deserunt mollit anim id est laborum
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default GeneralAccordion;
diff --git a/src/components/Accordions/GeneralAccordion/GeneralAccordion.test.jsx b/src/components/Accordions/GeneralAccordion/GeneralAccordion.test.jsx
@@ -0,0 +1,18 @@
+import { render, cleanup } from '@testing-library/react';
+import GeneralAccordion from './GeneralAccordion';
+
+describe('FAQ Page', () => {
+  afterEach(() => cleanup());
+
+  test('should render general accordion', () => {
+    const { getByTestId } = render(<GeneralAccordion />);
+    const generalAccordion = getByTestId('valid-generalAccordion');
+    expect(generalAccordion).toBeInTheDocument();
+  });
+
+  test('should render general accordion title', () => {
+    const { getByText } = render(<GeneralAccordion />);
+    const title = getByText('General');
+    expect(title).toBeInTheDocument();
+  });
+});
diff --git a/src/components/Accordions/RegisterAccordion/RegisterAccordion.jsx b/src/components/Accordions/RegisterAccordion/RegisterAccordion.jsx
@@ -0,0 +1,173 @@
+function RegisterAccordion() {
+  return (
+    <div
+      className="accordion w-2/3 text-left my-10"
+      id="accordionExample3"
+      data-testid="valid-registerAccordion"
+    >
+      <div className="flex flex-row justify-start align-center ">
+        <div className="p-2">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            className="h-7 w-7"
+            viewBox="0 0 20 20"
+            fill="currentColor"
+          >
+            <path
+              fillRule="evenodd"
+              d="M10 9a3 3 0 100-6 3 3 0 000 6zm-7 9a7 7 0 1114 0H3z"
+              clipRule="evenodd"
+            />
+          </svg>
+        </div>
+        <p
+          className="text-2xl font-semibold p-2"
+          data-testid="valid-registerAccordionTitle"
+        >
+          Register
+        </p>
+      </div>
+
+      <div className="accordion-item bg-[#FEEEEE] border-b-2 border-pink-200">
+        <h2 className="accordion-header mb-0" id="headingOne3">
+          <button
+            className="
+            accordion-button
+            collapsed
+            relative
+            flex
+            items-center
+            w-full
+            py-4
+            px-5
+            font-semibold
+            text-base text-[#6A2C70] text-left
+            rounded-none
+            transition
+            focus:outline-none
+      "
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseOne3"
+            aria-expanded="true"
+            aria-controls="collapseOne3"
+          >
+            Lorem ipsum dolor sit amet 1... ?
+          </button>
+        </h2>
+        <div
+          id="collapseOne3"
+          className="accordion-collapse collapse"
+          aria-labelledby="headingOne3"
+          data-bs-parent="#accordionExample3"
+        >
+          <div className="accordion-body py-4 px-5 bg-[#FEEEEE]">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+            aliquip ex ea commodo consequat. Duis aute irure dolor in
+            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+            culpa qui officia deserunt mollit anim id est laborum
+          </div>
+        </div>
+      </div>
+      <div className="accordion-item bg-[#FEEEEE] border-b-2 border-pink-200">
+        <h2 className="accordion-header mb-0" id="headingTwo3">
+          <button
+            className="
+              accordion-button
+              collapsed
+              relative
+              flex
+              items-center
+              w-full
+              py-4
+              px-5
+              font-semibold
+              text-base 
+              text-[#6A2C70] 
+              text-left
+              bg-[#FEEEEE]
+              rounded-none
+              transition
+              focus:outline-none
+            "
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseTwo3"
+            aria-expanded="false"
+            aria-controls="collapseTwo3"
+          >
+            Lorem ipsum dolor sit amet 2... ?
+          </button>
+        </h2>
+        <div
+          id="collapseTwo3"
+          className="accordion-collapse collapse"
+          aria-labelledby="headingTwo3"
+          data-bs-parent="#accordionExample3"
+        >
+          <div className="accordion-body py-4 px-5 bg-[#FEEEEE]">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+            aliquip ex ea commodo consequat. Duis aute irure dolor in
+            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+            culpa qui officia deserunt mollit anim id est laborum
+          </div>
+        </div>
+      </div>
+      <div className="accordion-item bg-[#FEEEEE] border-b-2 border-pink-200">
+        <h2 className="accordion-header mb-0" id="headingThree3">
+          <button
+            className="
+              accordion-button
+              collapsed
+              relative
+              flex
+              items-center
+              w-full
+              py-4
+              px-5
+              font-semibold
+              text-base
+              text-[#6A2C70] 
+              text-left
+              bg-[#FEEEEE]
+              rounded-none
+              transition
+              focus:outline-none
+            "
+            type="button"
+            data-bs-toggle="collapse"
+            data-bs-target="#collapseThree3"
+            aria-expanded="false"
+            aria-controls="collapseThree3"
+          >
+            Lorem ipsum dolor sit amet 3... ?
+          </button>
+        </h2>
+        <div
+          id="collapseThree3"
+          className="accordion-collapse collapse show"
+          aria-labelledby="headingThree3"
+          data-bs-parent="#accordionExample3"
+        >
+          <div className="accordion-body py-4 px-5 bg-[#FEEEEE]">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
+            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+            aliquip ex ea commodo consequat. Duis aute irure dolor in
+            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+            culpa qui officia deserunt mollit anim id est laborum
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default RegisterAccordion;