Skip to content

Commit fe66085

Browse files
ksraj123ksraj123
committed
suggested changes
1 parent 0560ee6 commit fe66085

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1189
-956
lines changed

‎netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# provide twitter api key
55
[build.environment]
6-
TWITTER_API_KEY = "AAAAAAAAAAAAAAAAAAAAAEtZGgEAAAAAToMHBHPR1ZpRPIVmo0B9G4syUxs%3DKJpStKohUbcPsI69bLsBOUbwrvpEpDL2JBJ9JuzvnkGDaMZ1Np"
6+
TWITTER_API_KEY = "AAAAAAAAAAAAAAAAAAAAAIWYFwEAAAAAA3RBpjzS8nlirryXCXM%2FTsl8sKo%3DaWb1t2lrgmUeZqvFF6OTiyALws9gdVKkO0009mYmqvDcr2LAy2"

‎package-lock.json

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"react": "^16.12.0",
3232
"react-bootstrap": "^1.0.0-beta.16",
3333
"react-dom": "^16.12.0",
34+
"react-html-parser": "^2.0.2",
3435
"react-markdown": "^4.3.1",
3536
"react-markdown-editor-lite": "^0.5.2",
3637
"react-markdown-to-html": "^1.0.11",

‎src/App.css

Lines changed: 34 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@font-face {
2-
font-family: 'Inter';
3-
src: local('Inter'), url(./fonts/Inter-Regular.otf) format('opentype');
2+
font-family: "Inter";
3+
src: local("Inter"), url(./fonts/Inter-Regular.otf) format("opentype");
44
}
55

66
p {
@@ -16,53 +16,38 @@ p {
1616
pointer-events: none;
1717
}
1818

19-
.navbar{
20-
height:10vh;
19+
.navbar {
20+
height: 10vh;
2121
}
22-
.navbar-collapse.show{
22+
.navbar-collapse.show {
2323
overflow-y: hidden;
2424
}
25-
/* #logo{
26-
width:10vw;
27-
} */
28-
@media only screen and (max-width:800px){
29-
#logo{
30-
width:30vw !important;
25+
26+
@media only screen and (max-width: 800px) {
27+
#logo {
28+
width: 30vw !important;
3129
}
3230
}
33-
.main{
31+
.main {
3432
margin: 0 auto;
35-
/* margin-top:12vh; */
3633
max-width: 960;
3734
padding: 0px 1.0875rem 1.45rem;
3835
padding-top: 0;
3936
}
40-
footer{
37+
footer {
4138
margin-top: 3vh;
42-
/* background-color:#869AB8; */
43-
/* color:white; */
44-
}
45-
/* @media (min-width: 1200px){
46-
.container {
47-
max-width: 80% !important;
4839
}
49-
} */
50-
/* footer h3{
51-
52-
float:left
53-
} */
5440

5541
#discover1 {
5642
font-family: Raleway-SemiBold;
5743
font-size: 0.8em;
58-
color:black;
44+
color: black;
5945
letter-spacing: 1px;
6046
line-height: 15px;
6147
border: 2px solid black;
6248
border-radius: 40px;
6349
background: white;
6450
transition: all 0.3s ease 0s;
65-
/* float:right; */
6651
}
6752

6853
#discover2 {
@@ -72,30 +57,24 @@ footer{
7257
display: none;
7358
}
7459

75-
@media only screen and (max-width:1800px){
76-
.navbar{
77-
height:12vh
60+
@media only screen and (max-width: 1800px) {
61+
.navbar {
62+
height: 12vh;
7863
}
79-
/* .main{
80-
margin-top:12vh
81-
} */
8264
}
8365

84-
@media only screen and (max-width:1024px){
85-
.navbar{
86-
height:12vh
87-
}
88-
.main{
89-
/* margin-top:12vh */
66+
@media only screen and (max-width: 1024px) {
67+
.navbar {
68+
height: 12vh;
9069
}
9170
}
9271

93-
@media only screen and (max-width:320px){
94-
.navbar{
95-
height:16vh;
72+
@media only screen and (max-width: 320px) {
73+
.navbar {
74+
height: 16vh;
9675
}
97-
.main{
98-
margin-top:16vh
76+
.main {
77+
margin-top: 16vh;
9978
}
10079
}
10180

@@ -105,8 +84,6 @@ footer{
10584
}
10685
}
10786

108-
109-
11087
.App-header {
11188
background-color: #282c34;
11289
min-height: 100vh;
@@ -122,22 +99,24 @@ footer{
12299
color: #61dafb;
123100
}
124101

125-
.fade-appear, .fade-enter {
126-
opacity: 0;
127-
z-index: 1;
102+
.fade-appear,
103+
.fade-enter {
104+
opacity: 0;
105+
z-index: 1;
128106
}
129-
.fade-appear-active, .fade-enter.fade-enter-active {
130-
opacity: 1;
131-
transition: opacity 300ms linear 150ms;
107+
.fade-appear-active,
108+
.fade-enter.fade-enter-active {
109+
opacity: 1;
110+
transition: opacity 300ms linear 150ms;
132111
}
133112

134113
.fade-exit {
135-
opacity: 1;
114+
opacity: 1;
136115
}
137116

138117
.fade-exit.fade-exit-active {
139-
opacity: 0;
140-
transition: opacity 150ms linear;
118+
opacity: 0;
119+
transition: opacity 150ms linear;
141120
}
142121

143122
@keyframes App-logo-spin {

‎src/App.js

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Switch, Route, HashRouter as Router } from "react-router-dom";
2-
import {CSSTransition, TransitionGroup} from 'react-transition-group';
2+
import { CSSTransition, TransitionGroup } from "react-transition-group";
33
import React from "react";
44
import "./App.css";
55
import NewHome from "./pages/Home/NewHome";
@@ -13,17 +13,31 @@ function App() {
1313
<div className="App" style={{ width: "100%" }}>
1414
<Router>
1515
<NavBar />
16-
<Route render={({location}) => {
17-
return (<TransitionGroup>
18-
<CSSTransition timeout={450} classNames="fade" key={location.pathname}>
19-
<Switch location={location}>
20-
<Route path="/team"><Team/></Route>
21-
<Route path="/codeofconduct"><COC/></Route>
22-
<Route exact path="/"><NewHome/></Route>
23-
</Switch>
24-
</CSSTransition>
25-
</TransitionGroup>)
26-
}} />
16+
<Route
17+
render={({ location }) => {
18+
return (
19+
<TransitionGroup>
20+
<CSSTransition
21+
timeout={450}
22+
classNames="fade"
23+
key={location.pathname}
24+
>
25+
<Switch location={location}>
26+
<Route path="/team">
27+
<Team />
28+
</Route>
29+
<Route path="/codeofconduct">
30+
<COC />
31+
</Route>
32+
<Route exact path="/">
33+
<NewHome />
34+
</Route>
35+
</Switch>
36+
</CSSTransition>
37+
</TransitionGroup>
38+
);
39+
}}
40+
/>
2741
<Footer />
2842
</Router>
2943
</div>

‎src/components/Activities/ActivityCard.css

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
transition: box-shadow 1s ease;
1010
}
1111

12-
.activity-card.activity:hover .activity-card-img-top.activity{
12+
.activity-card.activity:hover .activity-card-img-top.activity {
1313
transform: scale(1.2);
1414
overflow: hidden;
1515
}
@@ -53,11 +53,6 @@
5353
object-fit: scale-down;
5454
}
5555

56-
/* .activity-card-img-top.activity:hover {
57-
transform: scale(1.2);
58-
overflow: hidden;
59-
} */
60-
6156
.activity-card-description {
6257
text-align: left;
6358
}
@@ -76,4 +71,4 @@
7671
margin-bottom: 1rem;
7772
height: max-content !important;
7873
font-weight: bold;
79-
}
74+
}

‎src/components/Activities/ActivityCard.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import React from "react";
22
import "./ActivityCard.css";
33

4-
const ActivityCard = (props) => {
4+
const ActivityCard = props => {
55
return (
66
<div className="activity-card d-flex flex-column text-center activity overflow-hidden">
77
<img
88
src={props.activity.image}
99
alt=""
10-
className="activity-card-img-top activity"/>
10+
className="activity-card-img-top activity"
11+
/>
1112

1213
<div className="activity-card-body text-dark flex-column d-flex">
1314
<h4 className="activity-card-title activity" style={{ height: "100" }}>
@@ -20,7 +21,11 @@ const ActivityCard = (props) => {
2021
<div className="activity-card-links mt-auto">
2122
{props.activity.links.map((link, index) => {
2223
return (
23-
<a key={index} className="activity-card-link custom-links" href={link.href}>
24+
<a
25+
key={index}
26+
className="activity-card-link custom-links"
27+
href={link.href}
28+
>
2429
{link.name}
2530
</a>
2631
);

‎src/components/Collaborate/CollaborateCard.css

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,54 @@
11
.collaborate-card.option {
2-
width: 100%;
3-
height: 100%;
4-
border: none;
2+
width: 100%;
3+
height: 100%;
4+
border: none;
55
}
66

77
.collaborate-card.option:hover {
8-
box-shadow: 5px 10px 20px 1px rgba(0, 0, 0, 0.253);
9-
transition: box-shadow 1s ease;
8+
box-shadow: 5px 10px 20px 1px rgba(0, 0, 0, 0.253);
9+
transition: box-shadow 1s ease;
1010
}
1111

12-
.collaborate-card.option:hover .collaborate-card-img-top.option{
13-
transform: scale(1.2);
14-
overflow: hidden;
12+
.collaborate-card.option:hover .collaborate-card-img-top.option {
13+
transform: scale(1.2);
14+
overflow: hidden;
1515
}
1616

1717
.collaborate-card.option.collaborate-card-body {
18-
padding: 1rem 0;
18+
padding: 1rem 0;
1919
}
2020

2121
.collaborate-card.option.card-text {
22-
font-size: 0.9rem;
23-
padding: 0.4rem 1.9rem;
22+
font-size: 0.9rem;
23+
padding: 0.4rem 1.9rem;
2424
}
2525

2626
.container.fluid.row {
27-
padding-top: 6rem;
27+
padding-top: 6rem;
2828
}
2929

3030
.collaborate-card {
31-
height: 40rem;
32-
width: 25rem;
33-
border: 1px solid gray;
34-
padding: 2rem;
31+
height: 40rem;
32+
width: 25rem;
33+
border: 1px solid gray;
34+
padding: 2rem;
3535
}
3636

3737
.collaborate-card-img-top.option {
38-
transform: scale(1);
39-
transition: transform 0.5s ease;
40-
height: 10rem;
41-
object-fit: scale-down;
42-
color: rgb(34, 36, 122);
38+
transform: scale(1);
39+
transition: transform 0.5s ease;
40+
height: 10rem;
41+
object-fit: scale-down;
42+
color: rgb(34, 36, 122);
4343
}
4444

45-
/* .collaborate-card-img-top.option:hover {
46-
transform: scale(1.2);
47-
overflow: hidden;
48-
} */
49-
5045
.collaborate-card-description {
51-
text-align: left;
46+
text-align: left;
5247
}
5348

5449
.collaborate-card-title {
55-
margin-top: 2rem;
56-
margin-bottom: 1rem;
57-
height: max-content !important;
58-
font-weight: bold;
50+
margin-top: 2rem;
51+
margin-bottom: 1rem;
52+
height: max-content !important;
53+
font-weight: bold;
5954
}

0 commit comments

Comments
 (0)