diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index c3b48c5..c899f1c 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -1,9 +1,6 @@
name: Angular GitHub CI
-on:
- push:
- branches:
- - main
+on: [push]
jobs:
ci:
@@ -44,7 +41,8 @@ jobs:
run: |
npm run build
- name: Deploy
+ if: github.ref == 'refs/heads/main'
env:
GH_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
run: |
- npm run ng -- deploy --base-href=/anjeyy.github.io/ --name="automated deployment" --email=automated.gh-pages@bot.github.com
+ npm run ng -- deploy --base-href=anjeyy.github.io --name="automated deployment" --email=automated.gh-pages@bot.github.com
diff --git a/deployment/deploy-to-gh-pages.sh b/deployment/deploy-to-gh-pages.sh
index f130409..a9cd177 100644
--- a/deployment/deploy-to-gh-pages.sh
+++ b/deployment/deploy-to-gh-pages.sh
@@ -6,4 +6,4 @@ ng build
#todo(github ci/cd): 'ng add angular-cli-ghpages'
-ng deploy --base-href=anjeyy.github.io
+ng deploy --base-href=anjeyy.github.io --name="automated deployment" --email=automated.gh-pages@bot.github.com
diff --git a/src/app/about-me/Tile.ts b/src/app/about-me/Tile.ts
new file mode 100644
index 0000000..2a954f4
--- /dev/null
+++ b/src/app/about-me/Tile.ts
@@ -0,0 +1,6 @@
+export interface Tile {
+ color: string;
+ cols: number;
+ rows: number;
+ text: string;
+}
diff --git a/src/app/about-me/about-me.component.css b/src/app/about-me/about-me.component.css
new file mode 100644
index 0000000..fdb01ab
--- /dev/null
+++ b/src/app/about-me/about-me.component.css
@@ -0,0 +1,3 @@
+mat-grid-tile {
+ background: lightblue;
+}
diff --git a/src/app/about-me/about-me.component.html b/src/app/about-me/about-me.component.html
new file mode 100644
index 0000000..93381d8
--- /dev/null
+++ b/src/app/about-me/about-me.component.html
@@ -0,0 +1,37 @@
+
+
+
+ Title
+ Sub-Title
+
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+ Content,
+
+
+ Container for buttons at the bottom of the card
+ Footer
+
+
+
+
diff --git a/src/app/landing-page/landing-page.component.spec.ts b/src/app/about-me/about-me.component.spec.ts
similarity index 53%
rename from src/app/landing-page/landing-page.component.spec.ts
rename to src/app/about-me/about-me.component.spec.ts
index 373a229..ba5705f 100644
--- a/src/app/landing-page/landing-page.component.spec.ts
+++ b/src/app/about-me/about-me.component.spec.ts
@@ -1,20 +1,20 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { LandingPageComponent } from './landing-page.component';
+import { AboutMeComponent } from './about-me.component';
-describe('LandingPageComponent', () => {
- let component: LandingPageComponent;
- let fixture: ComponentFixture;
+describe('AboutMeComponent', () => {
+ let component: AboutMeComponent;
+ let fixture: ComponentFixture;
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [ LandingPageComponent ]
+ declarations: [ AboutMeComponent ]
})
.compileComponents();
});
beforeEach(() => {
- fixture = TestBed.createComponent(LandingPageComponent);
+ fixture = TestBed.createComponent(AboutMeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/about-me/about-me.component.ts b/src/app/about-me/about-me.component.ts
new file mode 100644
index 0000000..60d8c21
--- /dev/null
+++ b/src/app/about-me/about-me.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { Tile } from './Tile';
+
+@Component({
+ selector: 'app-about-me',
+ templateUrl: './about-me.component.html',
+ styleUrls: ['./about-me.component.css'],
+})
+export class AboutMeComponent implements OnInit {
+ tiles: Tile[] = [
+ { text: 'One', cols: 3, rows: 1, color: 'lightblue' },
+ { text: 'Two', cols: 1, rows: 2, color: 'lightgreen' },
+ { text: 'Three', cols: 1, rows: 1, color: 'lightpink' },
+ { text: 'Four', cols: 2, rows: 1, color: '#DDBDF1' },
+ ];
+
+ constructor() {}
+
+ ngOnInit(): void {}
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 10eb6d2..7a3922a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -17,15 +17,15 @@ import { MatTabsModule } from '@angular/material/tabs';
import { MatDividerModule } from '@angular/material/divider';
import { ClipboardModule } from '@angular/cdk/clipboard';
import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { LandingPageComponent } from './landing-page/landing-page.component';
import { TabOverviewComponent } from './tab-overview/tab-overview.component';
+import { AboutMeComponent } from './about-me/about-me.component';
@NgModule({
declarations: [
AppComponent,
ToolbarComponent,
- LandingPageComponent,
TabOverviewComponent,
+ AboutMeComponent,
],
imports: [
BrowserModule,
diff --git a/src/app/landing-page/landing-page.component.css b/src/app/landing-page/landing-page.component.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/landing-page/landing-page.component.html b/src/app/landing-page/landing-page.component.html
deleted file mode 100644
index d66f297..0000000
--- a/src/app/landing-page/landing-page.component.html
+++ /dev/null
@@ -1 +0,0 @@
-Welcome to my homepage!
diff --git a/src/app/landing-page/landing-page.component.ts b/src/app/landing-page/landing-page.component.ts
deleted file mode 100644
index 5533fd8..0000000
--- a/src/app/landing-page/landing-page.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-landing-page',
- templateUrl: './landing-page.component.html',
- styleUrls: ['./landing-page.component.css']
-})
-export class LandingPageComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit(): void {
- }
-
-}
diff --git a/src/app/tab-overview/tab-overview.component.html b/src/app/tab-overview/tab-overview.component.html
index 74fc9da..9241ce7 100644
--- a/src/app/tab-overview/tab-overview.component.html
+++ b/src/app/tab-overview/tab-overview.component.html
@@ -7,7 +7,7 @@
disabled
-
+
disabled