Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
E
Ecsite
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shoei.kanno
Ecsite
Commits
3ef65900
Commit
3ef65900
authored
Oct 23, 2020
by
shoei.kanno
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
最終修正
parent
0eac338a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
155 additions
and
2 deletions
+155
-2
EcsiteController.java
src/main/java/com/example/web/EcsiteController.java
+8
-0
slick.css
src/main/resources/static/css/slick.css
+119
-0
style.css
src/main/resources/static/css/style.css
+6
-0
common.js
src/main/resources/static/js/common.js
+5
-0
slick.min.js
src/main/resources/static/js/slick.min.js
+0
-0
cart.html
src/main/resources/templates/cart.html
+2
-1
index.html
src/main/resources/templates/index.html
+9
-1
list.html
src/main/resources/templates/list.html
+1
-0
log.html
src/main/resources/templates/log.html
+1
-0
logDetails.html
src/main/resources/templates/logDetails.html
+1
-0
management.html
src/main/resources/templates/management.html
+2
-0
wallets.html
src/main/resources/templates/wallets.html
+1
-0
No files found.
src/main/java/com/example/web/EcsiteController.java
View file @
3ef65900
...
@@ -86,6 +86,8 @@ public class EcsiteController {
...
@@ -86,6 +86,8 @@ public class EcsiteController {
public
String
top
(
Model
model
,
@AuthenticationPrincipal
LoginUser
userDetails
)
{
public
String
top
(
Model
model
,
@AuthenticationPrincipal
LoginUser
userDetails
)
{
User
user
=
userDetails
.
getUser
();
User
user
=
userDetails
.
getUser
();
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
Wallets
wallets
=
walletsService
.
findOne
(
user
.
getId
());
model
.
addAttribute
(
"wallets"
,
wallets
);
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
model
.
addAttribute
(
"cartValue"
,
0
);
model
.
addAttribute
(
"cartValue"
,
0
);
}
else
{
}
else
{
...
@@ -116,6 +118,8 @@ public class EcsiteController {
...
@@ -116,6 +118,8 @@ public class EcsiteController {
//user情報取得、格納
//user情報取得、格納
User
user
=
userDetails
.
getUser
();
User
user
=
userDetails
.
getUser
();
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
Wallets
wallets
=
walletsService
.
findOne
(
user
.
getId
());
model
.
addAttribute
(
"wallets"
,
wallets
);
//カート個数取得、格納
//カート個数取得、格納
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
model
.
addAttribute
(
"cartValue"
,
0
);
model
.
addAttribute
(
"cartValue"
,
0
);
...
@@ -131,6 +135,8 @@ public class EcsiteController {
...
@@ -131,6 +135,8 @@ public class EcsiteController {
public
String
history
(
@PathVariable
Integer
id
,
Model
model
,
SalesLog
salesLog
,
@AuthenticationPrincipal
LoginUser
userDetails
)
{
public
String
history
(
@PathVariable
Integer
id
,
Model
model
,
SalesLog
salesLog
,
@AuthenticationPrincipal
LoginUser
userDetails
)
{
User
user
=
userDetails
.
getUser
();
User
user
=
userDetails
.
getUser
();
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
Wallets
wallets
=
walletsService
.
findOne
(
user
.
getId
());
model
.
addAttribute
(
"wallets"
,
wallets
);
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
model
.
addAttribute
(
"cartValue"
,
0
);
model
.
addAttribute
(
"cartValue"
,
0
);
}
else
{
}
else
{
...
@@ -146,6 +152,8 @@ public class EcsiteController {
...
@@ -146,6 +152,8 @@ public class EcsiteController {
public
String
historyDetails
(
@PathVariable
Date
created
,
Model
model
,
@AuthenticationPrincipal
LoginUser
userDetails
)
{
public
String
historyDetails
(
@PathVariable
Date
created
,
Model
model
,
@AuthenticationPrincipal
LoginUser
userDetails
)
{
User
user
=
userDetails
.
getUser
();
User
user
=
userDetails
.
getUser
();
model
.
addAttribute
(
"user"
,
user
);
model
.
addAttribute
(
"user"
,
user
);
Wallets
wallets
=
walletsService
.
findOne
(
user
.
getId
());
model
.
addAttribute
(
"wallets"
,
wallets
);
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
if
(
session
.
getAttribute
(
"cartValue"
)
==
null
)
{
model
.
addAttribute
(
"cartValue"
,
0
);
model
.
addAttribute
(
"cartValue"
,
0
);
}
else
{
}
else
{
...
...
src/main/resources/static/css/slick.css
0 → 100644
View file @
3ef65900
/* Slider */
.slick-slider
{
position
:
relative
;
display
:
block
;
box-sizing
:
border-box
;
-webkit-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
user-select
:
none
;
-webkit-touch-callout
:
none
;
-khtml-user-select
:
none
;
-ms-touch-action
:
pan-y
;
touch-action
:
pan-y
;
-webkit-tap-highlight-color
:
transparent
;
}
.slick-list
{
position
:
relative
;
display
:
block
;
overflow
:
hidden
;
margin
:
0
;
padding
:
0
;
}
.slick-list
:focus
{
outline
:
none
;
}
.slick-list.dragging
{
cursor
:
pointer
;
cursor
:
hand
;
}
.slick-slider
.slick-track
,
.slick-slider
.slick-list
{
-webkit-transform
:
translate3d
(
0
,
0
,
0
);
-moz-transform
:
translate3d
(
0
,
0
,
0
);
-ms-transform
:
translate3d
(
0
,
0
,
0
);
-o-transform
:
translate3d
(
0
,
0
,
0
);
transform
:
translate3d
(
0
,
0
,
0
);
}
.slick-track
{
position
:
relative
;
top
:
0
;
left
:
0
;
display
:
block
;
margin-left
:
auto
;
margin-right
:
auto
;
}
.slick-track
:before
,
.slick-track
:after
{
display
:
table
;
content
:
''
;
}
.slick-track
:after
{
clear
:
both
;
}
.slick-loading
.slick-track
{
visibility
:
hidden
;
}
.slick-slide
{
display
:
none
;
float
:
left
;
height
:
100%
;
min-height
:
1px
;
}
[
dir
=
'rtl'
]
.slick-slide
{
float
:
right
;
}
.slick-slide
img
{
display
:
block
;
}
.slick-slide.slick-loading
img
{
display
:
none
;
}
.slick-slide.dragging
img
{
pointer-events
:
none
;
}
.slick-initialized
.slick-slide
{
display
:
block
;
}
.slick-loading
.slick-slide
{
visibility
:
hidden
;
}
.slick-vertical
.slick-slide
{
display
:
block
;
height
:
auto
;
border
:
1px
solid
transparent
;
}
.slick-arrow.slick-hidden
{
display
:
none
;
}
src/main/resources/static/css/style.css
View file @
3ef65900
...
@@ -2062,3 +2062,8 @@ th, td {
...
@@ -2062,3 +2062,8 @@ th, td {
#top-footer
{
#top-footer
{
margin-top
:
70px
;
margin-top
:
70px
;
}
}
/* ヘッダーにBalance表示 */
#balance-li
{
margin-top
:
19px
;
}
\ No newline at end of file
src/main/resources/static/js/common.js
0 → 100644
View file @
3ef65900
$
(
'.slick01'
).
slick
({
//{}を入れる
autoplay
:
true
,
//「オプション名: 値」の形式で書く
dots
:
true
//複数書く場合は「,」でつなぐ
});
\ No newline at end of file
src/main/resources/static/js/slick.min.js
0 → 100644
View file @
3ef65900
This diff is collapsed.
Click to expand it.
src/main/resources/templates/cart.html
View file @
3ef65900
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
<li><a
id=
"wallets"
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
<li><a
id=
"wallets"
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<li
id=
"balance-li"
>
Balance
<span
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li
class=
"active"
><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
<li
class=
"active"
><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
</ul>
</ul>
...
@@ -129,7 +130,7 @@
...
@@ -129,7 +130,7 @@
</div>
</div>
<br/>
<br/>
<div
id=
"walletAmount"
>
<div
id=
"walletAmount"
>
<p
id=
"total-price"
>
Wallet Amount
<span
id=
"total-price-span"
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></p>
<p
id=
"total-price"
>
Balance
<span
id=
"total-price-span"
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></p>
</div>
</div>
<div
id=
"buy"
>
<div
id=
"buy"
>
<button
class=
"js-modal-open"
id=
"buy-btn"
>
Buy
</button>
<button
class=
"js-modal-open"
id=
"buy-btn"
>
Buy
</button>
...
...
src/main/resources/templates/index.html
View file @
3ef65900
...
@@ -9,6 +9,9 @@
...
@@ -9,6 +9,9 @@
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
/>
<link
rel=
"icon"
href=
"images/favicon.png"
th:href=
"@{/images/favicon.png}"
/>
<link
rel=
"icon"
href=
"images/favicon.png"
th:href=
"@{/images/favicon.png}"
/>
<link
rel=
"stylesheet"
href=
"css/style.css"
th:href=
"@{/css/style.css}"
/>
<link
rel=
"stylesheet"
href=
"css/style.css"
th:href=
"@{/css/style.css}"
/>
<!-- スライドショー -->
<link
rel=
"stylesheet"
type=
"text/css"
th:href=
"@{css/slick.css}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
th:href=
"@{css/commmon.css}"
/>
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css"
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css"
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous"/> -->
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous"/> -->
<!--[if lt IE 9]>
<!--[if lt IE 9]>
...
@@ -69,6 +72,7 @@
...
@@ -69,6 +72,7 @@
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<li
id=
"balance-li"
>
Balance
<span
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
</ul>
</ul>
...
@@ -117,7 +121,7 @@
...
@@ -117,7 +121,7 @@
</ol>
</ol>
<!-- Wrapper for slides -->
<!-- Wrapper for slides -->
<div
class=
"carousel-inner"
role=
"listbox"
>
<div
class=
"carousel-inner
slick01
"
role=
"listbox"
>
<div
class=
"item active"
>
<div
class=
"item active"
>
<img
th:src=
"@{/images/スニーカー1.jpg}"
width=
"1648"
height=
"600"
alt=
""
/>
<img
th:src=
"@{/images/スニーカー1.jpg}"
width=
"1648"
height=
"600"
alt=
""
/>
<div
class=
"carousel-caption"
>
<div
class=
"carousel-caption"
>
...
@@ -271,5 +275,9 @@
...
@@ -271,5 +275,9 @@
integrity=
"sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
crossorigin=
"anonymous"
></script>
integrity=
"sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
crossorigin=
"anonymous"
></script>
<script
src=
"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"
<script
src=
"https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"
integrity=
"sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
crossorigin=
"anonymous"
></script>
integrity=
"sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
crossorigin=
"anonymous"
></script>
<!-- スライドショー -->
<script
type=
"text/javascript"
th:src=
"@{js/slick.min.js}"
></script>
<script
type=
"text/javascript"
th:src=
"@{js/common.js}"
></script>
</body>
</body>
</html>
</html>
src/main/resources/templates/list.html
View file @
3ef65900
...
@@ -92,6 +92,7 @@
...
@@ -92,6 +92,7 @@
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<li
id=
"balance-li"
>
Balance
<span
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
id=
"shoping-cart-span"
th:text=
"${cartValue}"
>
0
</span></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
id=
"shoping-cart-span"
th:text=
"${cartValue}"
>
0
</span></a></li>
</ul>
</ul>
...
...
src/main/resources/templates/log.html
View file @
3ef65900
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<li
id=
"balance-li"
>
Balance
<span
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
id=
"shoping-cart-span"
th:text=
"${cartValue}"
>
0
</span></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
id=
"shoping-cart-span"
th:text=
"${cartValue}"
>
0
</span></a></li>
</ul>
</ul>
...
...
src/main/resources/templates/logDetails.html
View file @
3ef65900
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
<li><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<li
id=
"balance-li"
>
Balance
<span
th:text=
"'¥' + ${wallets.amount}"
>
10000
</span></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li
class=
"active"
><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
<li
class=
"active"
><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
</ul>
</ul>
...
...
src/main/resources/templates/management.html
View file @
3ef65900
...
@@ -135,6 +135,7 @@
...
@@ -135,6 +135,7 @@
<tr>
<tr>
<th>
ID
</th>
<th>
ID
</th>
<th>
商品名
</th>
<th>
商品名
</th>
<th>
サイズ
</th>
<th>
価格
</th>
<th>
価格
</th>
<th>
在庫数
</th>
<th>
在庫数
</th>
<th>
商品画像
</th>
<th>
商品画像
</th>
...
@@ -144,6 +145,7 @@
...
@@ -144,6 +145,7 @@
<tr
th:each=
"shoe : ${shoes}"
>
<tr
th:each=
"shoe : ${shoes}"
>
<td
th:text=
"${shoe.id}"
>
1
</td>
<td
th:text=
"${shoe.id}"
>
1
</td>
<td
th:text=
"${shoe.name}"
>
AirMax
</td>
<td
th:text=
"${shoe.name}"
>
AirMax
</td>
<td
th:text=
"${shoe.size}"
>
27
</td>
<td
th:text=
"${shoe.price}"
>
¥10,000
</td>
<td
th:text=
"${shoe.price}"
>
¥10,000
</td>
<td
th:text=
"${shoe.stock}"
>
10
</td>
<td
th:text=
"${shoe.stock}"
>
10
</td>
<td><img
class=
"shoeImage"
th:src=
"@{/upload/{photo}(photo=${shoe.photo})}"
alt=
"productImage"
width=
"100"
height=
"50"
/></td>
<td><img
class=
"shoeImage"
th:src=
"@{/upload/{photo}(photo=${shoe.photo})}"
alt=
"productImage"
width=
"100"
height=
"50"
/></td>
...
...
src/main/resources/templates/wallets.html
View file @
3ef65900
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
<li
class=
"active"
><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
<li
class=
"active"
><a
th:href=
"@{/limited/wallets/{id}(id=${user.id})}"
>
Wallets
</a></li>
</ul>
</ul>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<ul
class=
"nav navbar-nav navbar-right cart-menu"
>
<li
id=
"balance-li"
>
Balance
<span
th:text=
"'¥' + ${wallet.amount}"
>
10000
</span></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
class=
"search-btn"
><i
class=
"fa fa-search"
aria-hidden=
"true"
></i></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
<li><a
th:href=
"@{/limited/cart}"
><span>
Cart
</span>
<span
class=
"shoping-cart"
th:text=
"${cartValue}"
>
0
</span></a></li>
</ul>
</ul>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment