Merge branch 'main' into rl6

conorheffron · Jan 8, 2025 · 75047f1 · 75047f1
2 parents b4c411a + e112d78
commit 75047f1
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 1 deletion.
diff --git a/frontend/README.md b/frontend/README.md
@@ -2,7 +2,7 @@
 
 The ironoc UI built with react for personal portfolio website.
 
-[![Node.js Package](https://github.com/conorheffron/ironoc/actions/workflows/npm-publish-github-packages.yml/badge.svg)](https://github.com/conorheffron/ironoc/actions/workflows/npm-publish-github-packages.yml)
+[![Node.js Package](https://github.com/conorheffron/ironoc/actions/workflows/npm-publish-packages.yml/badge.svg)](https://github.com/conorheffron/ironoc/actions/workflows/npm-publish-packages.yml)
 
 - See project README.md [here](https://github.com/conorheffron/ironoc/blob/main/README.md)
 - See npmjs package details here [https://www.npmjs.com/package/@conorheffron/ironoc-frontend](https://www.npmjs.com/package/@conorheffron/ironoc-frontend)

diff --git a/frontend/src/Footer.js b/frontend/src/Footer.js
@@ -0,0 +1,11 @@
+import { Container } from 'reactstrap';
+
+export default function Footer() {
+  return (
+        <div className="App">
+            <Container>
+                <footer><p>© 2017 by Conor Heffron</p></footer>
+            </Container>
+        </div>
+  );
+}
diff --git a/frontend/src/components/About.js b/frontend/src/components/About.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Container } from 'reactstrap';
 import '.././App.css';
 import AppNavbar from '.././AppNavbar';
+import Footer from '.././Footer';
 
 class About extends Component {
 
@@ -37,6 +38,7 @@ class About extends Component {
                         </a>
                 </header>
             </Container>
+            <Footer/>
         </div>
     );
   }

diff --git a/frontend/src/components/ControlledCarousel.js b/frontend/src/components/ControlledCarousel.js
@@ -4,6 +4,7 @@ import 'bootstrap/dist/css/bootstrap.css';
 import '.././App.css';
 import { Container } from 'reactstrap';
 import AppNavbar from '.././AppNavbar';
+import Footer from '.././Footer';
 import navy from '.././img/darkblue-bg.png';
 import teal from '.././img/teal-bg.png';
 import red from '.././img/red-bg.png';
@@ -103,6 +104,7 @@ class ControlledCarousel extends Component {
                             </Carousel.Item>
                         </Carousel>
                     </Container>
+                <Footer/>
             </div>
         );
     }

diff --git a/frontend/src/components/Home.js b/frontend/src/components/Home.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Container } from 'reactstrap';
 import '.././App.css';
 import AppNavbar from '.././AppNavbar';
+import Footer from '.././Footer';
 import logo from '.././img/robot-logo.png';
 
 class Home extends Component {
@@ -29,6 +30,7 @@ class Home extends Component {
                     <a href="https://www.ironoc.net/get-repo-issue/conorheffron/ironoc/">Issues JSON Sample</a>.</p>
                   </header>
               </Container>
+              <Footer/>
             </div>
         );
     }

diff --git a/frontend/src/components/NotFound.js b/frontend/src/components/NotFound.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Container } from 'reactstrap';
 import '.././App.css';
 import AppNavbar from '.././AppNavbar';
+import Footer from '.././Footer';
 
 class NotFound extends Component {
 
@@ -15,6 +16,7 @@ class NotFound extends Component {
                     <p id="my-intro">Sorry, the page you are looking for could not be found.</p>
                   </header>
               </Container>
+              <Footer/>
             </div>
         );
     }

diff --git a/frontend/src/components/RepoDetails.js b/frontend/src/components/RepoDetails.js
@@ -3,6 +3,7 @@ import { Button, ButtonGroup, Container, InputGroup, Table } from 'reactstrap';
 import '.././App.css';
 import Form from 'react-bootstrap/Form';
 import AppNavbar from '.././AppNavbar';
+import Footer from '.././Footer';
 import { Link } from 'react-router-dom';
 
 class RepoDetails extends Component {
@@ -82,6 +83,7 @@ class RepoDetails extends Component {
                             <tbody>{repoList}</tbody>
                         </Table>
                     </Container>
+                    <Footer/>
                 </div>
             );
     }

diff --git a/frontend/src/components/RepoIssues.js b/frontend/src/components/RepoIssues.js
@@ -3,6 +3,7 @@ import { Button, Container, InputGroup, Table } from 'reactstrap';
 import '.././App.css';
 import Form from 'react-bootstrap/Form';
 import AppNavbar from '.././AppNavbar';
+import Footer from '.././Footer';
 
 class RepoIssues extends Component {
 
@@ -75,6 +76,7 @@ class RepoIssues extends Component {
                             <tbody>{repoList}</tbody>
                         </Table>
                     </Container>
+                    <Footer/>
                 </div>
             );
     }