diff --git a/.github/workflows/azure-static-web-apps-white-sky-0acd4ad03.yml b/.github/workflows/azure-static-web-apps-victorious-moss-06d128203.yml similarity index 80% rename from .github/workflows/azure-static-web-apps-white-sky-0acd4ad03.yml rename to .github/workflows/azure-static-web-apps-victorious-moss-06d128203.yml index e54f443..3bc08ab 100644 --- a/.github/workflows/azure-static-web-apps-white-sky-0acd4ad03.yml +++ b/.github/workflows/azure-static-web-apps-victorious-moss-06d128203.yml @@ -1,15 +1,13 @@ -name: Publish Asset Store +name: Azure Static Web Apps CI/CD on: push: branches: - # - main - - feature/52-av-web + - main pull_request: types: [opened, synchronize, reopened, closed] branches: - # - main - - feature/52-av-web + - main jobs: build_and_deploy_job: @@ -24,10 +22,8 @@ jobs: with: submodules: true lfs: false - - name: Install OIDC Client from Core Package run: npm install @actions/core@1.6.0 @actions/http-client - - name: Get Id Token uses: actions/github-script@v6 id: idtoken @@ -36,18 +32,17 @@ jobs: const coredemo = require('@actions/core') return await coredemo.getIDToken() result-encoding: string - - name: Build And Deploy id: builddeploy uses: Azure/static-web-apps-deploy@v1 with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_WHITE_SKY_0ACD4AD03 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_VICTORIOUS_MOSS_06D128203 }} action: "upload" ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/AssetStore/asset-store-ui" # App source code path - api_location: "" # Api source code path - optional - # output_location: "app" # Built app content directory - optional + app_location: "./Portal/sharpengine-web-ui" # App source code path + # api_location: "" # Api source code path - optional + output_location: "build" # Built app content directory - optional github_id_token: ${{ steps.idtoken.outputs.result }} app_build_command: "CI=false npm run build" ###### End of Repository/Build Configurations ###### @@ -62,4 +57,3 @@ jobs: uses: Azure/static-web-apps-deploy@v1 with: action: "close" - diff --git a/.github/workflows/publish-asset-store.yml b/.github/workflows/publish-asset-store.yml index 5206b9c..e1a0afc 100644 --- a/.github/workflows/publish-asset-store.yml +++ b/.github/workflows/publish-asset-store.yml @@ -1,16 +1,65 @@ -name: Publish Asset Store _ Temp +name: Publish Asset Store on: push: branches: - - test + - main + - feature/52-av-web pull_request: + types: [opened, synchronize, reopened, closed] branches: - - test + - main + - feature/52-av-web jobs: - echo: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') runs-on: ubuntu-latest + name: Build and Deploy Job + permissions: + id-token: write + contents: read steps: - - name: Echo message - run: echo "Hello from the test branch 👋" + - uses: actions/checkout@v3 + with: + submodules: true + lfs: false + + - name: Install OIDC Client from Core Package + run: npm install @actions/core@1.6.0 @actions/http-client + + - name: Get Id Token + uses: actions/github-script@v6 + id: idtoken + with: + script: | + const coredemo = require('@actions/core') + return await coredemo.getIDToken() + result-encoding: string + + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_WHITE_SKY_0ACD4AD03 }} + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/AssetStore/asset-store-ui" # App source code path + api_location: "" # Api source code path - optional + # output_location: "app" # Built app content directory - optional + github_id_token: ${{ steps.idtoken.outputs.result }} + app_build_command: "CI=false npm run build" + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v1 + with: + action: "close" + diff --git a/.github/workflows/publish-web.yml b/.github/workflows/publish-web.yml index b7f0c3d..017a6b2 100644 --- a/.github/workflows/publish-web.yml +++ b/.github/workflows/publish-web.yml @@ -1,16 +1,49 @@ -name: Publish Web +name: Publish SharpEngine Web Portal on: push: branches: - - test + # - main + - feature/52-av-web pull_request: + types: [closed] branches: - - test + - main + # - feature/52-av-web jobs: - echo: + build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') runs-on: ubuntu-latest + name: Build and Deploy Job steps: - - name: Echo message - run: echo "Hello from the test branch 👋" + - uses: actions/checkout@v3 + with: + submodules: true + lfs: false + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_KIND_MEADOW_06167BF03 }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "./Portal/sharpengine-web-ui" # App source code path + # api_location: "" # Api source code path - optional + output_location: "build" # Built app content directory - optional + app_build_command: "CI=false npm run build" + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_KIND_MEADOW_06167BF03 }} + action: "close" diff --git a/Portal/sharpengine-web-ui/src/components/Header.tsx b/Portal/sharpengine-web-ui/src/components/Header.tsx index 87068d6..b5bab96 100644 --- a/Portal/sharpengine-web-ui/src/components/Header.tsx +++ b/Portal/sharpengine-web-ui/src/components/Header.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { ChevronDown, User } from 'lucide-react'; -import { HeaderLogin } from 'sharpengine-ui-shared/src/components/HeaderLogin' +//import { HeaderLogin } from 'sharpengine-ui-shared/src/components/HeaderLogin' export function Header() { const navigate = useNavigate(); @@ -63,7 +63,7 @@ export function Header() { - navigate('/profile')} /> + {/* navigate('/profile')} /> */} ); diff --git a/README.md b/README.md index 1af83a0..3621ef8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,21 @@
[![NuGet Version](https://img.shields.io/nuget/v/SharpEngine.Core.NET)](https://www.nuget.org/packages/SharpEngine.Core.NET) +![NuGet Downloads](https://img.shields.io/nuget/dt/PACKAGE_NAME) +