diff --git a/android/app/build.gradle b/android/app/build.gradle index 40ae9aa9..c94f95e3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "org.ilovefreegle.direct" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1202 - versionName "3.0.2" + versionCode 1203 + versionName "3.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/api/BaseAPI.js b/api/BaseAPI.js index 8af054bb..a6e86096 100644 --- a/api/BaseAPI.js +++ b/api/BaseAPI.js @@ -4,7 +4,7 @@ import { useAuthStore } from '~/stores/auth' import { useMobileStore } from '~/stores/mobile' import { useMiscStore } from '~/stores/misc' -let timer = 0 +// let timer = 0 // We add fetch retrying. // Note that $fetch and useFetch cause problems on Node v18, so we don't use them. @@ -270,11 +270,11 @@ export default class BaseAPI { } async $requestv2(method, path, config, logError = true, body = null) { - timer++ - const timerLabel = path + ' api-' + timer + // timer++ + // const timerLabel = path + ' api-' + timer - console.log('Start ', timerLabel) - console.time(timerLabel) + // console.log('Start ', timerLabel) + // console.time(timerLabel) let status = null let data = null @@ -404,7 +404,7 @@ export default class BaseAPI { ) } - console.timeEnd(timerLabel) + // console.timeEnd(timerLabel) return data } diff --git a/api/ChatAPI.js b/api/ChatAPI.js index d0fa096c..245fa990 100644 --- a/api/ChatAPI.js +++ b/api/ChatAPI.js @@ -5,12 +5,13 @@ export default class ChatAPI extends BaseAPI { return this.$getv2(`/chat/${chatid}/message`) } - async listChats(since, search, logError) { + async listChats(since, search, logError, empty) { return await this.$getv2( '/chat', { since, search, + empty, }, logError ) diff --git a/components/AdaptiveMap.vue b/components/AdaptiveMap.vue index 3a0194c6..0c286234 100644 --- a/components/AdaptiveMap.vue +++ b/components/AdaptiveMap.vue @@ -132,24 +132,30 @@ -
+ Sorry, we didn't find anything. Things come and go quickly, though, + so you could try later. Or you could: +
+
- You are logged in
+ You are logged in with
- with {{ ours }}as
If they are both yours, you can ask the volunteers to merge your accounts diff --git a/components/GroupHeader.vue b/components/GroupHeader.vue index 2b00ddc0..95f8a890 100644 --- a/components/GroupHeader.vue +++ b/components/GroupHeader.vue @@ -60,13 +60,13 @@
+
Give and get stuff for free with {{ group.namedisplay }}. Offer things you don't need, and ask for things you'd like. Don't just recycle - reuse with Freegle!
- +
<\/p>/g, '')
+ description = description.replace(/
<\/p>/g, '') + } + + console.log('Return', description) + return description + }, }, methods: { async leave() { diff --git a/components/IsochronePostMapAndList.vue b/components/IsochronePostMapAndList.vue index 13f42777..b11385e0 100644 --- a/components/IsochronePostMapAndList.vue +++ b/components/IsochronePostMapAndList.vue @@ -126,8 +126,15 @@
+ Sorry, we didn't find anything. Things come and go quickly, though, + so you could try later. Or you could: +
+You'll get emails. Name, approximate location, and profile picture are public - you can hide your real name and picture from Settings. Logging in @@ -197,22 +206,22 @@
+
- Sorry, we didn't find anything. Things come and go quickly, though, so - you could try later. Or you could: -
-+ You're not yet a member of this community; we'll join you. Change emails + or leave communities from + Settings. +
- We ask for your postcode so that we know how far away you are - the - closer the better. Your mobile is optional - we can notify you by text - (SMS) so you don't miss replies. We won't show it to the other - freegler. +
+
+
+ You've already given this freegler a + thumbs up + thumbs down + rating. You can only rate each freegler once. +
+You can remove your rating if you wish, or cancel.
+