Skip to content

Commit

Permalink
Merge pull request #76 from gtech-mulearn/master
Browse files Browse the repository at this point in the history
Category and Data Updation
  • Loading branch information
VinuBalagopalAP authored May 24, 2023
2 parents 5613a8a + e565379 commit 33adf98
Show file tree
Hide file tree
Showing 41 changed files with 2,290 additions and 267 deletions.
15 changes: 15 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.8.0",
"react-router-dom": "^6.4.2",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
Expand Down
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
import ScrollButton from "./Components/ScrollButton/ScrollButton";

import DomainDetails from "./Pages/DomainDetails/DomainDetails";
import Landing from "./Pages/Landing/Landing";
Expand All @@ -13,6 +14,7 @@ function App() {
<Route path="/:id" element={<DomainDetails />} />
</Routes>
</Router>
<ScrollButton />
</div>
);
}
Expand Down
6 changes: 5 additions & 1 deletion src/Components/DomainDetails/Card/Card.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@

.topic-card h2 {
font-weight: 500;
color: rgb(48, 46, 46);
font-size: 1.875rem;
line-height: 1.3;
}

.topic-card p {
font-weight: 300;
font-size: 1rem;
color: rgb(66, 64, 64);
line-height: 1.3;
max-width: 100%;
text-overflow: ellipsis;
Expand All @@ -44,6 +46,7 @@
}

.topic-card a {
color: rgb(66, 64, 64);
display: flex;
align-items: center;
gap: 0.625rem;
Expand All @@ -52,7 +55,8 @@
}

.link-text {
font-weight: 500;
color: black;
font-weight: light;
font-size: 1rem;
line-height: 1.3;
}
Expand Down
38 changes: 21 additions & 17 deletions src/Components/DomainDetails/Card/Card.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Card = ({
{photo && (
<div className="img-wrapper">
<img
alt=""
alt="domain"
src={require(`../../../data/${id}/images/${photo}`)}
onError={({ currentTarget }) => {
currentTarget.onerror = null;
Expand All @@ -36,23 +36,27 @@ const Card = ({
{desc && <p>{desc}</p>}
{desc && (
<div>
<span onClick={() => setModal(true)} className="link-text">
{linkText}
</span>
{link && link !== "#" && (
<>
<span onClick={() => setModal(true)} className="link-text">
{linkText}
</span>

<svg
className="svg-image"
width="12"
height="12"
viewBox="0 0 15 15"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12.1711 3.983L2.12965 14.0245L0.47998 12.3748L10.5203 2.33333H1.67115V0H14.5045V12.8333H12.1711V3.983Z"
fill="#000738"
/>
</svg>
<svg
className="svg-image"
width="12"
height="12"
viewBox="0 0 15 15"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12.1711 3.983L2.12965 14.0245L0.47998 12.3748L10.5203 2.33333H1.67115V0H14.5045V12.8333H12.1711V3.983Z"
fill="#000738"
/>
</svg>
</>
)}
</div>
)}
{!desc && link && (
Expand Down
58 changes: 29 additions & 29 deletions src/Components/Landing/Card/Card.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ import { Link } from "react-router-dom";
const Card = ({ name, image, link, description }) => {
return (
<>
<Link to={link}>
<div className={styles.card}>
<div className={styles.card_image}>
<img src={image} alt="" className={styles.card_img} />
</div>
<p className={styles.card_heading}>{name}</p>
<p className={styles.card_description}>{description}</p>
{link !== "#" && (
<Link to={link}>
<span className={styles.explore_more}>Explore More </span>
<svg
width="12"
height="12"
viewBox="0 0 15 15"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12.1711 3.983L2.12965 14.0245L0.47998 12.3748L10.5203 2.33333H1.67115V0H14.5045V12.8333H12.1711V3.983Z"
fill="#000738"
/>
</svg>
</Link>
)}
{link === "#" && (
<span className={styles.explore_more}>Coming Soon!</span>
)}
</div>
</Link>
<Link to={link}>
<div className={styles.card}>
<div className={styles.card_image}>
<img src={image} alt="domain images" className={styles.card_img} />
</div>
<p className={styles.card_heading}>{name}</p>
<p className={styles.card_description}>{description}</p>
{link !== "#" && (
<Link to={link}>
<span className={styles.explore_more}>Explore More </span>
<svg
width="12"
height="12"
viewBox="0 0 15 15"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12.1711 3.983L2.12965 14.0245L0.47998 12.3748L10.5203 2.33333H1.67115V0H14.5045V12.8333H12.1711V3.983Z"
fill="#000738"
/>
</svg>
</Link>
)}
{link === "#" && (
<span className={styles.explore_more}>Coming Soon!</span>
)}
</div>
</Link>
</>
);
};
Expand Down
7 changes: 3 additions & 4 deletions src/Components/Landing/Card/Card.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
.card:hover {
transform: translateY(-7px);

box-shadow: 10px 10px 30px rgba(0, 0, 0, 0.15);
}

Expand All @@ -29,8 +29,8 @@
transform: translateX(30px);
} */


.card:hover span, .card:hover svg path {
.card:hover span,
.card:hover svg path {
color: royalblue;
fill: royalblue;
}
Expand Down Expand Up @@ -73,7 +73,6 @@
line-height: 22px;
}


.readmore {
display: flex;
}
Expand Down
114 changes: 91 additions & 23 deletions src/Components/Navbar/Navbar.css
Original file line number Diff line number Diff line change
@@ -1,42 +1,110 @@
* {
padding: 0;
margin: 0;
box-sizing: border-box;
/* * {
outline: 1px solid rgb(255, 53, 53) !important;
} */

.inative {
pointer-events: auto;
}

.header {
height: 180px;
display: flex;
align-items: center;
justify-content: space-between;
}

.Navbar_image {
width: 62px;
width: 120px;
height: auto;
padding: 25px;
}

nav {
display: flex;
align-items: center;
justify-content: space-between;
padding-top: 40px;
padding-left: 50px;
padding-right: 50px;
padding-bottom: 70px;
flex-direction: row;
}

nav ul li {
nav a {
margin: 0 3.5rem;
font-family: "Poppins";
font-style: normal;
font-weight: 500;
font-size: 20px;
line-height: 32px;
list-style-type: none;
display: inline-block;
padding: 10px 10px;
}

nav ul li a {
font-size: 1.1rem;
color: black;
text-decoration: none;
font-size: 1.1rem;
}

nav ul li a:hover {
nav a:hover {
transition: 0.1s;
border-bottom: 2px solid black;
}

.nav-btn {
display: none;
visibility: hidden;
opacity: 0;
}

@media only screen and (max-width: 768px) {
.inactive {
pointer-events: none;
overflow: hidden;
}

.inactive nav {
pointer-events: auto;
}

nav {
position: fixed;
top: 0;
right: 0;
height: 100%;
width: 45%;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
background-color: rgba(241, 239, 239, 0.473);
padding: 3rem 0rem;
gap: 1.5rem;
background-color: rgba(241, 239, 239, 0.473);
backdrop-filter: blur(10px);
transition: 0.5s;
transform: translateX(100%);
}

nav a {
margin: 0 2.5rem;
}

.nav_popout {
transform: none; /* reset any previous transformations applied to the nav, thus making nav expanded again*/
}

.nav-btn {
-webkit-tap-highlight-color: transparent;
display: block;
visibility: visible;
opacity: 1;
margin-right: 1rem;
cursor: pointer;
font-size: 1.5rem;
background: transparent;
color: black;
border: none;
outline: none;
}

.nav-close-btn {
margin-right: 0.5rem;
position: absolute;
top: 25px;
right: 20px;
}
}

@media only screen and (max-width: 500px) {
nav {
width: 60%;
}
}
Loading

0 comments on commit 33adf98

Please sign in to comment.