diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d6aa37fd..fb7b8a1f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,17 +2,18 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { + AboutComponent, + AdminPageComponent, AnnotateComponent, CollaborateComponent, + ConsortiumComponent, + ContactComponent, DetailPageComponent, ExploreComponent, HomeComponent, - ProfilePageComponent, - AdminPageComponent, - AboutComponent, - ContactComponent, - PrivacyComponent, NotFoundComponent, + PrivacyComponent, + ProfilePageComponent, } from './pages'; import { AuthenticatedGuard } from './guards'; @@ -38,6 +39,13 @@ const routes: Routes = [ title: 'Privacy Policy', }, }, + { + path: 'consortium', + component: ConsortiumComponent, + data: { + title: 'Consortium', + }, + }, { path: 'contact', component: ContactComponent, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 75b09ed0..2276b2b7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ // External dependencies import { DragDropModule } from '@angular/cdk/drag-drop'; -import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; import { NgModule, Provider } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouteReuseStrategy } from '@angular/router'; @@ -42,39 +42,40 @@ import { MatTooltipModule } from '@angular/material/tooltip'; // Components import { - AuthDialogComponent, - EntityDetailComponent, + ActionbarComponent, AddressComponent, + AnimatedImageComponent, + AuthDialogComponent, + CompilationDetailComponent, + DetailEntityComponent, + DetailInstitutionComponent, + DetailPersonComponent, EntityComponent, - InstitutionComponent, - PersonComponent, + EntityDetailComponent, FooterComponent, + GridElementComponent, + InstitutionComponent, NavbarComponent, + PersonComponent, SidenavListComponent, UploadComponent, - ActionbarComponent, - AnimatedImageComponent, - CompilationDetailComponent, - GridElementComponent, - DetailEntityComponent, - DetailPersonComponent, - DetailInstitutionComponent, } from './components'; // Pages import { + AboutComponent, + AdminPageComponent, AnnotateComponent, CollaborateComponent, + ConsortiumComponent, + ContactComponent, DetailPageComponent, ExploreComponent, HomeComponent, + NotFoundComponent, + PrivacyComponent, ProfilePageComponent, ProfilePageHelpComponent, - AdminPageComponent, - AboutComponent, - ContactComponent, - PrivacyComponent, - NotFoundComponent, } from './pages'; // Wizards @@ -90,15 +91,15 @@ import { FilesizePipe, SafePipe } from './pipes'; // Dialogs import { ConfirmationDialogComponent, - RegisterDialogComponent, - EntitySettingsDialogComponent, - GroupMemberDialogComponent, + EditEntityDialogComponent, EntityRightsDialogComponent, - ExploreEntityDialogComponent, - UploadApplicationDialogComponent, + EntitySettingsDialogComponent, ExploreCompilationDialogComponent, - EditEntityDialogComponent, + ExploreEntityDialogComponent, + GroupMemberDialogComponent, PasswordProtectedDialogComponent, + RegisterDialogComponent, + UploadApplicationDialogComponent, } from './dialogs'; import { ResetPasswordDialogComponent } from './dialogs/reset-password-dialog/reset-password-dialog.component'; import { ForgotUsernameDialogComponent } from './dialogs/forgot-username-dialog/forgot-username-dialog.component'; @@ -160,6 +161,7 @@ const INTERCEPTORS: Provider[] = [ GridElementComponent, PasswordProtectedDialogComponent, NotFoundComponent, + ConsortiumComponent, DetailEntityComponent, DetailPersonComponent, DetailInstitutionComponent, diff --git a/src/app/components/navigation/footer/footer.component.html b/src/app/components/navigation/footer/footer.component.html index 8717b75b..c84f3ef8 100644 --- a/src/app/components/navigation/footer/footer.component.html +++ b/src/app/components/navigation/footer/footer.component.html @@ -1,18 +1,23 @@ diff --git a/src/app/components/navigation/footer/footer.component.scss b/src/app/components/navigation/footer/footer.component.scss index 76ae4080..92b5ec15 100644 --- a/src/app/components/navigation/footer/footer.component.scss +++ b/src/app/components/navigation/footer/footer.component.scss @@ -1,4 +1,10 @@ footer { + display: grid; + grid-template-columns: 1fr auto 1fr; + gap: 16px; + justify-content: center; + align-items: center; + background-color: #fff; font-size: 0.8rem; text-align: center; @@ -6,28 +12,18 @@ footer { a { text-decoration: none; color: #00afe7; - padding: 5px; } -} - -#footerlinks { - display: inline-block; - margin-left: 15px; -} - -#footerlinks ul { - list-style-type: none; - margin: 5px 0; - padding: 0; -} -#footerlinks ul li { - display: inline-block; - margin-right: 10px; -} + div.left, div.right { + display: flex; + align-items: center; + gap: inherit; + } -.footer-icon { - height: 18px; - margin-top: -2px; - vertical-align: middle; + div.left { + justify-content: flex-end; + } + div.right { + justify-content: flex-start; + } } diff --git a/src/app/components/navigation/footer/footer.component.ts b/src/app/components/navigation/footer/footer.component.ts index 8ea7023a..299c5b3c 100644 --- a/src/app/components/navigation/footer/footer.component.ts +++ b/src/app/components/navigation/footer/footer.component.ts @@ -5,4 +5,6 @@ import { Component } from '@angular/core'; templateUrl: './footer.component.html', styleUrls: ['./footer.component.scss'], }) -export class FooterComponent {} +export class FooterComponent { + public currentYear = new Date().getFullYear(); +} diff --git a/src/app/pages/index.ts b/src/app/pages/index.ts index 8b026d0b..fec7e1db 100644 --- a/src/app/pages/index.ts +++ b/src/app/pages/index.ts @@ -10,3 +10,4 @@ export { AboutComponent } from './static-pages/about/about.component'; export { ContactComponent } from './static-pages/contact/contact.component'; export { PrivacyComponent } from './static-pages/privacy/privacy.component'; export { NotFoundComponent } from './notfound/notfound.component'; +export { ConsortiumComponent } from './static-pages/consortium/consortium.component'; diff --git a/src/app/pages/static-pages/consortium/consortium.component.html b/src/app/pages/static-pages/consortium/consortium.component.html new file mode 100644 index 00000000..5124252d --- /dev/null +++ b/src/app/pages/static-pages/consortium/consortium.component.html @@ -0,0 +1,45 @@ +
+

Kompakkt Developer Consortium

+ +

+ Kompakkt is an open source suite of annotation tools currently in + development by a consortium of research institutions in Germany. + The goal of the consortium is to optimise development through improved + communication and coordination, so that new features are developed faster, + avoiding redundancy and prioritising long-term sustainability and reusability. + If you’re interested in joining the consortium, please contact: + info@kompakkt.de +

+

+ Members: +

+ +

+ Department for Digital Humanities
+ University of Cologne
+ Albertus-Magnus-Platz
+ 50931 Köln

+ info@kompakkt.de +

+
+ +

+ + Open Science Lab + +
+ TIB – Leibniz Information Centre for Science and Technology
+ Lange Laube 28
+ 30159 Hannover

+

+ +

For individual contacts, consult the Contact Page.

" +
diff --git a/src/app/pages/static-pages/consortium/consortium.component.scss b/src/app/pages/static-pages/consortium/consortium.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/pages/static-pages/consortium/consortium.component.ts b/src/app/pages/static-pages/consortium/consortium.component.ts new file mode 100644 index 00000000..2f9dcea0 --- /dev/null +++ b/src/app/pages/static-pages/consortium/consortium.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import { Meta, Title } from '@angular/platform-browser'; + +@Component({ + selector: 'app-consortium', + templateUrl: './consortium.component.html', + styleUrls: ['./consortium.component.scss'], +}) +export class ConsortiumComponent implements OnInit { + constructor(private titleService: Title, private metaService: Meta) { } + + ngOnInit() { + this.titleService.setTitle(`Kompakkt – Consortium`); + this.metaService.updateTag({ + name: 'description', + content: 'Kompakkt Consortium Information.', + }); + } +} diff --git a/src/assets/icons/GitHub-Mark-32px.png b/src/assets/icons/GitHub-Mark-32px.png deleted file mode 100644 index 8b25551a..00000000 Binary files a/src/assets/icons/GitHub-Mark-32px.png and /dev/null differ diff --git a/src/assets/icons/GitHub-Mark-Light-32px.png b/src/assets/icons/GitHub-Mark-Light-32px.png deleted file mode 100644 index 628da97c..00000000 Binary files a/src/assets/icons/GitHub-Mark-Light-32px.png and /dev/null differ diff --git a/src/assets/icons/github-logo.svg b/src/assets/icons/github-logo.svg new file mode 100644 index 00000000..f5d93767 --- /dev/null +++ b/src/assets/icons/github-logo.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/images/TIB_Logo_EN_RGB_100px.png b/src/assets/images/TIB_Logo_EN_RGB_100px.png new file mode 100644 index 00000000..66eab9f2 Binary files /dev/null and b/src/assets/images/TIB_Logo_EN_RGB_100px.png differ diff --git a/src/assets/images/csm_IDH_Logo_593d3538d3.png b/src/assets/images/csm_IDH_Logo_593d3538d3.png new file mode 100644 index 00000000..df5b7850 Binary files /dev/null and b/src/assets/images/csm_IDH_Logo_593d3538d3.png differ