Skip to content

Commit d0290ba

Browse files
committed
top part of layout finished
1 parent 461b801 commit d0290ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2427
-179
lines changed

package-lock.json

+144
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"@testing-library/jest-dom": "^5.16.5",
77
"@testing-library/react": "^13.4.0",
88
"@testing-library/user-event": "^13.5.0",
9+
"flowbite-react": "^0.4.9",
910
"react": "^18.2.0",
1011
"react-accessible-accordion": "^5.0.0",
1112
"react-dom": "^18.2.0",

src/App.css

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
display: flex;
33
padding-top: 80px;
44
}
5+
a {
6+
text-decoration: none;
7+
}
58

69
.main_content_wrapper {
710
width: 100%;
@@ -56,4 +59,11 @@
5659
.m_content_center {
5760
width: 85%;
5861
}
62+
.main_page_styles {
63+
padding-top: 20px !important;
64+
padding-right: 20px !important;
65+
}
66+
.profile_wrapper, .home_page_carousel {
67+
margin-top: 10px !important;
68+
}
5969
}

src/App.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ import Earn from "./pages/earn/earn";
1414
import Profile from "./pages/profile/profile";
1515
import Affilitates from "./pages/affiliates/affliates";
1616
import Rewards from "./pages/rewards/rewards";
17+
import Inventory from "./pages/inventory/inventory";
18+
import Withdraw from "./pages/withdraw/withdraw";
19+
import WithDrawModal from "./components/withdraw-modal/withdraw-modal";
1720

1821
function App() {
1922
const [isMenuVisible, setMenuVisible] = useState(false);
2023
const [isModalVisible, setModalVisible] = useState(false);
24+
const [isWithDrawVisible, setWithDrawVisible] = useState(false);
2125
const [isDepositeVisible, setDepositeModalVisible] = useState(false);
2226
const toggleMenu = () => {
2327
setMenuVisible(!isMenuVisible);
@@ -28,10 +32,18 @@ function App() {
2832
const toggleDeposit = () => {
2933
setDepositeModalVisible(!isDepositeVisible);
3034
};
35+
const toggleWithDraw = () => {
36+
setWithDrawVisible(!isWithDrawVisible);
37+
};
38+
3139
return (
3240
<>
3341
<div className="main_wrapper">
34-
<Navbar toggleModal={toggleModal} toggleDeposit={toggleDeposit} />
42+
<Navbar
43+
toggleModal={toggleModal}
44+
toggleDeposit={toggleDeposit}
45+
toggleWithDraw={toggleWithDraw}
46+
/>
3547
<div className="main_content">
3648
<Sidebar />
3749
<div className="main_content_wrapper">
@@ -49,6 +61,8 @@ function App() {
4961
<Route path="/earn" element={<Earn />} />
5062
<Route path="/affiliates" element={<Affilitates />} />
5163
<Route path="/rewards" element={<Rewards />} />
64+
<Route path="/inventory" element={<Inventory />} />
65+
<Route path="/withdraw" element={<Withdraw />} />
5266
<Route
5367
path="/profile"
5468
element={<Profile toggleDeposit={toggleDeposit} />}
@@ -70,6 +84,7 @@ function App() {
7084
</div>
7185
{!isModalVisible || <SignIn toggleModal={toggleModal} />}
7286
{!isDepositeVisible || <Deposit toggleDeposit={toggleDeposit} />}
87+
{!isWithDrawVisible || <WithDrawModal toggleWithDraw={toggleWithDraw} />}
7388
</>
7489
);
7590
}

src/assets/icons/arrow-down.svg

+5
Loading

src/assets/icons/card-item-btm.svg

+12
Loading

src/assets/icons/checked.svg

+5
Loading

0 commit comments

Comments
 (0)