Skip to content

Commit

Permalink
fix(lint): Fix ESLint & Codacy issues (#348)
Browse files Browse the repository at this point in the history 
Follow up for PR #346.

=> no more syntax errors reported by `$(npm bin)/prettier . --write` 🎉

Also, it:
- finishes the migration of the `bookmarklet` test from Webdriver to Cypress.
- updates argon2 from v0.25.1 to v0.27.0, in order to prevent fix the broken download of binaries from GitHub releases
- fixes "Uncaught ReferenceError: Barelog is not defined" on CI
  • Loading branch information
@adrienjoly
adrienjoly committed Aug 30, 2020
1 parent 1bcf406 commit 440dda6
Show file tree
Hide file tree
Showing 13 changed files with 3,707 additions and 3,632 deletions.
7 changes: 5 additions & 2 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
public/js/jquery*.js
public/js/*-min.js
public/js/*.min.js
public/js/*jquery*.js
public/js/md5.js
public/js/mustache.js
public/js/playem-all.js
public/js/playem-min.js
public/js/soundmanager2*.js
app/jstat*.js
1 change: 1 addition & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ jquery*.js
playem-all.js
public/js/soundmanager2.js
public/press/js/sliderz.v1.js
docs/_site/*.html
12 changes: 7 additions & 5 deletions app/templates/feed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,16 @@ <h2>Recent activity</h2>
o.async = 1;
o.src = e;
g.parentNode.insertBefore(o, g);
o.onload = a.onreadystatechange = function () {
a.readyState === 'complete' && Barelog(options);
};
})(window, document, 'script', 'https://cdn.barelog.com/widget.js');
o.addEventListener('load', function () {
setTimeout(function () {
Barelog(options);
}, 50);
});
})(window, document, 'script', 'https://cdn.productfeed.app/widget.js');

var options = {
id: 't8nrxyyfogwt',
trigger: '#barelog-trigger',
trigger: '#productfeed-trigger',
};
</script>
<!-- end of "What's new?" link -->
Expand Down
259 changes: 138 additions & 121 deletions app/templates/postPage.html
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,141 @@
<div class="posts">

{{#posts}}

<div class="background-header">
<div class="jsDynThumb" style="background-image:url({{img}})"></div>
</div>

<div class="post {{cssClass}}" data-pid="{{id}}" {{#score}} data-score="{{score}}" {{/score}} {{#order}}
data-order="{{n}}" {{/order}} {{#repost}} data-initialpid="{{pId}}" {{/repost}} {{#isLoved}} data-loved="true"
{{/isLoved}} data-time="{{agoTimestamp}}">


<a class="thumb jsDynThumb" target="_blank" data-eid="{{eId}}" data-img="{{img}}" onclick="return playTrack(this);"
style="background-image:url('{{img}}');">
<img src="{{img}}">
<div class="play"></div>
</a>

<h2><a href="{{postUrl}}" class="no-ajaxy">{{name}}</a></h2>
<span class="ago" datetime="{{agoTimestamp}}">
<a href="{{postUrl}}">{{agoRendered}}</a>
</span>

<p class="author">
<span style="{{#uId}}background-image:url('/img/u/{{uId}}');{{/uId}}"></span>
<a href="/u/{{uId}}">{{uNm}}</a> {{#showAdded}}added this track{{/showAdded}}
{{#pl}}
to <a href="{{plUrl}}">{{name}}</a>
{{/pl}}
{{#repost}}
via <a href="/u/{{uId}}">{{uNm}}</a>
{{/repost}}
</p>



<div class="stats">
<span class="nbReposts" style="{{^hasReposts}}display:none;{{/hasReposts}}"
onclick="javascript:showReposts('{{id}}')">
<span>{{nbReposts}}</span>
</span>

<span class="nbLoves" style="{{^hasLoves}}display:none;{{/hasLoves}}"
onclick="javascript:showPostLovers('{{id}}')">
<span>{{nbLoves}}</span>
</span>
<span class="nbComments" style="{{^hasComments}}display:none;{{/hasComments}}"
onclick="javascript:$('textarea.commentEntry').focus();">
<span>{{nbComments}}</span>
</span>
</div>

<div class="btns">
<a class="btnRepost" href="javascript:publishPost('{{id}}');">
Add to
</a>
<span>&middot;</span>
<a class="btnLike {{#isLoved}}selected{{/isLoved}}" href="javascript:toggleLovePost('{{id}}');">
{{#isLoved}}Liked{{/isLoved}}
{{^isLoved}}Like{{/isLoved}}
</a>
<span>&middot;</span>
<a class="btnComment" onclick="javascript:$('textarea.commentEntry').focus();">
Comment
</a>
<span>&middot;</span>
<a class="btnShare" href="javascript:sharePost('{{id}}');">
<span> Share </span>
</a>
{{#ownPost}}
<span class="postEdit">
<span>&middot;</span>
<a onclick="modalPostEditBox('{{id}}')">
Edit
</a>
</span>
{{/ownPost}}
</div>

<div class="ext">

<form class="comments">
{{#comments}}
<div class="comment {{cssClass}}" data-cid="{{_id}}">
<div class="author">
<span style="background-image:url('/img/u/{{uId}}');"></span>
<a href="/u/{{uId}}">
{{uNm}}
<span class="t">{{tRendered}}</span>
</a>
</div>
<p class="text">{{{html}}}</p>
{{#canDelete}}<div class="delete"></div>{{/canDelete}}
</div>
{{/comments}}
{{#loggedUser}}
<div class="newComment">
<span class="author">
<span style="background-image:url('/img/u/{{id}}');"></span>
</span>
<div>
<textarea class="commentEntry mention" placeholder="Comment"></textarea>
</div>
</div>
<div class="newTip">
<input type="submit" value="Post comment">
<p>Tip: You can mention people with "@"</p>
</div>
{{/loggedUser}}
</form>
</div>


</div>

{{#via}}
<a class="powered {{hostClass}}" href="{{contentUrl}}" target="_blank">Powered by {{hostLabel}}</a>
{{/via}}
{{/posts}}

{{#posts}}

<div class="background-header">
<div class="jsDynThumb" style="background-image:url({{img}})"></div>
</div>

<div
class="post {{cssClass}}"
data-pid="{{id}}"
data-score="{{score}}"
data-order="{{#order}}{{n}}{{/order}}"
data-initialpid="{{#repost}}{{pId}}{{/repost}}"
data-loved="{{#isLoved}}true{{/isLoved}}"
data-time="{{agoTimestamp}}"
>
<a
class="thumb jsDynThumb"
target="_blank"
data-eid="{{eId}}"
data-img="{{img}}"
onclick="return playTrack(this);"
style="background-image:url('{{img}}');"
>
<img src="{{img}}" />
<div class="play"></div>
</a>

<h2><a href="{{postUrl}}" class="no-ajaxy">{{name}}</a></h2>
<span class="ago" datetime="{{agoTimestamp}}">
<a href="{{postUrl}}">{{agoRendered}}</a>
</span>

<p class="author">
<span
style="{{#uId}}background-image:url('/img/u/{{uId}}');{{/uId}}"
></span>
<a href="/u/{{uId}}">{{uNm}}</a> {{#showAdded}}added this
track{{/showAdded}} {{#pl}} to <a href="{{plUrl}}">{{name}}</a> {{/pl}}
{{#repost}} via <a href="/u/{{uId}}">{{uNm}}</a>
{{/repost}}
</p>

<div class="stats">
<span
class="nbReposts"
style="{{^hasReposts}}display:none;{{/hasReposts}}"
onclick="javascript:showReposts('{{id}}')"
>
<span>{{nbReposts}}</span>
</span>

<span
class="nbLoves"
style="{{^hasLoves}}display:none;{{/hasLoves}}"
onclick="javascript:showPostLovers('{{id}}')"
>
<span>{{nbLoves}}</span>
</span>
<span
class="nbComments"
style="{{^hasComments}}display:none;{{/hasComments}}"
onclick="javascript:$('textarea.commentEntry').focus();"
>
<span>{{nbComments}}</span>
</span>
</div>

<div class="btns">
<a class="btnRepost" href="javascript:publishPost('{{id}}');"> Add to </a>
<span>&middot;</span>
<a
class="btnLike {{#isLoved}}selected{{/isLoved}}"
href="javascript:toggleLovePost('{{id}}');"
>
{{#isLoved}}Liked{{/isLoved}} {{^isLoved}}Like{{/isLoved}}
</a>
<span>&middot;</span>
<a
class="btnComment"
onclick="javascript:$('textarea.commentEntry').focus();"
>
Comment
</a>
<span>&middot;</span>
<a class="btnShare" href="javascript:sharePost('{{id}}');">
<span> Share </span>
</a>
{{#ownPost}}
<span class="postEdit">
<span>&middot;</span>
<a onclick="modalPostEditBox('{{id}}')"> Edit </a>
</span>
{{/ownPost}}
</div>

<div class="ext">
<form class="comments">
{{#comments}}
<div class="comment {{cssClass}}" data-cid="{{_id}}">
<div class="author">
<span style="background-image:url('/img/u/{{uId}}');"></span>
<a href="/u/{{uId}}">
{{uNm}}
<span class="t">{{tRendered}}</span>
</a>
</div>
<p class="text">{{{html}}}</p>
{{#canDelete}}
<div class="delete"></div>
{{/canDelete}}
</div>
{{/comments}} {{#loggedUser}}
<div class="newComment">
<span class="author">
<span style="background-image:url('/img/u/{{id}}');"></span>
</span>
<div>
<textarea
class="commentEntry mention"
placeholder="Comment"
></textarea>
</div>
</div>
<div class="newTip">
<input type="submit" value="Post comment" />
<p>Tip: You can mention people with "@"</p>
</div>
{{/loggedUser}}
</form>
</div>
</div>

{{#via}}
<a class="powered {{hostClass}}" href="{{contentUrl}}" target="_blank"
>Powered by {{hostLabel}}</a
>
{{/via}} {{/posts}}
</div>

<script src="/js/postPage.js"></script>
<script src="/js/postPage.js"></script>
Loading

0 comments on commit 440dda6

Please sign in to comment.