Skip to content

Commit

Permalink
Basic changes based on Oliver's feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
em843 committed May 8, 2024
1 parent ee64634 commit 6a3a145
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion website/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { PublicationsComponent } from './pages/publications/publications.compone

const routes: Routes = [
{ path: '', component: HomepageComponent },
{ path: 'bios', component: BiosComponent },
{ path: 'team', component: BiosComponent },
{ path: 'publications', component: PublicationsComponent },
];

Expand Down
1 change: 0 additions & 1 deletion website/src/app/components/components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { MatIconModule } from '@angular/material/icon';
BioCardComponent
],
imports: [
// other modules
MatDialogModule,
MatToolbarModule,
MatButtonModule,
Expand Down
4 changes: 2 additions & 2 deletions website/src/app/components/navbar/navbar.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<mat-toolbar color="primary" class="navbar">
<span>Gao Labs @ Cornell University</span>
<span>Gao Labs</span>
<a mat-button routerLink="/">Home</a>
<a mat-button routerLink="/bios">Bios</a>
<a mat-button routerLink="/team">Team</a>
<a mat-button routerLink="/publications">Publications</a>
</mat-toolbar>
8 changes: 4 additions & 4 deletions website/src/app/pages/homepage/homepage.component.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="page">
<mat-card class="card-2">
<div>
<img class="oliver-pic" src="../../assets/headshots/oliver-group.jpg" />
<h3>Dr. Oliver Gao</h3>
<img class="oliver-pic" src="../../assets/website-images/photo_2023_10_outing.jpg" />
<!-- <h3>Our Core Team during a fall outing to the apple orchard.</h3> -->
</div>
<div class="welcome-container">
<h1>Welcome to Gao Labs!</h1>
<p>Gao Labs is a joint effort of Cornell's Systems and Civil Engineering departments that focuses on two critical causes: public health and climate change. Read more about our current research and development efforts below.</p>
<p>Gao Labs, originating from Cornell University's Systems and Civil Engineering departments, is a group that focuses on two critical causes: public health and climate change. Read more about our current research and development efforts below.</p>
<div class="actions-container">
<button mat-button routerLink="/bios">Meet our Team</button>
<button mat-button routerLink="/team">Meet our Team</button>
</div>

</div>
Expand Down
3 changes: 2 additions & 1 deletion website/src/app/pages/homepage/homepage.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { NgModule } from '@angular/core';
import { HomepageComponent } from './homepage.component';
import { MatCardModule } from '@angular/material/card';
import { MatButtonModule } from '@angular/material/button';
import { RouterModule } from '@angular/router';

@NgModule({
declarations: [HomepageComponent],
imports: [MatCardModule, MatButtonModule],
imports: [MatCardModule, MatButtonModule, RouterModule],
exports: [HomepageComponent],

})
Expand Down
Binary file modified website/src/assets/headshots/Alireza Yazdiani.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6a3a145

Please sign in to comment.