Skip to content

Commit

Permalink
Merge pull request #166 from super-waffle/footer
Browse files Browse the repository at this point in the history
Footer
  • Loading branch information
rosieyeon authored Feb 17, 2022
2 parents 2a953a8 + 8e91dcd commit 25f1f4d
Show file tree
Hide file tree
Showing 117 changed files with 350 additions and 2,343 deletions.
Binary file added public/images/GongspLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/superWaffle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 14 additions & 11 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
// import { useNavigate } from "react-router-dom";
// import { useState } from "react/cjs/react.development";
import Navbar from './components/navbar';
import NavbarLanding from './components/navbarLanding';
import isLogin from './utils/isLogin';
import './statics/css/main.css';
import { Outlet } from 'react-router-dom';
import React from "react";
import Navbar from "./components/navbar";
import NavbarLanding from "./components/navbarLanding";
import isLogin from "./utils/isLogin";
import { Outlet } from "react-router-dom";
import Footer from "./components/footer";
import "./statics/css/darkUI.css";
import "./statics/css/app.css";

function App() {
console.log(`
Expand All @@ -19,12 +19,15 @@ function App() {
dP
`);
return (
<div>
<main>
{isLogin() && <Navbar sticky="top" />}
{!isLogin() && <NavbarLanding sticky="top" />}
<p>Landing Page</p>
<Outlet />
</div>
<div className="outlet">
<Outlet />
</div>
<Footer />
</main>
);
}

Expand Down
36 changes: 36 additions & 0 deletions src/components/footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { Link } from "react-router-dom";
import "../statics/css/Layout/footer.css";

export default function Footer() {
const logo = "../../images/logo-400.png";
return (
<footer className="footer">
{/* <div className="footer__contents">
<div className="footer__logo">
<img src={logo} alt=""></img>
</div>
<div className="footer__introduce">
<div>서비스</div>
<div></div>
</div>
<div className="footer__madeby">Creator</div>
<div>lorem</div>
</div> */}
<div className="footer__contents"></div>

<div className="footer__rights">
<div className="footer__logo">
<img src="../../images/superWaffle.png" />
<div>© Super Waffle</div>
</div>
<div className="footer__link">
<Link to={"/"}>Service</Link>
<Link to={"/"}>Policy</Link>
<Link to={"/"}>Creator</Link>
</div>
</div>
</footer>
);
}
53 changes: 53 additions & 0 deletions src/statics/css/Layout/footer.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/statics/css/Layout/footer.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions src/statics/css/Todo/todo.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/Todo/todo.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions src/statics/css/Todo/todoCreate.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/Todo/todoCreate.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions src/statics/css/Todo/todoItem.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/Todo/todoItem.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions src/statics/css/Todo/todoList.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/statics/css/Todo/todoList.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/statics/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/statics/css/app.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 25f1f4d

Please sign in to comment.