Merge branch 'main' into OF-496-App-Map-Locator-button-doesn-t-center-user-location

Author: joslynrani

.DS_Store

@@ -21,4 +21,5 @@ INFLUXDB_ORG=offlinery
 INFLUXDB_BUCKET=logs
 INFLUXDB_ADMIN_TOKEN=your-super-secret-admin-token
 GRAFANA_USER=admin
-GRAFANA_PASSWORD=admin
+GRAFANA_PASSWORD=admin
+DOCKER_DEFAULT_PLATFORM=linux/amd64

backend/.env-template

@@ -3,11 +3,9 @@
 {{>licenseInfo}}
 
 import Constants from 'expo-constants';
-import { isExpoGoEnvironment } from "../../../utils/expo.utils";
+import { IS_DEVELOPMENT_BUILD } from "../../../utils/env.utils";
 
-/*export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, "");*/
-
-export const BASE_PATH = ((isExpoGoEnvironment ?
+export const BASE_PATH = ((IS_DEVELOPMENT_BUILD ?
 `http://${Constants.expoConfig?.hostUri?.split(':').shift()?.concat(':3000')}`
 : "https://api.offlinery.io")+ "/v1").replace(
 /\/+$/,

backend/coverage/badge-branches.svg

@@ -84,6 +84,7 @@ services:
 
   backend:
     image: europe-west6-docker.pkg.dev/offlinery-439317/offlinery-backend/nestjs:${BACKEND_DOCKER_TAG:-latest}
+    platform: linux/amd64
     build:
       context: .
       dockerfile: Dockerfile

backend/coverage/badge-functions.svg

@@ -33,10 +33,10 @@ export class EncounterPublicDTO {
     reported: boolean;
 
     @ApiProperty({
-        type: [UserPublicDTO],
-        description: "Users that were nearby",
+        type: UserPublicDTO,
+        description: "Other Users that was nearby",
     })
-    users: UserPublicDTO[];
+    otherUser: UserPublicDTO;
 
     @ApiProperty({
         type: [MessagePublicDTO],
@@ -47,4 +47,7 @@ export class EncounterPublicDTO {
 
     @ApiProperty({ default: null })
     isNearbyRightNow: boolean | null;
+
+    @ApiProperty({ default: 1 })
+    amountStreaks: number;
 }

backend/coverage/badge-lines.svg

@@ -0,0 +1,12 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsBoolean, IsNotEmpty } from "class-validator";
+
+export class GenericStatusDTO {
+    @ApiProperty({ description: "User facing status." })
+    @IsBoolean()
+    @IsNotEmpty()
+    success: boolean;
+
+    @ApiProperty({ description: "Additional information about the response." })
+    info: string;
+}