Skip to content

Stylizing #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pdouglas21 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Stylizing #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dec0ae
created home page from hello
pdouglas21 Oct 14, 2020
1b24562
Merge pull request #1 from pdouglas21/home
pdouglas21 Oct 14, 2020
078aeb7
Created home page header including navbar.
pdouglas21 Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/service/MainController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
@Controller
public class MainController {

@GetMapping("/hello")
public String hello(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) {
@GetMapping("/home")
public String home(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) {
model.addAttribute("name", name);
return "hello";
return "home";
}

}
Binary file added src/main/resources/static/bb header.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions src/main/resources/static/bbstyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
body {
background-color: white;
text-align: center;
}
.header {
margin: 20px;
}
.bg-custom {
list-style: none;
text-decoration: none;
display: flex;
flex-direction: row;
}
.nav-link{
color: black;
align-items: center;
}
/*.header {
list-style: none;
text-decoration: none;
display: flex;
flex-direction: row;
margin: 10px;
}
.header logo {
}
.header title {
}
.nav ul {
list-style: none;
}

.header ul li{
list-style: none;
float: left;
padding: 10px 70px;
}

.nav ul li {
list-style: none;
}
.nav ul li a {
text-decoration: none;
float: left;
display: block;
padding: 10px 40px;
color: black;
}
.nav ul li a:hover {
color: #d5face;
}
*/
Binary file added src/main/resources/static/builder's title.png
View file
Open in desktop
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 src/main/resources/static/final bb logo (white).png
View file
Open in desktop
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 src/main/resources/static/final header.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/resources/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body>
<p>Get your greeting <a href="/hello">here</a></p>
<p>Get your greeting <a href="/home">here</a></p>
</body>
</html>
10 changes: 0 additions & 10 deletions src/main/resources/templates/hello.html
View file
Open in desktop

This file was deleted.

44 changes: 44 additions & 0 deletions src/main/resources/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
<Link rel = stylesheet type = "text/css" href = "bbstyle.css">
<title>Getting Started: Serving Web Content</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body>
<div class = "header">
<div class = "title">
<img src = "builder's title.png" width = "900" height="120">
</div>
</div>
<div class ="container">
<nav class = "navbar navbar-expand-sm bg-light justify-content-center">
<a class = "navbar-logo" href = "/home">
<img src = "final bb logo (white).png" alt="logo" height = "40" width = "40">
</a>
<ul navbar class = "bg-custom">
<li class = "nav-item">
<a class = "nav-link" href = "/kitchen" >Kitchen</a>
</li>
<li class = "nav-item">
<a class = "nav-link" href = "/livingroom" >Living Room</a>
</li>
<li class = "nav-item">
<a class = "nav-link" href = "/bedroom" >Bedroom</a>
</li>
<li class = "nav-item">
<a class = "nav-link" href = "/bathroom" >Bathroom</a>
</li>
<li class = "nav-item">
<a class = "nav-link" href = "/other" >Other</a>
</li>
<li class = "nav-item">
<a class = "nav-link" href = "/account" >Account</a>
</li>
</ul>
</nav>

</div>
</body>
</html>