diff --git a/components/ChatMessageInterested.vue b/components/ChatMessageInterested.vue index 74893f5d..f8ab4733 100644 --- a/components/ChatMessageInterested.vue +++ b/components/ChatMessageInterested.vue @@ -3,6 +3,11 @@
+
+ + View message on ModTools + +
@@ -113,6 +118,15 @@ export default { } return ret + }, + modtoolsLink() { + if (!this.modtools || !this.refmsg || !this.refmsg.id) { + return null + } + + const url = '/modtools/message/' + this.refmsg.id + + return url } }, methods: { diff --git a/components/LoginModal.vue b/components/LoginModal.vue index 2084c2f6..5f55eedd 100644 --- a/components/LoginModal.vue +++ b/components/LoginModal.vue @@ -42,10 +42,10 @@

Using one of these buttons is the easiest way to create an account:

-
-
+
- First posted on {{ message.groups[0].namedisplay }} on {{ datetime(message.date) }} + First posted on {{ message.postings[0].namedisplay }} on {{ datetime(message.postings[0].date) }}
diff --git a/components/ModGroupPostVisibility.vue b/components/ModGroupPostVisibility.vue index b16e57ea..5c7af7ae 100644 --- a/components/ModGroupPostVisibility.vue +++ b/components/ModGroupPostVisibility.vue @@ -130,7 +130,7 @@ export default { const CGA = this.CGA if (CGA) { - return turfbuffer(CGA, this.scale, { units: 'meters' }) + return turfbuffer(CGA, this.scale, 'meters') } else { return null } diff --git a/components/ModMember.vue b/components/ModMember.vue index c8d6bbc0..eb34ac2b 100644 --- a/components/ModMember.vue +++ b/components/ModMember.vue @@ -3,8 +3,13 @@
- - {{ email }} +
+ LoveJunk user #{{ user.ljuserid }} +
+
+ + {{ email }} +
@@ -112,7 +117,7 @@
-
+
+
@@ -315,7 +329,6 @@ export default { if (this.user) { if (this.user.emails) { this.user.emails.forEach(e => { - console.log('Check email', e.email) if (e.email && e.email.indexOf('@user.trashnothing.com') !== -1) { ret = true } @@ -325,6 +338,9 @@ export default { return ret }, + isLJ() { + return this.user && this.user.ljuserid + }, settings() { if (this.user && this.user.settings && this.user.settings) { return this.user.settings @@ -364,6 +380,14 @@ export default { set(newval) { this.user.newslettersallowed = newval } + }, + autorepost: { + get() { + return ( + this.member && !this.isTN && Boolean(!this.member.autorepostsdisable) + ) + }, + setnewval() {} } }, mounted() { diff --git a/components/ModMessage.vue b/components/ModMessage.vue index 2e2692b9..4ed13075 100644 --- a/components/ModMessage.vue +++ b/components/ModMessage.vue @@ -207,7 +207,7 @@
- + diff --git a/components/ModSupportListGroups.vue b/components/ModSupportListGroups.vue index 3279eeec..8e3a977f 100644 --- a/components/ModSupportListGroups.vue +++ b/components/ModSupportListGroups.vue @@ -246,24 +246,41 @@ export default { ) }, autoApproves(hotInstance, td, row, column, prop, value, cellProperties) { - let auto = parseInt(value) + // We don't want to highlight the colour for unpublished groups, because they're not actually causing any + // issues. + const publish = cellProperties.instance.getDataAtRow(row)[7] - if (auto > 50) { - td.style.backgroundColor = 'orange' - } + if (publish) { + let auto = parseInt(value) - auto = Math.abs(auto) + if (auto > 50) { + td.style.backgroundColor = 'orange' + } - Handsontable.renderers.NumericRenderer.call( - this, - hotInstance, - td, - row, - column, - prop, - auto, - cellProperties - ) + auto = Math.abs(auto) + + Handsontable.renderers.NumericRenderer.call( + this, + hotInstance, + td, + row, + column, + prop, + auto, + cellProperties + ) + } else { + Handsontable.renderers.TextRenderer.call( + this, + hotInstance, + td, + row, + column, + prop, + '-', + cellProperties + ) + } }, forceDate(hotInstance, td, row, column, prop, value, cellProperties) { let val = '-' diff --git a/mobile/modtools/android/config.xml b/mobile/modtools/android/config.xml index 36b0dfca..85cb2123 100644 --- a/mobile/modtools/android/config.xml +++ b/mobile/modtools/android/config.xml @@ -1,5 +1,5 @@ - + ModTools Tool to help moderators of Freegle groups Chris Cant, Freegle Ltd diff --git a/mobile/modtools/ios/config.xml b/mobile/modtools/ios/config.xml index f094e124..897f9c43 100644 --- a/mobile/modtools/ios/config.xml +++ b/mobile/modtools/ios/config.xml @@ -1,5 +1,5 @@ - + ModTools Tool to help moderators of Freegle and similar groups diff --git a/nuxt.config.js b/nuxt.config.js index 62a72700..59d702e1 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -3,12 +3,12 @@ import Sentry from '@nuxtjs/sentry' import { Dedupe as DedupeIntegration } from '@sentry/integrations' import sitemap from './utils/sitemap.js' -const FACEBOOK_APPID = '134980666550322' +// const FACEBOOK_APPID = '134980666550322' const SENTRY_DSN = 'https://b68903e730034a4ba3b8b2358331389e@o118493.ingest.sentry.io/4504362603184128' // Cordova const YAHOO_CLIENTID = 'dj0yJmk9N245WTRqaDd2dnA4JmQ9WVdrOWIzTlZNMU01TjJjbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWRh' const MOBILE_VERSION = '2.0.120' -const MODTOOLS_VERSION = '0.3.98' +const MODTOOLS_VERSION = '0.3.99' require('dotenv').config() @@ -85,10 +85,10 @@ const config = { { hid: 'author', name: 'author', content: 'Freegle' }, { name: 'supported-color-schemes', content: 'light' }, { name: 'color-scheme', content: 'light' }, - { - name: 'facebook-domain-verification', - content: 'zld0jt8mvf06rt1c3fnxvls3zntxj6' - }, + // { + // name: 'facebook-domain-verification', + // content: 'zld0jt8mvf06rt1c3fnxvls3zntxj6' + // }, { hid: 'og:type', property: 'og:type', content: 'website' }, { hid: 'description', @@ -120,14 +120,14 @@ const config = { property: 'og:url', content: 'https://www.ilovefreegle.org' }, - { hid: 'fb:app_id', property: 'fb:app_id', content: FACEBOOK_APPID }, + // { hid: 'fb:app_id', property: 'fb:app_id', content: FACEBOOK_APPID }, { hid: 'og:description', property: 'og:description', content: "Give and get stuff for free in your local community. Don't just recycle - reuse, freecycle and freegle!" }, - { hid: 'fb:app_id', property: 'og:site_name', content: FACEBOOK_APPID }, + // { hid: 'fb:app_id', property: 'og:site_name', content: FACEBOOK_APPID }, { hid: 'twitter:title', @@ -164,8 +164,8 @@ const config = { { rel: 'preconnect', href: 'https://www.youtube.com' }, { rel: 'preconnect', href: 'https://fonts.gstatic.com' }, { rel: 'preconnect', href: 'https://storage.googleapis.com' }, - { rel: 'preconnect', href: 'https://www.facebook.com' }, - { rel: 'preconnect', href: 'https://connect.facebook.com' }, + // { rel: 'preconnect', href: 'https://www.facebook.com' }, + // { rel: 'preconnect', href: 'https://connect.facebook.com' }, { rel: 'preconnect', href: 'https://apis.google.com' } ] }, @@ -220,7 +220,7 @@ const config = { { src: '~/plugins/vue-lazy-youtube-video', ssr: false }, { src: '~/plugins/inspectlet', ssr: false }, { src: '~/plugins/app-init-push.js', mode: 'client' }, - { src: '~/plugins/app-facebook.js', mode: 'client' }, + // { src: '~/plugins/app-facebook.js', mode: 'client' }, { src: '~/plugins/app-google.js', mode: 'client' }, { src: '~/plugins/app-yahoo.js', mode: 'client' }, { src: '~/plugins/app-apple.js', mode: 'client' }, @@ -658,7 +658,7 @@ const config = { CHAT_HOST: CHAT_HOST, OSM_TILE: OSM_TILE, GEOCODE: GEOCODE, - FACEBOOK_APPID: FACEBOOK_APPID, + // FACEBOOK_APPID: FACEBOOK_APPID, YAHOO_CLIENTID: YAHOO_CLIENTID, GOOGLE_MAPS_KEY: 'AIzaSyCdTSJKGWJUOx2pq1Y0f5in5g4kKAO5dgg', GOOGLE_API_KEY: 'AIzaSyArVxoX781qdcbmQZi1PKHX-qa0bPbboH4', diff --git a/pages/index.vue b/pages/index.vue index baa61692..06d99193 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,5 +1,11 @@