diff --git a/jst/comment.jst b/jst/comment.jst deleted file mode 100644 index 1bf7d8a..0000000 --- a/jst/comment.jst +++ /dev/null @@ -1,25 +0,0 @@ -<% -var isRemoved = _.has(comment,"removed"); -var isDeleted = _.has(comment,"deleted"); - -var commentCss = "comment comment-" + (isRemoved ? "removed" : (isDeleted ? "deleted" : (comment.depth % 2 == 0 ? "even" : "odd"))); -%> - -
-
- [–] - - <%= comment.author+(isDeleted ? " (deleted by user)" : "") %> - - <%= Format.prettyScore(comment.score) %> point<%= ((comment.score == 1) ? "": "s") %> - <%= Format.prettyDate(comment.created_utc) %> -
-
- <%= (comment.body === "[removed]" && isRemoved ? "

[likely removed by automoderator]

" : Format.parse(comment.body)) %> -
-
- permalink - reddit -
-
- diff --git a/jst/search.jst b/jst/search.jst deleted file mode 100644 index 18cb9e2..0000000 --- a/jst/search.jst +++ /dev/null @@ -1,78 +0,0 @@ - - var radioInput = function(name, displayNames, values) { - var inputs = ""; - - for(var i = 0, len = displayNames.length; i < len; i++){ - inputs += ''; - inputs += ''; - inputs += ''; - } - return inputs; - }; - - var textInput = function(name){ - return ''; - }; - - var label = function(name, display) { - return ''; - }; - - var inputRow = function(text, input) { - return '
'+text+''+input+"
"; - }; - - var selectTime = function() { - var values = ["hour", "12hour", "day", "week", "month", "6month", "year", "all"]; - var display = ["past hour", "past 12 hours", "past day", "past week", "past month", "past 6 months", "past year", "all time"]; - var html = '"; - }; - - var select = function(name, display, values){ - var html = '"; - }; - -return { - createSearch: function(){ - var searchBox = document.createElement("div"); - searchBox.id = "main-box"; - searchBox.className = "search-box"; - /* - Comments: - text (body) string - title (title) string - subreddit (subreddit) string - author (author) string - over_18 (over_18) sfw,nsfw,both * - locked (locked) bool * - between (after/before) "date" - sort (sort) asc,desc - */ - var html = inputRow('Im looking for: ', radioInput("thread", ["Thread","Comment"], ["true", "false"])); - html += inputRow(label("text", "Text"), textInput("text")); - html += inputRow(label("title","Title"), textInput("title")); - html += inputRow(label("subreddit", "Subreddit"), textInput("subreddit")); - html += inputRow(label("author", "Author"), textInput("author")); - html += inputRow("Over 18: ", radioInput("over_18", ["Both","NSFW","SFW"], ["both","nsfw","sfw"])); - html += inputRow("Locked: ", radioInput("locked", ["Both","True", "False"], ["both","true","false"])); - html += inputRow("Removed: ", select("removed", ["Removed and non-removed", "Only removed", "Only deleted"], ["all", "removed", "deleted"])); - html += inputRow("From:", selectTime()); - html += inputRow("Sort: ", select("sort", ["Highest score","Lowest score","Newest","Oldest"], ["score_desc","score_asc","time_desc","time_asc"])); - html += ''; - html += ''; - searchBox.innerHTML = html; - - mainDiv.appendChild(searchBox); \ No newline at end of file diff --git a/jst/subredditInfo.jst b/jst/subredditInfo.jst deleted file mode 100644 index 8010844..0000000 --- a/jst/subredditInfo.jst +++ /dev/null @@ -1,13 +0,0 @@ -
- top post of /r/<%= subreddit %> from: - -
\ No newline at end of file diff --git a/jst/subredditPagination.jst b/jst/subredditPagination.jst deleted file mode 100644 index b076fc7..0000000 --- a/jst/subredditPagination.jst +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/jst/thread.jst b/jst/thread.jst deleted file mode 100644 index 0e36bb8..0000000 --- a/jst/thread.jst +++ /dev/null @@ -1,44 +0,0 @@ -
-<% if(typeof postNr !== "undefined") { %> - <%= postNr %> -<% } %> -
-
-
<%= Format.prettyScore(thread.score) %>
-
-
-<% var url = _.replace(thread.url, "https://www.reddit.com", "https://www.removeddit.com"); - - if(_.includes(["self", "default", "image", "nsfw"], thread.thumbnail)) { %> - -<% } else { - var thumbnailWidth = _.defaultTo(thread.thumbnail_width, 140) * 0.5; - var thumbnailHeight = _.defaultTo(thread.thumbnail_height, 140) * 0.5; - %> - - -<% } %> -
- - <%= thread.title %> -<% if(!_.isNil(thread.link_flair_text)){ %> - <%= thread.link_flair_text %> -<% } %> - (<%= thread.domain %>) -
- submitted <%= Format.prettyDate(thread.created_utc) %> by - <%= thread.author %> - <% if(Reddit.isAll){ %> - to /r/<%= thread.subreddit %> - <% } %> -
-
- - <%= thread.num_comments %> comments - - - reddit - -
-
-
\ No newline at end of file diff --git a/jst/threadInfo.jst b/jst/threadInfo.jst deleted file mode 100644 index 8ba0ec6..0000000 --- a/jst/threadInfo.jst +++ /dev/null @@ -1,4 +0,0 @@ -
- removed comments: <%= removedComments %>/<%= totalComments %> (<%= (100 * removedComments / totalComments).toFixed(1) %>%) -
-
sorted by: top
\ No newline at end of file diff --git a/src/js/components/Comment.js b/src/js/components/Comment.js index e69de29..8dbf16a 100644 --- a/src/js/components/Comment.js +++ b/src/js/components/Comment.js @@ -0,0 +1,25 @@ +// <% +// var isRemoved = _.has(comment,"removed"); +// var isDeleted = _.has(comment,"deleted"); + +// var commentCss = "comment comment-" + (isRemoved ? "removed" : (isDeleted ? "deleted" : (comment.depth % 2 == 0 ? "even" : "odd"))); +// %> + +//
+//
+// [–] +// +// <%= comment.author+(isDeleted ? " (deleted by user)" : "") %> +// +// <%= Format.prettyScore(comment.score) %> point<%= ((comment.score == 1) ? "": "s") %> +// <%= Format.prettyDate(comment.created_utc) %> +//
+//
+// <%= (comment.body === "[removed]" && isRemoved ? "

[likely removed by automoderator]

" : Format.parse(comment.body)) %> +//
+//
+// permalink +// reddit +//
+//
+ diff --git a/src/js/components/SubredditPagination.js b/src/js/components/SubredditPagination.js new file mode 100644 index 0000000..85ec6dd --- /dev/null +++ b/src/js/components/SubredditPagination.js @@ -0,0 +1,14 @@ +// {/* */} \ No newline at end of file diff --git a/src/js/components/SubredditSort.js b/src/js/components/SubredditSort.js new file mode 100644 index 0000000..79835b5 --- /dev/null +++ b/src/js/components/SubredditSort.js @@ -0,0 +1,13 @@ +// {/*
+// top post of /r/<%= subreddit %> from: +// +//
*/} \ No newline at end of file diff --git a/src/js/components/ThreadHead.js b/src/js/components/ThreadHead.js index b2f5a70..eb0f03f 100644 --- a/src/js/components/ThreadHead.js +++ b/src/js/components/ThreadHead.js @@ -1,12 +1,12 @@ import React from 'react' -import {prettyScore, prettyDate, redditThumbnails} from 'utils' +import {prettyScore, prettyDate, parse, redditThumbnails} from 'utils' export default (props) => { if(!props.title) { return
} - const url = props.url.replace('reddit.com', 'removeddit.com') + const url = props.url.replace('https://www.reddit.com', '') const userLink = props.author !== '[deleted]' ? `https://www.reddit.com/user/${props.author}` : '' let thumbnail @@ -34,7 +34,7 @@ export default (props) => { {thumbnail}
- {props.title} + {props.title} {props.link_flair_text && {props.link_flair_text}} ({props.domain}) @@ -43,13 +43,15 @@ export default (props) => { {props.author}  to /r/{props.subreddit}
+ {props.selftext && +
}
{props.num_comments} comments - +   reddit - +   ceddit diff --git a/src/js/components/ThreadInfo.js b/src/js/components/ThreadInfo.js new file mode 100644 index 0000000..f550f3f --- /dev/null +++ b/src/js/components/ThreadInfo.js @@ -0,0 +1,9 @@ +import React from 'react' + +export default (props) => { +{/*
+ removed comments: <%= removedComments %>/<%= totalComments %> (<%= (100 * removedComments / totalComments).toFixed(1) %>%) +
+
sorted by: top
*/} + +} \ No newline at end of file diff --git a/src/js/pages/Search.js b/src/js/pages/Search.js new file mode 100644 index 0000000..d64d33a --- /dev/null +++ b/src/js/pages/Search.js @@ -0,0 +1,78 @@ + +// var radioInput = function(name, displayNames, values) { +// var inputs = ""; + +// for(var i = 0, len = displayNames.length; i < len; i++){ +// inputs += ''; +// inputs += ''; +// inputs += ''; +// } +// return inputs; +// }; + +// var textInput = function(name){ +// return ''; +// }; + +// var label = function(name, display) { +// return ''; +// }; + +// var inputRow = function(text, input) { +// return '
'+text+''+input+"
"; +// }; + +// var selectTime = function() { +// var values = ["hour", "12hour", "day", "week", "month", "6month", "year", "all"]; +// var display = ["past hour", "past 12 hours", "past day", "past week", "past month", "past 6 months", "past year", "all time"]; +// var html = '"; +// }; + +// var select = function(name, display, values){ +// var html = '"; +// }; + +// return { +// createSearch: function(){ +// var searchBox = document.createElement("div"); +// searchBox.id = "main-box"; +// searchBox.className = "search-box"; +// /* +// Comments: +// text (body) string +// title (title) string +// subreddit (subreddit) string +// author (author) string +// over_18 (over_18) sfw,nsfw,both * +// locked (locked) bool * +// between (after/before) "date" +// sort (sort) asc,desc +// */ +// var html = inputRow('Im looking for: ', radioInput("thread", ["Thread","Comment"], ["true", "false"])); +// html += inputRow(label("text", "Text"), textInput("text")); +// html += inputRow(label("title","Title"), textInput("title")); +// html += inputRow(label("subreddit", "Subreddit"), textInput("subreddit")); +// html += inputRow(label("author", "Author"), textInput("author")); +// html += inputRow("Over 18: ", radioInput("over_18", ["Both","NSFW","SFW"], ["both","nsfw","sfw"])); +// html += inputRow("Locked: ", radioInput("locked", ["Both","True", "False"], ["both","true","false"])); +// html += inputRow("Removed: ", select("removed", ["Removed and non-removed", "Only removed", "Only deleted"], ["all", "removed", "deleted"])); +// html += inputRow("From:", selectTime()); +// html += inputRow("Sort: ", select("sort", ["Highest score","Lowest score","Newest","Oldest"], ["score_desc","score_asc","time_desc","time_asc"])); +// html += ''; +// html += ''; +// searchBox.innerHTML = html; + +// mainDiv.appendChild(searchBox); \ No newline at end of file