-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ui bugs removed, routes fixed, responsiveness 90% fix, f.. (#5)
* ui bugs removed, routes fixed, responsiveness 90% fix, broilerplate for other pages done * dependency error fixed
- Loading branch information
Showing
15 changed files
with
844 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,37 @@ | ||
| import './App.css' | ||
| import Home from "./views/Home.jsx" | ||
| import Contact from "./components/Contact.jsx" | ||
| function App() { | ||
| import "./App.css"; | ||
| import { Suspense, lazy } from "react"; | ||
| import { Routes, Router, Route, Outlet, BrowserRouter } from "react-router-dom"; | ||
| const Navbar = lazy(() => import("./components/Navbar.jsx")); | ||
| const Home = lazy(() => import("./views/Home.jsx")); | ||
| const Contact = lazy(() => import("./views/Contact.jsx")); | ||
| const About = lazy(() => import("./views/About.jsx")); | ||
| const Profile = lazy(() => import("./views/Profile.jsx")); | ||
| const Plans = lazy(() => import("./views/Plans.jsx")); | ||
| const Workout = lazy(() => import("./views/Workout.jsx")); | ||
|
|
||
| function App() { | ||
| return ( | ||
| <div> | ||
| <Home/> | ||
| <Contact/> | ||
| </div> | ||
| ) | ||
| <> | ||
| <Suspense fallback={<div>Loading...</div>}> | ||
| <BrowserRouter> | ||
| <Navbar /> | ||
| <Routes> | ||
| <Route path="/" element={<Home />} /> | ||
| <Route path="/home" element={<Home />} /> | ||
| <Route path="/contact" element={<Contact />} /> | ||
| <Route path="/about" element={<About />} /> | ||
| <Route path="/plans" element={<Plans />} /> | ||
| <Route path="/plans:plansId" element={<Plans />} /> | ||
| <Route path="/workout:workoutId" element={<Workout />} /> | ||
| <Route path="/progress" element={<Profile />} /> | ||
| <Route path="/login" element={<Contact />} /> | ||
| <Route path="/signup" element={<Contact />} /> | ||
| <Route path="/*" element={<div>404 page not found</div>} /> | ||
| </Routes> | ||
| </BrowserRouter> | ||
| </Suspense> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| export default App | ||
| export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import React from "react"; | ||
| import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; | ||
| function CounterCard({ val, icon, text }) { | ||
| return ( | ||
| <div | ||
| className="data-container" | ||
| id="a0" | ||
| style={{ | ||
| fontFamily: "Poppins, sans-serif", | ||
| width: "28vmin", | ||
| height: "28vmin", | ||
| display: "flex", | ||
| flexDirection: "column", | ||
| justifyContent: "space-around", | ||
| padding: "1em 0", | ||
| position: "relative", | ||
| fontSize: "16px", | ||
| borderRadius: "0.5em", | ||
| backgroundColor: "#21242b", | ||
| borderBottom: "10px solid #FF4F04", | ||
| transition: "transform 0.5s ease, box-shadow 0.7s ease", | ||
| }} | ||
| > | ||
| <i className="fas fa-male"></i> | ||
| <FontAwesomeIcon | ||
| style={{ | ||
| paddingTop: "20px", | ||
| color: "#FF4F04", | ||
| fontSize: "2.5em", | ||
| textAlign: "center", | ||
| }} | ||
| icon={icon} | ||
| /> | ||
| <span | ||
| style={{ | ||
| color: "#ffffff", | ||
| display: "grid", | ||
| placeItems: "center", | ||
| fontWeight: "600", | ||
| fontSize: "3em", | ||
| marginBottom: "70px", | ||
| }} | ||
| className="num" | ||
| data-val="20" | ||
| id="hero" | ||
| > | ||
| {val} | ||
| </span> | ||
| <span | ||
| style={{ | ||
| color: "#e0e0e0", | ||
| fontSize: "1em", | ||
| textAlign: " center", | ||
| padding: " 0.7em 0", | ||
| fontWeight: "400", | ||
| lineHeight: "0", | ||
| }} | ||
| className="text" | ||
| > | ||
| {text} | ||
| </span> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default CounterCard; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // this component is temperary and will be replaced with the actual workout and exercise components | ||
| const Footer = () => { | ||
| return ( | ||
| <footer style={{ height: '25vh' }}> | ||
| <div> | ||
| <h3>Contact Us</h3> | ||
| <p>Email: [email protected]</p> | ||
| <p>Phone: 123-456-7890</p> | ||
| </div> | ||
| <div> | ||
| <h3>Follow Us</h3> | ||
| <ul> | ||
| <li><a href="#">Facebook</a></li> | ||
| <li><a href="#">Twitter</a></li> | ||
| <li><a href="#">Instagram</a></li> | ||
| </ul> | ||
| </div> | ||
| </footer> | ||
| ); | ||
| }; | ||
|
|
||
| export default Footer; |
Oops, something went wrong.