-
-
-
-const cbForm = (props) =>
- {props.error}
-
-
-
-
-const mapCBFormDispatchToProps = (dispatch) => {
- return {
- sendForm: (props) => {dispatch(sendForm(props))},
- }
-}
-const mapCBFormStateToProps = (state) => {
- return {
- sending: state.loading.cbform,
- result: state.cbFormState.result,
- }
-}
-
-const mapInputPropsToDispatch = (inputType, stateName) => (dispatch) => {
- return {
- checkValue: () => dispatch(cbFormCheckValueAction(stateName || inputType)),
- setValue: (e="") => dispatch(cbFormValueAction(stateName || inputType, (typeof(e)==='string'?e:e.target.value)))
- }
-}
-const mapStateToInputProps = (inputType,stateName) => (state) => {
- return {
- ftype: inputType,
- display: true,
- val: state.cbFormState[stateName || inputType],
- incorrect: (stateName||inputType) in state.cbFormState.incorrect,
- error: state.cbFormState.incorrect[stateName || inputType]
- }
-}
-
-//const NameField = ReactRedux.connect(mapStateToInputProps('name'), mapInputPropsToDispatch('name'))(InputField);
-const EmailField = ReactRedux.connect(mapStateToInputProps('email'), mapInputPropsToDispatch('email'))(InputField);
-//const SubjectField = ReactRedux.connect(mapStateToInputProps('subject'), mapInputPropsToDispatch('subject'))(InputField);
-const RequestField = ReactRedux.connect(mapStateToInputProps('message'), mapInputPropsToDispatch('message'))(TextArea);
-const Captcha = ReactRedux.connect(mapStateToInputProps('captcha'),mapInputPropsToDispatch('captcha'))(captcha);
-
-const cbFormActionResult = (reason) => ({type: CBFORM, kind: RESULT, value: reason})
-const cbFormValueAction = (field, value) =>({type:CBFORM, kind:SET, value: {[field]:value}})
-const cbFormErrorAction = (field, error) => ({type:CBFORM, kind:ERROR, value:{[field]:error} })
-const cbFormCheckValueAction = (field) => (dispatch, getState) => {
- if (field == 'message') {return}
- let state = getState()
- let res = check[field](state.cbFormState)
- dispatch(cbFormErrorAction(field, res))
- if (res != "") {
- console.log('Value for', field, 'did not pass check with msg:', res)
- }
-}
-
-const handleSubmit = (props) => (e) => {
- e.preventDefault();
- props.sendForm(props);
- }
-
-function sendForm (props) {
- return (dispatch,getState) => {
- let state = getState();
- if (state.loading.cbform) {
- //doubleclick :(
- console.log('double click in callback post')
- return;
- }
- dispatch(itemLoading('cbform'))
- //let fields = ['name','subject','email','captcha', 'message'];
- let fields = ['email','captcha', 'message'];
- fields.forEach((elem) => {
- if (state.cbFormState[elem]) {dispatch(cbFormCheckValueAction(elem))}
- });
- state=getState();
- if (isEmpty(state.cbFormState.incorrect)) {
- let body={};
- fields.forEach((elem) => {
- if (state.cbFormState[elem]) {
- let value = state.cbFormState[elem];
- Object.assign(body,{[elem]:value});
- }
- });
- fetch(config.apiBase + 'feedback', {
- method: 'POST',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- credentials: 'include',
- body: JSON.stringify(body)
- }).then(checkFetchStatus)
- .then((json) => {
- if (json['result'] == 'ok'){
- dispatch(cbFormActionResult())
- } else {
- dispatch(cbFormActionResult(json['error']))
- }
- if (typeof(grecaptcha) !== 'undefined') {
- grecaptcha.reset()
- }
- // prevent multiple posting on success
- dispatch(cbFormValueAction('email',''))
- dispatch(itemLoading('cbform'))
- })
- .catch((error) => {
- console.log(error);
- dispatch(cbFormErrorAction("An error occured. Please, retry"))
- dispatch(itemLoading('cbform'))
- });
- } else {
- dispatch(itemLoading('cbform'))
- }
- }
-}
-export let cbFormState = (state={incorrect:{}, email:"", message:"", result:"", captcha:""}, action) => {
- if (action.type != CBFORM) {return state}
- if (action.kind == RESULT) {return Object.assign({}, state, {result:"Ваше сообщение доставлено администратору и на него скоро ответят."})}
- if (action.kind == SET) return Object.assign({}, state, action.value)
- if (action.kind == ERROR) {
- let field = Object.keys(action.value)[0]
- if (action.value[field] == "") {
- let new_incorrect = Object.assign({}, state.incorrect)
- delete new_incorrect[field]
- return Object.assign({}, state, {incorrect: new_incorrect})
- } else {
- return Object.assign({}, state, {incorrect: Object.assign({}, state.incorrect, action.value)})
- }
- }
- return state;
-}
-
-
-export const CallbackForm = ReactRedux.connect(mapCBFormStateToProps,mapCBFormDispatchToProps)(cbForm)
diff --git a/components/captcha.js b/components/captcha.js
deleted file mode 100644
index d9e010f..0000000
--- a/components/captcha.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import {captchaSiteKey} from './config.js'
-import * as React from 'react'
-
-export const resetCaptcha = (cptID) => {
- console.log('trying to reset captcha');
- if (typeof(cptId) === "undefined") {
- if(typeof(window.grecaptcha) !== "undefined" && typeof(window.cptID) !== "undefined") {
- console.log('found global recaptcha');
- try {
- window.grecaptcha.reset(window.cptID)
- } catch (err) {
- console.log('error reseting captcha', err)
- }
- } else {
- console.log('no global captcha could be found for reset!')
- }
- } else {
- if (typeof(window.grecaptcha) !== "undefined") {
- console.log('found',cptID, 'recaptcha');
- try {
- window.grecaptcha.reset(cptID)
- } catch (err) {
- console.log('error reseting captcha', err)
- }
- } else {
- console.log('no local captcha could be found for reset!')
- }
- }
-}
-
-export class Recaptcha extends React.Component {
- constructor(props) {
- super(props);
- //this.props = Object.assign({},props);
- }
- componentWillUnmount () {
- resetCaptcha(window.cptID)
- }
- renderCaptcha (that) { return () => {
- console.log('that in captcha is', that)
- window.cptID = grecaptcha.render("recaptcha",
- {"sitekey": that.props.sitekey,
- "theme": that.props.theme,
- "callback": that.props.callback,
- "data-expired-callback": that.props.expireCallback,
- "size": that.props.size,
- "tabIndex": that.props.tabIndex
- })
-
- }}
- componentDidMount () {
- if (typeof (grecaptcha) === "undefined") {
- window.renderCaptcha = this.renderCaptcha(this);
- var script = document.createElement('script');
- script.type = 'text/javascript';
- script.src = 'https://www.google.com/recaptcha/api.js?render=explicit&onload=renderCaptcha';
- script.async = true;
- document.body.appendChild(script);
- } else {
- this.renderCaptcha(this)();
- }
- }
- render() {
- return
- }
-}
-
-Recaptcha.PropTypes = {
- sitekey: React.PropTypes.string,
- theme: React.PropTypes.string,
- callback: React.PropTypes.func.isRequired,
- expireCallback: React.PropTypes.func.isRequired,
- size: React.PropTypes.string,
- tabIndex: React.PropTypes.number.isRequired,
- className: React.PropTypes.string
-}
-Recaptcha.defaultProps = {
- sitekey: captchaSiteKey,
- theme: "light",
- size: "normal"
-}
diff --git a/components/carousel.js b/components/carousel.js
deleted file mode 100644
index 47e0d1b..0000000
--- a/components/carousel.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import * as React from 'react'
-import * as ReactRedux from 'react-redux'
-const platforms = [
- {id: 0, name:"Windows"},
- {id: 1, name:"WinPhone"},
- {id: 2, name:"OSX"},
- {id: 3, name:"IOS"},
- {id: 4, name:"Linux"},
- {id: 5, name:"Android"}
-];
-const clients = [
- {Name: "Xabber", ImgUrl: "https://lh3.googleusercontent.com/5ZCn-z0We-puYjQ_t1m3RATzuakUurga5gRvWkpNVZHhmgdHvIQj_tpvs93CKebOqquT=h600", Description: "Jabber Клиент с открытым исходным кодом, простым и аккуратным дизайном. Можно использовать одновременно с несколькими аккаунтами. Разрабатывается с целью быть лучшим андроид клиентом: не просто открытым, но и свободным от рекламы.
Поддерживает в том числе:
- Modern material interface
- Multiple accounts support
- Multi user chat (MUC)
- Chat history
- Avatars
- Notification setting for each contact
- Stream compression
- OTR, TLS, SSL, SASL
- Message delivery receipts
Открытый jabber клиент разработанный специально для Android 4+
Создавался с целью быть как можно более красивым и удобным, без ущерба для безопасности использования.
Поддерживает несколько аккаунтов, MUC, любые виды шифрования (OMEMO, OTR, PGP), отправку и приём изображений. Интегрируется с адресной книгой телефона. Почти не влияет на потребление электропитания.
", tags: [5]}, - {Name: "Yaxim", ImgUrl: "https://lh4.ggpht.com/9VvBWxJ7-S6SWb9_x8uVS8C_VVe9khX649Dzm_MWQ12a88hYexDCmMmgF4DuwEssHQ=h600", Description: "Минималистичный клиент для Android.
Несмотря на простой дизайн, yaxim стремится быть надёжным и полезным приложением. Из существенных плюсов можно отметить легковесность, поддержку конференций, подтверждения о доставке сообщений.
", tags: [5] }, - {Name: "Adium", ImgUrl: "https://upload.wikimedia.org/wikipedia/commons/c/c5/AdiumX_screenshot.png", Description: "Универсальный клиент мгновенного обмена сообщениями (мессенджер) для Mac OS X-систем, который поддерживает множество протоколов, и выпущен под лицензией GNU GPL.
Поддержка русского языка, использование многочисленных протоколов, tab-ы, уникальные возможности настройки интерфейса, возможность шифрования сообщений - вот далеко не полный список его возможностей.
http://www.ixbt.com/td/adium.shtml
", tags: [2]}, - {Name: "Pidgin", ImgUrl: "https://upload.wikimedia.org/wikipedia/commons/b/bc/Pidgin_Ubuntu_Buddy_List.png", Description: "Один из лучших кроссплатформенных клиентов. Поддерживает сразу несколько протоколов и аккаунтов (ICQ, Jabber, MSN, умеет Twitter)
Позволяет сохранять комментарии к пользователям из контакт‐листа. Может объединять несколько контактов в один метаконтакт.
https://ru.wikipedia.org/wiki/Pidgin", tags: [0,2,4]}, - {Name: "IM+", ImgUrl: "https://upload.wikimedia.org/wikipedia/ru/c/c2/Im_plus_screenshot.png", Description: "кроссплатформенная программа обмена мгновенными сообщениями для мобильных устройств, а также кроссплатформенное веб-приложение. Поддерживает протоколы Twitter, Facebook, Google Talk, XMPP, Yahoo!, AOL Instant Messenger, ICQ, Myspace, Windows Live Messenger/MSN, ВКонтакте, Mail.Ru Агент, Я.Онлайн, Одноклассники.ru.
Позволяет обмениваться файлами, сохраняет историю, допускает чат сразу с несколькими собеседниками, поддерживает скины и графические смайлики.
", tags: [0, 1, 3, 5]} -]; -const emptyPage = [{Name:"Ничего не нашлось",Description:"По вашим критериям не нашлось ни одного клиента. Попробуйте подобрать пару хороших клиентов для разных платформ. Или напишите свой: чем вы хуже других?", tags:[]}] -import {Footer} from "./menus.js"; -import {isEmpty} from "./helpers.js"; -const TAB = 'TAB'; // tab changed action -const TAG = 'TAG'; // client tag lock action - -const CarouselCell = (props) => -
-
-const OsTags = (props) =>
-
- ![]({props.Client.ImgUrl||""})
-
-
- {props.Client.Name}
-{props.Client.Name}
- - - {
- props.platforms.map( (tag) =>
-
-
- {/*tag.name*/}
-
- )}
-var Carousel = React.createClass({
- componentWillUpdate: function (newProps) {
- if (this.props.lockedTags != newProps.lockedTags) {
- this.flkty.deactivate();
- }
- },
- componentDidUpdate: function (oldProps) {
- //console.log('tags changes?',this.props,oldProps);
- if (this.props.lockedTags != oldProps.lockedTags) {
- this.flkty.activate();
- //this.flkty.reloadCells();
- }
- },
- componentDidMount: function () {
- if (typeof(document.querySelector) !== "undefined") {
- var elem = document.querySelector('.main-carousel');
- require.ensure(["flickity"], (require)=> {
- let flickity = require('flickity')
- var flkty = new flickity( elem, {
- contain: true,
- setGallerySize: true,
- wrapAround: true,
- noDomMod: true,
- dragThreshold: 20,
- watchCSS: true
- });
- flkty.on('cellSelect', this.props.onCellSelect(flkty));
- this.flkty = flkty;
- }, 'flickity');
- }
- },
- render: function() {
- var cells = this.props.clients.map(function(client){
- return (
-
-success.register =
- Успешно
-Наш охранный ёж решил,
- что может пустить вас.
-
- 
-
-success.remind =
- Успешно
-Выбранное вами имя зарегистрировано и на указанный email было отправлено письмо с дальнейшими инструкциями по активации аккаунта. Ссылка будет работать одни сутки.
-Пожалуйста, пройдите по ссылке из письма, чтобы завершить регистрацию.
- -
-
-
-
-success.password =
- Успешно
-Наши ежи с трудом запоминают новые пароли, но мы знаем как упростить эту задачу. Вам на почту была отправлена ссылка с секретным словом для обучения ежей.
-Используйте ссылку из письма, чтобы указать новый пароль.
-
-
-
-
-
-let errors = {}
-errors['not-authorized'] = 'Неверный логин или пароль'
-errors['bad-key'] = 'Неверный токен. Попробуйте запросить ссылку ещё раз.'
-errors['weak-password'] = 'Попробуйте ещё раз с более сложным паролем.'
-errors['email-exceeds'] = 'На этот email зарегистрировано слишком много аккаунтов. Попробуйте другой.'
-errors['email-not-exists'] = 'Мы не знаем, куда отправить письмо. Возможно, аккаунт был удалён.'
-errors['invalid-content-type'] = 'Упс! Что-то пошло не так. Попробуйте ещё раз или сообщите нам.'
-errors['service-error'] = 'Упс! Что-то пошло не так. Попробуйте ещё раз или сообщите нам.'
-errors['incomplete-data'] = 'Упс! Что-то пошло не так. Попробуйте ещё раз или сообщите нам.'
-errors['captcha-failure'] = 'Капча думает, что вы робот. Попробуйте ещё раз.'
-errors['login-already-exists'] = 'Такая учётная запись уже есть :( Попробуйте другой логин.'
-errors['item-not-found'] = 'Упс! Что-то пошло не так. Попробуйте ещё раз или сообщите нам.'
-errors['invalid-email'] = 'Сервер считает, что ваша почта "плохая". Попробуйте другую.'
-errors['invalid-jid'] = 'Имя пользователя не прошло проверку сервера. Вы точно не почту вводите? Попробуйте другой псевдоним.'
-errors['email-not-match'] = 'Имя пользователя и почта не совпадают.'
-errors['one-time-email'] = 'Выберите другой одноразовый ящик, этот мы знаем.'
-errors['unknown-mail-domain'] = 'Наш почтовый сервер не знает про этот домен. Попробуйте другой домен или сообщите нам об ошибке.'
-
-
-export {success, errors}
diff --git a/components/helpers.js b/components/helpers.js
deleted file mode 100644
index 2ccd453..0000000
--- a/components/helpers.js
+++ /dev/null
@@ -1,31 +0,0 @@
-export function isEmpty(object) {
- for(var key in object) {
- if(object.hasOwnProperty(key)){
- return false;
- }
- }
- return true;
-}
-export function some(object, test) {
- var i = 0
- for(var key in object) {
- if(object.hasOwnProperty(key)){
- if (test(object[key], i, object)) {
- return true
- } else {
- i+=1
- }}}
- return false
-}
-export function checkFetchStatus(response, debug=false) {
- console.log('checking status of', response);
- if (response.status >= 200 && response.status < 300) {
- if (debug) {console.log('got response:',response);}
- return response.json()
- } else {
- var error = new Error(response.statusText)
- error.response = response
- throw error
- }
-}
-
diff --git a/components/history.js b/components/history.js
deleted file mode 100644
index 361e6d6..0000000
--- a/components/history.js
+++ /dev/null
@@ -1,249 +0,0 @@
-import {itemLoading} from './loading.state';
-import {isEmpty,checkFetchStatus} from './helpers'
-import { Scrollbars } from 'react-custom-scrollbars'
-import * as config from './config.js';
-import * as React from 'react';
-import * as ReactRedux from 'react-redux';
-
-const HISTORY = 'HISTORY'; // history actions
-const FETCH = 'FETCH'; // start fetching from server
-const PEER = 'PEER'; // save current chat peer jid
-const UPDATE = 'UPDATE'; // add messages into state
-const UREQ = 'REQUEST_UPDATE'; // request history update
-const ALLMSG = 'ALL_MSG'; // all messages from history are fetched
-const HEIGHT = 'HEIGHT'; // save previous scroller height to calculate offset later
-const LONG_INTERVAL = 5000; // poll for new messages every 5 seconds
-const SHORT_INTERVAL = 200; //
-
-class Scroller extends React.Component {
- render () {
- return
- }
-}
-
-const message = (props) => {
- let dt = new Date(props.ts/1000)
- return Успешно
-Пока мы пытаемся объяснить охранным ежам, что пароль изменился, попробуйте войти в личный кабинет с новым паролем.
-
-
-
-}
-const Message = message
-
-const Nomsgs = (props) =>
- {props.peer_name}
- {props.my_name}
-
-
-
- {'' + dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()}
- {'' + dt.getHours() + ':' + dt.getMinutes()}
- {props.txt}
-
- Позднее здесь будет история общения с вашим собеседником
-
-
-class thread extends React.Component {
- checkScrollerVisible () {
- return () => {
- if (this.should_update) {
- this.should_update = false
- //let tp = this.scrollbar.refs.view.scrollHeight - this.scrollbar.refs.view.scrollTop
-
- //console.log('visible hight mark is', tp)
- //let tp = this.props.old_height
- if (! this.props.loading && ! this.props.no_more) {
- this.props.getMoreMessages(this.props.peer, this.props.oldest_ts)//, tp)
- }
- }
- }
- }
- componentDidMount () {
- if (this.scrollbar && (this.scrollbar.refs.view.scrollHeight !=0) ) {
- this.scrollbar.scrollToBottom()
- }
- if (this.props.peer)
- this.props.getMoreMessages(this.props.peer, this.props.oldest_ts)
- }
- componentWillReceiveProps (nextProps) {
- if ( (nextProps.messages.length != this.props.messages.length)
- && this.props.peer == nextProps.peer
- && this.scrollbar && nextProps.messages.length > 0) {
- //console.log('saving position for nextProps', nextProps)
- let srv = this.scrollbar.refs.view
- console.log('saving position:', srv.scrollHeight, srv.scrollTop, srv.scrollHeight - srv.scrollTop)
- this.props.saveScrollPosition(srv.scrollHeight - srv.scrollTop)
- }
- }
- componentDidUpdate (newprops){
- if (this.props.peer != newprops.peer ) {
- if (this.scrollbar) {
- this.scrollbar.scrollToBottom()
- }
- this.props.saveScrollPosition(null)
- }
- if (this.props.old_height && this.scrollbar) {
- let srv = this.scrollbar.refs.view
- console.log(this.props.messages.length, newprops.messages.length)
- console.log('unscrolling to', srv.scrollHeight, '-', this.props.old_height, srv.scrollHeight - this.props.old_height)
- this.scrollbar.scrollTop(srv.scrollHeight - this.props.old_height)
- this.should_update = true
- }
- //console.log('loading', this.props.loading, 'no_more', this.props.no_more)
- if (this.scrollbar && ! this.props.loading && ! this.props.no_more ){
- console.log('no more is', this.props.no_more)
- // basically, if DOM had settled, there are not enough messages,
- // but we didn't try fetching
- //console.log(scr.view.scrollHeight, '<=', scr.view.clientHeight)
- let srv = this.scrollbar.refs.view
- if (srv.scrollHeight <= srv.clientHeight) {
- console.log('visible high mark after update', srv.scrollHeight)
-
- this.props.getMoreMessages(this.props.peer, this.props.oldest_ts, srv.scrollHeight, this.props.old_height)
- }
- }
- }
- render () {
- let props = this.props
- let messages = []
- messages = props.messages.map((m, i) =>
- Ë Ë Ë
-
)}
- messages.push(È È È
)
- }
-
- return
- this.scrollbar = scrollbar}
- hideTracksWhenNotNeeded={true}
- onScrollAtTop={this.checkScrollerVisible()}
- edgeYThreshold={500}
- >
- {messages}
-
-
- }
-}
-const mapStateToThreadProps = (state) => {
- let msgs = []
- let oldest_ts = null
- let jid = state.MAMHistory.peer
- let peer = state.user.roster.filter((peer) => (peer.jid == jid))[0] || undefined
- let peer_name = peer && peer.name || state.MAMHistory.peer
- if (state.MAMHistory.msgs[state.MAMHistory.peer]) {
- let ids = Object.keys(state.MAMHistory.msgs[state.MAMHistory.peer]).sort()
- oldest_ts = ids[0]
- msgs = ids.map(
- (i) => state.MAMHistory.msgs[state.MAMHistory.peer][i]
- )
- }
- return {
- loading: state.loading[jid] || false,
- messages: msgs || [],
- no_more: (state.MAMHistory.no_more.indexOf(jid) != -1),
- old_height: state.MAMHistory.old_height,
- peer: state.MAMHistory.peer,
- peer_name: peer_name,
- my_name: state.user.vcard? state.user.vcard.NICKNAME : state.user.jid || "My precious",
- oldest_ts: oldest_ts
- }
-}
-const mapDispatchToThreadProps = (dispatch) => ({
- saveScrollPosition: (height) => dispatch(saveHeight(height)),
- getMoreMessages: (jid, timestamp, height, oldheight) => {
- if(!oldheight || (height != oldheight)) {dispatch(saveHeight(height))};
- dispatch(fetchHistory(jid, timestamp))
- },
- shouldUpdate: () => dispatch(requestHistoryUpdate(true))
-})
-
-export const Thread = ReactRedux.connect(mapStateToThreadProps, mapDispatchToThreadProps)(thread)
-
-const requestHistoryUpdate = (flag) => ({type: HISTORY, kind: UREQ, value: flag})
-const updateHistory = (jid, history) => (
- {type: HISTORY, kind: UPDATE, value: [jid, history]}
-)
-const setPeerJid = (jid) => ({type: HISTORY, kind: PEER, value: jid})
-const setEndReached = (jid) => ({type: HISTORY, kind: ALLMSG, value: jid})
-const saveHeight = (height) => ({type: HISTORY, kind: HEIGHT, value: height})
-
-export const setHistoryPeer = (jid) => (dispatch, getState) => {
- dispatch(setPeerJid(jid))
-}
-export const fetchHistory = (jid, timestamp=null) => (dispatch, getState) => {
- let state = getState()
- if (jid === undefined) return
- if (state.loading[jid]) {
- console.log('history for ', jid, ' is being fetched already')
- return
- }
- dispatch(itemLoading(jid))
- //console.log('fetching data since', timestamp)
- let body = Object.assign({jid:jid}, timestamp?{ts:parseInt(timestamp)}:{})
- fetch(config.apiBase + 'mam/messages', {
- method: 'POST',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- credentials: 'include',
- body: JSON.stringify(body)
- }).then((response) => checkFetchStatus(response,true)
- ).then((json) => {
- if ('error' in json && json.error != "") {
- //console.log('Error getting messages for '+ jid + ', something went wrong')
- console.log(json.error)
- }
- let messages = Object()
- if( json.messages) {
- json.messages.forEach((msg) => (messages[msg.ts] = msg))
- } else {
- dispatch(setEndReached(jid))
- }
- dispatch(updateHistory(jid, messages))
- dispatch(itemLoading(jid))
- }).catch((error)=>{
- console.log('Something went wront fetching messages for', jid,'.Message was:', error)
- dispatch(itemLoading(jid))
- })
-
-}
-
-export const MAMHistory = (state = {msgs:{}, no_more:[], old_height:null}, action) => {
- if (action.type != HISTORY) {return state}
- switch (action.kind) {
- case UPDATE: {
- let [jid, messages] = action.value
-
- let jid_messages = Object.assign({}, state.msgs[jid]||{}, messages)
-
-
- return Object.assign({},
- state,
- { msgs: Object.assign({}, state.msgs,
- {[jid]: jid_messages}
- )}
- )
- }
- case PEER: {
- return Object.assign({}, state, {peer: action.value, old_height: null})
- }
- case ALLMSG: {
- let no_more = [ ...state.no_more, action.value]
- return Object.assign({}, state, {no_more: no_more})
- }
- case HEIGHT: {
- return Object.assign({}, state, {old_height:action.value})
- }
- }
- return state;
-
-}
-
-
-
-
diff --git a/components/input.js b/components/input.js
deleted file mode 100644
index c222e04..0000000
--- a/components/input.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import * as React from 'react'
-
-export class TextArea extends React.Component{
- render () {
- let props=this.props;
- if (!props.display) {return null}
- return (
-
-
- {(props.incorrect)?
)
- }
-}
-
-export class InputField extends React.Component{
- componentDidMount() {
- this.props.focus && this.props.display && this._input.focus();
- }
- render () {
- let props=this.props;
- if (!props.display) {return null}
- return (
- {props.error}
- : ""
- }
-
- this._input=inp }
- />
- {(props.incorrect)?
)
- }
-}
-
-let check = {};
-check.login = (state) => {
- let Login = state.login;
- let Domains = state.domains;
- if (Login.length < 1) return "Введите логин, пожалуйста";
- if (Login.length > 512) return "Пожалуйста, используйте более короткий логин";
- if(!(typeof(Domains) === 'undefined')) {
- if (Login.indexOf('@') != -1) {
- let domain = Login.split('@',2)[1];
- console.log(domain);
- if (Domains.some((elem) => elem === domain)) {return "";}
- else return "Мы не поддерживаем домен "+domain;
- }
- //return "Логин не должен содержать символ '@'"
- };
-
- return "";
-};
-check.password = (state) => {
- let Password = state.password;
- if (Password.length <5) return "Пароль должен быть не менее 5 букв";
- if (Password.length >512) return "Пожалуйста, используйте более короткий пароль";
- return "";
-};
-check.email = (state) => {
- var filter=/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*$/ui;
- if (filter.test(state.email)) {
- return "";
- } else {
- return "Не больно-то это похоже на email адрес";
- }
-};
-check.captcha = (state) => {
- if (state.captcha.length > 1) {return ""}
- return "заполните, пожалуйста, капчу"
-};
-check.confirmation = (state) => {
- if (state.confirmation == state.password) {return ""}
- return "введённые пароли должны совпадать!"
-}
-
-export {check};
diff --git a/components/loading.state.js b/components/loading.state.js
deleted file mode 100644
index bb45b7d..0000000
--- a/components/loading.state.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export const LOAD = 'LOAD';
-export const itemLoading = (item) => ({type: LOAD, kind: item})
-export const loading = (state = {}, action) => {
- if (action.type != LOAD) return state
- console.log('trying set "',action.kind,'" item loading')
- let new_state = Object.assign({}, state)
- if (action.kind in new_state) {
- // invert value we have
- new_state[action.kind] = !new_state[action.kind]
- } else {
- // set loading, if key is not know
- new_state[action.kind] = true
- }
- return new_state
-}
diff --git a/components/loginForm.js b/components/loginForm.js
deleted file mode 100644
index dfb7ec0..0000000
--- a/components/loginForm.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import {Promise} from 'es6-promise';
-import {Link} from 'react-router';
-import * as ReactRedux from 'react-redux';
-import * as config from './config';
-import * as React from 'react';
-import * as Redux from 'redux';
-import 'whatwg-fetch';
-import {isEmpty,checkFetchStatus} from './helpers'
-import {Recaptcha} from './captcha.js'
-import {InputField, check} from './input.js'
-import {LOGINF, REGF, REMINDF, formAction, checkFormValueAction, formSetValueAction, formSuccessAction, formState, formValues, checkValue, submitForm} from './loginFormState.js'
-import * as msg from './form.messages.js'
-
-
-const handleSubmit = (props) => (e) => {
- e.preventDefault();
- props.sendForm(props);
- }
-
-const NewPasswordFormHeader = () => {props.error}
- : ""
- }
-
-
- Введите новый пароль
-
-
-
-const NoLinksFormHeader = (props) =>
- Вход
- Регистрация
-
-
-const FormHeader = (props) => {
- if (props.pwset) {return NewPasswordFormHeader(props) }
- if (props.nolinks) { return NoLinksFormHeader(props) }
- return (
-
- Вход
- Регистрация
- Сброс пароля
- props.router.push('/')} />
-
- )
-}
-const captcha = (props) => {
- if (props.display) return (
-
-
)
- return null
-}
-
-const FormItself = (props) =>
-
-
- {props.error}
-
-
-
-
-
-const Message = (props) => {
- if ( props.message ){
- return (
-
- {msg.success[props.result]}
-
)
- }
- return null
-}
-const LoginForm = React.createClass({
- contextTypes: {
- router: React.PropTypes.object
- },
- componentDidMount: function () {
- if (this.props.loggedin) {
- this.context.router.push('/personal')
- }
- },
- render: function () {
- let props=this.props
- if (props.loading) {
- return
-
-
- }
- return (
-
-
- )
- }
-});
-
-export function setLoginForm() {return formAction(LOGINF, false)}
-export function setRegForm(SecondStage=false) {return formAction(REGF, SecondStage)}
-export function setRemindForm(SecondStage=false) {return formAction(REMINDF, SecondStage)}
-export function setResetForm() {return formAction(REMINDF, true)}
-
-const mapLoginFormDispatchToProps = (dispatch) => {
- return {
- setLogin: () => {dispatch(setLoginForm())},
- setReg: () => {dispatch(setRegForm())},
- setRemind: () => {dispatch(setRemindForm())},
- sendForm: (props) => {dispatch(submitForm(props))},
- formSuccessAction: (kind, secondStage) => {dispatch(formSuccessAction(kind,secondStage))}
- }
-}
-const mapLoginFormStateToProps = (state) => {
- return {
- loggedin: state.user.loggedin || false,
- loading: !(('vcard' in state.loading ) || ('vcard' in state.user)) || ('vcard' in state.loading && state.loading.vcard),
- kind: state.loginForm.formState.kind,
- secondStage: state.loginForm.formState.secondStage,
- actionLabel: state.loginForm.formState.actionLabel,
- sending: state.loginForm.formState.sending,
- result: state.loginForm.formState.result,
- message: state.loginForm.formState.message
- }
-}
-const mapInputPropsToDispatch = (inputType, stateName) => (dispatch) => {
- return {
- checkValue: () => dispatch(checkFormValueAction(stateName || inputType)),
- setValue: (e="") => dispatch(formSetValueAction(stateName || inputType, (typeof(e)==='string'?e:e.target.value)))
- }
-}
-const mapStateToInputProps = (inputType,stateName) => (state) => {
- return {
- ftype: inputType,
- display: state.loginForm.formState[stateName || inputType],
- val: state.loginForm.formValues[stateName || inputType],
- incorrect: (stateName||inputType) in state.loginForm.formValues.incorrect,
- error: state.loginForm.formValues.incorrect[stateName || inputType]
- }
-}
-const LoginField = ReactRedux.connect(mapStateToInputProps('login'), mapInputPropsToDispatch('login'))(InputField);
-const PasswordField = ReactRedux.connect(mapStateToInputProps('password'), mapInputPropsToDispatch('password'))(InputField);
-const PasswordConfirmationField = ReactRedux.connect(mapStateToInputProps('password','confirmation'), mapInputPropsToDispatch('password','confirmation'))(InputField);
-const EmailField = ReactRedux.connect(mapStateToInputProps('email'), mapInputPropsToDispatch('email'))(InputField);
-const Captcha = ReactRedux.connect(mapStateToInputProps('captcha'),mapInputPropsToDispatch('captcha'))(captcha);
-export const loginForm = Redux.combineReducers({ formState, formValues})
-export const LoginFormConnected = ReactRedux.connect(mapLoginFormStateToProps, mapLoginFormDispatchToProps)(LoginForm);
-
-
diff --git a/components/loginFormState.js b/components/loginFormState.js
deleted file mode 100644
index 4d1818e..0000000
--- a/components/loginFormState.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import {InputField, check} from './input.js'
-import {isEmpty,checkFetchStatus} from './helpers'
-import * as config from './config';
-import * as msg from './form.messages.js'
-import {resetCaptcha} from './captcha.js'
-import {browserHistory as history} from 'react-router'
-import {setUserLoggedIn} from './user.js'
-
-let apiUrls = {'login':'auth', 'remind':'reset', 'register':'register'}
-const FORM = 'LFORM'; // login form actions
-
-export const LOGINF = 'login'; // make form to be a login form
-export const REGF = 'register'; // make form to be a registration form
-export const REMINDF = 'remind'; // make form to be a remind password form
-
-const SETFVAL = "SETFV" ; // set form value generic action
-const LOGINV = "LOGINV"; // set login value
-const EMAILV = "EMAILV"; // set email value
-const PASSWV = "PASSWV"; // set password value
-const CAPTCHAV = "CAPTCHAV"; // set recaptcha response
-
-const CHECKFV = "CHECK" ; // check form value action
-const CHKLOGIN = "CLOG" ; // check login value
-const CHKEMAIL = "CEMAIL"; // check email value
-const CHKPASS = "CPASS" ; // check password value
-const CHKCAPT = "CCAP" ; // check captcha value (ensure it is if needed)
-const CHKCNFR = "CCONFR"; // check password confirmation to match pw
-const CHKALL = "CALL" ; // check all fields of a form
-
-const SEND = "S"; // action to send form
-const GOT = "G"; // action to set state when request is done
-const SENDING = "S1"; // form state
-const FALTY = "F"; // form state in case of error
-
-
-export function formAction(actKind, value) {
- return {type:FORM, kind:actKind, value:value}
-}
-export function checkFormValueAction(field) {
- return formAction(CHECKFV, field)
-}
-
-function formActionSending() {
- return formAction(SEND, false)
-}
-export function formSetValueAction(kind, value) {
- return formAction(SETFVAL, {[kind]:value})
-}
-
-// is_msg displays text removing all inputs and setting redirect
-export function formActionResult(data, is_msg=false) {
- return formAction(GOT, {is_msg:is_msg, msg:data})
-}
-
-
-// runs checks for a field by type
-// returns an object to insert into new state
-// i.e. saves values for types other than checked
-function checkValue(type, state) {
- let incorrect = state.incorrect;
- let ckResult = (check[type])(state)
- if (ckResult == "") {
- delete(incorrect[type]);
- } else {
- incorrect[type] = ckResult;
- }
- return {incorrect:incorrect}
-}
-
-export function formValues (state={login:"", password:"", email:"",captcha:"", confirmation:"", incorrect:{}}, action){
- if (action.type != FORM) { return state };
- let newState = Object.assign({}, state);
- switch (action.kind) {
- case SETFVAL:
- let field = Object.keys(action.value)[0];
- Object.assign(newState, action.value);
- // skip cheking until it is forced
- if (! (field in newState.incorrect)) {
- return newState
- };
- Object.assign(newState, checkValue(field, newState));
- return newState;
- case CHECKFV:
- return Object.assign(newState, checkValue(action.value, newState));
- case LOGINF:
- case REGF:
- case REMINDF:
- //reset state of the form for each switch of type
- if (newState.captcha != "" ) {resetCaptcha()}
- return Object.assign(newState, {
- login:"", password:"",
- email:"", captcha:"",
- confirmation:"", incorrect:{}
- })
-
- }
- return state;
-}
-
-export function formState (state={
- login:true, password:true,
- email:false, captcha:true,
- confirmation: false, message: false,
- actionLabel:"Войти",
- kind:LOGINF, sending:false,
- secondStage: false,
- result:""
- }
- ,action){
- //console.log("formstate action:",state,action);
- if (action.type != FORM) {return state};
- let s = action.value ; // this is for action.value === SecondStage
- switch (action.kind) {
- case SEND: return Object.assign({}, state, {sending:!state.sending, result:""})
- case GOT: return Object.assign({}, state, {
- sending: false,
- message: action.value.is_msg,
- result: action.value.msg
- })
- case LOGINF: return Object.assign({}, state, {
- login: true, password: true,
- email: false, captcha: true,
- confirmation: false, message: false,
- actionLabel: "Войти", result: "",
- secondStage: false,
- kind:LOGINF
- })
- case REGF:
- case REMINDF:
- let newstate = {}
- if (action.value) {
- Object.assign(newstate, state, {
- login: false, password: true,
- email: false, captcha: false,
- confirmation: true, message: false,
- actionLabel: "Установить", result: "",
- secondStage: true, kind: action.kind
- })
-
- } else {
- Object.assign(newstate, state, {
- login: true, password: false,
- email: true, captcha: true,
- confirmation: false, message: false,
- actionLabel: "Регистрация", result: "",
- secondStage: false, kind: action.kind
- })
- if (action.kind == REMINDF) {
- Object.assign(newstate,
- {actionLabel: "Выслать пароль",
- email: false})
- }
- }
- return newstate
- default: return state
- }
-}
-
-
-const composeBodyForFetch = (dispatch, getState) => {
- let state=getState();
- let fields = ['login','password','email','captcha'];
- fields.forEach((elem) => {
- if (state.loginForm.formState[elem]) {dispatch(checkFormValueAction(elem))}
- });
-
- // renew state as check funstion should have processed it
- state=getState();
- if (! isEmpty(state.loginForm.formValues.incorrect)) {
- return null;
- } else {
- let body={};
- Object.assign(body,{kind:state.loginForm.formState.kind});
- // for each field get it's value, process and add into body
- fields.forEach((elem) => {
- if (state.loginForm.formState[elem]) {
- let value = state.loginForm.formValues[elem];
- if (elem == 'login') {
- if (value.indexOf('@') == -1) {
- console.log('index of @ is -1, adding domain to ', value);
- value = value.trim() + '@' + config.xmppDomain
- }
- value = value.toLowerCase()
- }
- Object.assign(body,{[elem]:value});
- }
- });
- return body;
- }
-}
-
-export function submitForm (props) {
- return (dispatch,getState) => {
- dispatch(formActionSending())
- let body = composeBodyForFetch( dispatch, getState);
-
- if (body) {
- if (typeof(props.routeParams) !== 'undefined' && typeof(props.routeParams.ehash) !== 'undefined') {
- Object.assign(body,{hash:props.routeParams.ehash})
- }
- fetch(config.apiBase + apiUrls[body.kind], {
- method: 'POST',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- credentials: 'include',
- body: JSON.stringify(body)
- }).then((response) => checkFetchStatus(response,true))
- .then((json) => {
- console.log('json response', json);
- resetCaptcha();
- dispatch(formSetValueAction('captcha', ""));
- if (json['result'] == 'ok'){
- dispatch(formSuccessAction(body.kind, props.secondStage))
- } else {
- dispatch(formActionResult(msg.errors[json['error']] || json['error']))
- }})
- .catch((error) => {console.log(error);dispatch(formActionResult("An error occured. Please, retry"))});
- } else {
- dispatch(formActionSending())
- }
- }
-}
-
-function formSuccessAction (kind, secondStage) {
- switch(kind) {
- case LOGINF: return (dispatch) => {
- dispatch(setUserLoggedIn())
- dispatch(formAction(GOT, {is_msg:true, msg:kind}));
- setTimeout(()=>{history.push('/personal')}, 2000)
- }
- case REGF:
- case REMINDF: return (dispatch) => {
- //
- dispatch(formAction(GOT, {is_msg: true, msg:secondStage?'password':kind}));
- setTimeout(()=>{history.push('/login')}, 2000)
- }
-
- }
-}
-
diff --git a/components/menus.js b/components/menus.js
deleted file mode 100644
index 49d103f..0000000
--- a/components/menus.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import {isEmpty} from './helpers';
-import {Link} from 'react-router';
-import {setVcard, setRoster, setJid} from "./user";
-import {Roster} from "./personal";
-import {itemLoading} from './loading.state';
-import Swipeable from 'react-swipeable';
-import * as React from 'react';
-import * as ReactRedux from 'react-redux';
-
-const LogoutMMItem = (props) => {
- if (props.loggedin) {
- return (
- e.stopPropagation()}>
-
- Выход
-
-
-
- )}
- else return null
-}
-
-class Mainmenu extends React.Component {
- render () {
- let props = this.props
- return (
-
- {props.message?
-
- }
-
-
- 
-
-
-
-
-
-
-
)
- }
-}
-
-const mapMMStateToProps = (state) => {
- let jid = state.MAMHistory.peer
- let peer = state.user.roster.filter((peer) => (peer.jid == jid))[0] || undefined
- let peer_name = peer && peer.name || state.MAMHistory.peer
- return {
- loggedin: state.user.loggedin,
- skipLogo: state.routing.locationBeforeTransitions && state.routing.locationBeforeTransitions.pathname == '/' || false,
- open: state.loading.menu || false,
- peer: state.MAMHistory.peer || undefined,
- peer_name: peer_name
- }
-}
-const mapDispatchToMMProps = (dispatch) => {
- return {
- getVcard: () => dispatch(setVcard(false)),
- getRoster: () => dispatch(setRoster(false)),
- toggleMenu: (onclick, tgt) => (e) => {if ((onclick && e.type == 'click')||!onclick) {e.preventDefault(); e.stopPropagation();dispatch(itemLoading('menu'))}}
- }
-}
-export const ConnectedMainMenu = ReactRedux.connect(mapMMStateToProps, mapDispatchToMMProps)(Mainmenu);
-
-
-export const Footer = (props) =>
-
-
-
- Jabber.ru
-
-
-
-
-
- Главная
- Помощь
- Сервисы
- Скачать
- Кабинет
-
-
-
- Главная
- Помощь
- Сервисы
- Скачать
- Кабинет
- {props.peer_name}
-
-
- {props.children}
-
-
-
diff --git a/components/metrika.js b/components/metrika.js
deleted file mode 100644
index 5479a23..0000000
--- a/components/metrika.js
+++ /dev/null
@@ -1 +0,0 @@
-export const Yametrika = {__html: '(function(d,w,c){(w[c]=w[c]||[]).push(function(){try{w.yaCounter24966088=new Ya.Metrika({id:24966088,clickmap:true,trackLinks:true,accurateTrackBounce:true,webvisor:true,trackHash:true});}catch(e){ }});var n=d.getElementsByTagName("script")[0],s=d.createElement("script"),f=function(){n.parentNode.insertBefore(s,n);};s.type="text/javascript";s.async=true;s.src="https://mc.yandex.ru/metrika/watch.js";if(w.opera=="[object Opera]"){d.addEventListener("DOMContentLoaded",f,false); }else{f();}})(document, window,"yandex_metrika_callbacks");'}
diff --git a/components/notfound.js b/components/notfound.js
deleted file mode 100644
index f00322f..0000000
--- a/components/notfound.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {Footer} from "./menus.js";
-import {LoginFormConnected} from "./loginForm.js";
-import {Link} from 'react-router';
-import * as React from 'react';
-import * as ReactRedux from 'react-redux';
-
-export const NotFound = (props) => {
- return
-
-
-
-
- Help
- FAQ
-
- {/**/}
-
-
- Сервисы
-
-
-
- {/**/}
-
-
- Клиенты
-
-
-
-
-
-
-
-
-
-
-
-}
-
diff --git a/components/personal.js b/components/personal.js
deleted file mode 100644
index b9f88f9..0000000
--- a/components/personal.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import {isEmpty} from "./helpers";
-import {setVcard, setRoster, setJid} from "./user";
-import {browserHistory as history, Link} from 'react-router'
-
-import { Scrollbars } from 'react-custom-scrollbars';
-import * as React from 'react';
-import * as ReactRedux from 'react-redux';
-
-const RosterItem = (props) =>
- 404
-No secret page for you. Only 404 is here :(
-{props.name || props.jid}
-
-
-class RRoster extends React.Component {
- render () {
- let props = this.props
- let roster = props && props.roster || []
- let classes = "roster"
- if ((roster.length == 0) && (! props.loggedin)) {classes = classes + " empty"}
- if ((roster.length == 0) && (props.loggedin)) {classes = classes + " nocontacts"}
- return
- {roster.map((item, ind) => (
- }
-}
-RRoster.contextTypes = {
- router: React.PropTypes.object
-}
-
-class PersonalMenu extends React.Component {
- render () { return
-
-
-
- }
-}
-
-export class Personal extends React.Component {
- componentDidMount() {
- if (! this.props.loggedin) {
- this.context.router.push('/login')
- }
- }
- render () {
- if (! this.props.loggedin) return
- return
- Настройки
-
-
-
- return
- ![]({"data:")
- : ""
- }
-
- }
-}
-
-Personal.contextTypes = {
- router: React.PropTypes.object
-}
-
-export const settlePersonal = () => (dispatch, getState) => {
- let state = getState()
- if (isEmpty(state.user.roster)) {
- dispatch(setRoster(false))
- }
- if (isEmpty(state.user.vcard)) {
- dispatch(setVcard(true))
- }
-}
-
-const mapStateToPersonalProps = (state) => {
- return {
- loggedin: state.user.loggedin,
- vcard: state.user.vcard,
- roster: state.user.roster,
- user: state.user
- }
-}
-const mapDispatchToPersonalProps = (dispatch) => {
- return {
- getVcard: () => dispatch(setVcard(true)),
- getRoster: () => dispatch(setRoster(false))
- }
-}
-
-const mapStateToRosterProps = (state) => {
- return {
- peer: state.MAMHistory.peer,
- roster: state.user.roster || [],
- loggedin: state.user.loggedin
- }
-}
-
-export const PersonalSpace = ReactRedux.connect(mapStateToPersonalProps, mapDispatchToPersonalProps)(Personal)
-export const Roster = ReactRedux.connect(mapStateToRosterProps)(RRoster)
-
diff --git a/components/root.js b/components/root.js
deleted file mode 100644
index 3445c63..0000000
--- a/components/root.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import {Footer} from "./menus.js";
-import {LoginFormConnected} from "./loginForm.js";
-import {Link} from 'react-router';
-import * as React from 'react';
-import * as ReactRedux from 'react-redux';
-
-export const RootPlain = (props) => {
- return
-}
-
-const mapStateToRootProps = (state) => {
- return {
- // if there is no 'vcard' state at all or it is not yet resolved
- loading: !(('vcard' in state.loading ) || ('vcard' in state.user)) || ('vcard' in state.loading && state.loading.vcard),
- loggedin: state.user.loggedin,
- }
-}
-
-
-export const Root = ReactRedux.connect(mapStateToRootProps)(RootPlain)
diff --git a/components/scrollspy.js b/components/scrollspy.js
deleted file mode 100644
index 779dc06..0000000
--- a/components/scrollspy.js
+++ /dev/null
@@ -1,135 +0,0 @@
-const win = window
-const doc = document
-
-
-export class Scrollspy extends React.Component {
-
- static get PropTypes () {
- return {
- items: React.PropTypes.arrayOf(React.PropTypes.string).isRequired,
- currentClassName: React.PropTypes.string.isRequired,
- }
- }
-
- static get defaultProps () {
- return {
- items: [],
- currentClassName: '',
- }
- }
-
- constructor (props) {
- super(props)
-
- this.state = {
- targetItems: [],
- inViewState: [],
- }
- }
-
- _initSpyTarget (items) {
- const targetItems = items.map((item) => {
-
- return doc.getElementById(item)
- })
-
- return targetItems
- }
-
- _getElemsViewState (targets) {
- let elemsInView = []
- let elemsOutView = []
- let viewStatusList = []
-
- const targetItems = targets ? targets : this.state.targetItems
-
- let hasInViewAlready = false
-
- for (let i = 0, max = targetItems.length; i < max; i++) {
- let currentContent = targetItems[i]
- let isInView = hasInViewAlready ? false : this._isInView(currentContent)
-
- if (isInView) {
- hasInViewAlready = true
- elemsInView.push(currentContent)
- } else {
- elemsOutView.push(currentContent)
- }
-
- viewStatusList.push(isInView)
- }
-
- return {
- inView: elemsInView,
- outView: elemsOutView,
- viewStatusList,
- }
- }
-
- _isInView (el) {
- const winH = win.innerHeight
- const scrollTop = doc.documentElement.scrollTop || doc.body.scrollTop
- const scrollBottom = scrollTop + winH
- const elTop = el.offsetTop
- const elBottom = elTop + el.offsetHeight
-
- return (elTop < scrollBottom) && (elBottom > scrollTop)
- }
-
- _spy (targets) {
- this.setState({
- inViewState: this._getElemsViewState(targets).viewStatusList,
- })
- }
-
- _handleSpy () {
- let timer
-
- if (timer) {
- clearTimeout(timer)
- timer = null
- }
- timer = setTimeout(this._spy.bind(this), 100)
- }
-
- _initFromProps () {
- const targetItems = this._initSpyTarget(this.props.items)
-
- this.setState({
- targetItems,
- })
-
- this._spy(targetItems)
- }
-
- componentDidMount () {
- this._initFromProps()
- win.addEventListener('scroll', this._handleSpy.bind(this))
- }
-
- componentWillUnmount () {
- win.removeEventListener('scroll', this._handleSpy.bind(this))
- }
-
- componentWillReceiveProps () {
- this._initFromProps()
- }
-
- render () {
- let counter = 0
- const items = React.Children.map(this.props.children, (child, idx) => {
- return React.cloneElement(child, {
- className: (child.props.className ? child.props.className : '') + (this.state.inViewState[idx] ? ' ' + this.props.currentClassName : ''),
- key: counter++,
- })
- })
-
- return (
-
- )
- }
-}
diff --git a/components/settings.js b/components/settings.js
deleted file mode 100644
index dcc9a25..0000000
--- a/components/settings.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import * as config from './config';
-import {some, checkFetchStatus} from './helpers';
-import {itemLoading} from './loading.state';
-import { Scrollbars } from 'react-custom-scrollbars';
-import * as msg from './form.messages.js'
-
-import * as React from 'react';
-import * as ReactRedux from 'react-redux';
-
-const SETTINGS = 'SETTINGS'; // set setting action
-const FETCH = 'FETCH'; // start fetching from server
-const VALUE = 'values';
-const ERROR = 'errors';
-
-class settings extends React.Component {
- render () {
- let props = this.props
- /*
- if (props.loading) {return (У нас обед!
-Мы обязательно сделаем здесь много интересного. Но несколько позже.
- { this.props.user.vcard.PHOTO && this.props.user.vcard.PHOTO.BINVAL != "" ? -
-
-
- )}*/
- return
-
-
-
- }
-}
-
-
-
-const mapStateToSettingsProps = (state) => {
- let defaultOptions = {roster:"сохраняться, если собеседник в ростере", always:"сохраняться всегда", never:"не сохраняться никогда"}
- return {
- loading: state.loading.settings || false,
- historyDefaultOptions: defaultOptions,
- historyDefault: state.settings[VALUE].default,
- historyAlwaysList: Array.prototype.join.call(state.settings[VALUE].always,"\n"),
- historyNeverList: Array.prototype.join.call(state.settings[VALUE].never,"\n"),
- always_err: state.settings[ERROR].always,
- never_err: state.settings[ERROR].never,
- form_err: state.settings[ERROR].form
- }
-}
-const mapDispatchToSettingsProps = (dispatch) => ({
- setHistoryDefault : (ev) => {dispatch(setSettingsValue('default', ev.target.value))},
- setHistoryList : (list) => (ev) => { if (ev.target.value.endsWith('\n') || ev.target.classList[0]) {
- dispatch(validateSettingsLists())
- }
- dispatch(setSettingsValue(list, ev.target.value.split('\n')))
- },
- saveSettings : () => {dispatch(saveSettings())},
- validate: ()=> {dispatch(validateSettingsLists())}
- }
-)
-export const Settings = ReactRedux.connect(mapStateToSettingsProps, mapDispatchToSettingsProps)(settings)
-
-export const fetchSettings = () => (dispatch, getState) => {
- let item = 'settings'
- let state = getState()
- if (!state.user.loggedin) {
- console.log('user is not logged in')
- }
- if (state.loading.settings) {
- console.log('Settings are already being fetched')
- }
- dispatch(itemLoading(item))
- fetch(config.apiBase + 'mam/' + item, {
- method: 'GET',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- credentials: 'include',
- }).then((response) => checkFetchStatus(response,true))
- .then((json) => {
- if ('error' in json && json.error != "") {
- console.log('Error getting '+item+', something went wrong')
- console.log(json.error)
- }
-
- dispatch(setSettingsValue('default', json.default))
- if (json.never) dispatch(setSettingsValue('never', json.never))
- if (json.always) dispatch(setSettingsValue('always', json.always))
- dispatch(itemLoading(item))
- }).catch((error)=>{
- console.log('Something went wrong fetching', item,'Message was:', error)
- dispatch(itemLoading(item))
- })
-}
-const saveSettings = () => (dispatch, getState) => {
- dispatch(validateSettingsLists())
- dispatch(setSettingsError('form', false))
- let state = getState()
- if (some(state.settings[ERROR], (el) => !!el)) {
- dispatch(setSettingsError('form', "В списках контактов есть ошибки. Исправьте, пожалуйста."))
- return
- } else {
- dispatch(itemLoading('settings'))
- let body = state.settings[VALUE]
- const filter = (el) => !!el
- body.always = body.always.filter(filter)
- body.never = body.never.filter(filter)
- console.log('settings settings to', JSON.stringify(body))
- fetch(config.apiBase + 'mam/settings', {
- method: 'POST',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- credentials: 'include',
- body: JSON.stringify(body)
- }).then((response) => checkFetchStatus(response,true))
- .then( (json) => {
- if ('error' in json && json.error != "") {
- console.log('Error getting settings: something went wrong')
- console.log(json.error)
- dispatch(setSettingsError('form', msg.error[json.error] || json.error))
- }
- dispatch(setSettingsError('form', "Настройки сохранены."))
- dispatch(itemLoading('settings'))
- }).catch (( error ) => {
- console.log('Could not save settings due to:', error)
- dispatch(setSettingsError('form', "Попробуйте ещё раз позже, пожалуйста"))
- dispatch(itemLoading('settings'))
- })
- }
-}
-const setSettingsError = (err_type, value) => ({type: SETTINGS, kind: ERROR, value: {[err_type]:value}})
-const setSettingsValue = (val_type, value) => ({type:SETTINGS, kind: VALUE, value: {[val_type]:value}})
-
-const validateSettingsLists = () => (dispatch, getState) => {
- let state = getState()
- dispatch(setSettingsError('always', (!validateListOfJIDs(state.settings[VALUE].always))))
- dispatch(setSettingsError('never', (!validateListOfJIDs(state.settings[VALUE].never))))
-}
-const validateListOfJIDs = (list) => list.every((item,ind, ar) => {
- if (item.trim() == '') return true;
- let jid = item.split('@')
- return (jid.length == 2) && jid.every((it) => !! it) // false for empty string
-})
-
-
-export const settingsState = (state={
- [VALUE]:{default:'roster', always:[], never:[]},
- [ERROR]:{always:false, never:false, form:""}
- }, action) => {
- if (action.type != SETTINGS) return state;
-
- return Object.assign({}, state, {[action.kind]:
- Object.assign({}, state[action.kind], action.value)
- })
-}
diff --git a/components/svcs.js b/components/svcs.js
deleted file mode 100644
index 6227bb8..0000000
--- a/components/svcs.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import {Footer} from "./menus.js";
-import {Anchor, Anchored} from "./anchor.js";
-import {Link} from 'react-router';
-import * as React from 'react';
-
-const Placeholder = (props) =>
-
- На этой странице можно включить (или выключить) сохранение своих сообщений. Изменения сделанные на этой странице начинают учитываться сервером не сразу. На применение настроек может потребоваться около часа.
- По умолчанию, сообщения будут: - -
- Переписка с этими контактами будет сохраняться всегда:
-
-
- {props.always_err?"Ошибка в списке контактов":null}
-
- Переписка с этими контактами не будет сохраняться никогда:
-
-
- {props.never_err?"Ошибка в списке контактов":null}
-
-
- {props.form_err}
-
- 
-
-export const Svcs = Anchored(
- class extends React.Component {
- render () { return (
-
-)}})
diff --git a/components/user.js b/components/user.js
deleted file mode 100644
index 64f12b4..0000000
--- a/components/user.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as config from './config.js';
-import {isEmpty,checkFetchStatus} from './helpers';
-import {formActionResult} from './loginFormState';
-import {itemLoading} from './loading.state';
-import {browserHistory as history} from 'react-router';
-import {setLoginForm} from './loginForm.js';
-
-const USER = 'USER'; // all user action
-const VCARD = 'vcard'; //set user's vcard value action
-const ROSTER = 'roster'; //set user's vcard value action
-const JID = 'JID'; // set user jid (after auth or whatever)
-const LOGIN = 'LOGIN'; //sets only 'loggedin' state
-const LOGOUT = 'LOGOUT'; //unset whole state on logout (kill cached data, maybe)
-
-export const userLogout = () => (dispatch, getstat) => {
- dispatch(logout())
- dispatch(setLoginForm())
- console.log('fetching logout')
- fetch(config.apiBase + 'logout', {credentials: 'include'})
- history.push('/')
-}
-
-const getUserItem = (item) => (redirMe) => (dispatch, getState) => {
- let state = getState()
- if (!state.user.loggedin) {
- console.log('Not fetching', item, ': user is not logged in')
- return
- }
- if (!isEmpty(state.user[item]) || state.loading[item]) {
- console.log('User item', item, 'is not empty or is already being fetched')
- return
- }
- console.log('setting '+ item);
- dispatch(itemLoading(item));
- fetch(config.apiBase + item, {
- method: 'GET',
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- credentials: 'include',
- }).then((response) => checkFetchStatus(response,true))
- .then((json) => {
- if ('error' in json && json.error != "") {
- console.log('Error getting '+item+', something went wrong')
- console.log(json.error)
- if (redirMe) {
- history.push('/login')
- dispatch(formActionResult('Пожалуйста, авторизуйтесь ещё раз.'))
- }
-
- }
-
- json[item] && dispatch(setUserStateItem(item, json[item]))
- dispatch(itemLoading(item))
- }).catch((error)=>{
- console.log('Something went wront fetching', item,'Message was:', error)
- dispatch(itemLoading(item))
- })
-}
-
-const login = () => ({type:USER, kind:LOGIN})
-const logout = () => ({type:USER, kind:LOGOUT})
-const setUserStateItem = (item, value) => ({type: USER, kind: item, value: value})
-
-export const setRoster = getUserItem('roster')
-export const setVcard = getUserItem('vcard')
-export const setUserLoggedIn = login
-
-
-export const user = (state={roster:[], vcard:{}, jid:null, loggedin: false}, action) =>{
- if (action.type != USER) return state;
- console.log('User action: ', action)
- switch (action.kind) {
- case JID: return Object.assign({}, state, {jid:action.value})
- case VCARD: return Object.assign({}, state, {vcard:action.value.vCard, loggedin: true})
- case ROSTER: return Object.assign({}, state, {roster:action.value})
- case LOGIN: return Object.assign({}, state, {loggedin: true})
- case LOGOUT: return Object.assign({}, state, {jid:null, loggedin: false, vcard: {}, roster:[]})
- default: return state;
- }
- return state;//should never happen...
-
-}
diff --git a/css/_about.scss b/css/_about.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/css/_carousel.scss b/css/_carousel.scss
deleted file mode 100644
index 66f4b14..0000000
--- a/css/_carousel.scss
+++ /dev/null
@@ -1,160 +0,0 @@
-.picon {
- font: $piconfont;
- text-transform: uppercase;
- padding: 7px 0em 4px 1em;
- color: #777777;
- border-bottom: solid;
- border-color: gray;
- cursor: pointer;
-
- &.selected {
- color: #ffffff;
- border-color: #ffffff;
- }
- &.locked {
- border-color: $mred !important;
- border-bottom: solid;
- span:after {
- content: " w";
- visibility: visible;
- }
- }
- span:before {
- content:attr(data-txt);
- display:inline;
- }
- span:after {
- font: 15px WebSymbolsLigaRegular;
- text-transform: none;
- content:" v";
- display: inline;
- visibility: hidden;
- }
- &:hover span:after {
- visibility: visible;
- }
-
-}
-.platform-icons {
- margin-bottom: 45px;
- text-align: center;
-}
-#carousel {
- //padding-top: 30px;
-}
-.main-carousel {
- margin: auto;
- width: 90%;
- min-height: 600px;
-
- &:after {
- content: 'flickity';
- display: none;
- }
-}
-.cellwrap {
- width: 80%;
- min-height: 600px;
- margin-right: 15%;
-}
-
-.carousel-cell {
- //width: 100%;
- //min-height: 600px;
- //margin-right: 15%;
- display: table;
-}
-
-.clientImg {
- display: table-cell;
- text-align: center;
- max-height: 600px;
- div {
- max-width:360px;
- max-height:600px;
- overflow:hidden;
- text-align:right;
- direction:rtl;
- img {
- display:block;
- }
- }
-}
-.description-wrap1{
- display:table-cell;
- vertical-align: top;
- padding-left: 60px;
- &>h2 {
- margin-top: 0;
- }
-}
-
-.client-description {
- @extend .wtxt;
- font: $clientdescfont;
- min-height: 600px;
-}
-
-.clientNameNarrow {
- display: none;
-}
-
-.flickity-page-dots {
- display: none;
-}
-
-
-@media screen and (max-width: ($mdevW)+200) {
- .flickity-prev-next-button {
- display:none;
- }
- .main-carousel {
- width: 100%;
- }
- .cellwrap,
- .carousel-cell {
- margin: 0;
- width: 100%;
- }
-}
-@media screen and (max-width: $mdevW) {
- #carousel {
- padding-top: 0;
- }
- .clientNameWide {
- display: none;
- }
- .clientNameNarrow {
- text-align: center;
- display: block;
- }
-
- .clientImg {
- display:block;
- div {
- width: 100%;
- margin: auto;
- img {
- width: auto;
- height: auto;
- max-width: 100%;
- margin: auto;
- }
- }
- }
- .description-wrap1{
- display:block;
- padding: 15px;
- text-align:justify;
- }
-
- .picon {
- width: 35%;
- display: inline-block;
- }
- .platform-icons {
- margin-bottom: 0;
- }
-
-
-}
diff --git a/css/_conferences.scss b/css/_conferences.scss
deleted file mode 100644
index c083e70..0000000
--- a/css/_conferences.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-.footer > .conferences {
- width: 80%;
-}
-.conference {
- //display: inline-block;
- //width: 25%;
- position: relative;
- min-width: 10em;
- &>a {
- border-bottom: none;
- }
-}
-
-.confico {
- display: inline-block;
- width: 16px;
- height: 16px;
- background-position: center;
- background-size: cover;
- margin-right: .5em;
- vertical-align: bottom;
-}
-.confname {
- display: inline-block;
-}
-
-.conferences + .footer-holder {
- height: 300px;
-}
-.conferences {
- min-height: 350px;
- columns: 4 10em;
-}
diff --git a/css/_fonts.scss b/css/_fonts.scss
deleted file mode 100644
index 1b4c864..0000000
--- a/css/_fonts.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-//@import url(https://fonts.googleapis.com/css?family=Roboto&subset=latin,cyrillic);
-@import url('https://fonts.googleapis.com/css?family=Exo+2:300|Jura:600&subset=cyrillic');
-//@import url('https://fonts.googleapis.com/css?family=Exo+2:400,300,500|Jura:600&subset=cyrillic');
-
-@font-face{
- font-family: 'WebSymbolsLigaRegular';
- src: url('/fonts/WebSymbolsLiga-Regular/websymbolsligaregular.eot');
- src: url('/fonts/WebSymbolsLiga-Regular/websymbolsligaregular.eot?#iefix') format('embedded-opentype'),
- url('/fonts/WebSymbolsLiga-Regular/websymbolsligaregular.woff') format('woff'),
- url('/fonts/WebSymbolsLiga-Regular/websymbolsligaregular.ttf') format('truetype'),
- url('/fonts/WebSymbolsLiga-Regular/websymbolsligaregular.svg#WebSymbolsRegular') format('svg');
-}
-
-@font-face {
- font-family:"bicubik";
- src:url("/fonts/bicubik.woff") format("woff"),url("/fonts/bicubik.ttf") format("truetype");
- font-weight:normal;
- font-style:normal;
-}
-
-/*
-@font-face {
- font-family: "Proxima Nova";
- src: url("/fonts/proximanova-reg-cur.otf");
-}
-
-@font-face {
- font-family:"HelveticaNeueCyrUl";
- src:url("/fonts/HelveticaNeueCyr-UltraLight.woff") format("woff"),url("/fonts/HelveticaNeueCyr-UltraLight.otf") format("opentype");
-}
-
-$helvetica-ff: HelveticaNeueCyrUl,Helvetica Neue,Helvetica,Arial,sans-serif;
-$trebuchet-ff: Trebuchet MS,Lucida Grande,Lucida Sans Unicode,Lucida Sans,Tahoma,sans-serif;
-$proxima-ff: "Proxima Nova","Open Sans",Arial,sans-serif;
-*/
-$mred: #e45539;
-$rred: #ee8866;
-$juraff: Jura,sans-serif;
-$forumff: "Forum",sans-serif;
-$istokff: "Istok Web", sans-serif;
-$robotoff: Roboto,sans-serif;
-$exo2ff: "Exo 2", sans-serif;
-$tenorff: $exo2ff;//"Tenor Sans",sans-serif;
-$footerwff: $tenorff;
-$footmenuitemff: $footerwff;
-$footmenuheadff: $juraff;
-$mmfont: 20px $juraff;
-$piconfont: 18px $juraff;
-$clientdescfont: 18px $tenorff;
-$formheaderfont: 27px $juraff;
-$inputfont: italic 18px $tenorff;
-
-.wtxt {
- color: #ffffff;
-}
-.rtxt {
- color: $mred;
-}
-
-h1,h2 {
- font-family: $juraff;
-}
diff --git a/css/_footnlogog.scss b/css/_footnlogog.scss
deleted file mode 100644
index fa71cd2..0000000
--- a/css/_footnlogog.scss
+++ /dev/null
@@ -1,235 +0,0 @@
-.logo {
- background-image: url('/static/logo.png');
- background-size: contain;
- background-repeat: no-repeat;
- width: 90px;
- height: 90px;
- display: inline-block;
- position:relative;
- bottom: -12px;
-}
-.logotext {
- margin-left: -15px;
- font-family:bicubik,"Lucida Console", Monaco, monospace;
- font-size: 30px;
- font-weight: bold;
- display: inline-block;
- letter-spacing: 7px;
-
-}
-.logorow {
- min-height: 3.5em;
- position:relative;
- margin: auto;
- @media screen and (min-width: $sdevW) {
- padding-bottom: 15px;
- }
-}
-
-
-
-.footer {
- color: #FFFFFF;
- position: absolute;
- bottom:0px;
- width: 100%;
- left: 0;
-}
-
-.footerwrap {
- @extend .wtxt;
- font: 18px $footerwff;
- padding: 10px;
- @media screen and (max-width: $smdevW + 1) {
- padding: 0 10px;
- }
- position:relative;
- margin: auto;
- //min-height: 100%;
- a h1, a h2, h1 a, h2 a{
- &:hover:before {
- content:"o"; //link symbol
- font: 1em WebSymbolsLigaRegular;
- text-transform:none;
- position:absolute;
- left: -1em;
- line-height: 1em;
- }
- }
- h1, h2 {
- @extend .rtxt;
- }
-}
-a {
- text-decoration: none;
-}
- p a:after {
- //content:"\00a0@"; //going out link
- content:"@"; //going out link
- font: 15px WebSymbolsLigaRegular;
- text-transform:none;
- display:inline;
- margin-left: 2px;
- }
-.fblock {
- display: inline-block;
- vertical-align: top;
- padding-right: 60px;
- padding-bottom: 20px;
-}
-
-.footmenu {
- display: inline-block;
- margin-left:10px;
-}
-.footmenuitem {
- font: 15px $footmenuitemff;
- padding-top: 5px;
- a {
- color:inherit;
- text-decoration: none;
- position: relative;
- }
-}
-.footmenuheader {
- font: 18px $footmenuheadff;
-}
-.hg2 {
- width: 730px;
- height: 290px;
- right: 0;
-
- span {
- width: 738px;
- }
-}
-.hg, .hg2{
- position: absolute;
- bottom: 0px;
- overflow: hidden;
- text-align: center;
- display: inline-block;
- z-index: -1;
-}
-.hg, .hg2 {
- span {
- display: block;
- margin-left: -4px;
- }
- img {
- height: 100%;
- width: 100%;
- object-fit: cover;
- }
-}
-
-.footer-holder {
- height: 200px;
-
- @media screen and (max-width: $mdevW)
- and (orientation: landscape) {
-
- height: 200px;
-}
-
-}
-
-@media screen and (min-width: 1400px) {
- .footerwrap {
- width: 80%;
- }
-
- .hg, .hg2 {
- width: 730px;
- height: 290px;
- right: 0;
- span {
- width: 738px;
- }
- }
-}
-@media screen and (min-width: $midDevW + 1) and (max-width: $bigDevW) {
- .footerwrap {
- width: 90%
- }
- .logorow {
- margin-top: 0;
- //width: 90%;
- &.nologo {
- margin-top: -2em;
- }
- }
- .hg, .hg2 {
- width: 584px;
- height: 248px;
- right: 0; //5%
-
- span {
- width: 592px;
- }
- }
-}
-@media screen and (max-width: $midDevW) {
- .hg, .hg2 {
- width: 365px;
- height: 155px;
- right: 0;
-
- span {
- width: 373px;
- }
- }
-}
-/*
-@media screen and (min-width: $mbdevW) and (max-width: $midDevW) {
- .mainmenu {
- position: relative;
- margin-top: 30px;
- }
- .logorow.nologo {
- //margin-top: -2em;
- }
-}*/
-@media screen and (min-width: $mdevW) and (max-width: $mbdevW) {
- &.nologo {
- margin-top: 1em;
- }
-}
-//@media screen and (max-width: $mbdevW) {
-@media screen and (max-width: $midDevW) {
- .logorow {
- text-align: center;
- margin-top: 1em;
- &>a {
- width: 100%;
- text-align: center;
- margin-bottom: 1em;
- }
- }
- .logo{
- text-align:center;
- display:none;
- }
-}
-@media screen and (max-width: $sdevW) {
- .logorow {
- margin-top: 0;
- }
-}
-@media screen and (max-width: $mdevW) {
- .hg2 {display: none;}
- .hg > span > img {
- width:50%;
- height:auto;
- position: absolute;
- bottom: 0;
- right: 0;
- }
- .footer-holder {
- height: 320px;
- }
- .fblock {
- width:50%;
- padding-right:0px;
- }
-}
diff --git a/css/_formsninputs.scss b/css/_formsninputs.scss
deleted file mode 100644
index c4b5611..0000000
--- a/css/_formsninputs.scss
+++ /dev/null
@@ -1,328 +0,0 @@
-@import './css/_loader.scss';
-.form {
- text-align: left;
- color:#FFFFFF;
- position: relative;
-
- &.submit {
- display:block;
- box-sizing: border-box;
- border: solid $mred;
- //height: 33px;
- //width: 135px;
- //padding: 2px;
- }
- &.remind {
- text-align: right;
- position: relative;
- //right:42px;
- //bottom: -25px;
- font-size: 15px;
- a {
- border-bottom: 2px solid $mred;
- color:inherit;
- text-decoration: none;
- padding-bottom: 2px;
- }
- }
- &.register {
- padding: 10px;
- font-size: 18px;
- a {
- border-bottom: 2px solid $mred;
- }
- }
- input {
- font: $inputfont;
- box-sizing: border-box;
- padding: 7px;
- padding-bottom: 11px;
- border: 0;
- border-radius: 0;
- margin-bottom: 25px;
- padding-left: 12px;
- width: 100%;
-
- &.has-error {
- padding: 4px 4px 8px 8px;
- border: 3px solid $mred;
- box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
- animation: hsError 400ms ease-in-out;
- }
- }
- .error {
- //text-transform: uppercase;
- color: white;
- font-size: 15px;
- position: absolute;
- bottom: 5px;
- right: 0px;
- text-align: right;
- }
- &Error {
- margin-top: 10px;
- //position: absolute;
- //top: 0px;
- //right: 5px;
- //text-align: right;
- //max-width: 240px;
- }
-}
-#recaptcha {
- margin: auto;
- max-width: 294px;
- height: 71px;
- overflow: hidden;
- position: relative;
-
- div {
- position: relative;
- left: -3px;
- top: -2px;
- }
-}
-@keyframes rotologo {
- 0% {transform: rotate(10deg); }
- 35% {transform: rotate(-20deg); }
- 100% {transform: rotate(370deg); }
-}
-.recap {
- background: #F9F9F9 url("/static/logo.f.mblue.png") no-repeat center/contain ;
- position: relative;
- margin-bottom: 25px;
- border: #F9F9F9 3px solid;
- border-radius: 0;
- box-sizing: border-box;
- width: 100%;
- display:inline-block;
- overflow: hidden;
- &.has-error {
- border-color: $mred;
- }
- &::before {
- display: block;
- position: absolute;
- width: 80px;
- height: 102%;
- content: " ";
- background: transparent url("/static/logo.n.mblue.png") no-repeat center/contain ;
- transform: rotate(10deg);
- animation-name: rotologo;
- animation-duration: 1s;
- animation-iteration-count: 30;
- right: 0;
- left: 0;
- margin: auto;
-
- }
-}
-
-.cbform {
- position: relative;
- form {
- width: 50%;
- text-align: left;
- @media screen and (max-width: $mdevW) {
- width: 100%;
- }
- }
- .message {
- width: 100%;
- margin: none;
- padding: none;
- }
- textarea {
- padding: 0 10px;
- font: 1em "Exo 2", sans-serif;
- width: 100%;
- min-height: 200px;
- box-sizing:border-box;
- margin-bottom: 25px;
- }
- .recap {
- //width:unset;
- @media screen and (max-width: $mdevW) {
- width: 100%;
- text-aligh: middle;
- }
- }
- .form.submit, .formError {
- position: relative;
- text-align: center;
- top: unset;
- right: unset;
- display:block;
- width:100%;
- margin-left: 0;
- }
- .loader {
- position: relative;
- display: block;
- margin: auto;
- top: -3.5em;
- right: 0;
- }
-}
-
-.buttonRow {
- min-height: 62px;
- position: relative;
-}
-
-
-form {
- text-align: left;
- button {
- background-color: transparent;
- width: 100%;
- font-size: 18px;
- border:0;
- padding:0;
- color: inherit;
- cursor: pointer;
- }
-}
-
-.loginLabel, .regLabel {
- cursor: pointer;
- }
-
-.bodywrap>.loginForm {
- position: fixed;
- top: 120px;
- right:0;
- left:0;
- bottom: 0;
- overflow-y: auto;
- text-align: center;
- background-color: rgba(35,55,71,1);
- //background: transparent;
- .loader {
- position: relative;
- top: -1.5em;
- margin: auto;
- margin-bottom: 3em;
- }
- @media screen and (max-width: $sdevW){
- top: 3.5em;
- }
-
-}
-
-.bodywrap>.loginForm>.scroll {
- position: relative;
- margin: auto;
- height: 100%;
- @media screen and (max-width:$mdevW) {
- min-height: 370px;
- }
- @media screen and (min-width:$mdevW) {
- min-height: 700px;
- }
-}
-.mainlogin>.loginForm .message {
- text-align: center;
-}
-
-.form {
- &.submit {
- }
- &HeaderRow {
- text-align: left;
- margin-bottom: 25px;
- .remLabel {
- display: none;
- }
- &.remind {
- .remLabel {
- display: inline;
- }
- .regLabel, .logLabel {
- display: none;
- }
- }
- }
- &Header {
- text-decoration: none;
- margin-right: 20px;
- letter-spacing: 1px;
- font: $formheaderfont
- }
- &Error {
- // width: 70%;
- }
-}
-
-
-
-.close {
- cursor: pointer;
- position: absolute;
- right: 10px;
- top: 10px;
- width: 24px;
- height: 24px;
- border-radius: 50%;
- border: 1px white solid;
-
- &:hover {
- opacity: 0.8;
- }
- &:before,
- &:after {
- position: absolute;
- left: 11px;
- bottom: 5px;
- content: ' ';
- height: 14px;
- width: 2px;
- background-color: $mred;
- }
- &:before {
- transform: rotate(45deg);
- }
- &:after {
- transform: rotate(-45deg);
- }
-}
-.fwrap {
- box-sizing: border-box;
- color: #ffffff;
- display: block;
- background-color: #435762;
- padding: 35px 40px 20px 40px;
- width: 500px;
- position:absolute;
- right:0px;
- left:0px;
- margin: auto;
- top: 20%;
- @media screen and (max-width: ($mdevW)) {
- padding: 15px 20px 20px 10px;
- width: 95%;
- top: 0;
- position: relative;
- }
- @media screen and (max-width: ($mdevW)-200) {
- width: 100%;
- height: 100%;
- padding: 15px 0px;
- }
-
-}
-@media screen and (max-width: ($mdevW)) {
- a.close {
- display: none;
- }
- .loginForm {
- //padding-top:20px;
- background:none;
-
- .form {
- &HeaderRow {
- text-align: center;
- margin-bottom: 15px;
- }
- }
- }
-}
diff --git a/css/_globals.scss b/css/_globals.scss
deleted file mode 100644
index 1e2779c..0000000
--- a/css/_globals.scss
+++ /dev/null
@@ -1,107 +0,0 @@
-
-$sdevW: 400px;
-$mdevW: 700px;
-$mbdevW: 850px;
-$smdevW: 900px;
-$midDevW: 1100px;
-$bigDevW: 1400px;
-
-$mblue: rgb(35,55,71);
-
-a {
- color:inherit;
-}
-html {
- width:100%;
- //min-height: 100vh;
-}
-
-body {
- box-sizing: border-box;
- background: #233747;
- width:100%;
- margin: 0;
- height: 100%;
- overflow-x:hidden;
- //min-height: 100vh;
-}
-.hidden {
- visibility:hidden;
- opacity: 0 !important;
- transition: opacity 1s ease-in-out;
-}
-.visible {
- transition: opacity 1s ease-in-out;
- display: block !important;
- visibility: visible !important;
- opacity: 1 !important;
-}
-#RC {
- width:100%;
- height: 100%;
- //position: absolute;
- //top: 0;
- //bottom: 0;
- //width: 100%;
-}
-.bodywrap {
- position: relative;
- //min-height: 500px;
- //height: 100%;
- @media screen and (max-width: $mdevW) {
- min-height: 0;
- height: initial;
- }
-
-}
-.gradient-log {
- background: #586875;
- background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiM1ODY4NzUiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjM2Q1MDVlIiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==);
- background: -moz-linear-gradient(left, #586875 50%, #3d505e 100%);
- background: -webkit-gradient(linear, left top, right top, color-stop(50%,#586875), color-stop(100%,#3d505e));
- background: -webkit-linear-gradient(left, #586875 50%,#3d505e 100%);
- background: -o-linear-gradient(left, #586875 50%,#3d505e 100%);
- background: -ms-linear-gradient(left, #586875 50%,#3d505e 100%);
- background: linear-gradient(to right, #586875 50%,#3d505e 100%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#586875', endColorstr='#3d505e',GradientType=1 );
-}
-.gradient-bak {
- background: #233747;
- background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSI2MCUiIHN0b3AtY29sb3I9IiMyMzM3NDciIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNDQ2Mjc3IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==);
- background: -moz-linear-gradient(left, #233747 60%, #446277 100%);
- background: -webkit-gradient(linear, left top, right top, color-stop(60%,#233747), color-stop(100%,#446277));
- background: -webkit-linear-gradient(left, #233747 60%,#446277 100%);
- background: -o-linear-gradient(left, #233747 60%,#446277 100%);
- background: -ms-linear-gradient(left, #233747 60%,#446277 100%);
- background: linear-gradient(to right, #233747 60%,#446277 100%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#233747', endColorstr='#446277',GradientType=1 );
-}
-.gradient {
- background: #233747;
-background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIzMCUiIHN0b3AtY29sb3I9IiMyMzM3NDciIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjNDQ2Mjc3IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==);
- background: -moz-linear-gradient(left, #233747 30%, #446277 100%);
- background: -webkit-gradient(linear, left top, right top, color-stop(30%,#233747), color-stop(100%,#446277));
- background: -webkit-linear-gradient(left, #233747 60%,#446277 100%);
- background: -o-linear-gradient(left, #233747 30%,#446277 100%);
- background: -ms-linear-gradient(left, #233747 30%,#446277 100%);
- background: linear-gradient(to right, #233747 30%,#446277 100%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#233747', endColorstr='#446277',GradientType=1 );
-}
-
-.debug {
- position: fixed;
- bottom:10px;
- left:10px;
- color: white;
-}
-.footerwrap {
- a {
- border-bottom: solid $mred 1px;
- &.rtxt {
- border-color: transparent;
- }
- }
- h1 a, h2 a {
- border-bottom: none;
- }
-}
diff --git a/css/_loader.scss b/css/_loader.scss
deleted file mode 100644
index 5b62eeb..0000000
--- a/css/_loader.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-.loader {
-// position: absolute;
-// right:20%;
-// bottom: 100%;
-}
-.loader:before,
-.loader:after,
-.loader {
- border-radius: 50%;
- width: 2.5em;
- height: 2.5em;
- animation-fill-mode: both;
- animation: load7 1.8s infinite ease-in-out;
-}
-.loader {
- color: #ffffff;
- transform: translateZ(0);
- animation-delay: -0.16s;
-}
-.loader:before {
- left: -3.5em;
- -webkit-animation-delay: -0.32s;
- animation-delay: -0.32s;
-}
-.loader:after {
- left: 3.5em;
-}
-.loader:before,
-.loader:after {
- content: '';
- position: absolute;
- top: 0;
-}
-
-@keyframes load7 {
- 0%,
- 80%,
- 100% {
- box-shadow: 0 2.5em 0 -1.3em;
- }
- 40% {
- box-shadow: 0 2.5em 0 0;
- }
-}
-
-
diff --git a/css/_mainmenu.scss b/css/_mainmenu.scss
deleted file mode 100644
index 87c0f58..0000000
--- a/css/_mainmenu.scss
+++ /dev/null
@@ -1,281 +0,0 @@
-.logorow {
- &>a, .mainmenu {
- display: inline-block;
- box-sizing: border-box;
- }
- @media screen and (min-width: $midDevW) {
- .mainmenu {
- margin-left: 3%;
- }
- }
- &>.logowrap {
- display: inline-block;
- text-align: right;
- @media screen and (max-width:$midDevW) {
- text-align: center;
- }
- width: 50%;
- a {
- outline: none;
- }
- @media screen and (max-width: $sdevW){
- display: none;
- }
- }
- @media screen and (max-width: $sdevW){
- .clicker {
- display: block;
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: 1;
- }
- }
-}
-.logorow .mainmenu {
- @extend .wtxt;
- font: $mmfont;
- letter-spacing: 1px;
- &>.root, &>.p-menu-ico {
- display: none;
- }
- .mmitem .logout .ico, .mmitem.peer {
- display: none;
- }
-
- @media screen and (max-width: $midDevW) and (min-width: $mbdevW){
- //margin-top: 30px;
- display: block;
- padding: 0;
- }
- @media screen and (max-width: $sdevW){
- width: 100%;
- text-align: center;
- margin: 3px 0;
- .mmitem {
- display: inline-block;
- position: relative;
- margin: auto;
- margin-top: 12px;
- font-size: 30px;
- &.peer {
- display: inline-block;
- text-transform: none;
- overflow: hidden;
- max-width: 62%;
- &>a {
- text-transform: none;
- }
- }
- &>a {
- display: none;
- &.selected, &.logout {
- display: inline;
- }
- }
- &.logout {
- min-width: 1em;
- display: inline-block;
- float: right;
- margin: 10px;
- margin-bottom: 0;
- z-index: 2;
- .text {
- display: none;
- }
- .ico {
- display: inline;
- z-index: 2;
- }
- }
- }
- &>.p-menu-ico {
- display: inline;
- float: left;
- width: 1em;
- margin: 0.5em;
- }
- }
-}
-
-
-
-.mmitem {
- &:last-child {
- margin-right: 0;
- }
- margin-right: 2em;
- position: relative;
- a {
- &.selected {
- @extend .rtxt
- }
- color:inherit;
- text-decoration: none;
- position: relative;
- outline: none;
- text-transform: uppercase;
- display:inline-block;
-
- &:after {
- display:block;
- padding: 5px 5px 0px 5px;
- position:absolute;
- width:100%;
- margin-left: -5px;
- content: '';
- border-bottom: solid 3px $mred;
- transform: scaleX(0.0);
- transition: transform 250ms ease-in-out;
-
- }
- &.logout:after {
- display: none;
- }
- &:hover:after {
- transform: scaleX(1.0);
- }
- }
- &.logout .ico::after{
- font: 30px WebSymbolsLigaRegular;
- content: "`"; // logout
- }
-}
-
-@media screen and (min-width: $midDevW + 1) and (max-width: $bigDevW) {
- .mmitem {
- margin-right: 1em;
- }
-}
-
-@media screen and (max-width: $midDevW){
- .mmitem{
- margin-top: 1em;
- letter-spacing: 0;
- margin-right: 0.6em;
- }
-}
-@media screen and (max-width: $mdevW){
- .mainmenu {
- //margin-top: 10px;
- }
-
- .mmitem{
- &:last-child {
- margin-right: 1em;
- }
- a {
- margin-bottom: 5px;
- &:after {
- padding: 0;
- margin-left: 0;
- }
- }
- }
-
-}
-@media screen and (max-width: $sdevW){
- .mmitem{
- font-size: 16px;
- &:last-child {
- margin-right: 0em;
- }
- }
-
-}
-
-.clicker {
- display: none;
-}
-.p-menu-ico {
- display: block;
- height: 3px;
- background-color: white;
- box-shadow: 0 9px white, 0 18px white;
- &::before {
- display: block;
- content: " ";
- position: absolute;
- top: -0.3em;
- bottom: -.92em;
- left: -0.3em;
- right: -0.3em;
- //border: solid white 2px;
- border-radius: 3px;
- }
-}
-
-.scrollout-container {
- display: none;
- position: fixed;
- overflow: hidden;
- height: 100%;
- width: 100%;
- z-index: -1;
- @media screen and (max-width: $sdevW){
- display: block;
- transition: z-index 0.5s step-end;
- .scrollout {
- margin-left: -100%;
- transition: margin 0.4s ease-out;
- }
- &.openned {
- z-index: 10;
- transition: z-index 0.5s step-start;
- background: rgba($mblue, 0.6);
- .scrollout {
- margin-left: 0;
- }
- }
- }
-}
-.scrollout {
- display: block;
- overflow: auto;
- position: absolute;
- background: $mblue;
- height: 100%;
- width: 80%;
- .mmitem {
- @extend .wtxt;
- font: $mmfont;
- display: block;
- margin: 10px auto;
- width: 90%;
- font-size: 30px;
- text-align: left;
- border-bottom: 1px rgba($mred, 0.8) solid;
-
- a::after {
- display: none;
- }
- &::before {
- content: "\0d7";
- display: inline-block;
- font: 30px WebSymbolsLigaRegular;
- }
- }
- .roster {
- margin-top: 1em;
- text-align: center;
- &.empty, &.nocontacts {
- color: gray;
- &::before {
- display:block;
- content: "l";//"cloudup";
- font: 3em WebSymbolsLigaRegular;
- }
- &::after {
- display:block;
- font: 1.5em "Exo 2", sans-serif;
- }
- }
- &.empty::after {
- content: "Войдите, чтобы увидеть список собеседников.";
- }
- &.nocontacts::after {
- content: "Расскажите друзьям про jabber.ru и добавьте их в свой список контактов!";
- }
- }
-}
-
diff --git a/css/_notfound.scss b/css/_notfound.scss
deleted file mode 100644
index 30b0d18..0000000
--- a/css/_notfound.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.notFoundNumber {
- color: $mred;
- width: 100%;
- font-family: bicubik,"Lucida Console", Monaco, monospace;
- font-size: 5em;
- font-weight: bold;
-
-}
-.notFoundText {
- @extend .wtxt;
- font: $mmfont;
-}
diff --git a/css/_personal.scss b/css/_personal.scss
deleted file mode 100644
index 203cd14..0000000
--- a/css/_personal.scss
+++ /dev/null
@@ -1,293 +0,0 @@
-.personal {
- box-sizing: border-box;
- color: white;
- bottom: 0;
- margin: 0 auto;
- color: white;
- position: fixed;
- left: 0;
- right: 0;
- bottom: 0;
- top: 150px;
- max-width: 80%;
- @media screen and (max-width: $midDevW) {
- max-width: 90%;
- //width: 90%;
- }
- @media screen and (max-width: $mbdevW) {
- max-width: 100%;
- }
- &>.p-menu {
- width: 20%;
- height: 100%;
- }
- &>.roster-history {
- width: 80%;
- max-width: 1024px;
- height: 100%;
- box-sizing: border-box;
- }
- @media screen and (max-width: $sdevW) {
- top: 3.5em;
- //position: relative;
- .r-settings {
- margin: 1px;
- left: 0;
-
- }
- &>.p-menu {
- display: none;
- }
- &>.roster-history {
- width: 100%;
- }
- }
-
-}
-
-.p-menu, .roster-history {
- font-family: Jura, sans-serif;
- color: white;
- display: inline-block;
- position: relative;
-}
-
-.p-settings {
- text-align: right;
- display: block;
- position: relative;
- line-height: 2em;
- box-sizing: border-box;
- &:after {
- content: "^";//"settings";
- font: 1em WebSymbolsLigaRegular;
- display:inline-block;
- margin: 0 0 0 0.5em;
- }
- &.selected:after {
- color: $mred;
- }
- &:before {
- position: absolute;
- display: block;
- content: " ";
- bottom: 0px;
- height: 1px;
- width: 100%;
- background: $mred;
- background: linear-gradient(to right, rgba($mred,0), $mred);
- }
- &.selected:before, &:hover:before {
- background: $mred;
- }
- &.selected, &:active, &:hover {
- outline: none;
- }
-}
-.roster {
- color: white;
- a.selected, a:active, a:hover {
- outline: none;
- }
-}
-.r-item {
- display: block;
- text-align: right;
- padding: 0.5em 0;
- font-size: 1.5em;
- box-sizing: border-box;
- padding: 0.5em 20px 0.5em 0;
- width: 100%;
- position: relative;
- overflow-wrap: break-word;
- outline: none;
-
- &:first-of-type:after, & + &:after {
- display: block;
- position: absolute;
- left: 0;
- right: 0px;
- bottom: 0;
- height: 1px;
- content: " ";
- background: $mred;
- background: linear-gradient(to right, rgba($mred,0), $mred);
- }
- &:last-of-type:after {
- background: $mred;
- background: linear-gradient(to right, rgba($mred,0), $mred);
- }
- &.selected:after, &:hover:after {
- background: $mred;
- }
-}
-
-.r-settings {
- position: absolute;
- left: 22%;
- right: 0;
- margin-left: 40px;
- * {
- box-sizing: border-box;
- }
- display: inline-block;
- height: 100%;
- text-align: left;
- font: 1.5em "Exo 2", sans-serif;
- color: white;
- &>div {
- margin-bottom: 15px;
- }
- .settings-default, .settings-always, .settings-never, .settings-save {
- position: relative;
- padding: 10px;
- }
- .settings-default>p:nth-child(1) {
- width: 90%;
- margin-top: -0.5em;
- text-align: justify;
- @media screen and (max-width: $sdevW) {
- width: 100%
- }
- }
- .settings-save {
- padding: 10px;
- }
- select {
- color: white;//rgba(0,0,0,0);
- //text-shadow: 0 0 0 white;
- font-size: 0.8em;
- line-height: 2em;
- height: 3em;
- }
- textarea {
- color: white;
- min-height: 10em;
- font-size: 1em;
- }
- select, textarea {
- display: block;
- background: $mblue;
- border: 2px $mred solid;
- margin: 20px;
- padding: 0 20px;
- width: 90%;
- @media screen and (max-width: $sdevW) {
- margin: 10px auto;
- padding: 0 10px;
- width: 100%;
- }
- }
- textarea + .errortext {
- color: $rred;
- bottom: 0;
- right: 7%;
- right: calc(5% + 20px);
-
- }
- button {
- color: white;
- background: $mblue;
- border: 2px $mred solid;
- font: 1em "Exo 2", sans-serif;
- min-width: 20%;
- padding: 15px;
- margin: 30px;
- }
- .errortext {
- position: absolute;
- text-align: right;
- width: 90%;
- margin: auto;
- @media screen and (max-width: $mbdevW) {
- position: static;
- }
- }
- .settings-save > .errortext {
- position: static;
- }
-}
-
-.roster-history {
- .no-history {
- text-align: center;
- width: 80%;
- font: 2.5em "Exo 2", sans-serif;
- margin: auto;
- color: gray;
- @media screen and (max-width: $sdevW) {
- width: 100%;
- }
- }
- .no-history:before {
- content: "l";//"cloudup";
- font: 3em WebSymbolsLigaRegular;
- display:block;
- }
-
- .message {
- margin: 5px 10px;
- padding: 10px;
- max-width: 90%;
- @media screen and (max-width: $mbdevW) {
- margin: 5px 10px;
- padding: 0;
- max-width: 100%;
- }
- .message-author {
- color: #a6a6a6;
- display: inline;
- text-transform: capitalize;
- }
- &.incoming {
- .me {
- display: none;
- }
-
- }
- &.outgoing {
- .peer {
- display:none;
- }
- }
- .message-text {
- hyphens: auto;
- overflow-wrap: break-word;
- font: 1.3em "Exo 2", sans-serif;
- @media screen and (max-width: $mbdevW) {
- font-size: 1em;
- }
- }
- .message-timestamp {
- display: inline;
- color: grey;
- margin-left: 0.5em;
- .ts-date, .ts-time {
- display: inline;
- }
- .ts-date {
- display: none;
- }
- }
- }
-}
-.message.incoming + .message.outgoing, .message.outgoing + &.message.incoming {
- margin: 12px 10px 0 10px;
-}
-.message.incoming + .message.incoming, .message.outgoing + .message.outgoing {
- margin: 0 10px;
- padding-top: 0;
- .message-author, .message-timestamp {
- display:none
- }
-}
-.roster-history-placeholder {
- font: 3em WebSymbolsLigaRegular;
- text-align: center;
- color: gray;
-}
-.start-placeholder {
- font: 3em WebSymbolsLigaRegular;
- text-align: center;
- color: gray;
-}
diff --git a/css/_root.scss b/css/_root.scss
deleted file mode 100644
index 0cdd75e..0000000
--- a/css/_root.scss
+++ /dev/null
@@ -1,143 +0,0 @@
-.nologo {
- padding-top:0;
- .logo {
- @media screen and (min-width: $mdevW) {
- background: transparent;
- }
- }
-}
-.mainhelp, .mainlogin {
- display: inline-block;
- position: relative;
- box-sizing: border-box;
- width: 50%;
- padding: 3%;
- padding-bottom: 10%;
- vertical-align: top;
- text-align: right;
- h1 {
- margin-top: 0;
- }
- .formHeader {
- font-size: 36px;
- @media screen and (max-width: $mdevW ) {
- font-size: 30px;
- }
- }
- .form.submit {
- margin: 0;
- }
- .form.remind {
- position: relative;
- right: 0;
- bottom: 0;
- }
- .loader {
- position: relative;
- display: block;
- margin: auto;
- }
- @media screen and (max-width: $mbdevW) {
- text-align: justify;
- }
- @media screen and (max-width: $smdevW+1) {
- padding: 0 1%;
- }
- @media screen and (max-width: $bigDevW) {
- padding-top: 0;
- }
- @media screen and (max-width: $mdevW + 1) {
- width: 100%;
- }
-}
-
-.mainhelp {
- p {
- text-indent: 2em;
- }
-}
-
-.mainlogin {
- min-height: 550px;
- border-left: solid 1px;
- border-color: $mred;
- .loginForm, .gradient-log{
- background:transparent;
- position: relative;
- width: unset;
- padding: unset;
- overflow: unset;
- top: unset;
- .hg2 {display:none}
- a.close {display:none}
- }
-
- .success {
- margin-bottom: -40px;
- }
- @media screen and (min-width: 550px ) and (max-width: $mdevW) {
- .loginForm {
- max-width: 80%;
- margin: auto;
- }
-
- }
- @media screen and (max-width: $mdevW) {
- border: none;
- padding: 0;
- padding-bottom: 10%;
- }
-}
-.mainreg {
- width: 90%;
- margin: auto;
- @media screen and (max-width: $bigDevW) {
- width: 100%
- }
- @media screen and (max-width: $mdevW ) {
- .mainhelp {
- display:none;
- }
- }
-}
-.dialog {
- width: 80%;
- @media screen and (max-width: $bigDevW) {
- width: 100%
- }
- margin: auto;
- display: table;
- h1 {
- margin: 0.5em 0;
- }
- &:after {
- content: "";
- display: table;
- clear: both;
- }
- .hello, .phrases {
- h1:nth-child(1) {
- margin-top: 0;
- }
- width: 50%;
- box-sizing: border-box;
- display: table-cell;
- padding: 0 3%;
- @media screen and (max-width: $smdevW + 1) {
- padding: 0 1%;
- }
- @media screen and (max-width: $mdevW + 1) {
- width: 100%;
- }
- }
- .hello {
- background-image: url('/static/logo.png');
- background-size: contain;
- background-repeat: no-repeat;
- background-position: 87% 50%;
- height: 100%;
- @media screen and (max-width: $mdevW + 1) {
- display:none;
- }
- }
-}
diff --git a/css/_svcs.scss b/css/_svcs.scss
deleted file mode 100644
index 2442226..0000000
--- a/css/_svcs.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-.svcimg {
- margin: 25px;
-}
-.footerwrap .svc:nth-child(odd) .svcimg {
- float:left;
-}
-.footerwrap .svc:nth-child(even) .svcimg {
- float:right;
- transform: scaleX(-1);
-}
-.svc:nth-child(n+2):before {
- display: block;
- width: 90%;
- content:" ";
- border: 1px solid $mred;
- margin: auto;
-}
-.svc:last-of-type p:last-child {
- width: 70%;
-}
-.svcs h2 {
- margin-bottom: -0.6em;
-}
-.svc:first-child h1 {
- margin-top: 0;
-}
-.svc.planning {
- color: gray;
- h2 {
- color: darkgrey;
- }
- h1>.anchor {
- display: inline-block;
- }
- h1:after {
- content: " — в процессе запуска";
- color: darkgrey;
- }
-}
-
-@media screen and (max-width: $mdevW) {
-
- .svcimg {
- height: auto;
- width: 100%;
- margin: auto;
- text-align: center;
- img {
- height: auto;
- width: auto;
- max-width: 250px;
- max-height: 350px;
-
- }
- }
-}
diff --git a/index.js b/index.js
deleted file mode 100644
index 6222a99..0000000
--- a/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import {App, store} from "./components/application.js"
-import {syncHistoryWithStore} from 'react-router-redux'
-import {browserHistory} from 'react-router'
-import * as ReactDOM from 'react-dom';
-import * as React from 'react';
-
-const history = syncHistoryWithStore(browserHistory, store);
-
-const SApp = App(history);
-
-ReactDOM.render(
-
- {props.children}
-
-
-
-
+
+ );
+}
+
+export default connect()(Footer);
diff --git a/src/components/footer/Footer.scss b/src/components/footer/Footer.scss
new file mode 100644
index 0000000..ce2f00c
--- /dev/null
+++ b/src/components/footer/Footer.scss
@@ -0,0 +1,51 @@
+.footer {
+ background-color: $medium-blue;
+ grid-column-start: 1;
+ grid-column-end: 6;
+ grid-row-start: 9;
+ align-content: center;
+
+ display: grid;
+ grid-template-columns: repeat(7, 14.3%);
+ color: #ffffff;
+
+ .footer-emblem {
+ grid-column-start: 2;
+ grid-column-end: 4;
+ }
+
+ .footer-emblem > img {
+ width: 400px;
+ }
+
+ .services {
+ grid-column-start: 4;
+ grid-column-end: 7;
+
+ display: grid;
+ grid-template-columns: repeat(3, auto);
+ grid-template-rows: repeat(3, auto);
+
+ text-align: left;
+ padding-left: 20px;
+
+ .title {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+
+ margin-bottom: 20px;
+ }
+
+ .footer-menu-column {
+ display: flex;
+ flex-direction: column;
+ font-size: large;
+
+ a, a:link, a:visited {
+ color: #ffffff;
+ text-decoration: none;
+ }
+ }
+ }
+}
diff --git a/src/components/footer/emblem.svg b/src/components/footer/emblem.svg
new file mode 100644
index 0000000..9e7d195
--- /dev/null
+++ b/src/components/footer/emblem.svg
@@ -0,0 +1,147 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/components/help/Help.jsx b/src/components/help/Help.jsx
new file mode 100644
index 0000000..22452dd
--- /dev/null
+++ b/src/components/help/Help.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import {connect} from "react-redux";
+
+class Help extends React.PureComponent {
+ render() {
+ return (
+ <>
+ Help page.
+
+ );
+ }
+}
+
+export default connect(() => ({}), () => ({}))(Help);
diff --git a/src/components/login/Login.jsx b/src/components/login/Login.jsx
new file mode 100644
index 0000000..e553d98
--- /dev/null
+++ b/src/components/login/Login.jsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import {connect} from "react-redux";
+import {bool} from 'prop-types';
+
+import Registration from './Registration';
+import Signup from './Signup';
+
+class Login extends React.PureComponent {
+
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ selectedAuth: false
+ }
+ }
+
+ static propTypes = {
+ isLogged: bool
+ };
+
+ switchToSignup = () => {
+ this.setState({selectedAuth: true})
+ };
+
+ switchToRegistration = () => {
+ this.setState({selectedAuth: false})
+ };
+
+ render() {
+ return (
+
+ 
+
+
+
+
+ Помощь
+ Сервисы
+ Клиенты
+
+
+
+
+ FAQ
+ Contacts
+
+ {
+ this.state.selectedAuth
+ ?
+ );
+ }
+}
+
+export default connect(state => ({
+ isLogged: state.getIn(['login', 'token'], null) !== null
+}), () => ({}))(Login);
diff --git a/src/components/login/Login.scss b/src/components/login/Login.scss
new file mode 100644
index 0000000..03d0188
--- /dev/null
+++ b/src/components/login/Login.scss
@@ -0,0 +1,42 @@
+.login-root {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: stretch;
+
+ .login-title > h3 {
+ display: inline;
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+
+ .login-row {
+ margin-top: 20px;
+
+ button {
+ color: #ffffff;
+ background-color: $medium-blue;
+ width: 40%;
+ border-radius: 25px;
+ }
+
+ .reset-password {
+ color: $medium-blue;
+ text-decoration: underline;
+ }
+
+ & + .login-info {
+ padding-left: 15%;
+ padding-right: 15%;
+ }
+ }
+
+ .login-title > div {
+ display: inline-block;
+ }
+
+ .left-right-margin {
+ margin-left: 15px;
+ margin-right: 15px;
+ }
+}
diff --git a/src/components/login/Registration.jsx b/src/components/login/Registration.jsx
new file mode 100644
index 0000000..88886a2
--- /dev/null
+++ b/src/components/login/Registration.jsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import {connect} from "react-redux";
+import {func} from 'prop-types';
+
+class Registration extends React.PureComponent {
+
+ static propTypes = {
+ switchToSignup: func.isRequired
+ };
+
+ render() {
+ return (
+ <>
+
+
+
+ Регистрация
+
+
+ /
+
+
+ Вход
+
+
+
+
+
+
+
+
+
+
+
+ После регистрации скачайте программу
+ из перечня ниже, позовите друзей
+ и общайтесь.
+
+
+ );
+ }
+}
+
+export default connect()(Registration);
diff --git a/src/components/login/Signup.jsx b/src/components/login/Signup.jsx
new file mode 100644
index 0000000..25b7705
--- /dev/null
+++ b/src/components/login/Signup.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import {connect} from "react-redux";
+import {func} from 'prop-types';
+
+class Registration extends React.PureComponent {
+
+ static propTypes = {
+ switchToRegistration: func.isRequired
+ };
+
+ render() {
+ return (
+ <>
+
+
+
+ Регистрация
+
+
+ /
+
+
+ Вход
+
+
+
+
+
+
+
+
+
+
+
+ Напомнить пароль
+
+
+ );
+ }
+}
+
+export default connect()(Registration);
diff --git a/src/components/main/Main.jsx b/src/components/main/Main.jsx
new file mode 100644
index 0000000..82a1e33
--- /dev/null
+++ b/src/components/main/Main.jsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import {func, object} from 'prop-types';
+import {connect} from 'react-redux';
+import {login} from '../app/AppActions';
+import {TwitterTimelineEmbed} from 'react-twitter-embed';
+import {List} from 'immutable';
+import Slider from "react-slick";
+
+import Footer from '../footer/Footer';
+import Login from '../login/Login';
+
+class Main extends React.PureComponent {
+
+ static propTypes = {
+ signup: func,
+ loadClients: func,
+ clients: object
+ };
+
+ componentDidMount() {
+ this.props.loadClients();
+ }
+
+ render() {
+ return (
+
+
+
+ );
+ }
+}
+
+export default connect(
+ state => ({
+ waiting: state.getIn(['login', 'waiting'], false),
+ failed: state.getIn(['login', 'failed'], false),
+ token: state.getIn(['login', 'token'], null),
+ clients: state.getIn(['main', 'clients'], List())
+ }),
+ dispatch => ({
+ signup: (username, password) => login(dispatch, username, password),
+ loadClients: () => dispatch({type: 'LOAD_CLIENTS_STARTED'}),
+ }))(Main);
diff --git a/src/components/main/Main.scss b/src/components/main/Main.scss
new file mode 100644
index 0000000..55816ae
--- /dev/null
+++ b/src/components/main/Main.scss
@@ -0,0 +1,140 @@
+@import "~slick-carousel/slick/slick.css";
+@import "~slick-carousel/slick/slick-theme.css";
+
+.main {
+ display: grid;
+ grid-template-columns: 2fr 3fr 1fr 3fr 2fr;
+ grid-template-rows: minmax(60px, 5%) 160px minmax(6%, 120px) minmax(240px, 13%) 3% minmax(320px, 24%) minmax(5%, 60px) minmax(340px, 23%) minmax(200px, 13%);
+ grid-auto-rows: 100px;
+ font-size: x-large;
+
+ text-align: center;
+
+ .intro-first {
+ z-index: -1;
+ grid-row-start: 2;
+ grid-column-start: 1;
+ background-color: $light-blue;
+ }
+
+ .intro-middle {
+ z-index: -1;
+ grid-row-start: 2;
+ grid-column-start: 3;
+ background-color: $light-blue;
+ }
+
+ .intro-last {
+ z-index: -1;
+ grid-row-start: 2;
+ grid-column-start: 5;
+ background-color: $light-blue;
+ }
+
+ .intro {
+ grid-row-start: 2;
+ grid-column-start: 2;
+
+ background-color: $light-blue;
+ color: #ffffff;
+
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .intro-logo {
+ background-color: $light-blue;
+ grid-column-start: 4;
+ grid-row-start: 2;
+ }
+
+ .intro-image {
+ margin-top: -40px;
+ margin-bottom: -30px;
+ height: 280px;
+ }
+
+ .clients {
+ grid-row-start: 8;
+ background-color: $light-blue;
+ display: flex;
+ justify-content: center;
+
+ .slider-container {
+ width: 1200px;
+
+ .slider-item {
+
+ display: flex;
+ flex-direction: column;
+ align-items: stretch;
+
+ a, a:hover, a:active {
+ color: #ffffff;
+ text-decoration: none;
+ }
+ }
+
+ .slider-item-title {
+ color: #ffffff;
+ font-size: larger;
+ }
+
+ .slider-item-content {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-around;
+ align-items: flex-start;
+ }
+
+ .slider-item-image > img {
+ height: 260px;
+ }
+
+ .slick-current > .slider-item-content > img {
+ height: 340px;
+ }
+ }
+ }
+
+ .news {
+ grid-column-start: 4;
+ grid-row-start: 6;
+
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: stretch;
+
+ & > h3 {
+ margin-top: 20px;
+ }
+ }
+
+ .info {
+ grid-row-start: 4;
+ grid-column-start: 2;
+ }
+
+ .login {
+ grid-column-start: 2;
+ grid-row-start: 6;
+ }
+
+ .donation {
+ grid-row-start: 4;
+ grid-column-start: 4;
+
+ button {
+ margin-top: 25px;
+ font-weight: bold;
+ border-color: $light-blue;
+ background-color: #ffffff;
+ color: $medium-blue;
+ border-radius: 25px;
+ width: 60%;
+ }
+ }
+}
diff --git a/src/components/main/MainReducer.js b/src/components/main/MainReducer.js
new file mode 100644
index 0000000..16e54e3
--- /dev/null
+++ b/src/components/main/MainReducer.js
@@ -0,0 +1,16 @@
+import {List, Map} from "immutable";
+
+const initialState = Map({
+ clients: List(),
+});
+
+export default (state = initialState, action) => {
+ switch (action.type) {
+ case 'LOAD_CLIENTS_SUCCESS':
+ return state.set('clients', action.payload);
+ default:
+ return state;
+ }
+};
+
+
diff --git a/src/components/main/intro.svg b/src/components/main/intro.svg
new file mode 100644
index 0000000..c428ae1
--- /dev/null
+++ b/src/components/main/intro.svg
@@ -0,0 +1,316 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/components/main/sagas.js b/src/components/main/sagas.js
new file mode 100644
index 0000000..5d3f6a1
--- /dev/null
+++ b/src/components/main/sagas.js
@@ -0,0 +1,51 @@
+import {put, takeLatest} from 'redux-saga/effects';
+import {fromJS} from 'immutable';
+
+const clientsStub = [
+ {
+ name: "Xabber",
+ imgUrl: "https://lh3.googleusercontent.com/5ZCn-z0We-puYjQ_t1m3RATzuakUurga5gRvWkpNVZHhmgdHvIQj_tpvs93CKebOqquT=h600",
+ link: "https://xabber.com"
+ },
+ {
+ name: "Conversations",
+ imgUrl: "https://lh3.ggpht.com/ib4uM-oxW1Q8zSHib_UJVPaw73G5AHF1B3Swx_MXDXNzXf3hBDqgHnMWtYxChZ1I4fs=h600",
+ link: "https://conversations.im"
+ },
+ {
+ name: "Yaxim",
+ imgUrl: "https://lh4.ggpht.com/9VvBWxJ7-S6SWb9_x8uVS8C_VVe9khX649Dzm_MWQ12a88hYexDCmMmgF4DuwEssHQ=h600",
+ link: "https://yaxim.org/"
+ },
+ {
+ name: "Adium",
+ imgUrl: "https://upload.wikimedia.org/wikipedia/commons/c/c5/AdiumX_screenshot.png",
+ link: "https://adium.im/"
+ },
+ {
+ name: "Pidgin",
+ imgUrl: "https://upload.wikimedia.org/wikipedia/commons/b/bc/Pidgin_Ubuntu_Buddy_List.png",
+ link: "https://pidgin.im/"
+ },
+ {
+ name: "IM+",
+ imgUrl: "https://upload.wikimedia.org/wikipedia/ru/c/c2/Im_plus_screenshot.png",
+ link: "https://plus.im/"
+ }
+];
+
+function* loadClients() {
+ try {
+ //const clients = yield call(Api);
+ const payload = fromJS(clientsStub);
+ yield put({type: 'LOAD_CLIENTS_SUCCESS', payload: payload})
+ } catch (e) {
+ yield put({type: 'LOAD_CLIENTS_FAILED'})
+ }
+}
+
+function* mainSaga() {
+ yield takeLatest('LOAD_CLIENTS_STARTED', loadClients)
+}
+
+export default mainSaga;
diff --git a/src/components/router/Router.jsx b/src/components/router/Router.jsx
new file mode 100644
index 0000000..470423f
--- /dev/null
+++ b/src/components/router/Router.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import {BrowserRouter, Route} from "react-router-dom";
+import Main from '../main/Main';
+import About from '../about/About';
+import Service from '../service/Service';
+import Help from '../help/Help';
+
+export default class Router extends React.PureComponent {
+
+ render = () => (
+
+
+
+
+ Чат, который всегда с тобой
+
+
+ 
+
+
+
+
+
+
+ Один абзац о нас
+
+
+ Jabber.ru - это мессенджер.
+ Бесплатный, безопасный, независимый,
+ не содержит рекламы и не собирает данные
+ о пользователях.
+
+
+
+
+ Помочь нам
+
+
+ Наш чат всегда был бесплатным, таким
+ и останется. Но мы с благодарностью примем
+ пожертвования от всех, кому нравится jabber.ru
+
+
+
+
+
+
+
+ Новости
+
+
+
+
+
+
+ {this.props.clients.map((c, idx) => {
+ return (
+
+
+
+
+ {c.get('name')}
+
+
+ );
+ })}
+
+
+ }/)
+
+
+
+
+