Skip to content

Commit f19b258

Browse files
committed
resolve merge conflict at App Navbar and .eslintcache
1 parent 93d2a87 commit f19b258

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

.eslintcache

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
[{"/home/debajit/Desktop/JSeeker/src/index.js":"1","/home/debajit/Desktop/JSeeker/src/App.js":"2","/home/debajit/Desktop/JSeeker/src/components/Navbar.js":"3","/home/debajit/Desktop/JSeeker/src/components/Table/Table.js":"4","/home/debajit/Desktop/JSeeker/src/components/Table/data.js":"5","/home/debajit/Desktop/JSeeker/src/components/Footer/Footer.js":"6"},{"size":193,"mtime":1609754840874,"results":"7","hashOfConfig":"8"},{"size":587,"mtime":1609757423860,"results":"9","hashOfConfig":"8"},{"size":472,"mtime":1609757600199,"results":"10","hashOfConfig":"8"},{"size":968,"mtime":1609754934369,"results":"11","hashOfConfig":"8"},{"size":11257,"mtime":1609754840874,"results":"12","hashOfConfig":"8"},{"size":1053,"mtime":1609759936325,"results":"13","hashOfConfig":"8"},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"16"},"earp11",{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"16"},{"filePath":"19","messages":"20","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"16"},{"filePath":"21","messages":"22","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":"23","usedDeprecatedRules":"16"},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"16"},{"filePath":"26","messages":"27","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/home/debajit/Desktop/JSeeker/src/index.js",[],["28","29"],"/home/debajit/Desktop/JSeeker/src/App.js",[],"/home/debajit/Desktop/JSeeker/src/components/Navbar.js",[],"/home/debajit/Desktop/JSeeker/src/components/Table/Table.js",["30","31"],"import React from \"react\";\nimport { Table } from \"reactstrap\";\nimport { Button } from \"reactstrap\";\nimport \"./Table.css\";\nimport data from \"./data\";\n\nconst Tablee = (props) => {\n return (\n <Table striped className=\"mt-5\">\n <thead>\n <tr>\n <th>No</th>\n <th>Company</th>\n <th>Career Site</th>\n <th>Glassdor Link</th>\n </tr>\n </thead>\n <tbody>\n {data.map((item, index) => (\n <tr>\n <th scope=\"row\">{index + 1}</th>\n <td>{item.companyName}</td>\n <td>\n <a href={item.carrearURL} target=\"_blank\">\n <Button color=\"primary\">Click</Button>\n </a>\n </td>\n <td>\n <a href={item.glassdoorURL} target=\"_blank\">\n <Button color=\"primary\">Click</Button>\n </a>\n </td>\n </tr>\n ))}\n </tbody>\n </Table>\n );\n};\n\nexport default Tablee;\n","/home/debajit/Desktop/JSeeker/src/components/Table/data.js",[],"/home/debajit/Desktop/JSeeker/src/components/Footer/Footer.js",["32","33"],{"ruleId":"34","replacedBy":"35"},{"ruleId":"36","replacedBy":"37"},{"ruleId":"38","severity":1,"message":"39","line":24,"column":41,"nodeType":"40","endLine":24,"endColumn":56},{"ruleId":"38","severity":1,"message":"39","line":29,"column":43,"nodeType":"40","endLine":29,"endColumn":58},{"ruleId":"38","severity":1,"message":"39","line":16,"column":17,"nodeType":"40","endLine":16,"endColumn":32},{"ruleId":"38","severity":1,"message":"39","line":24,"column":17,"nodeType":"40","endLine":24,"endColumn":32},"no-native-reassign",["41"],"no-negated-in-lhs",["42"],"react/jsx-no-target-blank","Using target=\"_blank\" without rel=\"noreferrer\" is a security risk: see https://html.spec.whatwg.org/multipage/links.html#link-type-noopener","JSXAttribute","no-global-assign","no-unsafe-negation"]
2-
1+
[{"/home/debajit/Desktop/JSeeker/src/index.js":"1","/home/debajit/Desktop/JSeeker/src/App.js":"2","/home/debajit/Desktop/JSeeker/src/components/Navbar.js":"3","/home/debajit/Desktop/JSeeker/src/components/Table/Table.js":"4","/home/debajit/Desktop/JSeeker/src/components/Table/data.js":"5","/home/debajit/Desktop/JSeeker/src/components/Footer/Footer.js":"6"},{"size":193,"mtime":1609754840874,"results":"7","hashOfConfig":"8"},{"size":695,"mtime":1609760392918,"results":"9","hashOfConfig":"8"},{"size":472,"mtime":1609757600199,"results":"10","hashOfConfig":"8"},{"size":968,"mtime":1609754934369,"results":"11","hashOfConfig":"8"},{"size":11257,"mtime":1609754840874,"results":"12","hashOfConfig":"8"},{"size":1053,"mtime":1609759936325,"results":"13","hashOfConfig":"8"},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"16"},"earp11",{"filePath":"17","messages":"18","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":"19","usedDeprecatedRules":"16"},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"16"},{"filePath":"22","messages":"23","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":"24","usedDeprecatedRules":"16"},{"filePath":"25","messages":"26","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"27"},{"filePath":"28","messages":"29","errorCount":0,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":"30","usedDeprecatedRules":"16"},"/home/debajit/Desktop/JSeeker/src/index.js",[],["31","32"],"/home/debajit/Desktop/JSeeker/src/App.js",["33"],"import React from \"react\";\nimport Darkmode from \"darkmode-js\";\nimport NavBar from \"./components/Navbar\";\nimport Tablee from \"./components/Table/Table\";\nimport \"./App.css\";\nimport clip from \"./assets/clip.gif\";\nimport logo from \"./assets/logo.svg\";\nimport Footer from \"./components/Footer/Footer\";\n\nconst App = () => {\n const options = {\n label: \"🌓\",\n time: \"0.5s\",\n };\n const darkmode = new Darkmode(options);\n\n return (\n <div>\n <NavBar src={logo} alt=\"JSEEKR Logo\" />\n <div className=\"container\">\n <img src={clip} className=\"clips mt-4\" />\n <Tablee />\n {darkmode.showWidget()}\n </div>\n <Footer />\n </div>\n );\n};\n\nexport default App;\n","/home/debajit/Desktop/JSeeker/src/components/Navbar.js",[],"/home/debajit/Desktop/JSeeker/src/components/Table/Table.js",["34","35"],"import React from \"react\";\nimport { Table } from \"reactstrap\";\nimport { Button } from \"reactstrap\";\nimport \"./Table.css\";\nimport data from \"./data\";\n\nconst Tablee = (props) => {\n return (\n <Table striped className=\"mt-5\">\n <thead>\n <tr>\n <th>No</th>\n <th>Company</th>\n <th>Career Site</th>\n <th>Glassdor Link</th>\n </tr>\n </thead>\n <tbody>\n {data.map((item, index) => (\n <tr>\n <th scope=\"row\">{index + 1}</th>\n <td>{item.companyName}</td>\n <td>\n <a href={item.carrearURL} target=\"_blank\">\n <Button color=\"primary\">Click</Button>\n </a>\n </td>\n <td>\n <a href={item.glassdoorURL} target=\"_blank\">\n <Button color=\"primary\">Click</Button>\n </a>\n </td>\n </tr>\n ))}\n </tbody>\n </Table>\n );\n};\n\nexport default Tablee;\n","/home/debajit/Desktop/JSeeker/src/components/Table/data.js",[],["36","37"],"/home/debajit/Desktop/JSeeker/src/components/Footer/Footer.js",["38","39"],"import React from \"react\";\nimport { MDBCol, MDBContainer, MDBRow, MDBFooter } from \"mdbreact\";\nimport \"./Footer.css\";\n\nconst Footer = () => {\n return (\n <MDBFooter color=\"blue\" className=\"font-small pt-4 mt-4 mb-4\">\n <MDBContainer fluid className=\"text-md-left\">\n <MDBRow>\n <MDBCol className=\"col-xs-12 center-block text-center\">\n <h3 className=\"title footer-text\">About Us</h3>\n <p className=\"footer-text\">\n Made with ❤️ and ☕ by\n <a\n href=\"https://www.linkedin.com/in/sankalan-dasgupta-ba390616a/\"\n target=\"_blank\"\n >\n {\" \"}\n Sankalan{\" \"}\n </a>\n &\n <a\n href=\"https://www.linkedin.com/in/debajit-mallick/\"\n target=\"_blank\"\n >\n {\" \"}\n Debajit\n </a>\n </p>\n </MDBCol>\n </MDBRow>\n </MDBContainer>\n </MDBFooter>\n );\n};\n\nexport default Footer;\n",{"ruleId":"40","replacedBy":"41"},{"ruleId":"42","replacedBy":"43"},{"ruleId":"44","severity":1,"message":"45","line":21,"column":9,"nodeType":"46","endLine":21,"endColumn":50},{"ruleId":"47","severity":1,"message":"48","line":24,"column":41,"nodeType":"49","endLine":24,"endColumn":56},{"ruleId":"47","severity":1,"message":"48","line":29,"column":43,"nodeType":"49","endLine":29,"endColumn":58},{"ruleId":"40","replacedBy":"50"},{"ruleId":"42","replacedBy":"51"},{"ruleId":"47","severity":1,"message":"48","line":16,"column":17,"nodeType":"49","endLine":16,"endColumn":32},{"ruleId":"47","severity":1,"message":"48","line":24,"column":17,"nodeType":"49","endLine":24,"endColumn":32},"no-native-reassign",["52"],"no-negated-in-lhs",["53"],"jsx-a11y/alt-text","img elements must have an alt prop, either with meaningful text, or an empty string for decorative images.","JSXOpeningElement","react/jsx-no-target-blank","Using target=\"_blank\" without rel=\"noreferrer\" is a security risk: see https://html.spec.whatwg.org/multipage/links.html#link-type-noopener","JSXAttribute",["52"],["53"],"no-global-assign","no-unsafe-negation"]

src/App.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ import React from "react";
22
import Darkmode from "darkmode-js";
33
import NavBar from "./components/Navbar";
44
import Tablee from "./components/Table/Table";
5-
<<<<<<< HEAD
6-
import FooterPage from "./components/Footer/Footer";
7-
import './App.css'
8-
import logo from "./assets/logo.svg";
5+
import "./App.css";
96
import clip from "./assets/clip.gif";
10-
=======
117
import logo from "./assets/logo.svg";
128
import Footer from "./components/Footer/Footer";
13-
>>>>>>> ed35991c610c8e3488c5ccd7bb04f77bcac7fbb7
149

1510
const App = () => {
1611
const options = {
@@ -23,7 +18,7 @@ const App = () => {
2318
<div>
2419
<NavBar src={logo} alt="JSEEKR Logo" />
2520
<div className="container">
26-
<img src={clip} className="clips mt-4"/>
21+
<img src={clip} className="clips mt-4" />
2722
<Tablee />
2823
{darkmode.showWidget()}
2924
</div>

src/components/Navbar.css

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
font-family: "Audiowide", cursive;
77
}
88
.navbar {
9-
<<<<<<< HEAD
10-
padding-bottom: 0px;
11-
margin-left: 0px;
12-
}
13-
=======
149
padding-bottom: 0px;
10+
margin-left: 0px;
1511
}
16-
>>>>>>> ed35991c610c8e3488c5ccd7bb04f77bcac7fbb7

0 commit comments

Comments
 (0)