Skip to content

Step1 PR #98

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

Merged
javajigi merged 4 commits into from
Dec 27, 2018
Merged

Step1 PR #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7542e8
Remove duplicate in index, make base.html
Dec 27, 2018
1655588
Make all tests passed
Dec 27, 2018
4aca039
Remove duplicates in HTMLs
Dec 27, 2018
9df271c
Remove join.html
Dec 27, 2018
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
42 changes: 42 additions & 0 deletions src/main/resources/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# block "style"}}
{{/ block}}
</head>
<body>
<div class="issues issues—wrap mdl-layout mdl-js-layout is-upgraded">

{{# block "header"}}
<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestones/list">Milestones</a>
<a class="mdl-navigation__link" href="/users/login">login</a>
<a class="mdl-navigation__link" href="/users/form">join</a>
</nav>
</div>
</header>
{{/ block}}

{{# block "main"}}
{{/ block}}

<div class="mdl-layout__obfuscator"></div>
</div>

{{#block "script"}}
{{/ block}}

</body>
</html>
43 changes: 10 additions & 33 deletions src/main/resources/static/index.html → src/main/resources/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# partial "style"}}
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
<link rel="stylesheet"
Expand All @@ -17,25 +9,9 @@
href="https://code.getmdl.io/1.1.3/material.blue_grey-orange.min.css">
<link rel="stylesheet" href="/css/styles.css">
<link rel="stylesheet" href="/css/tinymce.css">
</head>
<body>
<div class="issues issues--wrap mdl-layout mdl-js-layout is-upgraded">

<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestone/list.html">Milestones</a>
<a class="mdl-navigation__link" href="/user/login.html">login</a>
<a class="mdl-navigation__link" href="/user/join.html">join</a>
</nav>
</div>
</header>
{{/ partial}}

{{# partial "main"}}
<main class="mdl-layout__content">

<div class="issues__posts mdl-grid">
Expand Down Expand Up @@ -303,12 +279,13 @@ <h2 class="mdl-card__title-text mdl-color-text--grey-800">Issues</h2>
</div>
</footer>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
{{/ partial}}

{{# partial "script"}}
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.3/dialog-polyfill.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.3/dialog-polyfill.min.js"></script>
<script src="https://cdn.tinymce.com/4/tinymce.min.js"></script>
<script src="/js/main.js"></script>
</body>
</html>
{{/ partial}}

{{> base}}
0 src/main/resources/static/issue/form.html → src/main/resources/templates/issue/form.html
View file
Open in desktop
File renamed without changes.
39 changes: 9 additions & 30 deletions src/main/resources/static/issue/show.html → src/main/resources/templates/issue/show.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# partial "style"}}
<link href='https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en'
rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.blue_grey-orange.min.css">
<link rel="stylesheet" href="/css/styles.css">
</head>
<body>
<div class="issues issues--wrap mdl-layout mdl-js-layout has-drawer is-upgraded">

<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestone/list.html">Milestones</a>
<a class="mdl-navigation__link" href="/user/login.html">login</a>
<a class="mdl-navigation__link" href="/user/join.html">join</a>
</nav>
</div>
</header>
{{/ partial}}

{{# partial "main"}}
<main class="mdl-layout__content">
<div class="issues-back">
<a href="/" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon back-btn" title="go back"
Expand Down Expand Up @@ -226,9 +203,11 @@ <h2 class="mdl-card__title-text">testIssue #1</h2>
</div>
</footer>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
{{/ partial}}

{{# partial "script"}}
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
</body>
</html>
{{/ partial}}

{{> base}}
40 changes: 9 additions & 31 deletions ...main/resources/static/milestone/form.html → ...n/resources/templates/milestone/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,12 @@
<!doctype html>
<html lang="ko">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# partial "style"}}
<link href='https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en'
rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.blue_grey-orange.min.css">
<link rel="stylesheet" href="/css/styles.css">
</head>
<body>
<div class="issues issues--wrap mdl-layout mdl-js-layout has-drawer is-upgraded">

<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestone/list.html">Milestones</a>
<a class="mdl-navigation__link" href="/user/login.html">login</a>
<a class="mdl-navigation__link" href="/user/join.html">join</a>
</nav>
</div>
</header>
{{/ partial}}

{{# partial "main"}}
<main class="mdl-layout__content">
<div class="issues-back">
<a class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon back-btn" title="go back"
Expand Down Expand Up @@ -72,13 +49,14 @@
</div>
</footer>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
{{/ partial}}

{{# partial "script"}}
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script>
$('.back-btn').on('click',function(){history.back();})

</script>
</body>
</html>
{{/ partial}}

{{> base}}
38 changes: 9 additions & 29 deletions ...main/resources/static/milestone/list.html → ...n/resources/templates/milestone/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,14 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# partial "style"}}
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.3/dialog-polyfill.css">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.blue_grey-orange.min.css">
<link rel="stylesheet" href="/css/styles.css">
<link rel="stylesheet" href="/css/tinymce.css">
</head>
<body>
<div class="issues issues--wrap mdl-layout mdl-js-layout has-drawer is-upgraded">
{{/ partial}}

<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestone/list.html">Milestones</a>
<a class="mdl-navigation__link" href="/user/login.html">login</a>
<a class="mdl-navigation__link" href="/user/join.html">join</a>
</nav>
</div>
</header>
{{# partial "main"}}
<main class="mdl-layout__content">
<div class="issues__posts mdl-grid">
<div class="issues-card-wide mdl-card mdl-shadow--2dp">
Expand Down Expand Up @@ -111,11 +89,13 @@ <h2 class="mdl-card__title-text mdl-color-text--grey-800">Milestones</h2>
</div>
</footer>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
{{/ partial}}

{{# partial "script"}}
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.3/dialog-polyfill.min.js"></script>
<script src="https://cdn.tinymce.com/4/tinymce.min.js"></script>
<script src="main.js"></script>
</body>
</html>
{{/ partial}}

{{> base}}
39 changes: 9 additions & 30 deletions src/main/resources/static/user/join.html → src/main/resources/templates/user/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# partial "style"}}
<link href='https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en'
rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.blue_grey-orange.min.css">
<link rel="stylesheet" href="/css/styles.css">
</head>
<body>
<div class="issues issues--wrap mdl-layout mdl-js-layout has-drawer is-upgraded">

<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestone/list.html">Milestones</a>
<a class="mdl-navigation__link" href="/user/login.html">login</a>
<a class="mdl-navigation__link" href="/user/join.html">join</a>
</nav>
</div>
</header>
{{/ partial}}

{{# partial "main"}}
<main class="mdl-layout__content">
<div class="issues-back">
<a class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon back-btn" title="go back"
Expand Down Expand Up @@ -83,13 +60,15 @@ <h4>Join Member</h4>
</div>
</footer>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
{{/ partial}}

{{# partial "script"}}
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script>
$('.back-btn').on('click',function(){history.back();})

</script>
</body>
</html>
{{/ partial}}

{{> base}}
39 changes: 9 additions & 30 deletions src/main/resources/static/user/login.html → src/main/resources/templates/user/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<title>Issue Tracking System</title>

{{# partial "style"}}
<link href='https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en'
rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.blue_grey-orange.min.css">
<link rel="stylesheet" href="/css/styles.css">
</head>
<body>
<div class="issues issues--wrap mdl-layout mdl-js-layout has-drawer is-upgraded">

<header class="mdl-layout__header mdl-layout__header--waterfall">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-title">Issue Tracking System</span>
<div class="mdl-layout-spacer"></div>
<!-- Tabs -->
<nav class="mdl-navigation">
<a class="mdl-navigation__link" href="/">Issues</a>
<a class="mdl-navigation__link" href="/milestone/list.html">Milestones</a>
<a class="mdl-navigation__link" href="/user/login.html">login</a>
<a class="mdl-navigation__link" href="/user/join.html">join</a>
</nav>
</div>
</header>
{{/ partial}}

{{# partial "main"}}
<main class="mdl-layout__content">
<div class="issues-back">
<a class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon back-btn" title="go back"
Expand Down Expand Up @@ -71,13 +48,15 @@ <h4>Login Member</h4>
</div>
</footer>
</main>
<div class="mdl-layout__obfuscator"></div>
</div>
{{/ partial}}

{{# partail "script"}}
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script>
$('.back-btn').on('click',function(){history.back();})

</script>
</body>
</html>
{{/ partial}}

{{> base}}
Loading