From 2f682b5e3cfc3fc5f961b60129be7bc90e0d6a03 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 28 Dec 2016 22:38:21 +0300 Subject: juick-www: now on spring-webmvc --- juick-www/src/main/resources/juick.conf.example | 6 + juick-www/src/main/resources/layouts/content.html | 27 ---- juick-www/src/main/resources/layouts/rss.xml | 38 ----- juick-www/src/main/resources/views/404.html | 11 -- juick-www/src/main/resources/views/help.html | 10 -- .../src/main/resources/views/partial/footer.html | 34 ----- .../main/resources/views/partial/homecolumn.html | 6 - .../main/resources/views/partial/navigation.html | 37 ----- .../resources/views/partial/settings_tabs.html | 5 - .../src/main/resources/views/partial/tags.html | 3 - juick-www/src/main/resources/views/pm_inbox.html | 37 ----- juick-www/src/main/resources/views/pm_sent.html | 33 ----- .../src/main/resources/views/settings_about.html | 20 --- .../main/resources/views/settings_auth-email.html | 9 -- .../src/main/resources/views/settings_main.html | 156 --------------------- .../main/resources/views/settings_password.html | 17 --- .../src/main/resources/views/settings_privacy.html | 9 -- .../src/main/resources/views/settings_result.html | 9 -- juick-www/src/main/resources/views/signup.html | 41 ------ 19 files changed, 6 insertions(+), 502 deletions(-) create mode 100644 juick-www/src/main/resources/juick.conf.example delete mode 100644 juick-www/src/main/resources/layouts/content.html delete mode 100644 juick-www/src/main/resources/layouts/rss.xml delete mode 100644 juick-www/src/main/resources/views/404.html delete mode 100644 juick-www/src/main/resources/views/help.html delete mode 100644 juick-www/src/main/resources/views/partial/footer.html delete mode 100644 juick-www/src/main/resources/views/partial/homecolumn.html delete mode 100644 juick-www/src/main/resources/views/partial/navigation.html delete mode 100644 juick-www/src/main/resources/views/partial/settings_tabs.html delete mode 100644 juick-www/src/main/resources/views/partial/tags.html delete mode 100644 juick-www/src/main/resources/views/pm_inbox.html delete mode 100644 juick-www/src/main/resources/views/pm_sent.html delete mode 100644 juick-www/src/main/resources/views/settings_about.html delete mode 100644 juick-www/src/main/resources/views/settings_auth-email.html delete mode 100644 juick-www/src/main/resources/views/settings_main.html delete mode 100644 juick-www/src/main/resources/views/settings_password.html delete mode 100644 juick-www/src/main/resources/views/settings_privacy.html delete mode 100644 juick-www/src/main/resources/views/settings_result.html delete mode 100644 juick-www/src/main/resources/views/signup.html (limited to 'juick-www/src/main/resources') diff --git a/juick-www/src/main/resources/juick.conf.example b/juick-www/src/main/resources/juick.conf.example new file mode 100644 index 00000000..bbe2a9e5 --- /dev/null +++ b/juick-www/src/main/resources/juick.conf.example @@ -0,0 +1,6 @@ +mysql_username=username +xmpp_password=secret +sape_user=usertoken +wns_application_sip=ms-app://x-1-11-1-1111111111-... +wns_client_secret=secret +xmpp_disabled=false \ No newline at end of file diff --git a/juick-www/src/main/resources/layouts/content.html b/juick-www/src/main/resources/layouts/content.html deleted file mode 100644 index ef12382c..00000000 --- a/juick-www/src/main/resources/layouts/content.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - {% block headers %} - {{ headers | raw }} - {% endblock %} - {{ title }} - - - - - {% include "views/partial/navigation.html" %} -
- {% block content %} - {% endblock %} -
- - {% include "views/partial/footer.html" %} - - \ No newline at end of file diff --git a/juick-www/src/main/resources/layouts/rss.xml b/juick-www/src/main/resources/layouts/rss.xml deleted file mode 100644 index 23866c8a..00000000 --- a/juick-www/src/main/resources/layouts/rss.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {{ user.getName() }} - Juick - http://juick.com/{{ user.getName() }}/ - The latest messages by @{{ user.getName() }} at Juick - - http://i.juick.com/a/{{ user.getUid() }}.png - {{ user.getName() }} - Juick - http://juick.com/{{ user.getName() }}/ - - {% for msg in msgs %} - - http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }} - http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }} - <![CDATA[@{{ msg.getUser().getName() }}: {% for tag in msg.getTags() %} *{{ tag }}{% endfor %}]]> - - {{ sdfRSS.format(msg.getDate()) }} - http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }} - {% for tag in msg.getTags() %} - {{ tag }} - {% endfor %} - {% if msg.getAttachmentType() is not empty %} - {% if msg.getAttachmentType() == "jpg" %} - - - {% elseif msg.getAttachmentType() == "png" %} - - - {% endif %} - {% endif %} - - - {% endfor %} - - diff --git a/juick-www/src/main/resources/views/404.html b/juick-www/src/main/resources/views/404.html deleted file mode 100644 index c993df4b..00000000 --- a/juick-www/src/main/resources/views/404.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-

Страница не найдена

-

Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.

-
-{% endblock %} - -{% block "column" %} -{% include "views/partial/homecolumn.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/help.html b/juick-www/src/main/resources/views/help.html deleted file mode 100644 index 3d9960d1..00000000 --- a/juick-www/src/main/resources/views/help.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
- {{ content | raw }} -
-{% endblock %} - -{% block "column" %} -{{ navigation | raw }} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/partial/footer.html b/juick-www/src/main/resources/views/partial/footer.html deleted file mode 100644 index 6978a2c0..00000000 --- a/juick-www/src/main/resources/views/partial/footer.html +++ /dev/null @@ -1,34 +0,0 @@ - - \ No newline at end of file diff --git a/juick-www/src/main/resources/views/partial/homecolumn.html b/juick-www/src/main/resources/views/partial/homecolumn.html deleted file mode 100644 index 5293918d..00000000 --- a/juick-www/src/main/resources/views/partial/homecolumn.html +++ /dev/null @@ -1,6 +0,0 @@ -

- {% include "views/partial/tags.html" %} - {% if showAdv %} - конструктор сайтов - {% endif %} -

\ No newline at end of file diff --git a/juick-www/src/main/resources/views/partial/navigation.html b/juick-www/src/main/resources/views/partial/navigation.html deleted file mode 100644 index 2863d0c3..00000000 --- a/juick-www/src/main/resources/views/partial/navigation.html +++ /dev/null @@ -1,37 +0,0 @@ -
- - - -
- {% if visitor.getUID() > 0 %} - - - {% else %} -

Чтобы добавлять сообщения и комментарии, представьтесь. -

- {% endif %} -
-
diff --git a/juick-www/src/main/resources/views/partial/settings_tabs.html b/juick-www/src/main/resources/views/partial/settings_tabs.html deleted file mode 100644 index d7901d5e..00000000 --- a/juick-www/src/main/resources/views/partial/settings_tabs.html +++ /dev/null @@ -1,5 +0,0 @@ -
\ No newline at end of file diff --git a/juick-www/src/main/resources/views/partial/tags.html b/juick-www/src/main/resources/views/partial/tags.html deleted file mode 100644 index 4d05b7fb..00000000 --- a/juick-www/src/main/resources/views/partial/tags.html +++ /dev/null @@ -1,3 +0,0 @@ -{% for tag in tags %} - {{ tag }} -{% endfor %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/pm_inbox.html b/juick-www/src/main/resources/views/pm_inbox.html deleted file mode 100644 index 36b3e511..00000000 --- a/juick-www/src/main/resources/views/pm_inbox.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -{% if not msgs.isEmpty() %} - -{% endif %} -{% endblock %} -{% block "column" %} -{% include "views/partial/homecolumn.html" %} -{% endblock %} diff --git a/juick-www/src/main/resources/views/pm_sent.html b/juick-www/src/main/resources/views/pm_sent.html deleted file mode 100644 index 7c6fb686..00000000 --- a/juick-www/src/main/resources/views/pm_sent.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-
-
To:
-
-
-
-
-{% if not msgs.isEmpty() %} - -{% endif %} -{% endblock %} -{% block "column" %} -{% include "views/partial/homecolumn.html" %} -{% endblock %} diff --git a/juick-www/src/main/resources/views/settings_about.html b/juick-www/src/main/resources/views/settings_about.html deleted file mode 100644 index 0252af35..00000000 --- a/juick-www/src/main/resources/views/settings_about.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-
-

Full name:

-

Country:

-

URL:
- Please, start with "http://"

-

About:
-
- Max. 255 symbols

-

Avatar:
- Recommendations: PNG, 96x96, <50Kb. Also, JPG and GIF supported.

-

-
-
-{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/settings_auth-email.html b/juick-www/src/main/resources/views/settings_auth-email.html deleted file mode 100644 index 79691083..00000000 --- a/juick-www/src/main/resources/views/settings_auth-email.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-

{{ result }}

Settings.

-
-{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/settings_main.html b/juick-www/src/main/resources/views/settings_main.html deleted file mode 100644 index f4630be2..00000000 --- a/juick-www/src/main/resources/views/settings_main.html +++ /dev/null @@ -1,156 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-

Настройки

-
-
- Notification options -

Reply notifications ("Message posted")

-

Subscriptions notifications ("@user subscribed...")

-

Posts recommendations ("Recommended by @user")

-

-
-
-
- - Telegram - {% if telegram_name is not empty %} -
-
Telegram: {{ telegram_name }} — - - -
-
- {% else %} -

To connect Telegram account: send any text message to @Juick_bot -

- {% endif %} -
-
-
- - XMPP accounts - -

Your accounts:

-

- {% for jid in jids %} -
- {% endfor %} - {% for auth in auths %} - - — Confirm
- {% endfor %} -

- {% if jids is not empty %} -

- {% endif %} -

To add new jabber account: send any text message to juick@juick.com -

-
-
-
- - E-mail - -
-

Add account:
- - - -

-
-
-

Your accounts:

-

- {% for email in emails %} -
- {% endfor %} - {% if emails is empty %} - -

- {% else %} -

-

- {% endif %} -
- {% if emails is not empty %} -
-

You can receive all your subscriptions by email:
- Sent to every day at - -

-
- {% endif %} -

 

-

You can post to Juick via e-mail. Send your plain text - messages to special secret e-mail. You can attach one photo or video file.

-

Secret email: {% if ehash is not empty %} {{ ehash }} {% else %}-{% endif %}

-
-

-
-
-
- - Facebook - - {% if fbstatus.isConnected() %} - {% if fbstatus.isCrosspostEnabled() %} -
-
- Facebook: Enabled — - - -
-
- {% else %} -
-
- Facebook: Disabled — - - -
-
- {% endif %} - {% else %} -

Cross-posting to Facebook: Connect to Facebook

- {% endif %} -
-
- - Twitter - {% if twitter_name is not empty %} -
-
Twitter: {{ twitter_name }} — - - -
-
- {% else %} -

Cross-posting to Twitter: Connect to Twitter

- {% endif %} -
- -
-{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/settings_password.html b/juick-www/src/main/resources/views/settings_password.html deleted file mode 100644 index e9c2dce0..00000000 --- a/juick-www/src/main/resources/views/settings_password.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-
- Changing your password -
- -

Change password:
- (max. length - 16 symbols)

-
-
-
-{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/settings_privacy.html b/juick-www/src/main/resources/views/settings_privacy.html deleted file mode 100644 index 48756d8e..00000000 --- a/juick-www/src/main/resources/views/settings_privacy.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-

Privacy

-
-{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/settings_result.html b/juick-www/src/main/resources/views/settings_result.html deleted file mode 100644 index 3f5482d4..00000000 --- a/juick-www/src/main/resources/views/settings_result.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -
-

{{ result | raw }}

-
-{% endblock %} -{% block "column" %} -{% include "views/partial/settings_tabs.html" %} -{% endblock %} \ No newline at end of file diff --git a/juick-www/src/main/resources/views/signup.html b/juick-www/src/main/resources/views/signup.html deleted file mode 100644 index 724ad961..00000000 --- a/juick-www/src/main/resources/views/signup.html +++ /dev/null @@ -1,41 +0,0 @@ -{% extends "layouts/content.html" %} -{% block content %} -

- {% if type | slice(0, 1) == 'f' %} - Facebook - {% elseif type | slice(0, 1) == 'v' %} - VKontakte - {% elseif type | slice(0, 1) == 'x' %} - XMPP - {% elseif type | slice(0, 1) == 'd' %} - Telegram - {% endif %} - {{ account | raw }}

- -

Связать с существующим аккаунтом Juick

-
- - - - {% if visitor.getUID() > 0 %} - - {% else %} -

Имя пользователя:

-

Пароль:

-

- {% endif %} -
- -
- -

Создать новый аккаунт Juick

-
- - - -

Имя пользователя:
(От 2-х до 16-и латинских символов - и/или цифр, дефис)

-

Пароль:
(от 6-и до 32-х символов)

-

-
-{% endblock %} \ No newline at end of file -- cgit v1.2.3