Skip to content

Commit

Permalink
Merge branch 'develop' into feature/require-login
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixTJDietrich authored Nov 20, 2024
2 parents 511e247 + 80cd9ee commit 40cb027
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 7 deletions.
3 changes: 2 additions & 1 deletion webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export const environment = {
domains: '${UMAMI_DOMAINS}'
},
legal: {
imprintHtml: '${LEGAL_IMPRINT_HTML}'
imprintHtml: '${LEGAL_IMPRINT_HTML}',
privacyHtml: '${LEGAL_PRIVACY_HTML}'
}
};
EOF
Expand Down
3 changes: 1 addition & 2 deletions webapp/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import { FooterComponent } from './core/footer/footer.component';
selector: 'app-root',
standalone: true,
imports: [RouterOutlet, RouterLink, RouterLinkActive, AngularQueryDevtools, HeaderComponent, FooterComponent],
templateUrl: './app.component.html',
styles: []
templateUrl: './app.component.html'
})
export class AppComponent {
title = 'Hephaestus';
Expand Down
6 changes: 4 additions & 2 deletions webapp/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { AdminComponent } from '@app/admin/admin.component';
import { AdminGuard } from '@app/core/security/admin.guard';
import { UserProfileComponent } from '@app/user/user-profile.component';
import { SettingsComponent } from '@app/settings/settings.component';
import { ImprintComponent } from '@app/legal/imprint/imprint.component';
import { ImprintComponent } from '@app/legal/imprint.component';
import { PrivacyComponent } from '@app/legal/privacy.component';

export const routes: Routes = [
{ path: '', component: HomeComponent },
Expand All @@ -17,5 +18,6 @@ export const routes: Routes = [
},
{ path: 'user/:id', component: UserProfileComponent },
{ path: 'settings', component: SettingsComponent },
{ path: 'imprint', component: ImprintComponent }
{ path: 'imprint', component: ImprintComponent },
{ path: 'privacy', component: PrivacyComponent }
];
3 changes: 3 additions & 0 deletions webapp/src/app/core/footer/footer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<p class="text-balance text-center text-sm leading-loose text-muted-foreground md:text-left">
<a routerLink="about" class="font-medium underline underline-offset-4">About</a>
</p>
<p class="text-balance text-center text-sm leading-loose text-muted-foreground md:text-left">
<a routerLink="privacy" class="font-medium underline underline-offset-4">Privacy</a>
</p>
<p class="text-balance text-center text-sm leading-loose text-muted-foreground md:text-left">
<a routerLink="imprint" class="font-medium underline underline-offset-4">Imprint</a>
</p>
Expand Down
File renamed without changes.
16 changes: 16 additions & 0 deletions webapp/src/app/legal/privacy.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Component } from '@angular/core';
import { environment } from 'environments/environment';

@Component({
selector: 'app-privacy',
standalone: true,
template: `
<div class="container prose dark:prose-invert">
<h1>Privacy</h1>
<div [innerHTML]="imprintHtml"></div>
</div>
`
})
export class PrivacyComponent {
imprintHtml = environment.legal.privacyHtml;
}
3 changes: 2 additions & 1 deletion webapp/src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const environment = {
domains: ''
},
legal: {
imprintHtml: '<p>This is the imprint.</p>'
imprintHtml: '<p>This is the imprint.</p>',
privacyHtml: '<p>This is the privacy policy.</p>'
}
};
3 changes: 2 additions & 1 deletion webapp/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const environment = {
domains: ''
},
legal: {
imprintHtml: '<p>This is the imprint.</p>'
imprintHtml: '<p>This is the imprint.</p>',
privacyHtml: '<p>This is the privacy policy.</p>'
}
};
1 change: 1 addition & 0 deletions webapp/src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

/* Material CDK */
@import '@angular/cdk/overlay-prebuilt.css';
@import '@angular/cdk/a11y-prebuilt.css';

@tailwind base;
@tailwind components;
Expand Down

0 comments on commit 40cb027

Please sign in to comment.