From 4c7c72da6cabe956e6352787597981892de0c3f8 Mon Sep 17 00:00:00 2001 From: Max Geller Date: Fri, 4 Oct 2024 20:02:03 -0700 Subject: [PATCH 1/8] chore: Update README with badges for Angular, Supabase, and Netlify --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3bb765c..dcde3cc 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ ![GitHub issues](https://img.shields.io/github/issues/max-geller/angular-supastarter) ![GitHub license](https://img.shields.io/github/license/max-geller/angular-supastarter) +![Angular](https://img.shields.io/badge/angular-%23DD0031.svg?style=for-the-badge&logo=angular&logoColor=white) +![Supabase](https://img.shields.io/badge/Supabase-%233ECF8E.svg?style=for-the-badge&logo=supabase&logoColor=white) +![Netlify](https://img.shields.io/badge/netlify-%23000000.svg?style=for-the-badge&logo=netlify&logoColor=#00C7B7) + A production-ready starter template for building multi-tenant applications with Angular 18 and Supabase. ![Demo GIF](path/to/demo.gif) From dc0b48f8773b9c7d8972b89ac91b9481737add79 Mon Sep 17 00:00:00 2001 From: Max Geller Date: Fri, 4 Oct 2024 20:02:52 -0700 Subject: [PATCH 2/8] chore: Add Angular Material badge to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dcde3cc..7f39afe 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ ![Angular](https://img.shields.io/badge/angular-%23DD0031.svg?style=for-the-badge&logo=angular&logoColor=white) ![Supabase](https://img.shields.io/badge/Supabase-%233ECF8E.svg?style=for-the-badge&logo=supabase&logoColor=white) ![Netlify](https://img.shields.io/badge/netlify-%23000000.svg?style=for-the-badge&logo=netlify&logoColor=#00C7B7) +![Angular Material](https://img.shields.io/badge/Angular_Material-%23000000.svg?style=for-the-badge&logo=angular&logoColor=white) A production-ready starter template for building multi-tenant applications with Angular 18 and Supabase. From cba9a650f8a043731bb5e7094cee957225330bed Mon Sep 17 00:00:00 2001 From: Max Geller Date: Fri, 4 Oct 2024 20:20:00 -0700 Subject: [PATCH 3/8] updating main.yaml --- .github/workflows/main.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 28c7c68..58a7450 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -2,7 +2,8 @@ name: Production Build and Deploy on: push: branches: - - main + - development + jobs: build: From 67408d52f8cc626d5f75e0c87f79389f80b27e2e Mon Sep 17 00:00:00 2001 From: Max Geller Date: Fri, 4 Oct 2024 20:21:00 -0700 Subject: [PATCH 4/8] chore: Update Node.js version to 22 in main.yaml --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 58a7450..c9be778 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v3 with: - node-version: 20 + node-version: 22 - name: Build Angular app to prod working-directory: angular-starter From 2819ba60f89fa62962e70c7d9c48830802737fcd Mon Sep 17 00:00:00 2001 From: Max Geller Date: Fri, 4 Oct 2024 20:27:32 -0700 Subject: [PATCH 5/8] chore: Update Node.js version to 20 in main.yaml --- .github/workflows/main.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c9be778..d601aa5 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,13 +9,15 @@ jobs: build: runs-on: ubuntu-latest steps: + - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 22 + node-version: 20 + registry-url: https://npm.pkg.github.com/ - name: Build Angular app to prod working-directory: angular-starter From 98421958c9011fb5eb94bd5fae3a0cbdde9ad3ed Mon Sep 17 00:00:00 2001 From: Max Geller Date: Fri, 4 Oct 2024 21:08:18 -0700 Subject: [PATCH 6/8] updating contributing.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13debf6..fcaec70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to Multi-Tenant Angular 18 Starter with Supabase -First off, thank you for considering contributing to this project! It's people like you that make this starter template a great tool for the Angular developercommunity. +First off, thank you for considering contributing to this project! It's people like you that make this starter template a great tool for the Angular developer community. ## Table of Contents From 6093bcb4f73d6740487314576929b336d5e12993 Mon Sep 17 00:00:00 2001 From: Max Geller Date: Sat, 5 Oct 2024 08:27:22 -0700 Subject: [PATCH 7/8] chore: Update .gitignore to include *.code-workspace --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 184af47..7ceae64 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ yarn-error.log *.sublime-workspace # Visual Studio Code +*.code-workspace .vscode/* !.vscode/settings.json !.vscode/tasks.json @@ -31,6 +32,7 @@ yarn-error.log !.vscode/extensions.json .history/* + # Miscellaneous /.angular/cache .sass-cache/ From d426446baf51f1f0d1ab0ff19f43fe75082b1f40 Mon Sep 17 00:00:00 2001 From: Max Geller Date: Sat, 5 Oct 2024 08:35:29 -0700 Subject: [PATCH 8/8] updating main.yaml --- .github/workflows/main.yaml | 29 +++++++++++++++++++---------- src/index.html | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d601aa5..ce35c6a 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,31 +1,40 @@ -name: Production Build and Deploy +name: Staging Build and Deploy +# This workflow is triggered on a push to the development branch on: push: branches: - - development + - staging +# Set Permissions +permissions: + contents: write +# Configure Jobs jobs: build: + # concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession. runs-on: ubuntu-latest steps: - - name: Checkout code +# Checkout + - name: Checkout Code 🛎️ uses: actions/checkout@v4 +# Setup Node.js - name: Set up Node.js uses: actions/setup-node@v4 with: node-version: 20 registry-url: https://npm.pkg.github.com/ - - name: Build Angular app to prod - working-directory: angular-starter - run: npm install && npm run build --configuration=production +# Install Dependencies and Build App + - name: Build Angular App 🔧 + # working-directory: angular-starter + run: | + npm ci + npm run build --configuration=staging - - name: Deploy to GitHub Pages (Production) + - name: Deploy to GitHub Pages 🚀 uses: JamesIves/github-pages-deploy-action@v4 with: - folder: angular-starter/dist/browser - branch: prod - token: ${{ secrets.GH_TOKEN }} + folder: build # The folder the action should deploy. diff --git a/src/index.html b/src/index.html index 28f86f9..0e037f8 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ - Angular 18 Starter + Angular 18 SupaStarter - Multi-Tenant SaaS Starter