Skip to content

Commit 88c8fe2

Browse files
moved shortcuts to homepage
1 parent 7005add commit 88c8fe2

5 files changed

Lines changed: 7 additions & 8 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\\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"]
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","D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\reportWebVitals.js":"9"},{"size":333,"mtime":1610610450040,"results":"10","hashOfConfig":"11"},{"size":877,"mtime":1610525089845,"results":"12","hashOfConfig":"11"},{"size":517,"mtime":1609056805508,"results":"13","hashOfConfig":"11"},{"size":894,"mtime":1610525089845,"results":"14","hashOfConfig":"11"},{"size":454,"mtime":1610475498323,"results":"15","hashOfConfig":"11"},{"size":534,"mtime":1610610616835,"results":"16","hashOfConfig":"11"},{"size":770,"mtime":1610616124767,"results":"17","hashOfConfig":"11"},{"size":1177,"mtime":1610610965351,"results":"18","hashOfConfig":"11"},{"size":375,"mtime":1609056805509,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"w9tfkj",{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"26"},{"filePath":"27","messages":"28","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"26"},{"filePath":"31","messages":"32","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"37","messages":"38","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",[],["39","40"],"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",[],"D:\\code\\web\\bitbyteGithub\\TPC-website\\frontend\\src\\reportWebVitals.js",[],{"ruleId":"41","replacedBy":"42"},{"ruleId":"43","replacedBy":"44"},"no-native-reassign",["45"],"no-negated-in-lhs",["46"],"no-global-assign","no-unsafe-negation"]

frontend/src/App.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import './App.css';
22
import HomePage from "./components/homePage";
3-
import Shortcuts from "./components/shortcuts";
4-
import Nav from "./components/Nav";
3+
import Nav from "./components/nav";
54

65
function App() {
76
return (
87
<div className="App">
9-
<Shortcuts />
108
<Nav />
119
<HomePage />
1210

frontend/src/components/homePage/index.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import styles from './style.module.css';
22
import SvgBackground from '../svgbackground';
33
import HomeNav from "../homeNav";
4+
import Shortcuts from "../shortcuts";
45

56
function HomePage() {
67
return (
@@ -13,6 +14,7 @@ function HomePage() {
1314
<SvgBackground />
1415
</div>
1516
<HomeNav />
17+
<Shortcuts />
1618
</div>
1719
);
1820
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
@media only screen and (max-width: 1080px) {
4242
.home {
43+
min-height: 80vh;
4344
grid-template-columns: auto;
4445
grid-template-rows: 50% 40%;
4546
grid-template-areas:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.container {
2-
position: absolute;
2+
position: fixed;
33
left: 0;
44
display: flex;
55
flex-direction: column;
@@ -34,9 +34,7 @@
3434
position: fixed;
3535
width: 7vh;
3636
background: none;
37-
height: 40vh;
38-
margin-top: 60vh;
39-
z-index: 4;
37+
z-index: 3;
4038
}
4139
.logo {
4240
width: 5vh;

0 commit comments

Comments
 (0)