Merge everything into single Spring Boot application

1 files changed, 0 insertions, 175 deletions

diff --git a/juick-server/src/main/resources/templates/views/thread.html b/juick-server/src/main/resources/templates/views/thread.html
deleted file mode 100644
index 478258cf..00000000
--- a/juick-server/src/main/resources/templates/views/thread.html
+++ /dev/null
@@ -1,175 +0,0 @@
-{% extends "layouts/default" %}
-{% import "views/macros/tags" %}
-{% block content %}
-<ul id="0">
-    <li id="msg-{{ msg.mid }}" class="msg msgthread">
-        <div class="msg-cont">
-            <div class="msg-header">
-                <div class="msg-avatar">
-                    <a href="/{{ msg.user.name }}/"><img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/></a>
-                </div>
-                <span>
-                    <a href="/{{ msg.user.name }}/"><span>{{ msg.user.name }}</span></a>
-                </span>
-                <div class="msg-ts">
-                    <a href="/{{ msg.user.name }}/{{ msg.mid }}">
-                        <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
-                              title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT">
-                            {{ msg.timestamp | prettyTime }}
-                        </time>
-                    </a>
-                </div>
-                <div class="msg-tags">
-                    {{ tags(msg.user.name, msg.tags | tagsList) }}
-                </div>
-            </div>
-            <div class="msg-txt">{{ msg | formatMessage }}</div>
-            {% if msg.AttachmentType is not empty %}
-            <div class="msg-media">
-                <a href="//i.juick.com/p/{{ msg.mid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}.{{ msg.AttachmentType }}">
-                    <img src="//i.juick.com/photos-512/{{ msg.mid }}.{{ msg.AttachmentType }}" alt=""/>
-                </a>
-            </div>
-            {% endif %}
-            <nav class="l">
-                {% if visitor.uid == msg.user.uid %}
-                <a href="/{{ msg.mid }}" class="a-like msg-button">
-                    <span class="msg-button-icon">
-                        <i data-icon="ei-heart" data-size="s"></i>
-                        {% if msg.Likes > 0 %}&nbsp;{{ msg.Likes }}{% endif %}
-                    </span>
-                    <span>&nbsp;{{ i18n("messages","message.recommend") }}</span>
-                </a>
-                {% elseif visitor.uid > 0 %}
-                <a href="/post?body=!+%23{{ msg.mid }}" class="a-like msg-button">
-                    <span class="msg-button-icon">
-                        <i data-icon="ei-heart" data-size="s"></i>
-                        {% if msg.Likes > 0 %}&nbsp;{{ msg.Likes }}{% endif %}
-                    </span>
-                    <span>&nbsp;{{ i18n("messages","message.recommend") }}</span>
-                </a>
-                {% else %}
-                <a href="/login" class="a-login msg-button">
-                    <span class="msg-button-icon">
-                        <i data-icon="ei-heart" data-size="s"></i>
-                        {% if msg.Likes > 0 %}&nbsp;{{ msg.Likes }}{% endif %}
-                    </span>
-                    <span>&nbsp;{{ i18n("messages","message.recommend") }}</span>
-
-                </a>
-                {% endif %}
-                <a href="#" class="msg-menu msg-button">
-                    <i data-icon="ei-link" data-size="s"></i>
-                    <span>&nbsp;{{ i18n("messages","message.share") }}</span>
-                </a>
-                {% if visitor.uid > 0 %}
-                {% if visitor.uid != msg.user.uid %}
-                {% if visitorSubscribed %}
-                <a href="/post?body=U+%23{{ msg.mid }}" class="msg-button">
-                    <i data-icon="ei-check" data-size="s"></i>
-                    <span>&nbsp;{{ i18n("messages","message.subscribed") }}</span>
-                </a>
-                {% else %}
-                <a href="/post?body=S+%23{{ msg.mid }}" class="a-sub msg-button">
-                    <i data-icon="ei-eye" data-size="s"></i>
-                    <span>&nbsp;{{ i18n("messages","message.subscribe") }}</span>
-                </a>
-                {% endif %}
-                {% else %}
-                <a href="/post?body=D+%23{{ msg.mid }}" class="msg-button">
-                    <i data-icon="ei-close" data-size="s"></i>
-                    <span>&nbsp;{{ i18n("messages","message.delete") }}</span>
-                </a>
-                {% endif %}
-                {% endif %}
-                {% if msg.FriendsOnly %}
-                <a href="#" class="a-privacy">Открыть доступ</a>
-                {% endif %}
-            </nav>
-            {% if msg.VisitorCanComment %}
-            <form class="msg-comment-target">
-                <input type="hidden" name="mid" value="{{ msg.mid }}"/>
-                <div class="msg-comment">
-                    <div class="ta-wrapper">
-                        <textarea name="body" rows="1" class="reply" placeholder="{{ i18n("messages","message.writeComment") }}"></textarea>
-                    </div>
-                </div>
-            </form>
-            {% endif %}
-            {% if recomm is not empty %}
-            <div class="msg-recomms">{{ i18n("messages","message.recommendedBy") }}
-                {% for rec in recomm %}
-                <a href="/{{ rec }}/">@{{ rec }}</a>{% if loop.index < (loop.length - 1) %}, {% endif %}
-                {% endfor %}
-                {% if msg.likes > recomm.size() %}
-                    &nbsp;{{ i18n("messages","message.recommendedOthers", msg.likes - recomm.size()) }}
-                {% endif %}
-            </div>
-            {% endif %}
-        </div>
-    </li>
-</ul>
-<div class="title2">
-    {% if visitor.uid > 0 %}
-    <img src="/api/thread/mark_read/{{ msg.mid }}-{{ msg.rid }}.gif?hash={{visitor.authHash}}" />
-    {% endif %}
-    <h2>{{ i18n("messages","reply.replies") }} ({{ replies.size() }})</h2>
-</div>
-
-<ul id="replies">
-    {% for msg in replies %}
-    <li id="{{ msg.rid }}" class="msg">
-        <div class="msg-cont">
-            <div class="msg-header" data-uri="{{ msg.user.uri }}">
-                {% if not msg.user.banned %}
-                <a class="a-username" href="/{{ msg.user.name }}/">{{ msg.user.name }}</a>
-                <div class="msg-avatar">
-                    <a class="a-username" href="/{{ msg.user.name }}/">
-                        <img src="//i.juick.com/a/{{ msg.user.uid }}.png" alt="{{ msg.user.name }}"/>
-                    </a>
-                </div>
-                {% else %}
-                [удалено]:
-                <div class="msg-avatar">
-                    <img src="//i.juick.com/av-96.png"/>
-                </div>
-                {% endif %}
-                <div class="msg-ts">
-                    <a href="/{{ msg.mid }}#{{ msg.rid }}">
-                        <time datetime="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }}Z"
-                              title="{{ msg.timestamp | timestamp | date('yyyy-MM-dd HH:mm:ss') }} GMT">
-                            {{ msg.timestamp | prettyTime }}
-                        </time>
-                    </a>
-                </div>
-            </div>
-            <div class="msg-txt">{{ msg | formatMessage }}</div>
-            {% if msg.AttachmentType is not empty %}
-            <div class="msg-media">
-                <a href="//i.juick.com/p/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" data-fname="{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}">
-                    <img src="//i.juick.com/photos-512/{{ msg.mid }}-{{ msg.rid }}.{{ msg.AttachmentType }}" alt=""/>
-                </a>
-            </div>
-            {% endif %}
-            <div class="msg-links">/{{ msg.rid }}
-                {% if msg.replyto > 0 %}
-                {{ i18n("messages","reply.inReplyTo") }} <a href="#{{ msg.replyto }}">/{{ msg.replyto }}</a>
-                {% endif %}
-                {% if msg.VisitorCanComment %}
-                &middot; <a href="/post?body=%23{{ msg.mid }}/{{ msg.rid }}%20" class="a-thread-comment">{{ i18n("messages","reply.reply") }}</a>
-            </div>
-            <div class="msg-comment-target msg-comment-hidden"></div>
-            {% elseif visitor.uid == 0 %}
-            &middot; <a href="#" class="a-login">{{ i18n("messages","reply.reply") }}</a>
-        </div>
-        {% else %}
-        </div>
-        {% endif %}
-        </div>
-    </li>
-    {% endfor %}
-</ul>
-{% endblock %}
-{% block "column" %}
-{% include "views/partial/usercolumn" %}
-{% endblock %}
\ No newline at end of file