Skip to content
Snippets Groups Projects
Commit d7b81a30 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Propagating version from package.json to the about section

parent d1a9f556
No related branches found
No related tags found
No related merge requests found
<?xml version='1.0' encoding='utf-8'?>
<widget id="no.nibio.vips.observation" version="0.0.1"
<widget id="no.nibio.vips.observation" version="0.9.5"
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 Aapp</name>
<name>VIPS Field Observation App</name>
<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>
<author email="tor-einar.skog@nibio.no" href="https://www.nibio.no/en/employees/tor-einar-skog">Tor-Einar Skog</author>
<author email="bhabesh.mukhopadhyay@nibio.no" href="https://nibio.no/en/employees/bhabesh-bhabani-mukhopadhyay">Bhabesh B Mukhopadhyay</author>
<hook src="hooks/versionHook.js" type="after_prepare" />
<author>Bhabesh B Mukhopadhyay</author>
<icon src="static/css/images/logo_vips_new.png" />
<content src="index.html" />
<access origin="*" />
......
......@@ -61,11 +61,11 @@ html, body {
<router-link class="nav-link" onclick="$('.offcanvas-collapse').toggleClass('open')" to="/settings">{{ $t("settings.heading")}}</router-link>
</li>
<li class="nav-item">
<a data-toggle="collapse" href="#divAbout" aria-expanded="false" aria-controls="divAbout">{{ $t("about.header")}}</a>
<a class="vips-btn" data-toggle="collapse" href="#divAbout" aria-expanded="false" aria-controls="divAbout">{{ $t("about.header")}}</a>
<div class="collapse" id="divAbout">
<div v-html="$t('about.text')"></div>
<br>
(v%%VERSION%%)
{{ $t("about.version") }}: {{ version }}
</div>
</li>
......
{
"name": "vipsobservationapp",
"version": "1.0.0",
"version": "0.9.5",
"private": true,
"description": "The Field Pest Observation App for VIPS users",
"author": "Tor-Einar Skog <tor-einar.skog@nibio.no>",
......
......@@ -36,6 +36,7 @@
import Welcome from '@/components/Welcome'
import CommonUtil from "@/components/CommonUtil";
export default {
name: 'App',
components : {
......
......@@ -83,5 +83,6 @@
"index.header" : "Field observations",
"about.header" : "About",
"about.version" : "Version",
"about.text" : "The app is developed by <a href='https://nibio.no/en' target='new'>NIBIO</a>s <a href='https://www.nibio.no/en/subjects/plant-health/vips--a-digital-pest-prediction-platform'>VIPS-team</a>."
}
\ No newline at end of file
......@@ -78,6 +78,7 @@
"index.header" : "Feltobservasjoner",
"about.header" : "Om appen",
"about.version" : "Versjon",
"about.text" : "Appen er utviklet av <a href='https://nibio.no' target='new'>NIBIO</a>s <a href='https://www.vips-landbruk.no/'>VIPS-team</a>."
......
......@@ -29,6 +29,7 @@ import { faMagnifyingGlassPlus } from '@fortawesome/free-solid-svg-icons'
library.add(faMagnifyingGlassPlus);
import { faUser } from '@fortawesome/free-solid-svg-icons'
library.add(faUser);
import {version} from '../package'
// Adding the template component
......@@ -40,8 +41,8 @@ Vue.config.productionTip = false
var store = {
debug: true,
state: {
user:{},
uuid:""
user: {},
uuid: ""
}
}
......@@ -86,7 +87,8 @@ new Vue({
//jsonServerResponse,
sharedState: store.state,
username: "",
password:""
password:"",
version: version // See import {version} from '../package' (referring to package.json)
},
components :
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment