Skip to content
Permalink
Browse files
refactor(app+main)!: comment out the search and everything related to…
… resources (DSP-1291) (#371)

* refactor(app+main): comment out routes and tags related to resources, search and res collections

* doc(readme): add info about the new branch system

* refactor(readme): update readme

Co-authored-by: flaurens <flavie.laurens@unibas.ch>
  • Loading branch information
flavens and flaurens committed Jan 28, 2021
1 parent 17bf71c commit 50b13091e6437a68ea2a45bb7b50a4e655f5d85d
Showing with 34 additions and 18 deletions.
  1. +13 −1 README.md
  2. +3 −2 src/app/app-global.ts
  3. +6 −6 src/app/app-routing.module.ts
  4. +12 −9 src/app/main/header/header.component.html
@@ -1,9 +1,11 @@
# DSP APP &mdash; Generic user interface of DaSCH Service Platform
# DSP-APP &mdash; 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:
@@ -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',
@@ -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
@@ -11,14 +11,15 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
<span class="fill-remaining-space"></span>

<!-- search-panel (in desktop and tablet version) -->
<span class="action">
<dsp-search-panel
<!-- <span class="action"> -->
<!-- button to reactivate when dsp-app will be used as a research platform again: -->
<!-- <dsp-search-panel
[projectfilter]="true"
[advanced]="true"
[expert]="true"
(search)="doSearch($event)">
</dsp-search-panel>
<!-- advanced and expert search (in desktop and tablet version) -->
</dsp-search-panel> -->
<!-- to keep? > advanced and expert search (in desktop and tablet version) -->
<!-- <span class="other-search-link">
<button mat-button color="primary" class="advanced-search-link" routerLink="/search/advanced">
<span>Advanced search</span>
@@ -27,7 +28,7 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
<span>Expert search</span>
</button>
</span> -->
</span>
<!-- </span> -->

<span class="fill-remaining-space desktop-only"></span>

@@ -38,9 +39,10 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>

<!-- action tools: info menu, select language, login button, user menu -->
<span class="action">
<button mat-icon-button *ngIf="session" aria-label="Add a new resource" (click)="openNewResourceForm('createResource')" class="main-toolbar-button new-resource" >
<!-- button to reactivate when dsp-app will be used as a research platform again: -->
<!-- <button mat-icon-button *ngIf="session" aria-label="Add a new resource" (click)="openNewResourceForm('createResource')" class="main-toolbar-button new-resource" >
<mat-icon>add_circle_outline</mat-icon>
</button>
</button> -->

<button mat-button [routerLink]="'/help'" class="main-toolbar-button help">Help</button>

@@ -58,7 +60,8 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
</div>

<!-- search-panel (in phone version) -->
<div class="search-panel-phone" *ngIf="show">
<!-- div to reactivate when dsp-app will be used as a research platform again: -->
<!-- <div class="search-panel-phone" *ngIf="show">
<dsp-fulltext-search class="dsp-fulltext-search" (search)="doSearch($event)" [projectfilter]="true">
</dsp-fulltext-search>
</div>
</div> -->

0 comments on commit 50b1309

Please sign in to comment.