diff --git a/README.md b/README.md index 3e766e8530..c7fb356832 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ -# DSP APP — Generic user interface of DaSCH Service Platform +# DSP-APP — Generic user interface of DaSCH Service Platform [![Github](https://img.shields.io/github/v/tag/dasch-swiss/dsp-app?include_prereleases&label=Github%20tag)](https://github.com/dasch-swiss/dsp-app) [![Docker](https://img.shields.io/docker/v/daschswiss/dsp-app?label=Docker%20image)](https://hub.docker.com/r/daschswiss/dsp-app) [![CI](https://github.com/dasch-swiss/dsp-app/workflows/CI/badge.svg)](https://github.com/dasch-swiss/dsp-app/actions?query=workflow%3ACI) +> **_NOTE:_** The current DSP-APP version presents the **admin view** only. + This app is a simple user interface for the Data and Service Center for the Humanities DaSCH, which uses the DSP-API/Knora server application in the backend. It's a system for annotation and linkage of resources in arts and humanities. DSP-APP implements [DSP-JS-LIB](https://www.npmjs.com/package/@dasch-swiss/dsp-js) to connect with [DSP-API](https://docs.dasch.swiss/developers/knora/api-reference/). DSP-API is a software framework for storing, sharing, and working with primary resources and data in the humanities. @@ -43,6 +45,16 @@ To get more help on the Angular CLI use `ng help` or go check out the [Angular C We built the user guidelines and developer documentation with [MkDocs](https://www.mkdocs.org/) in a separate [repository](https://github.com/dasch-swiss/dsp-docs). The user guide is published on [docs.dasch.swiss/user-guide](https://docs.dasch.swiss/user-guide). +## Work on GitHub + +### "main" branch + +- use the branch "main" to work on the DSP-ADMIN app. Any changes should be created in branches from "main" and should be merged into the "main" branch. + +### "develop" branch + +- use the branch "develop" to work on the whole DSP-APP app (admin + research parts). Any new developments should be created in branches from "develop" and should be merged into the "develop" branch. + ## Publish a new version to DockerHub Before publishing: diff --git a/src/app/app-global.ts b/src/app/app-global.ts index b773f50f75..0b27d2d07c 100644 --- a/src/app/app-global.ts +++ b/src/app/app-global.ts @@ -52,12 +52,13 @@ export class AppGlobal { route: '/projects', icon: 'assignment' }, - { + // label to reactivate when dsp-app will be used as a research platform again: --> + /* { label: 'My Collections', shortLabel: 'Collections', route: '/collections', icon: 'star' - }, + }, */ { label: 'My Account', shortLabel: 'Account', diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 60d0737ded..d1770a0c29 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -118,11 +118,11 @@ const routes: Routes = [ component: UserComponent, canActivate: [AuthGuard] }, - { + /* { path: 'collections', component: UserComponent, canActivate: [AuthGuard] - }, + }, */ { path: 'system', component: SystemComponent, @@ -143,7 +143,7 @@ const routes: Routes = [ } ] }, - { + /* { path: 'search', children: [ { @@ -155,12 +155,12 @@ const routes: Routes = [ component: ResultsComponent } ] - }, - { + }, */ + /* { path: 'resource/:id', component: ResourceComponent, runGuardsAndResolvers: 'always' - }, + }, */ { path: 'cookie-policy', component: CookiePolicyComponent diff --git a/src/app/main/header/header.component.html b/src/app/main/header/header.component.html index bf12a8d177..6a60ff2a48 100644 --- a/src/app/main/header/header.component.html +++ b/src/app/main/header/header.component.html @@ -11,14 +11,15 @@

DSP

- - --> + + + --> + - + @@ -38,9 +39,10 @@

DSP

- @@ -58,7 +60,8 @@

DSP

-
+ +