Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Resources in RoadMap on a new Page with /roadmap route #700

Closed
wants to merge 2 commits into from
Closed

Added Resources in RoadMap on a new Page with /roadmap route #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
168f7b8
Added Resources in RoadMap on a new Page with /roadmap route
MridulTi Aug 31, 2022
0624364
Merge branch 'main' into MridulTi-Roadmap
MridulTi Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions funwithphysics/public/Images-public/svg/Rocket.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added funwithphysics/public/Images-public/svg/cloud.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions funwithphysics/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,13 @@ import CalContinuity from "./Components/Integration/Topic/Calculator";
import Trigonometry from "./Components/Trigonometry/trigonometry";
import CalTrigonometryFunctions from "./Components/Trigonometry/Topic/Calculator";
import CalHyperbola from "./Components/Geometry/Topic/Calculator";
// MridulTi-Roadmap
import RoadMap from "./Components/RoadMap/RoadMap";
=======
import ChemistryTopic from "./Components/ChemistryTopics/index";
import PeriodicTable from "./Components/PeriodicTable/periodicTable";
import Properties from "./Components/PeriodicTable/properties";
// main

const Home = lazy(() => {
return Promise.all([
Expand Down Expand Up @@ -148,6 +152,23 @@ const App = () => {
</>
}
></Route>
<Route
exact
path="/roadmap"
element={
<>
<Suspense
fallback={
<div className="loadingdiv">
<img className="loadingimg" src={Loadingimg} alt="" />
</div>
}
>
<RoadMap/>
</Suspense>
</>
}
></Route>
<Route
exact
path="/contact"
Expand Down
31 changes: 31 additions & 0 deletions funwithphysics/src/Components/Home/Home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,25 @@ h2 {
padding: 5px;
}

// MridulTi-Roadmap
.btn-exams{
background-color: #ffffff;
color: #000;
border:0.2rem solid #000;
width: 20vw;
padding: 0% 5%;
text-align: center;
margin: 0%;
}
.btn-exams:hover{
background-color: #2c2b30;
color: #ffffff;
}
.btn-exam-link:hover{
color: #ffffff;
}
=======
// main
/*---Feature Section---*/

#fh5co-course-categories,
Expand All @@ -64,7 +83,19 @@ h2 {
padding: 7em 0;
clear: both;
}
// MridulTi-Roadmap
@media screen and (min-width:1200px){
.banner_button{
gap: 2%;
}
.btn-exams{
width: 12vw;
text-align: center;
}
}
=======

// main
@media screen and (max-width: 768px) {
#fh5co-course-categories,
#fh5co-counter,
Expand Down
8 changes: 8 additions & 0 deletions funwithphysics/src/Components/Home/Home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useContext, useEffect, useState,useRef } from "react";
import "../Home/Home.css";
import {Link} from "react-router-dom";
import { Button } from "react-bootstrap";
import Footer from "../Footer/Footer";
import { LearnMore } from "../LearnMore";
Expand Down Expand Up @@ -95,12 +96,18 @@ const bookReaderStyle = {
Learn
<i style={bookReaderStyle} className='fas fa-book-reader'></i>
</Button>
// MridulTi-Roadmap
<Button className="btn-exams"><Link to="/roadmap" className="btn-exam-link">Competitive Exams</Link></Button>
=======
// main
</div>
</div>
</div>

{/* About Us Section */}
<div>
// MridulTi-Roadmap
=======
<h3 className="aboutus-header" id="aboutus">
About Us
</h3>
Expand All @@ -126,6 +133,7 @@ const bookReaderStyle = {
{/* End of About Us Section */}

<div>
// main
<h3 className='learn-header' id='learn'>
Learn
</h3>
Expand Down
205 changes: 205 additions & 0 deletions funwithphysics/src/Components/RoadMap/RoadMap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
.Roadmap{
padding: 5% 0% 0%;
margin-bottom: -10%;
text-align: center;
}
.Roadmap>h1{
margin-bottom: 5%;
}
.roadmap-underline{
border: 0.1rem solid #F3703B;
background-color: #F3703B;
width: 15vw;
margin: 0% 42%;
margin-bottom: 5%;
}
.Roadmap-title{
width: 20vw;
margin: 10% 40% ;
position: absolute;
color: #000;
}
.Roadmap-title>h3{
border-radius: 0.5rem;
margin: 60% 0%;
padding: 5% ;
}
.Roadmap-title>h3:active{
font-size:1.5rem;
width: 18vw;
margin-left: 5%;
}
a{
color: #000;
}
a:hover{
color: blue;
text-decoration: none;
}
.svg-cloud{
z-index: 10;
width: 100vw;
margin-top: -20%;
margin-left: 0%;
}
.left-top-B{
position: absolute;
font-size: 7rem;
margin-top: 30%;
right: 12rem;
color: rgb(73, 73, 73);
}
.left-B{
position: absolute;
font-size: 7rem;
margin-top: -30%;
color: rgb(73, 73, 73);
right: 12rem;
}
.right-B{
position: absolute;
font-size: 7rem;
margin-top: -115%;
color: rgb(73, 73, 73);
left: 12rem;
}
.C1{
background-color: #F3703B;
}
.C2{
background-color: #FFD303;
}
.left-top-T{
position: absolute;
right:17rem;
margin-top: 36%;
}
.left-top-T>h5{
margin: 5% 0%;
width: 30vw;
padding: 0.5% 0%;
background-color: turquoise;
}
.left-top-T>h5:active{
font-size: 1.2rem;
width: 29vw;
margin-left: 2%;
}
.left-T{
position: absolute;
right:17rem;
margin-top: -20%;
}
.left-T>h5{
margin: 5% 0%;
padding: 0.5% 0%;
width: 30vw;
background-color: turquoise;
}
.left-T>h5:active{
font-size: 1.2rem;
width: 29vw;
margin-left: 2%;
}
.right-T{
position: absolute;
left:17rem;
margin-top: -110%;
}
.right-T>h5{
margin: 5% 0%;
width: 30vw;
padding: 0.5% 0%;

background-color: turquoise;
}
.right-T>h5:active{
width: 29vw;
font-size: 1.2rem;
margin-left: 2%;
}
@media screen and (min-width:1200px){
.Roadmap{
margin-bottom: -5%;
}
.Roadmap>h1{
margin-bottom: 2%;
}
.Roadmap-title>h3:active{
font-size:1.4rem;
width: 8vw;
margin-left:25%;
}
.roadmap-underline{
width: 10vw;
margin: 0% 45% 5%;
}
.left-top-B{
position: absolute;
font-size: 7rem;
margin-top: 12%;
right:19rem;
color: rgb(73, 73, 73);
}
.left-B{
position: absolute;
font-size: 7rem;
margin-top: -13%;
color: rgb(73, 73, 73);
right: 19rem;
}
.right-B{
position: absolute;
font-size: 7rem;
margin-top: -55%;
color: rgb(73, 73, 73);
left: 17rem;
}
.Roadmap-title{
margin: 6% 41%;
}
.Roadmap-title>h3{
width: 10vw;
font-size: 1.5rem;
border-radius: 0.5rem;
margin:25% 20%;
padding: 5% ;
}
.left-top-T{
right: 27rem;
margin-top: 13%;
}
.left-top-T>h5:active{
width: 18vw;
font-size: 1.2rem;
margin-left: 5%;
}
.left-top-T>h5{
width: 20vw;
}
.left-T{
right: 27rem;
margin: -10% 0%;
}
.left-T>h5{
width: 20vw;
}
.left-T>h5:active{
width: 18vw;
font-size: 1.2rem;
margin-left: 5%;
}
.right-T{
left:25rem;
margin: -55% 0%;
}
.right-T>h5{
width: 20vw;
}
.right-T>h5:active{
width: 18vw;
font-size: 1.2rem;
margin-left: 5%;
}

}
Loading