Skip to content

Commit 07a5f3c

Browse files
bj-jiwrajkabj-jiwrajka
committed
minor improvements && redesign aboutus page
1 parent 0740709 commit 07a5f3c

File tree

15 files changed

+137
-79
lines changed

15 files changed

+137
-79
lines changed

Diff for: ‎public/_redirects

-1
This file was deleted.

Diff for: ‎public/assets/grafiny.png

6.65 KB
Loading

Diff for: ‎public/assets/grafinyLogoLight.png

-17.2 KB
Binary file not shown.

Diff for: ‎public/db/ourteam.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
[
22
{
33
"name": "Bijay Jiwrajka",
4-
"position": "Developer",
5-
"photo": "/assets/developer.png",
4+
"designation": "Developer",
5+
"photo": "https://res.cloudinary.com/dfa0k8sry/image/upload/v1706212091/IMG_20240121_230459_-_Bijay_Jiwrajka_w6vif9.webp",
66
"linkedin": "/bijay-jiwrajka-6b308a225/",
77
"github": "bj-jiwrajka",
88
"facebook": "bj-jiwrajka"
99
},
1010
{
1111
"name": "Anubhav Chakraborty",
12-
"position": "Developer",
13-
"photo": "/assets/developer.png",
12+
"designation": "Developer",
13+
"photo": "https://res.cloudinary.com/dhry5xscm/image/upload/v1694017402/gdsc%20seniors/team_pics/Anubhav_tvj6em.webp",
1414
"linkedin": "/bijay-jiwrajka-6b308a225/",
1515
"github": "bj-jiwrajka",
1616
"facebook": "bj-jiwrajka"
1717
},
1818
{
1919
"name": "Tithi Jha",
20-
"position": "UI/UX",
21-
"photo": "/assets/developer.png",
20+
"designation": "UI/UX",
21+
"photo": "https://res.cloudinary.com/dhry5xscm/image/upload/v1694017418/gdsc%20seniors/team_pics/TithiJha_ljq98g.webp",
2222
"linkedin": "/bijay-jiwrajka-6b308a225/",
2323
"github": "bj-jiwrajka",
2424
"facebook": "bj-jiwrajka"
2525
},
2626
{
2727
"name": "Pragya Annesha Baruah",
28-
"position": "UI/UX",
29-
"photo": "/assets/developer.png",
28+
"designation": "UI/UX",
29+
"photo": "https://res.cloudinary.com/dhry5xscm/image/upload/v1694017406/gdsc%20seniors/team_pics/PragyaAnneshaBaruah_prisql.webp",
3030
"linkedin": "/bijay-jiwrajka-6b308a225/",
3131
"github": "bj-jiwrajka",
3232
"facebook": "bj-jiwrajka"

Diff for: ‎src/Assets/Images/Facebook.png

-50.4 KB
Binary file not shown.

Diff for: ‎src/Assets/Images/Google.png

-12.5 KB
Binary file not shown.

Diff for: ‎src/Assets/Images/nitsLogo.png

-23.1 KB
Binary file not shown.

Diff for: ‎src/Components/DepartmentCard/DepartmentCard.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const iconMappping = {
44
CSE: "/assets/departments/CSEdept.png",
55
ECE: "/assets/departments/ECEdept.png",
66
EE: "/assets/departments/EEdept.png",
7-
MECH: "/assets/departments/Mechdept.png",
7+
MECH: "/assets/departments/MECHdept.png",
88
CIVIL: "/assets/departments/CIVILdept.png",
99
EIE: "/assets/departments/EIEdept.png",
1010
};

Diff for: ‎src/Components/Institutions/Institutions.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ const Institutions = () => {
137137
onKeyDown={handleKeyPress}
138138
>
139139
<img
140-
src="../src/Assets/Images/nitsLogo.png"
140+
src="/images/nitsLogo.png"
141141
alt="institute logo"
142142
className={styles.instiCardImg}
143143
/>

Diff for: ‎src/Components/Landing/Landing.jsx

+29-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,40 @@
1+
import { useContext } from "react";
12
import Landingstyle from "./Landing.module.scss";
3+
import UserContext from "../../Global/Auth/authContext";
4+
25
const Landing = () => {
6+
const context = useContext(UserContext);
7+
const { user } = context;
8+
39
return (
410
<section className={Landingstyle.main}>
511
<div className={Landingstyle.header}>
612
<div className={Landingstyle.title}>
713
<div className={Landingstyle.text}>
814
<h1>Grafiny</h1>
9-
<h3>Lorem ipsum dolor sit amet consectetur.</h3>
10-
<p>
11-
Lorem ipsum dolor sit amet consectetur adipisicing elit. Ipsa pariatur harum
12-
maiores? Vitae repellendus, cumque voluptatibus iure itaque accusantium.
13-
Delectus, rem. Quae consequuntur voluptatum nam optio fugiat alias aliquam,
14-
vitae explicabo eos quibusdam praesentium, perspiciatis laboriosam a
15-
voluptatem saepe officiis.
16-
</p>
15+
{user ? (
16+
<>
17+
<h3> Welcome to Grafiny!</h3>
18+
<p>
19+
Grafiny is a platform that allows students to share and access academic
20+
resources such as notes, past papers, and more. Join us to explore a
21+
treasure trove of knowledge tailored for your academic excellence.
22+
</p>
23+
</>
24+
) : (
25+
<>
26+
<h3> Where Knowledge Meets Community!</h3>
27+
<p>
28+
Imagine a place where every lecture note, every code snippet, and every
29+
past question paper is right at your fingertips. Whether you are
30+
cramming for finals or simply curious to dive deeper into your courses,
31+
Grafiny has got you covered. Engage with a community of learners just
32+
like you. Upload, share and upvote the best study materials out there.
33+
With a simple click, you will transform your study sessions from
34+
stressful to successful.
35+
</p>
36+
</>
37+
)}
1738
</div>
1839
</div>
1940

Diff for: ‎src/Components/Landing/Landing.module.scss

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
letter-spacing: 0.04em;
2525
margin: auto;
2626
margin-top: 2rem;
27-
width: 90%;
28-
/* Upperbound(desktop) */
2927
font-family: var(--gdsc-font-1);
3028
font-style: normal;
3129
font-weight: 400;

Diff for: ‎src/Components/OurTeam/OurTeam.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const OurTeam = () => {
2222
key={member.name}
2323
style={{ backgroundImage: `url(${member.photo})` }}
2424
>
25-
<img src="../../../public/assets/membercard-bottom.png" alt="" />
25+
<img src="/assets/membercard-bottom.png" alt="" />
2626
<div className={styles["member-info"]}>
2727
<h2>{member.name}</h2>
2828
<h3>{member.position}</h3>

Diff for: ‎src/Pages/AboutUs/AboutUs.jsx

+32-22
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,51 @@
11
import style from "./AboutUs.module.scss";
2+
import developers from "../../../public/db/ourteam.json";
3+
24
const AboutUs = () => {
35
return (
46
<div className={style.background}>
57
<h2 className={style.header}>
68
ABOUT <span className={style.us}>US</span>
79
</h2>
810
<div className={style.LeftBox}>
9-
<div className={style.ImgContainer}>
10-
<div className={style.LeftImg}></div>
11-
</div>
11+
<img src="/assets/grafiny.png" alt="grafiny" />
1212
<p className={style.LeftContent}>
13-
Lorem ipsum dolor sit amet consectetur adipisicing elit. Ipsa pariatur harum
14-
maiores? Vitae repellendus, cumque voluptatibus iure itaque accusantium.
15-
Delectus, rem. Quae consequuntur voluptatum nam optio fugiat alias aliquam,
16-
vitae explicabo eos quibusdam praesentium, perspiciatis laboriosam a voluptatem
17-
saepe officiis. Quae consequuntur voluptatum nam optio fugiat alias aliquam,
18-
vitae explicabo eos quibusdam praesentium, perspiciatis laboriosam a voluptatem
19-
saepe officiis.
13+
The name Grafiny is derived from graphite and the relation between graphite and
14+
paper is too well known. Grafiny is a platform crafted with dedication and
15+
innovation by the Google Developer Student Clubs (GDSC) at NIT Silchar. Our
16+
mission is to create a centralized hub where students can easily access and
17+
share study materials, including notes, codes and past exam papers, all
18+
contributed by students . It empowers students to not only access valuable
19+
resources but also contribute to the learning community by uploading their own
20+
materials and providing feedback through upvotes and comments. It reflects our
21+
commitment to leveraging technology to support education and foster
22+
collaboration among students.
2023
</p>
2124
</div>
2225
<div className={style.middleBox}>
2326
<div className={style.middleBoxLeft}></div>
2427
<div className={style.middleBoxRight}></div>
2528
</div>
2629
<div className={style.RightBox}>
27-
<div className={style.ImgContainer}>
28-
<div className={style.RightImg}></div>
29-
</div>
30-
<p className={style.RightContent}>
31-
Lorem ipsum dolor sit amet consectetur adipisicing elit. Ipsa pariatur harum
32-
maiores? Vitae repellendus, cumque voluptatibus iure itaque accusantium.
33-
Delectus, rem. Quae consequuntur voluptatum nam optio fugiat alias aliquam,
34-
vitae explicabo eos quibusdam praesentium, perspiciatis laboriosam a voluptatem
35-
saepe officiis. Quae consequuntur voluptatum nam optio fugiat alias aliquam,
36-
vitae explicabo eos quibusdam praesentium, perspiciatis laboriosam a voluptatem
37-
saepe officiis.
38-
</p>
30+
<h2>OUR TEAM</h2>
31+
{developers.map((developer, index) => (
32+
<div
33+
key={index}
34+
className={`${style.developer} ${
35+
index % 2 === 0 ? style.developerLeft : style.developerRight
36+
}`}
37+
>
38+
<img
39+
src={developer.photo}
40+
alt={developer.name}
41+
className={style.developerImg}
42+
/>
43+
<div className={style.developerInfo}>
44+
<h3>{developer.name}</h3>
45+
<p>{developer.designation}</p>
46+
</div>
47+
</div>
48+
))}
3949
</div>
4050
</div>
4151
);

Diff for: ‎src/Pages/AboutUs/AboutUs.module.scss

+58-33
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
font-size: 7vmin;
1313
z-index: 1;
1414
font-family: "Poppins";
15-
letter-spacing: 20px;
1615
font-weight: 600;
1716
color: var(--gdsc-grayish-1-100);
1817
margin: 1vh auto 0 auto;
@@ -23,33 +22,15 @@
2322
}
2423
}
2524

26-
.ImgContainer {
27-
height: 20%;
28-
display: flex;
29-
align-items: center;
30-
justify-content: center;
31-
}
32-
3325
.LeftBox {
3426
background-color: #f6f5f5;
3527
width: 50%;
3628
height: 100vh;
37-
padding: 4% 9% 4% 4%;
29+
padding: 2rem 6rem 2rem 2rem;
3830
display: flex;
3931
flex-direction: column;
4032
align-items: center;
4133
justify-content: center;
42-
43-
.LeftImg {
44-
width: 300px;
45-
height: 130px;
46-
background-image: url("/assets/gdscNits.png");
47-
background-size: 100%;
48-
}
49-
50-
.LeftContent {
51-
text-align: justify;
52-
}
5334
}
5435

5536
.middleBox {
@@ -78,19 +59,59 @@
7859
padding: 4% 4% 4% 9%;
7960
display: flex;
8061
flex-direction: column;
81-
align-items: center;
8262
justify-content: center;
8363

84-
.RightImg {
85-
width: 220px;
86-
height: 85px;
87-
background-image: url("../assets/grafinyLogoLight.png");
88-
background-size: 100%;
64+
h2 {
65+
font-family: "Poppins";
66+
font-style: normal;
67+
font-weight: 500;
68+
font-size: 3rem;
69+
text-align: center;
70+
letter-spacing: 0.1rem;
71+
text-transform: uppercase;
72+
color: var(--gdsc-bg-3-100);
73+
margin-bottom: 2rem;
8974
}
9075

91-
.RightContent {
92-
color: white;
93-
text-align: justify;
76+
.developer {
77+
display: flex;
78+
align-items: center;
79+
margin-bottom: 0.5rem;
80+
81+
&.developerLeft {
82+
flex-direction: row;
83+
}
84+
85+
&.developerRight {
86+
flex-direction: row-reverse;
87+
}
88+
89+
.developerImg {
90+
width: 4rem;
91+
height: 4rem;
92+
border-radius: 50%;
93+
object-fit: cover;
94+
margin-right: 1rem;
95+
96+
&:last-child {
97+
margin-right: 0;
98+
margin-left: 20px;
99+
}
100+
}
101+
102+
.developerInfo {
103+
h3 {
104+
margin: 0;
105+
font-size: 1.2rem;
106+
font-weight: 500;
107+
color: var(--gdsc-dark-1-100);
108+
}
109+
110+
p {
111+
margin: 0;
112+
color: var(--gdsc-grayish-1-100);
113+
}
114+
}
94115
}
95116
}
96117
}
@@ -106,9 +127,9 @@
106127

107128
.header {
108129
width: 100%;
109-
top: 5%;
130+
top: 0;
110131
text-align: center;
111-
font-size: 9vmin;
132+
font-size: 2rem;
112133
z-index: 1;
113134
font-family: "Poppins";
114135
letter-spacing: 10px;
@@ -124,12 +145,16 @@
124145

125146
.LeftBox {
126147
width: 100%;
127-
padding: 10%;
148+
padding: 1.2rem;
128149
}
129150

130151
.RightBox {
152+
margin-top: 5rem;
131153
width: 100%;
132-
padding: 10%;
154+
155+
h2 {
156+
font-size: 2rem;
157+
}
133158
}
134159

135160
.middleBox {

Diff for: ‎vercel.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"rewrites": [{ "source": "/(.*)", "destination": "/index.html" }]
3-
}
2+
"rewrites": [
3+
{
4+
"source": "/(.*)",
5+
"destination": "/index.html"
6+
}
7+
]
8+
}

0 commit comments

Comments
 (0)