From 45c53b9caa3e8dd12c73929cd2eb0e578e435e66 Mon Sep 17 00:00:00 2001
From: Daniel Molnar <dm@tpwd.de>
Date: Mon, 20 Jun 2022 18:18:19 +0200
Subject: [PATCH] Increase version to 2.6.0

- updated CHANGELOG
- updated version number everywhere
- added new and missing keys to temp example secrets file
---
 CHANGELOG.md            | 25 ++++++++++++++++++++
 README.md               |  4 ++--
 app.json                |  2 +-
 src/config/secrets.temp | 52 +++++++++++++++++++++++++++++++++++++++--
 4 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50bf8f99b..8018597a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [v2.6.0] :rocket:
+
+This version brings fist integrations of volunteer and consul areas.
+
+### Added
+
+- integration of HumHub as new optional volunteer feature including user accounts, groups, chats, events, ...
+  - extended and used the HumHub API functionalities to fit our needs for a seamless integration
+    - check this repo for more infos: https://github.com/ikuseiGmbH/smart-village-app-humhub-ext
+  - this is a first version containing a lot of features that will be expanded and optimized in upcoming releases
+- integration of Consul as new optional consul feature including user accounts, debates, proposals, polls, ...
+  - updated and used GraphQL API of https://github.com/consul/consul
+  - this is a first version containing a lot of features that will be expanded and optimized in upcoming releases
+- added an option to the settings screen so that users can see the intro of the app again
+
+### Changed
+
+- migrated Teleport API from v3 to v4 that is used for BUS-BB
+
+### Fixed
+
+- fixed waste reminder notification times for summer time
+- fixed Matomo setup with adding check for existence of mandatory values for initialization of an instance
+  - there was a warning otherwise which caused an annoying warning message on the screen with every app reload in development
+
 ## [v2.5.4]
 
 Set app language to German and bugfixes
diff --git a/README.md b/README.md
index 08520ed25..e483ca847 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Smart Village App - Mobile App
 
-![Project version](https://img.shields.io/badge/version-2.5.4-informational.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/ee77a5fd8990be0158c1/maintainability)](https://codeclimate.com/github/ikuseiGmbH/smart-village-app-app/maintainability) ![Node version](https://img.shields.io/badge/node-14.18.1-informational.svg) ![Yarn version](https://img.shields.io/badge/yarn-1.22.4-informational.svg) ![Expo version](https://img.shields.io/badge/expo-43.0.0-informational.svg)
+![Project version](https://img.shields.io/badge/version-2.6.0-informational.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/ee77a5fd8990be0158c1/maintainability)](https://codeclimate.com/github/ikuseiGmbH/smart-village-app-app/maintainability) ![Node version](https://img.shields.io/badge/node-14.18.1-informational.svg) ![Yarn version](https://img.shields.io/badge/yarn-1.22.4-informational.svg) ![Expo version](https://img.shields.io/badge/expo-43.0.0-informational.svg)
 
 The Smart Village App is a open source mobile app for villages, communities and counties. It is made with React Native for Android and iOS.
 
@@ -52,4 +52,4 @@ Have a look at the [changelog](./CHANGELOG.md) to be up to date with the develop
 
 ---
 
-###### Version: 2.5.4
+###### Version: 2.6.0
diff --git a/app.json b/app.json
index af5c27fcc..223b80afb 100644
--- a/app.json
+++ b/app.json
@@ -9,7 +9,7 @@
       "ios",
       "android"
     ],
-    "version": "2.5.4",
+    "version": "2.6.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "scheme": "smart-village-app",
diff --git a/src/config/secrets.temp b/src/config/secrets.temp
index 7f6d4fd97..f2aeb60c3 100644
--- a/src/config/secrets.temp
+++ b/src/config/secrets.temp
@@ -1,5 +1,30 @@
 // you need to provide these data and rename this file to .js instead of .temp
 // in order to fetch data from the server
+
+module.exports.staticRestSuffix = {
+  wasteCalendarExport: '/waste_calendar/export?',
+  wasteReminderRegister: '/notification/wastes.json',
+  wasteReminderDelete: '/notification/wastes/'
+};
+
+module.exports.encounterApi = {
+  serverUrl: '',
+  version: 'v1/',
+  encounter: {
+    create: 'encounter',
+    poll: 'encounters/poll',
+    list: 'encounters'
+  },
+  qr: 'qr_code',
+  support: {
+    create: 'support/create'
+  },
+  user: 'user'
+};
+
+module.exports.bbBusUrl = '';
+module.exports.bbBusUrlV2 = '';
+
 module.exports.secrets = {
   localhost: {
     serverUrl: '',
@@ -14,7 +39,10 @@ module.exports.secrets = {
     matomoSiteId: 0,
 
     busBb: {
-      areaId: 0
+      areaId: 0,
+      v2: {
+        areaId: 0
+      }
     },
 
     rest: {
@@ -31,7 +59,27 @@ module.exports.secrets = {
         project: ''
       },
       dsn: ''
-    }
+    },
+
+    volunteer: {
+      passwordForgottenUrl: '',
+      inviteUrl: '',
+      serverUrl: '',
+      dataPrivacyLink: '',
+      v1: '/api/v1/',
+      v2: '/api/v2/'
+    },
+
+    consul: {
+      serverUrl: '',
+      graphqlEndpoint: '/graphql',
+
+      settings: '/account',
+      termsOfService: '/conditions',
+      passwordForgotten: '/users/password/new'
+    },
   },
+
+  // other slugs/communities
   ...
 };