Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
SatyaJaiss authored Oct 6, 2024
2 parents f0ff0d5 + d909016 commit 2beaf30
Show file tree
Hide file tree
Showing 9 changed files with 262 additions and 305 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Make sure you have the following installed:
8. 🛠️ Install dependencies:
```bash
npm install
npm install swiper@latest
```

9. 📊 Start the development server:
Expand Down
19 changes: 19 additions & 0 deletions frontend/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 frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"react-scroll": "^1.9.0",
"react-slick": "^0.30.2",
"slick-carousel": "^1.8.1",
"swiper": "^11.1.14",
"web-vitals": "^4.2.3"
},
"scripts": {
Expand Down
Binary file added frontend/public/images/moon.png
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 frontend/public/images/sun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 45 additions & 0 deletions frontend/src/components/Navbar/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,51 @@
padding: 0;
}

.themechangebtn{
background-color: #fff;
}

.themechangebtn:hover{
background-color: #fff;
}

.themechangebtn img{
height:25px;
width: 25px;
background-color: none;
}

.dark-mode .navbar {
background-color: #333;
color: #fff;
}

.dark-mode .nav-links a {
color: #fff;
}

.dark-mode .nav-links a:hover {
color: #ccc;
}

.dark-mode .logo {
filter: invert(1);
}

.theme-button {
background-color: #333;
color: #fff;
border: none;
padding: 10px 20px;
font-size: 16px;
cursor: pointer;
}

.theme-button:hover {
background-color: #444;
}


.logo {
height: 40px;
}
Expand Down
198 changes: 64 additions & 134 deletions frontend/src/pages/About/About.css
Original file line number Diff line number Diff line change
@@ -1,167 +1,97 @@
body,
html {
margin: 0;
padding: 0;
font-family: "Helvetica Neue", Arial, sans-serif;
width: 100%;
-webkit-font-smoothing: antialiased; /* Smooth font rendering */
-moz-osx-font-smoothing: grayscale;
}

.scroll-up-btn {
position: fixed;
bottom: 25px;
right: 30px;
height: 40px;
width: 40px;
background-color: #dbf5ef;
border-radius: 50%;
border: none;
justify-content: center;
cursor: pointer;
}

.about-container {
width: 100%;
background: linear-gradient(
to right,
#dbecfb,
#dbf5ef
); /* Updated background gradient */
background: linear-gradient(to right, #DBECFB, #DBF5EF);
}

.about-main-content {
.carousel-container {
width: 100%;
margin: 0 auto;
padding: 32px 0;
padding: 50px 0;
text-align: center;
}

.about-intro-section {
display: flex;
flex-direction: column;
width: 100%;
height: 40vh; /* Make the section take up the full viewport height */
padding: 16px 0;
justify-content: center;
align-items: center;
.carousel-title {
font-size: 48px;
font-weight: 900;
text-align: center;
padding-top: 40px;
margin-bottom: 20px;
color: #333;
text-transform: uppercase;
}

.about-intro-text {
display: flex;
flex-direction: column;
flex: 1;
padding: 16px;
align-items: center;
justify-content: center;
text-align: center; /* Ensure the text is centered within the intro-text div */
.carousel-title::after {
content: "";
display: block;
width: 100px;
height: 4px;
background-color: #000;
margin: 10px auto 0;
margin-bottom: 20px;
}

.about-title {
font-size: 56px;
color: #18181b; /* Darker text color for better contrast */
font-weight: 900; /* Bolder text */
line-height: 1.2; /* Improved line-height for better readability */
.swiper-container {
width: 80%;
padding-top: 50px;
padding-bottom: 50px;
margin: 0 auto;
}

.about-subtitle {
font-size: 24px;
color: #4a4a4a; /* Slightly darker subtitle */
font-weight: 500;
line-height: 1.4;
.swiper-slide {
background-position: center;
background-size: cover;
width: 300px;
background-color: #fff;
overflow: hidden;
border-radius: 10px;
}

.about-slider-wrapper {
padding: 16px;
background-color: white;
z-index: 10;
width: 100%;
.picture {
width: 300px;
height: 300px;
overflow: hidden;
}

.about-slider-header {
padding: 8px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.swiper-container img {
display: block;
width: 100%;
height: 100%;
}

.about-slider-header > h2 {
margin: 0;
.details {
padding: 20px;
font-weight: 600;
text-align: center;
font-weight: 700;
}

.about-slider-header > hr {
width: 20%;
border-bottom: 2px solid rgb(153, 192, 214);
opacity: 0.5;
}

.about-slider {
padding: 2rem;
}

.about-card {
background-color: #ffffff;
border-radius: 8px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
margin-bottom: 40px;
}

.about-card-image-container {
width: 100%; /* Example width */
height: 200px; /* Example height */
overflow: hidden; /* Ensure any overflow is clipped */
}

.about-card-image {
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 8px;
margin-bottom: 8px;
.title {
margin: 0;
font-size: 20px;
color: #000;
}

.about-card-content {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 5px;
padding: 0.5rem 2rem 2rem 2rem;
margin-top: 1rem;
.subtitle {
display: block;
font-size: 16px;
color: #555;
margin-top: 10px;
}

.about-card-title {
font-weight: 700;
.dark-mode .swiper-slide{
background-color: #333;
border: 2px solid #fff;
}

.about-card-subtitle {
color: #718096;
margin-top: 2px;
margin-bottom: 2rem;
.dark-mode .about-container{
background: black !important;
}

.about-card-button {
background-color: #18181b; /* Dark background for "Sign Up" button */
color: #ffffff;
padding: 16px;
border: none;
cursor: pointer;
border-radius: 25px;
/* margin-right: 12px; */
font-size: 18px;
transition: background 0.3s ease;
}
.about-card-button:hover {
background-color: #333333; /* Slightly lighter on hover */
.dark-mode .carousel-title{
color: #fff;
}

.about-card-link {
text-decoration: none;
color: #ffffff;
.dark-mode .details .title{
color: #fff;
}

.slick-slide > div {
margin: 0 10px;
}
.dark-mode .details .subtitle{
color: #fff;
}
Loading

0 comments on commit 2beaf30

Please sign in to comment.