From ad2cbe2b2f9768edc8eed3718bcf5679ddc6ea60 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 10 Dec 2017 22:14:00 +0100 Subject: more styling --- bucky/search/search.js | 11 +-- public/assets/css/bucky.css | 103 ++++++++++++++++--------- public/assets/js/lib/views/index/threadform.js | 1 + public/assets/js/lib/views/search/results.js | 3 + public/assets/js/util/format.js | 7 ++ views/pages/index.ejs | 8 +- 6 files changed, 82 insertions(+), 51 deletions(-) diff --git a/bucky/search/search.js b/bucky/search/search.js index 4818ef9..6e1fd01 100644 --- a/bucky/search/search.js +++ b/bucky/search/search.js @@ -2,15 +2,10 @@ var db = require('../db') var bdb = require('./bdb')('search') var STOPWORDS = require('./stopwords') -var wordRegexp = new RegExp("(\W+)"); -var wordBoundaryRegexp = new RegExp("\W"); +var wordRegexp = new RegExp("[^a-z0-9]+", 'g'); function parse_terms (s) { - return s.toLowerCase().split(wordRegexp).filter((term) => { - if (! term.match(wordBoundaryRegexp)) { - return true - } - return false - }) +console.log(s, wordRegexp) + return s.toLowerCase().split(wordRegexp).filter((term) => !!term) } function cmp (a,b){ return (a "; } +#files tr.total td:first-child { + padding: 5px; +} #gallery { width: 100%; diff --git a/public/assets/js/lib/views/index/threadform.js b/public/assets/js/lib/views/index/threadform.js index 0fd149c..7a8e8ed 100644 --- a/public/assets/js/lib/views/index/threadform.js +++ b/public/assets/js/lib/views/index/threadform.js @@ -28,6 +28,7 @@ var ThreadForm = FormView.extend({ }) var sorted = Object.keys(tags).sort().map(kw => tags[kw]) this.$('[name=keyword]').append(sorted) + $("body").removeClass('loading') }.bind(this)) }, diff --git a/public/assets/js/lib/views/search/results.js b/public/assets/js/lib/views/search/results.js index d01db96..885d3b7 100644 --- a/public/assets/js/lib/views/search/results.js +++ b/public/assets/js/lib/views/search/results.js @@ -35,6 +35,9 @@ var SearchResults = View.extend({ this.$(".next_page").toggle(res.meta.start + res.meta.limit > res.meta.count) this.$(".next_page").attr("href", querystring(next_page)) res.results.forEach((result) => { + if (! result.thread) { + return + } var image if (result.file && is_image(result.file.filename)) { image = result.file diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js index a185b33..bfabfc3 100644 --- a/public/assets/js/util/format.js +++ b/public/assets/js/util/format.js @@ -1,3 +1,10 @@ +var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)) +var is_ipad = (navigator.userAgent.match(/iPad/i)) +var is_android = (navigator.userAgent.match(/Android/i)) +var is_mobile = is_iphone || is_ipad || is_android +var is_desktop = ! is_mobile; +document.body.classList.add(is_desktop ? 'desktop' : 'mobile'); + function commatize (n) { var nums = [], i, counter = 0, r = Math.floor if (n > 1024) { diff --git a/views/pages/index.ejs b/views/pages/index.ejs index 06a084c..37f828e 100644 --- a/views/pages/index.ejs +++ b/views/pages/index.ejs @@ -21,13 +21,7 @@ -
- new post | - inbox | - message | - profile | - logout -
+