Skip to content

Commit

Permalink
Merge pull request #31 from opencdms/v0.0.5
Browse files Browse the repository at this point in the history
v0.0.5
  • Loading branch information
isedwards authored May 16, 2023
2 parents 431fd81 + 1dc969f commit 73f839d
Show file tree
Hide file tree
Showing 8 changed files with 938 additions and 351 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
API="https://blue.opencdms.org"
API="https://green.opencdms.org"
BUCKET="http://localhost:9000"
MINIO_UID='opencdms'
MINIO_PWD='insecure-change-me'
Expand Down
2 changes: 2 additions & 0 deletions src/_nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ var registry = require("./registry.json")
// default menu item
var pages = [
{
/*
component: 'VListItem',
name: 'home',
to: '/dashboard',
routeName: "home",
icon: 'mdi-view-dashboard',
*/
},
]

Expand Down
28 changes: 19 additions & 9 deletions src/components/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,16 @@
<v-list-item v-bind="props" prepend-icon="mdi-table" title="Data"/>
</template>
<v-list-item router :to="{name: 'data-table'}" prepend-icon="mdi-table-search" title="Search"/>
<v-list-item router :to="{name: 'data-ingest'}" prepend-icon="mdi-database-arrow-left" title="data-ingest"/>
<v-list-item router :to="{name: 'data-extract'}" prepend-icon="mdi-database-arrow-right" title="data-extract"/>
<v-list-item router :to="{name: 'data-inventory'}" prepend-icon="mdi-abacus" title="data-inventory"/>
<v-list-item router :to="{name: 'data-map'}" prepend-icon="mdi-map" title="data-map"/>
<!--<v-list-item router :to="{name: 'data-ingest'}" prepend-icon="mdi-database-arrow-left" title="data-ingest"/>-->
<!--<v-list-item router :to="{name: 'data-extract'}" prepend-icon="mdi-database-arrow-right" title="data-extract"/>-->
<!--<v-list-item router :to="{name: 'data-inventory'}" prepend-icon="mdi-abacus" title="data-inventory"/>-->
<!--<v-list-item router :to="{name: 'data-map'}" prepend-icon="mdi-map" title="data-map"/>-->
<v-list-item router :to="{name: 'data-station'}" prepend-icon="mdi-map-marker" title="data-station"/>
<v-list-item router :to="{name: 'data-parameter'}" prepend-icon="mdi-thermometer" title="data-parameter"/>
<!--<v-list-item router :to="{name: 'data-parameter'}" prepend-icon="mdi-thermometer" title="data-parameter"/>-->
</v-list-group>
<v-divider/>

<!--
<v-list-group value="Forms">
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" prepend-icon="mdi-spirit-level" title="Forms"/>
Expand All @@ -69,7 +70,9 @@
<v-list-item router :to="{name: 'collection-form'}" prepend-icon="mdi-spirit-level" title="New collection"/>
</v-list-group>
<v-divider/>

-->

<!--
<v-list-group value="Products">
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" prepend-icon="mdi-spirit-level" title="Products"/>
Expand All @@ -79,32 +82,39 @@
<v-list-item router :to="{name: 'product-daycli'}" prepend-icon="mdi-spirit-level" title="product-daycli"/>
</v-list-group>
<v-divider/>
-->

<!--
<v-list-group value="Quality control">
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" prepend-icon="mdi-spirit-level" title="Quality control"/>
</template>
<v-list-item router :to="{name: 'quality-control'}" prepend-icon="mdi-spirit-level" title="quality-control"/>
</v-list-group>
<v-divider/>
-->

<!--
<v-list-group value="Settings">
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" prepend-icon="mdi-spirit-level" title="Settings"/>
</template>
<v-list-item router :to="{name: 'settings-user'}" prepend-icon="mdi-spirit-level" title="settings-user"/>
</v-list-group>
<v-divider/>
-->

<!--
<v-list-group value="WIS2">
<template v-slot:activator="{ props }">
<v-list-item v-bind="props" prepend-icon="mdi-spirit-level" title="WIS2"/>
</template>
<v-list-item router :to="{name: 'wis2-publication'}" prepend-icon="mdi-publish" title="Manage publications"/>
<v-list-item router :to="{name: 'wis2-subscription'}" prepend-icon="mdi-spirit-level" title="Manage subscriptions"/>
<v-list-item router :to="{name: 'wis2-catalogue'}" prepend-icon="mdi-cloud-search" title="Catalogue"/>
<v-list-item router :to="{name: 'wis2-publication'}" prepend-icon="mdi-publish" title="Manage publications"/>
<v-list-item router :to="{name: 'wis2-subscription'}" prepend-icon="mdi-spirit-level" title="Manage subscriptions"/>
<v-list-item router :to="{name: 'wis2-catalogue'}" prepend-icon="mdi-cloud-search" title="Catalogue"/>
</v-list-group>
<v-divider/>
-->

</v-list>

Expand Down
209 changes: 209 additions & 0 deletions src/registry.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
[
{
"component": "VListItem",
"name": "dashboard",
"to": "/home",
"routeName": "dashboard",
"icon": "mdi-home",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "dashboard",
"to": "/dashboard",
"routeName": "dashboard",
"icon": "mdi-home",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-ingest",
"to": "/observations/ingest",
"routeName": "data-ingest",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-extract",
"to": "/observations/extract",
"routeName": "data-extract",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-inventory",
"to": "/observations/inventory",
"routeName": "data-inventory",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-map",
"to": "/observations/map",
"routeName": "data-map",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-parameter",
"to": "/observations/parameter",
"routeName": "data-parameter",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-parameter",
"to": "/observations/parameter/",
"routeName": "data-parameter",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "observation-form",
"to": "/observations/forms/",
"routeName": "observation-form",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "product-climate-normal",
"to": "/products/normals",
"routeName": "product-climate-normal",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "product-climate-normal",
"to": "/products/normals/",
"routeName": "product-climate-normal",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "product-climat",
"to": "/products/monthly",
"routeName": "product-climat",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "product-climat",
"to": "/products/monthly/",
"routeName": "product-climat",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "product-daycli",
"to": "/products/daily",
"routeName": "product-daycli",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "product-daycli",
"to": "/products/daily/",
"routeName": "product-daycli",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "quality-control",
"to": "/quality-control",
"routeName": "quality-control",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "settings-user",
"to": "/settings/user/",
"routeName": "settings-user",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "wis2-publication",
"to": "/wis2/publication",
"routeName": "wis2-publication",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "wis2-publication",
"to": "/wis2/publication//view",
"routeName": "wis2-publication",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "wis2-publication",
"to": "/wis2/publication//edit",
"routeName": "wis2-publication",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "wis2-subscription",
"to": "/wis2/subscriptions",
"routeName": "wis2-subscription",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "wis2-subscription",
"to": "/wis2/subscriptions//view",
"routeName": "wis2-subscription",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "wis2-subscription",
"to": "/wis2/subscriptions//edit",
"routeName": "wis2-subscription",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
}
]
9 changes: 0 additions & 9 deletions src/registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-ingest",
"to": "/observations/ingest",
"routeName": "data-ingest",
"icon": "mdi-construction",
"display": true,
"package": "@opencdms"
},
{
"component": "VListItem",
"name": "data-extract",
Expand Down
6 changes: 3 additions & 3 deletions src/router/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ const routes = [
{
path: '/wis2/catalogue',
name: 'wis2-catalogue',
component: () => import(/* webpackChunkName: "dashboard" */ '@/views/wis2-subscribe.vue'), // to do, change view name
component: () => import(/* webpackChunkName: "dashboard" */ '@/views/wis2-subscription.vue'), // to do, change view name
},
{
path: '/data/station/:id(.*)',
Expand All @@ -426,8 +426,8 @@ const routes = [
path: '/data/table',
name: 'data-table',
component: () => import(/* webpackChunkName: "dashboard" */ '@/views/data-table.vue')
},
...generateOtherRoutes(navs)
}//,
//...generateOtherRoutes(navs)
],
},
]
Expand Down
Loading

0 comments on commit 73f839d

Please sign in to comment.