Skip to content

Commit 7005add

Browse files
improved naming
1 parent ca4ced0 commit 7005add

12 files changed

Lines changed: 153 additions & 143 deletions

File tree

frontend/.eslintcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\App.js":"1","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\mainSection\\index.jsx":"2","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\nav\\index.jsx":"3","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx":"4","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\index.js":"5","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js":"6","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\mobileNav\\index.jsx":"7","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"8"},{"size":380,"mtime":1610477109708,"results":"9","hashOfConfig":"10"},{"size":589,"mtime":1610477129463,"results":"11","hashOfConfig":"10"},{"size":528,"mtime":1610476541145,"results":"12","hashOfConfig":"10"},{"size":877,"mtime":1610474918546,"results":"13","hashOfConfig":"10"},{"size":517,"mtime":1609056805508,"results":"14","hashOfConfig":"10"},{"size":894,"mtime":1610477066839,"results":"15","hashOfConfig":"10"},{"size":1189,"mtime":1610476546784,"results":"16","hashOfConfig":"10"},{"size":454,"mtime":1610475498323,"results":"17","hashOfConfig":"10"},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"w9tfkj",{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"31","messages":"32","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"28"},"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\App.js",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\mainSection\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\nav\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\index.js",[],["35","36"],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\mobileNav\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[],{"ruleId":"37","replacedBy":"38"},{"ruleId":"39","replacedBy":"40"},"no-native-reassign",["41"],"no-negated-in-lhs",["42"],"no-global-assign","no-unsafe-negation"]
1+
[{"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\App.js":"1","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx":"2","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\index.js":"3","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js":"4","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"5","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx":"6","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx":"7","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\Nav\\index.jsx":"8"},{"size":333,"mtime":1610610450040,"results":"9","hashOfConfig":"10"},{"size":877,"mtime":1610525089845,"results":"11","hashOfConfig":"10"},{"size":517,"mtime":1609056805508,"results":"12","hashOfConfig":"10"},{"size":894,"mtime":1610477066839,"results":"13","hashOfConfig":"10"},{"size":454,"mtime":1610475498323,"results":"14","hashOfConfig":"10"},{"size":534,"mtime":1610610616835,"results":"15","hashOfConfig":"10"},{"size":710,"mtime":1610610897667,"results":"16","hashOfConfig":"10"},{"size":1177,"mtime":1610610965351,"results":"17","hashOfConfig":"10"},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"w9tfkj",{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"25","messages":"26","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"27","messages":"28","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"24"},{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"31","messages":"32","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\App.js",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\index.js",[],["35","36"],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\components\\Nav\\index.jsx",[],{"ruleId":"37","replacedBy":"38"},{"ruleId":"39","replacedBy":"40"},"no-native-reassign",["41"],"no-negated-in-lhs",["42"],"no-global-assign","no-unsafe-negation"]

frontend/src/App.css

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@ body {
1919
.App {
2020
min-height: 100vh;
2121
background-image: var(--background-gradient);
22-
display: grid;
23-
grid-template-columns: 66fr 33fr;
24-
grid-template-areas: "main nav";
2522
}
2623

2724
@media only screen and (max-width: 1080px) {
2825
.App {
29-
grid-template-columns: auto;
30-
grid-template-rows: 10% 50% 40%;
26+
display: grid;
27+
grid-template-rows: 10% 90%;
3128
grid-template-areas:
3229
"nav"
33-
"main"
34-
"footer";
30+
"primary";
3531
}
3632
}

frontend/src/App.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
import './App.css';
2-
import Main from "./components/mainSection";
3-
import Nav from "./components/nav";
2+
import HomePage from "./components/homePage";
43
import Shortcuts from "./components/shortcuts";
5-
import MobileNav from "./components/mobileNav";
4+
import Nav from "./components/Nav";
65

76
function App() {
87
return (
98
<div className="App">
109
<Shortcuts />
11-
<MobileNav />
12-
<Main />
1310
<Nav />
11+
<HomePage />
1412

1513
</div>
1614
);
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import styles from './style.module.css';
2+
import NavLinks from "../navLinks";
3+
4+
function HomeNav() {
5+
return (
6+
<div className={styles.container}>
7+
<div className={styles.buttons}>
8+
<span className={styles.navBtn}>About Us</span>
9+
<span className={styles.navBtn}>Contact Us</span>
10+
</div>
11+
<ul className={styles.nav}>
12+
<NavLinks />
13+
</ul>
14+
<img className={styles.vector} src="./ComponentTMP_0-image7.png" alt=""/>
15+
</div>
16+
);
17+
}
18+
19+
export default HomeNav;
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.container {
2+
padding: 3vh;
3+
display: flex;
4+
flex-direction: column;
5+
align-items: center;
6+
justify-content: space-around;
7+
z-index: 3;
8+
}
9+
.buttons {
10+
background: var(--nav-btn-background);
11+
padding: 1vh 2vh;
12+
border-radius: 20px;
13+
}
14+
.navBtn {
15+
margin: 0 2vh;
16+
color: white;
17+
padding: 1vh;
18+
cursor: pointer;
19+
}
20+
.navBtn:hover {
21+
color: rgb(241, 238, 238);
22+
}
23+
.nav {
24+
list-style: none;
25+
margin-top: 2vh;
26+
}
27+
28+
.vector {
29+
width: 100%;
30+
}
31+
32+
@media only screen and (max-width: 1080px) {
33+
.buttons,
34+
.nav {
35+
display: none;
36+
}
37+
.container {
38+
grid-area: footer;
39+
}
40+
.vector {
41+
width: 80%;
42+
}
43+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import styles from './style.module.css';
2+
import SvgBackground from '../svgbackground';
3+
import HomeNav from "../homeNav";
4+
5+
function HomePage() {
6+
return (
7+
<div className={styles.home}>
8+
<div className={styles.container}>
9+
<span className={styles.heading}>The Programming Club IIITDMJ</span>
10+
<img src="./ComponentTMP_0-image.png" alt="The Programming Club"/>
11+
<span className={styles.text}>An Open Coding Community to explore and do a lot more with your friends and members.</span>
12+
<button className={styles.primaryBtn}>Explore Now</button>
13+
<SvgBackground />
14+
</div>
15+
<HomeNav />
16+
</div>
17+
);
18+
}
19+
20+
export default HomePage;

frontend/src/components/mainSection/style.module.css renamed to frontend/src/components/homePage/style.module.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
.home {
2+
grid-area: primary;
3+
min-height: 100vh;
4+
display: grid;
5+
grid-template-columns: 66fr 33fr;
6+
grid-template-areas: "main nav";
7+
}
18
.container {
29
grid-area: main;
310
display: flex;
@@ -32,6 +39,13 @@
3239
}
3340

3441
@media only screen and (max-width: 1080px) {
42+
.home {
43+
grid-template-columns: auto;
44+
grid-template-rows: 50% 40%;
45+
grid-template-areas:
46+
"main"
47+
"footer";
48+
}
3549
.container {
3650
justify-content: right;
3751
}

frontend/src/components/mainSection/index.jsx

Lines changed: 0 additions & 17 deletions
This file was deleted.

frontend/src/components/mobileNav/index.jsx

Lines changed: 0 additions & 29 deletions
This file was deleted.

frontend/src/components/mobileNav/style.module.css

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)