Merge branch 'development' into staging

max-geller · Oct 5, 2024 · f6b9fcd · f6b9fcd
2 parents a2b57b0 + d426446
commit f6b9fcd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,28 +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:
-      - main
+      - 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
-        uses: actions/checkout@v2
 
+# Checkout
+      - name: Checkout Code 🛎️
+        uses: actions/checkout@v4
+
+# Setup Node.js
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        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/.gitignore b/.gitignore
@@ -24,13 +24,15 @@ yarn-error.log
 *.sublime-workspace
 
 # Visual Studio Code
+*.code-workspace
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
 .history/*
 
+
 # Miscellaneous
 /.angular/cache
 .sass-cache/

diff --git 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
 

diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@
 ![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.
 

diff --git a/src/index.html b/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Angular 18 Starter</title>
+  <title>Angular 18 SupaStarter - Multi-Tenant SaaS Starter</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">