Skip to content

Commit

Permalink
Merge pull request #58 from AndrewBoessen/privacypolicy
Browse files Browse the repository at this point in the history
Privacy / TOS Pages
  • Loading branch information
SebPuchi authored Feb 5, 2025
2 parents 731a79a + a318bc3 commit 3f415db
Show file tree
Hide file tree
Showing 14 changed files with 465 additions and 13 deletions.
11 changes: 10 additions & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,22 @@ import { ProfessorPageEntryComponent } from './professor-page-entry/professor-pa
import { ClassrPageEntryComponent } from './class-page-entry/class-page-entry.component';
import { HomePageComponent } from './HomePageComponets/home-page/home-page.component';
import { UserprofileComponent } from './userprofile/userprofile.component';
import { PrivacyComponent } from './privacy/privacy.component';
import { TermsComponent } from './terms/terms.component';

const routes: Routes = [
{ path: 'professor/:profId', component: ProfessorPageEntryComponent },
{ path: 'class/:classId', component: ClassrPageEntryComponent },
{ path: 'profile', component: UserprofileComponent },
{ path: 'privacy', component: PrivacyComponent },
{ path: 'terms', component: TermsComponent },
];

@NgModule({
imports: [RouterModule.forRoot(routes, { useHash: true })],
imports: [
RouterModule.forRoot(routes, { useHash: true }),
RouterModule.forRoot(routes, {scrollPositionRestoration: 'enabled'})
],
exports: [RouterModule],
})
export class AppRoutingModule {}
Expand All @@ -22,4 +29,6 @@ export const routingComponents = [
ProfessorPageEntryComponent,
ClassrPageEntryComponent,
UserprofileComponent,
PrivacyComponent,
TermsComponent,
];
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- * * * * * * * * * * * * * * APP ENTRY * * * * * * * * * * * * * * * * * -->

<div class="hm-body">
<app-home-page *ngIf="isHomeBarVisible"></app-home-page>
<app-home-page *ngIf="isHomeVisible"></app-home-page>
</div>

<router-outlet></router-outlet>
8 changes: 5 additions & 3 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Router, NavigationEnd } from '@angular/router';
export class AppComponent implements OnInit {
title = 'frontEnd';
message: any;
isHomeBarVisible: boolean = true;
isHomeVisible: boolean = true;

constructor(
private apiService: ApiService,
Expand All @@ -20,10 +20,12 @@ export class AppComponent implements OnInit {
) {
router.events.subscribe((event) => {
if (event instanceof NavigationEnd) {
this.isHomeBarVisible =
this.isHomeVisible =
!/\/professor/.test(event.url) &&
!/\/class/.test(event.url) &&
!/\/profile/.test(event.url);
!/\/profile/.test(event.url) &&
!/\/terms/.test(event.url) &&
!/\/privacy/.test(event.url);
}
});
}
Expand Down
4 changes: 4 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ import { NoDataComponent } from './Skeletons/no-data/no-data.component';
import { NoDataProfessorComponent } from './Skeletons/no-data-professor/no-data-professor.component';
import { NoDataReviewsComponent } from './Skeletons/no-data-reviews/no-data-reviews.component';
import { NoDataClassComponent } from './Skeletons/no-data-class/no-data-class.component';
import { PrivacyComponent } from './privacy/privacy.component';
import { TermsComponent } from './terms/terms.component';

@NgModule({
declarations: [
Expand All @@ -84,6 +86,8 @@ import { NoDataClassComponent } from './Skeletons/no-data-class/no-data-class.co
NoDataProfessorComponent,
NoDataReviewsComponent,
NoDataClassComponent,
PrivacyComponent,
TermsComponent,
],
imports: [
BrowserModule,
Expand Down
28 changes: 22 additions & 6 deletions src/app/footer/footer.component.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
.footer {
height: 10vh;
background-color: #6d1f22;
flex-direction: column;
flex-direction: row;
justify-content: space-between;
align-items: center;
display: flex;
padding-right: 20px;
padding-left:20px;
color: #fff;
font-family: "Helvetica Neue 55 Cdnfonts", sans-serif;
}

.footerRoutesWrapper {
flex-direction: row;
justify-content: center;
align-items: flex-start;
display: flex;
}

.text-block {
color: #fff;
margin-left: 20px;
font-family: "Helvetica Neue 55 Cdnfonts", sans-serif;

@media screen and (max-width: 767px) {
.footer {
flex-direction:column;
justify-content:center;
flex-direction:column-reverse;
gap:10px;

}

}
9 changes: 7 additions & 2 deletions src/app/footer/footer.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<div class="footer">
<div class="text-block">
© 2024 | Sebastian Pucher &amp; Andrew Boessen
<div class="authorWrapper">
© 2025 | Sebastian Pucher &amp; Andrew Boessen
</div>

<div class="footerRouterWrapper">
<a routerLink="/terms" routerLinkActive="active" ariaCurrentWhenActive="page" style="color: white;"> Terms</a>
| <a routerLink="/privacy" routerLinkActive="active" ariaCurrentWhenActive="page" style="color: white;"> Privacy</a>
</div>
</div>
82 changes: 82 additions & 0 deletions src/app/privacy/privacy.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
.privacySection {
margin-top: 50px;
margin-bottom:50px;
height: auto;
flex-direction: column;
align-items: center;
display: block;
}
.privacyWrap {
width: 1000px;
margin-top: 50px;
margin-left: auto;
margin-right: auto;
display: flex;
flex-direction: column;
align-items: center;
}

.privacyHeading {
margin-bottom: 20px;
margin-top: 5px;
font-family: Roboto, sans-serif;
font-weight: 400;
line-height: 44px;
font-size: 30px;
}

.taglinePrivacy {
opacity: 0.6;
letter-spacing: 2px;
text-transform: uppercase;
font-family: Roboto, sans-serif;
font-size: 12px;
}
.dividerPrivacy {
width: 60px;
height: 2px;
background-color: #c5bfb0;
margin-left: auto;
margin-right: auto;
}
.legalTextWrapPrivacy {
flex-direction: row;
justify-content: center;
margin-top: 13px;
margin-bottom: 13px;
display: flex;
}
.legalParagraphPrivacy {
text-align: center;
margin-top: 10px;
font-family: Roboto, sans-serif;
font-size: 20px;
line-height: 35px;
}
.legalSubParagraphPrivacy {
text-align: left;
margin-top: 10px;
font-family: Roboto, sans-serif;
font-size: 15px;
line-height: 35px;
}
.privacyContent{
height: auto;
width:90%;
flex-direction: column;
align-items: left;
display: block;
}
.legalHeadingPrivacy {
text-align: center;
margin-top: 12px;
font-family: Roboto, sans-serif;
font-size: 15px;
line-height: 35px;
font-weight:bold;
}
@media screen and (max-width: 991px) {
.privacyWrap{
width:90%;
}
}
Loading

0 comments on commit 3f415db

Please sign in to comment.