From 3a08eff8c94b1fcf95f5cd6abade9ffaf361b2e0 Mon Sep 17 00:00:00 2001 From: Roman Eriksen Date: Wed, 10 Sep 2025 10:04:07 +0200 Subject: [PATCH 1/7] first commit --- angular.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/angular.json b/angular.json index e34620a..6ac9997 100644 --- a/angular.json +++ b/angular.json @@ -91,5 +91,8 @@ } } } + }, + "cli": { + "analytics": "d41c056c-319e-4151-ad9d-5e4b6977a157" } } From 59919566d79bc98e48c72a9a285066257ad72b45 Mon Sep 17 00:00:00 2001 From: Roman Eriksen Date: Wed, 10 Sep 2025 10:09:49 +0200 Subject: [PATCH 2/7] first change --- src/app/app.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/app.component.html b/src/app/app.component.html index de43290..e4ace8c 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,5 @@

Hello

From {{ domain }}

+

This is my first change

From bf83d937abd04b7ecb48f318b771aaa5ad60330c Mon Sep 17 00:00:00 2001 From: Roman Eriksen Date: Wed, 10 Sep 2025 10:23:57 +0200 Subject: [PATCH 3/7] second change --- .github/workflows/main.yml | 18 ++++++++++++++++++ src/app/app.component.html | 1 + 2 files changed, 19 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..ffeb46b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +name: Trigger Netlify Build +on: + push: + branches: + - main + +jobs: + deploy: + runs-on: ubuntu-latest + name: 'Deploy to Netlify' + steps: + - uses: actions/checkout@v3 + - uses: jsmrcaga/action-netlify-deploy@v2.4.0 + with: + NETLIFY_AUTH_TOKEN: ${{ secrets.NEW_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.MY_SITE_ID }} + NETLIFY_DEPLOY_TO_PROD: true + build_directory: dist/romanswebsite/browser \ No newline at end of file diff --git a/src/app/app.component.html b/src/app/app.component.html index e4ace8c..d4731bc 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,4 +2,5 @@

Hello

From {{ domain }}

This is my first change

+

This is my second change

From 5ec0c6a0122d4f092ccb5e4ddb86c75eb42a1bbd Mon Sep 17 00:00:00 2001 From: Roman Eriksen Date: Wed, 10 Sep 2025 10:29:42 +0200 Subject: [PATCH 4/7] third commit --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffeb46b..3e15cd1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,4 +15,5 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.NEW_AUTH_TOKEN }} NETLIFY_SITE_ID: ${{ secrets.MY_SITE_ID }} NETLIFY_DEPLOY_TO_PROD: true - build_directory: dist/romanswebsite/browser \ No newline at end of file + build_directory: dist/hello-ci-cd + # build_directory: dist/romanswebsite/browser \ No newline at end of file From 391902a6f808adc9d47eaa75a080213e07206087 Mon Sep 17 00:00:00 2001 From: Roman Eriksen Date: Wed, 10 Sep 2025 10:36:08 +0200 Subject: [PATCH 5/7] added redirect --- angular.json | 3 ++- src/_redirects | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/_redirects diff --git a/angular.json b/angular.json index 6ac9997..3bf409e 100644 --- a/angular.json +++ b/angular.json @@ -81,7 +81,8 @@ "tsConfig": "tsconfig.spec.json", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/_redirects" ], "styles": [ "src/styles.css" diff --git a/src/_redirects b/src/_redirects new file mode 100644 index 0000000..ad37e2c --- /dev/null +++ b/src/_redirects @@ -0,0 +1 @@ +/* /index.html 200 From 8f99da0bb1c5db3b57fe7580b2d7d086d5802023 Mon Sep 17 00:00:00 2001 From: Roman Eriksen Date: Wed, 10 Sep 2025 10:41:41 +0200 Subject: [PATCH 6/7] added browser --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3e15cd1..be6d82c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,5 +15,5 @@ jobs: NETLIFY_AUTH_TOKEN: ${{ secrets.NEW_AUTH_TOKEN }} NETLIFY_SITE_ID: ${{ secrets.MY_SITE_ID }} NETLIFY_DEPLOY_TO_PROD: true - build_directory: dist/hello-ci-cd + build_directory: dist/hello-ci-cd/browser # build_directory: dist/romanswebsite/browser \ No newline at end of file From 6449ba87c99cb67b03a0e952541525abb45d7eb8 Mon Sep 17 00:00:00 2001 From: Roman Stenseth Eriksen Date: Wed, 10 Sep 2025 10:45:46 +0200 Subject: [PATCH 7/7] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 5950904..91445f5 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,8 @@ Save this token somewhere as we will need it later. Once a token is created (and ## Instructions Using what was covered in the morning - create a github action that will deploy the website using netlify + +## Netlify + +https://romanswebsite.netlify.app/ +