From 16dd3d343c722e474dd0ff6b9162ccb2d741ede5 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Fri, 26 Apr 2024 11:28:51 +0200
Subject: [PATCH] chore: Version 2.0.1, add cordova-plugin-statusbar, style
changes
---
config.xml | 10 ++++---
package.json | 6 ++--
src/App.vue | 29 ++++++--------------
src/components/CropCategory.vue | 2 +-
src/components/ObservationTimeSeries.vue | 2 +-
src/components/ObservationTimeSeriesList.vue | 2 +-
src/components/PlacesList.vue | 2 +-
static/css/vipsobsapp.css | 8 ++++++
8 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/config.xml b/config.xml
index eb13011..268a89a 100644
--- a/config.xml
+++ b/config.xml
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="no.nibio.vips.observation" version="1.0.9"
+<widget id="no.nibio.vips.observation" version="2.0.1"
xmlns="http://www.w3.org/ns/widgets"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>VIPS Field Observation App</name>
- <description>The Field Observation app for VIPS users.
+ <description>The Field Observation app for VIPS users.
Build it with 'npm run build' before any cordova
specific actions - so that vuejs can
compile to www folder</description>
@@ -21,6 +21,8 @@ compile to www folder</description>
<!--allow-intent href="mailto:*" /-->
<!--allow-intent href="geo:*" /-->
<plugin name="cordova-plugin-geolocation" spec="4.1.0" />
+ <preference name="StatusBarOverlaysWebView" value="false" />
+ <preference name="StatusBarStyle" value="default" />
<platform name="android">
<allow-intent href="market:*" />
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
@@ -30,7 +32,7 @@ compile to www folder</description>
<platform name="ios">
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
-
+
<icon src="platform_assets/ios/app_icons/20.png" width="20" height="20" />
<icon src="platform_assets/ios/app_icons/29.png" width="29" height="29" />
<icon src="platform_assets/ios/app_icons/40.png" width="40" height="40" />
@@ -50,7 +52,7 @@ compile to www folder</description>
<icon src="platform_assets/ios/app_icons/167.png" width="167" height="167" />
<icon src="platform_assets/ios/app_icons/180.png" width="180" height="180" />
<icon src="platform_assets/ios/app_icons/1024.png" width="1024" height="1024" />
-
+
<edit-config target="NSCameraUsageDescription" file="*-Info.plist" mode="merge">
<string>Bruker kameraet for å ta bilder av skadegjørere i felt</string>
</edit-config>
diff --git a/package.json b/package.json
index b39871c..b3bbee6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vipsobservationapp",
- "version": "1.0.9",
+ "version": "2.0.1",
"private": true,
"description": "The Field Pest Observation App for VIPS users",
"author": "Tor-Einar Skog <tor-einar.skog@nibio.no>",
@@ -46,6 +46,7 @@
"cordova-plugin-camera": "^6.0.0",
"cordova-plugin-geolocation": "^4.1.0",
"cordova-plugin-inappbrowser": "^5.0.0",
+ "cordova-plugin-statusbar": "^4.0.0",
"css-loader": "^0.28.0",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^1.1.4",
@@ -89,7 +90,8 @@
"cordova-plugin-camera": {
"ANDROIDX_CORE_VERSION": "1.6.+"
},
- "cordova-plugin-inappbrowser": {}
+ "cordova-plugin-inappbrowser": {},
+ "cordova-plugin-statusbar": {}
}
},
"engines": {
diff --git a/src/App.vue b/src/App.vue
index 236a66d..85963a2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,25 +1,25 @@
<!--
-
- Copyright (c) 2022 NIBIO <http://www.nibio.no/>.
-
+
+ Copyright (c) 2022 NIBIO <http://www.nibio.no/>.
+
This file is part of VIPSObservationApp.
VIPSObservationApp is free software: you can redistribute it and/or modify
- it under the terms of the NIBIO Open Source License as published by
+ it under the terms of the NIBIO Open Source License as published by
NIBIO, either version 1 of the License, or (at your option) any
later version.
-
+
VIPSObservationApp is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
NIBIO Open Source License for more details.
-
+
You should have received a copy of the NIBIO Open Source License
along with VIPSObservationApp. If not, see <http://www.nibio.no/licenses/>.
-
+
Author: Bhabesh Bhabani Mukhopadhyay
Author: Tor-Einar Skog <tor-einar.skog@nibio.no>
Dated : 19-Aug-2021
-
+
-->
<template>
<main id="app" role="main" class="container">
@@ -33,7 +33,7 @@ import CommonUtil from "@/components/CommonUtil";
export default {
name: 'App',
components : {
-
+
},
methods: {
},
@@ -44,14 +44,3 @@ export default {
}
}
</script>
-
-<style>
-body {
- font-family: 'Avenir', Helvetica, Arial, sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- /*text-align: center;*/
- color: #2c3e50;
- margin-top: 15px;
-}
-</style>
diff --git a/src/components/CropCategory.vue b/src/components/CropCategory.vue
index 93fa2db..f9c7d61 100644
--- a/src/components/CropCategory.vue
+++ b/src/components/CropCategory.vue
@@ -22,7 +22,7 @@
-->
<template>
<div id="divCropCategory">
- <div>
+ <div class="mt-2">
<div class="alert alert-info" role="alert">
{{ $t("crop.category.empty.alert") }}
</div>
diff --git a/src/components/ObservationTimeSeries.vue b/src/components/ObservationTimeSeries.vue
index 841c891..48d457c 100644
--- a/src/components/ObservationTimeSeries.vue
+++ b/src/components/ObservationTimeSeries.vue
@@ -20,7 +20,7 @@
-->
<template xmlns="http://www.w3.org/1999/html">
- <div id="observationTimeSeriesForm">
+ <div class="mt-2">
<div class="mb-2">
<router-link :to="{name:'ObservationTimeSeriesList', params: {paramExpandedId: this.dataToSubmit.id, paramYear: this.paramYear}}"
class="vips-btn">
diff --git a/src/components/ObservationTimeSeriesList.vue b/src/components/ObservationTimeSeriesList.vue
index 2c070f2..9bdb398 100644
--- a/src/components/ObservationTimeSeriesList.vue
+++ b/src/components/ObservationTimeSeriesList.vue
@@ -19,7 +19,7 @@
Dated : 13-Mar-2024
-->
<template>
- <div>
+ <div class="mt-2">
<div class="addItem" v-if="myPoiList.length > 0">
<router-link :to="{name: 'ObservationTimeSeries', params: {paramYear: this.selectedYear }}">
<button type="button" class="btn btn-primary">+</button>
diff --git a/src/components/PlacesList.vue b/src/components/PlacesList.vue
index fd4ab52..1072817 100644
--- a/src/components/PlacesList.vue
+++ b/src/components/PlacesList.vue
@@ -28,7 +28,7 @@
<button type="button" class="btn btn-primary">+</button>
</router-link>
</div>
- <div class="alert alert-info alert-dismissible fade show">
+ <div class="alert alert-info alert-dismissible fade show mt-2">
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
<span v-if="poiRequired">{{ $t("observationTimeSeries.placeslist.explanation") }}</span>
<span v-else>{{ $t("placeslist.explanation") }}</span>
diff --git a/static/css/vipsobsapp.css b/static/css/vipsobsapp.css
index 6107118..28360c3 100644
--- a/static/css/vipsobsapp.css
+++ b/static/css/vipsobsapp.css
@@ -1,3 +1,11 @@
+body {
+ font-family: 'Avenir', Helvetica, Arial, sans-serif;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ color: #2c3e50;
+ margin-top: 20px;
+}
+
.navbar {
background-color: #3d8052 !important;
}
--
GitLab