apply prettier formating
This commit is contained in:
committed by
Aleksey Gurianov
parent
5d1201351a
commit
2df3aa01d4
+83
-69
@@ -15,94 +15,108 @@ export const getPostComments = ({ sort, url }) => fetcher.get(`/find?url=${url}&
|
||||
|
||||
export const getLastComments = ({ siteId, max }) => fetcher.get(`/last/${max}?site=${siteId}`);
|
||||
|
||||
export const getCommentsCount = ({ urls, siteId }) => fetcher.post({
|
||||
url: `/counts?site=${siteId}`,
|
||||
body: urls,
|
||||
});
|
||||
export const getCommentsCount = ({ urls, siteId }) =>
|
||||
fetcher.post({
|
||||
url: `/counts?site=${siteId}`,
|
||||
body: urls,
|
||||
});
|
||||
|
||||
export const getComment = ({ id }) => fetcher.get(`/id/${id}?url=${url}`);
|
||||
|
||||
export const getUserComments = ({ user, limit }) => fetcher.get(`/comments?user=${user}&limit=${limit}`);
|
||||
|
||||
export const putCommentVote = ({ id, url, value }) => fetcher.put({
|
||||
url: `/vote/${id}?url=${url}&vote=${value}`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const putCommentVote = ({ id, url, value }) =>
|
||||
fetcher.put({
|
||||
url: `/vote/${id}?url=${url}&vote=${value}`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const addComment = ({ text, pid }) => fetcher.post({
|
||||
url: '/comment',
|
||||
body: {
|
||||
text,
|
||||
locator: {
|
||||
site: siteId,
|
||||
url,
|
||||
export const addComment = ({ text, pid }) =>
|
||||
fetcher.post({
|
||||
url: '/comment',
|
||||
body: {
|
||||
text,
|
||||
locator: {
|
||||
site: siteId,
|
||||
url,
|
||||
},
|
||||
...(pid ? { pid } : {}),
|
||||
},
|
||||
...(pid ? { pid } : {}),
|
||||
},
|
||||
withCredentials: true,
|
||||
});
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const updateComment = ({ text, id }) => fetcher.put({
|
||||
url: `/comment/${id}?url=${url}`,
|
||||
body: {
|
||||
text,
|
||||
},
|
||||
withCredentials: true,
|
||||
});
|
||||
export const updateComment = ({ text, id }) =>
|
||||
fetcher.put({
|
||||
url: `/comment/${id}?url=${url}`,
|
||||
body: {
|
||||
text,
|
||||
},
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const getPreview = ({ text }) => fetcher.post({
|
||||
url: '/preview',
|
||||
body: {
|
||||
text,
|
||||
},
|
||||
withCredentials: true,
|
||||
});
|
||||
export const getPreview = ({ text }) =>
|
||||
fetcher.post({
|
||||
url: '/preview',
|
||||
body: {
|
||||
text,
|
||||
},
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const getUser = () => fetcher.get({
|
||||
url: '/user',
|
||||
withCredentials: true
|
||||
});
|
||||
export const getUser = () =>
|
||||
fetcher.get({
|
||||
url: '/user',
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
/* admin */
|
||||
export const pinComment = ({ id, url }) => fetcher.put({
|
||||
url: `/admin/pin/${id}?url=${url}&pin=1`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const pinComment = ({ id, url }) =>
|
||||
fetcher.put({
|
||||
url: `/admin/pin/${id}?url=${url}&pin=1`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const unpinComment = ({ id, url }) => fetcher.put({
|
||||
url: `/admin/pin/${id}?url=${url}&pin=0`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const unpinComment = ({ id, url }) =>
|
||||
fetcher.put({
|
||||
url: `/admin/pin/${id}?url=${url}&pin=0`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const setVerifyStatus = ({ id }) => fetcher.put({
|
||||
url: `/admin/verify/${id}?verified=1`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const setVerifyStatus = ({ id }) =>
|
||||
fetcher.put({
|
||||
url: `/admin/verify/${id}?verified=1`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const removeVerifyStatus = ({ id }) => fetcher.put({
|
||||
url: `/admin/verify/${id}?verified=0`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const removeVerifyStatus = ({ id }) =>
|
||||
fetcher.put({
|
||||
url: `/admin/verify/${id}?verified=0`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const removeComment = ({ id }) => fetcher.delete({
|
||||
url: `/admin/comment/${id}?url=${url}`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const removeComment = ({ id }) =>
|
||||
fetcher.delete({
|
||||
url: `/admin/comment/${id}?url=${url}`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const blockUser = ({ id }) => fetcher.put({
|
||||
url: `/admin/user/${id}?block=1`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const blockUser = ({ id }) =>
|
||||
fetcher.put({
|
||||
url: `/admin/user/${id}?block=1`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const unblockUser = ({ id }) => fetcher.put({
|
||||
url: `/admin/user/${id}?block=0`,
|
||||
withCredentials: true,
|
||||
});
|
||||
export const unblockUser = ({ id }) =>
|
||||
fetcher.put({
|
||||
url: `/admin/user/${id}?block=0`,
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export const getBlocked = () => fetcher.get({
|
||||
url: '/admin/blocked',
|
||||
withCredentials: true,
|
||||
});
|
||||
export const getBlocked = () =>
|
||||
fetcher.get({
|
||||
url: '/admin/blocked',
|
||||
withCredentials: true,
|
||||
});
|
||||
|
||||
export default {
|
||||
logOut,
|
||||
|
||||
@@ -32,4 +32,4 @@ module.exports = {
|
||||
DEFAULT_SORT,
|
||||
LS_COLLAPSE_KEY,
|
||||
LS_SORT_KEY,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -8,12 +8,8 @@ const methods = ['get', 'post', 'put', 'patch', 'delete', 'head'];
|
||||
|
||||
methods.forEach(method => {
|
||||
fetcher[method] = data => {
|
||||
const {
|
||||
url,
|
||||
body = {},
|
||||
withCredentials = false,
|
||||
overriddenApiBase = API_BASE,
|
||||
} = (typeof data === 'string' ? { url: data } : data);
|
||||
const { url, body = {}, withCredentials = false, overriddenApiBase = API_BASE } =
|
||||
typeof data === 'string' ? { url: data } : data;
|
||||
const basename = `${BASE_URL}${overriddenApiBase}`;
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
@@ -5,8 +5,8 @@ Promise.prototype.finally = function finallyFn(callback) {
|
||||
const constructor = this.constructor;
|
||||
|
||||
return this.then(
|
||||
(value) => constructor.resolve(callback()).then(() => value),
|
||||
(reason) => constructor.resolve(callback()).then(() => reason)
|
||||
value => constructor.resolve(callback()).then(() => value),
|
||||
reason => constructor.resolve(callback()).then(() => reason)
|
||||
);
|
||||
};
|
||||
|
||||
@@ -20,7 +20,8 @@ export default function loadPolyfills() {
|
||||
'includes' in Array.prototype &&
|
||||
'assign' in Object &&
|
||||
'keys' in Object
|
||||
) return Promise.resolve();
|
||||
)
|
||||
return Promise.resolve();
|
||||
|
||||
return import(/* webpackChunkName: "polyfills" */ 'core-js');
|
||||
};
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
const querySettings = window.location.search.substr(1).split('&').reduce((acc, param) => {
|
||||
const pair = param.split('=');
|
||||
acc[pair[0]] = decodeURIComponent(pair[1]);
|
||||
return acc;
|
||||
}, {}) || {};
|
||||
const querySettings =
|
||||
window.location.search
|
||||
.substr(1)
|
||||
.split('&')
|
||||
.reduce((acc, param) => {
|
||||
const pair = param.split('=');
|
||||
acc[pair[0]] = decodeURIComponent(pair[1]);
|
||||
return acc;
|
||||
}, {}) || {};
|
||||
|
||||
export const siteId = querySettings['site_id'];
|
||||
export const url = querySettings['url'];
|
||||
|
||||
@@ -19,7 +19,6 @@ class Store {
|
||||
this.listeners[key].push(cb);
|
||||
}
|
||||
|
||||
|
||||
set(key, obj) {
|
||||
this.data[key] = obj;
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ describe('Store', () => {
|
||||
|
||||
store.set('comments', []);
|
||||
store.onUpdate('comments', listener);
|
||||
store.addComment({id:`new`});
|
||||
store.addComment({ id: `new` });
|
||||
|
||||
expect(listener).toBeCalledWith([{"comment": {"id": "new"}}]);
|
||||
expect(listener).toBeCalledWith([{ comment: { id: 'new' } }]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -46,7 +46,7 @@ export default class AuthPanel extends Component {
|
||||
{user.name}
|
||||
</strong>
|
||||
{isUserIdVisible && <span className="auth-panel__user-id"> ({user.id})</span>}.{' '}
|
||||
<span {...getHandleClickProps(props.onSignOut)} className="auth-panel__pseudo-link" role="link" >
|
||||
<span {...getHandleClickProps(props.onSignOut)} className="auth-panel__pseudo-link" role="link">
|
||||
Sign out?
|
||||
</span>
|
||||
</div>
|
||||
@@ -79,7 +79,7 @@ export default class AuthPanel extends Component {
|
||||
{user.admin && (
|
||||
<span
|
||||
className="auth-panel__pseudo-link auth-panel__admin-action"
|
||||
{...getHandleClickProps(this.toggleBlockedVisibility)}
|
||||
{...getHandleClickProps(this.toggleBlockedVisibility)}
|
||||
role="link"
|
||||
>
|
||||
{isBlockedVisible ? 'Hide' : 'Show'} blocked
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
.blocked-users__list-item_view_invisible {
|
||||
.blocked-users__username {
|
||||
opacity: .5;
|
||||
opacity: 0.5;
|
||||
text-decoration: line-through;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,16 +52,12 @@ export default class BlockedUsers extends Component {
|
||||
<span className="blocked-users__username">{user.name}</span>{' '}
|
||||
<span className="blocked-users__user-id">({user.id})</span>
|
||||
{isUserUnblocked && (
|
||||
<span
|
||||
{...getHandleClickProps(() => this.block(user))}
|
||||
className="blocked-users__action">
|
||||
<span {...getHandleClickProps(() => this.block(user))} className="blocked-users__action">
|
||||
block
|
||||
</span>
|
||||
)}
|
||||
{!isUserUnblocked && (
|
||||
<span
|
||||
{...getHandleClickProps(() => this.unblock(user))}
|
||||
className="blocked-users__action">
|
||||
<span {...getHandleClickProps(() => this.unblock(user))} className="blocked-users__action">
|
||||
unblock
|
||||
</span>
|
||||
)}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
vertical-align: middle;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
color: #259C9A;
|
||||
color: #259c9a;
|
||||
|
||||
&:hover {
|
||||
color: #31c7c5;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.comment__control {
|
||||
margin-right: 8px;
|
||||
cursor: pointer;
|
||||
color: #8CD4D4;
|
||||
color: #8cd4d4;
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
|
||||
@@ -7,6 +7,6 @@
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
opacity: .75;
|
||||
opacity: 0.75;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
background-size: cover;
|
||||
|
||||
&:hover {
|
||||
opacity: .75;
|
||||
opacity: 0.75;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
.comment__vote_disabled {
|
||||
&, &:hover {
|
||||
&,
|
||||
&:hover {
|
||||
background-image: url('comment__vote_disabled.svg');
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
margin-left: 4px;
|
||||
|
||||
&.comment__vote_selected {
|
||||
&, &:hover {
|
||||
&,
|
||||
&:hover {
|
||||
background-image: url('comment__vote_type_down.svg');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
margin-right: 4px;
|
||||
|
||||
&.comment__vote_selected {
|
||||
&, &:hover {
|
||||
&,
|
||||
&:hover {
|
||||
background-image: url('comment__vote_type_up.svg');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
.comment_collapsed {
|
||||
> .comment__body {
|
||||
.comment__text, .comment__actions {
|
||||
.comment__text,
|
||||
.comment__actions {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}
|
||||
|
||||
// it isn't mobile first, but it's fine here
|
||||
@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer:coarse) and (max-width: 768px) {
|
||||
@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer: coarse) and (max-width: 768px) {
|
||||
border: 8px solid #eee;
|
||||
padding-bottom: 0;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ $step: 24px;
|
||||
|
||||
&.comment_replying {
|
||||
.comment__input {
|
||||
@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer:coarse) and (max-width: 768px) {
|
||||
@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer: coarse) and (max-width: 768px) {
|
||||
margin-left: -$i * $step;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
// it isn't mobile first, but it's fine here
|
||||
@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer:coarse) and (max-width: 768px) {
|
||||
@media (-moz-touch-enabled: 1) and (max-width: 768px), (pointer: coarse) and (max-width: 768px) {
|
||||
border: 8px solid #eee;
|
||||
padding-bottom: 0;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.comment_useless {
|
||||
.comment__body {
|
||||
opacity: .35;
|
||||
opacity: 0.35;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.comment_view_admin {
|
||||
.comment__username {
|
||||
color: #0e7e9d;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
.comment__username {
|
||||
color: #0aa;
|
||||
};
|
||||
}
|
||||
|
||||
.comment__info {
|
||||
display: inline;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
.comment_view_user {
|
||||
&.comment_collapsed {
|
||||
.comment__text, .comment__actions {
|
||||
.comment__text,
|
||||
.comment__actions {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
background: #fff;
|
||||
color: #000;
|
||||
|
||||
&:hover, &:focus {
|
||||
&:hover,
|
||||
&:focus {
|
||||
box-shadow: inset 0 0 0 2px #0aa;
|
||||
color: #099;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
.input__button_type_send {
|
||||
background: #259C9A;
|
||||
background: #259c9a;
|
||||
color: #fff;
|
||||
|
||||
&:hover, &:focus {
|
||||
&:hover,
|
||||
&:focus {
|
||||
background: #0aa;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}
|
||||
|
||||
&:disabled {
|
||||
opacity: .5;
|
||||
opacity: 0.5;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
transform: translateZ(0); // let's try to fix blinking in Safari, again
|
||||
|
||||
&:focus {
|
||||
box-shadow: inset 0 0 0 2px #259C9A;
|
||||
box-shadow: inset 0 0 0 2px #259c9a;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,12 @@
|
||||
max-height: 300px;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
&:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
@@ -58,7 +63,8 @@
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
th, td {
|
||||
th,
|
||||
td {
|
||||
padding: 6px 13px;
|
||||
border: 1px solid #dfe2e5;
|
||||
}
|
||||
@@ -77,7 +83,7 @@
|
||||
padding: 0.2em 0.4em;
|
||||
margin: 0;
|
||||
font-size: 85%;
|
||||
background-color: rgba(#1b1f23, .05);
|
||||
background-color: rgba(#1b1f23, 0.05);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
@@ -115,8 +121,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
sup, sub {
|
||||
sup, sub {
|
||||
sup,
|
||||
sub {
|
||||
sup,
|
||||
sub {
|
||||
vertical-align: middle; // to prevent some visual cheats
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
height: 36px;
|
||||
margin: 20px auto;
|
||||
padding: 0;
|
||||
background: #259C9A;
|
||||
background: #259c9a;
|
||||
border-radius: 4px;
|
||||
border: 0;
|
||||
font-size: 14px;
|
||||
@@ -14,7 +14,8 @@
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover, &:focus {
|
||||
&:hover,
|
||||
&:focus {
|
||||
background: #0aa;
|
||||
}
|
||||
|
||||
|
||||
+4
-6
@@ -13,7 +13,7 @@ function init() {
|
||||
const nodes = [].slice.call(document.getElementsByClassName(COUNTER_NODE_CLASSNAME));
|
||||
|
||||
if (!nodes) {
|
||||
console.error('Remark42: Can\'t find counter nodes.');
|
||||
console.error("Remark42: Can't find counter nodes.");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -34,9 +34,7 @@ function init() {
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
api.getCommentsCount({ urls: Object.keys(map), siteId: remark_config.site_id })
|
||||
.then(res => {
|
||||
res.forEach(item => (map[item.url].innerHTML = item.count));
|
||||
});
|
||||
api.getCommentsCount({ urls: Object.keys(map), siteId: remark_config.site_id }).then(res => {
|
||||
res.forEach(item => (map[item.url].innerHTML = item.count));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -11,7 +11,7 @@ function init() {
|
||||
const node = document.getElementById(NODE_ID);
|
||||
|
||||
if (!node) {
|
||||
console.error('Remark42: Can\'t find root node.');
|
||||
console.error("Remark42: Can't find root node.");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -79,4 +79,3 @@ function init() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ export function createDomContainer(setup) {
|
||||
beforeAll(() => {
|
||||
domContainer = document.createElement('div');
|
||||
(document.body || document.documentElement).appendChild(domContainer);
|
||||
setup({domContainer});
|
||||
setup({ domContainer });
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
Reference in New Issue
Block a user