Skip to content
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

chat.html とemologlist.htmlを動くようにしているはずです #40

Merged
merged 1 commit into from
Aug 27, 2020
+37 −30
Merged

chat.html とemologlist.htmlを動くようにしているはずです #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/main/resources/templates/chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<p class="emolog-date" th:text="${date}">8/18</p>
</li>
<li class="emolog-show">
<!--自分のエモログの表示-->
<!--相手のエモログの表示-->
<!--<p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p> -->
<p class="emoji" th:text="${FriendEmolog}"></p>
<p class="emoji" th:text="${FriendEmolog ['contents']}"></p>
<p>朝 <img th:src="@{images/arrow.png}" alt="emolog_arrow"> 夜</p>
<!--相手のエモログの表示-->
<p class="emoji" th:text="${MyEmolog}"></p>
<!--自分のエモログの表示-->
<p class="emoji" th:text="${MyEmolog ['contents']}"></p>
</li>
</ul>

Expand Down
58 changes: 33 additions & 25 deletions src/main/resources/templates/emologlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,39 @@

<!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
<ul>
<li><a href="chat">
<p class="emolog-date">8月18日<p>
<!--相手のエモログの表示-->
<p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
<img src="images/arrow.png" alt="emolog_arrow">
</a>
</li>
<li>
<p class="emolog-date">8月17日<p>
<!--相手のエモログの表示-->
<p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
<img src="images/arrow.png" alt="emolog_arrow">
</li>
<li>
<p class="emolog-date">8月16日<p>
<!--相手のエモログの表示-->
<p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
<img src="images/arrow.png" alt="emolog_arrow">
</li>
<li>
<p class="emolog-date">8月15日<p>
<!--相手のエモログの表示-->
<p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
<img src="images/arrow.png" alt="emolog_arrow">
</li>
<ul class="friend_ul" th:each="emolog:${emologs}">
<li><a th:href="'../../chat/'+${emolog.id}">
<!--<p class="emolog-date" th:text="|${#dates.month(${emolog.created_at})} 月 ${#dates.day(${emolog.created_at})} 日|">8月18日<p>
相手のエモログの表示-->
<p class="emoji" th:text="${emolog.contents}" >&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>
<img th:src="@{/images/arrow.png}" alt="emolog_arrow">
</a>
</li>
<!--静的サンプル表示部分-->
<!-- <li><a href="chat">-->
<!-- <p class="emolog-date">8月18日<p>-->
<!-- <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>-->
<!-- <img src="images/arrow.png" alt="emolog_arrow">-->
<!-- </a>-->
<!-- </li>-->
<!-- <li>-->
<!-- <p class="emolog-date">8月17日<p>-->
<!-- &lt;!&ndash;相手のエモログの表示&ndash;&gt;-->
<!-- <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>-->
<!-- <img src="images/arrow.png" alt="emolog_arrow">-->
<!-- </li>-->
<!-- <li>-->
<!-- <p class="emolog-date">8月16日<p>-->
<!-- &lt;!&ndash;相手のエモログの表示&ndash;&gt;-->
<!-- <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>-->
<!-- <img src="images/arrow.png" alt="emolog_arrow">-->
<!-- </li>-->
<!-- <li>-->
<!-- <p class="emolog-date">8月15日<p>-->
<!-- &lt;!&ndash;相手のエモログの表示&ndash;&gt;-->
<!-- <p class="emoji">&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;&#x1f349;</p>-->
<!-- <img src="images/arrow.png" alt="emolog_arrow">-->
<!-- </li>-->
</ul>
</div>
<!-- ナビゲーションバーを表示-->
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/templates/friendlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<!-- 友達の一覧を表示-->
<div class="emolog-list">

<!-- 本当はjava でデータを取ってきてすべて表示　例を書く-->
<ul>
<li>
<a href="emologlist.html">
Expand Down