From f022a437c84ff4d1b43a3a610c67e8b51ee4c6c4 Mon Sep 17 00:00:00 2001 From: Jason Sheets Date: Thu, 8 Jun 2023 21:17:00 -0400 Subject: [PATCH 1/5] publish From 599dfbf1612076d2d2e162bbe0dee55f9807adcb Mon Sep 17 00:00:00 2001 From: "Jason.Sheets" Date: Tue, 13 Jun 2023 14:59:24 -0400 Subject: [PATCH 2/5] FIle changes in Development --- ...-static-web-apps-ashy-meadow-07943480f.yml | 45 ----------------- ...e-static-web-apps-orange-bay-048c6830f.yml | 45 ----------------- Untitled-1.json | 25 ++++++++++ Untitled-3.yml | 48 +++++++++++++++++++ 4 files changed, 73 insertions(+), 90 deletions(-) delete mode 100644 .github/workflows/azure-static-web-apps-ashy-meadow-07943480f.yml delete mode 100644 .github/workflows/azure-static-web-apps-orange-bay-048c6830f.yml create mode 100644 Untitled-1.json create mode 100644 Untitled-3.yml diff --git a/.github/workflows/azure-static-web-apps-ashy-meadow-07943480f.yml b/.github/workflows/azure-static-web-apps-ashy-meadow-07943480f.yml deleted file mode 100644 index 8fa1194..0000000 --- a/.github/workflows/azure-static-web-apps-ashy-meadow-07943480f.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - master - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - master - -jobs: - 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: - - uses: actions/checkout@v3 - with: - submodules: true - - 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_ASHY_MEADOW_07943480F }} - 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: "/" # App source code path - api_location: "api" # Api source code path - optional - output_location: "build" # Built app content directory - optional - ###### 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_ASHY_MEADOW_07943480F }} - action: "close" diff --git a/.github/workflows/azure-static-web-apps-orange-bay-048c6830f.yml b/.github/workflows/azure-static-web-apps-orange-bay-048c6830f.yml deleted file mode 100644 index f80eb11..0000000 --- a/.github/workflows/azure-static-web-apps-orange-bay-048c6830f.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - master - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - master - -jobs: - 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: - - uses: actions/checkout@v3 - with: - submodules: true - - 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_ORANGE_BAY_048C6830F }} - 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: "/app" # App source code path - api_location: "api" # Api source code path - optional - output_location: "build" # Built app content directory - optional - ###### 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_ORANGE_BAY_048C6830F }} - action: "close" diff --git a/Untitled-1.json b/Untitled-1.json new file mode 100644 index 0000000..7956206 --- /dev/null +++ b/Untitled-1.json @@ -0,0 +1,25 @@ +{ + "trailingSlash": "auto", + "routes": [ + { + "route": "/proxy.pac", + "allowedRoles": ["authenticated"] + } + ], + "navigationFallback": { + "rewrite": "/index.html", + "exclude": ["/images/*.{png,jpg,gif}", "/css/*"] + }, + "globalHeaders": { + "content-security-policy": "default-src https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'; frame-ancestors 'none'; base-uri 'none';" + }, + "mimeTypes": { + ".pac": "application/x-ns-proxy-autoconfig" + }, + "responseOverrides": { + "401": { + "rewrite": "/login", + "statusCode": 302 + } + } +} \ No newline at end of file diff --git a/Untitled-3.yml b/Untitled-3.yml new file mode 100644 index 0000000..e47159c --- /dev/null +++ b/Untitled-3.yml @@ -0,0 +1,48 @@ +name: Deploy web app to Azure Static Web Apps +# Environment variables +env: + APP_LOCATION: "/" # location of your client code + APP_ARTIFACT_LOCATION: "build" # location of client code build output +# Triggers +on: + push: + branches: + - main + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - main +# Permissions +permissions: + issues: write + contents: read +# Jobs +jobs: + build_and_deploy: + # Run when there is a push to main or a pull request to main that is open, synchronized, reopened, or closed + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + runs-on: ubuntu-latest + name: Build and Deploy + steps: + # Checkout the repository + - uses: actions/checkout@v3 + with: + submodules: true + # Build and deploy the app + - name: Build And Deploy + uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} + repo_token: ${{ secrets.STATIC_WEB_CONFIG_PACFILE }} + action: "upload" + app_location: ${{ env.APP_LOCATION }} + app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }} + close: + # Run when a pull request to main is closed + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close + steps: + # Close the pull request + - name: Close + run: echo ${{ toJson(github.event.pull_request) }} \ No newline at end of file From dff2ede15f9a4e98458c7cc2d4da9fefdb376a3a Mon Sep 17 00:00:00 2001 From: "Jason.Sheets" Date: Tue, 13 Jun 2023 16:12:00 -0400 Subject: [PATCH 3/5] changed ynl title, webconfig title and moved to appropriate folder --- Untitled-1.json => build/Untitled-1.json | 0 build/webconfig.json | 25 ++++++++++++ staticwebconfig.yml | 48 ++++++++++++++++++++++++ 3 files changed, 73 insertions(+) rename Untitled-1.json => build/Untitled-1.json (100%) create mode 100644 build/webconfig.json create mode 100644 staticwebconfig.yml diff --git a/Untitled-1.json b/build/Untitled-1.json similarity index 100% rename from Untitled-1.json rename to build/Untitled-1.json diff --git a/build/webconfig.json b/build/webconfig.json new file mode 100644 index 0000000..7956206 --- /dev/null +++ b/build/webconfig.json @@ -0,0 +1,25 @@ +{ + "trailingSlash": "auto", + "routes": [ + { + "route": "/proxy.pac", + "allowedRoles": ["authenticated"] + } + ], + "navigationFallback": { + "rewrite": "/index.html", + "exclude": ["/images/*.{png,jpg,gif}", "/css/*"] + }, + "globalHeaders": { + "content-security-policy": "default-src https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'; frame-ancestors 'none'; base-uri 'none';" + }, + "mimeTypes": { + ".pac": "application/x-ns-proxy-autoconfig" + }, + "responseOverrides": { + "401": { + "rewrite": "/login", + "statusCode": 302 + } + } +} \ No newline at end of file diff --git a/staticwebconfig.yml b/staticwebconfig.yml new file mode 100644 index 0000000..e47159c --- /dev/null +++ b/staticwebconfig.yml @@ -0,0 +1,48 @@ +name: Deploy web app to Azure Static Web Apps +# Environment variables +env: + APP_LOCATION: "/" # location of your client code + APP_ARTIFACT_LOCATION: "build" # location of client code build output +# Triggers +on: + push: + branches: + - main + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - main +# Permissions +permissions: + issues: write + contents: read +# Jobs +jobs: + build_and_deploy: + # Run when there is a push to main or a pull request to main that is open, synchronized, reopened, or closed + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + runs-on: ubuntu-latest + name: Build and Deploy + steps: + # Checkout the repository + - uses: actions/checkout@v3 + with: + submodules: true + # Build and deploy the app + - name: Build And Deploy + uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} + repo_token: ${{ secrets.STATIC_WEB_CONFIG_PACFILE }} + action: "upload" + app_location: ${{ env.APP_LOCATION }} + app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }} + close: + # Run when a pull request to main is closed + if: github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close + steps: + # Close the pull request + - name: Close + run: echo ${{ toJson(github.event.pull_request) }} \ No newline at end of file From 9e7fae8bbddd1a07bc98dacf70792f1d23b39045 Mon Sep 17 00:00:00 2001 From: "Jason.Sheets" Date: Fri, 30 Jun 2023 15:24:28 -0400 Subject: [PATCH 4/5] dded websonfig.json and webconfig.xml, added data sources for storage account and blob storgae container, added variables for storage account and storage container. --- Untitled-3.yml | 48 --------------------------------------------- build/webconfig.xml | 9 +++++++++ staticwebconfig.yml | 48 --------------------------------------------- 3 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 Untitled-3.yml create mode 100644 build/webconfig.xml delete mode 100644 staticwebconfig.yml diff --git a/Untitled-3.yml b/Untitled-3.yml deleted file mode 100644 index e47159c..0000000 --- a/Untitled-3.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Deploy web app to Azure Static Web Apps -# Environment variables -env: - APP_LOCATION: "/" # location of your client code - APP_ARTIFACT_LOCATION: "build" # location of client code build output -# Triggers -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main -# Permissions -permissions: - issues: write - contents: read -# Jobs -jobs: - build_and_deploy: - # Run when there is a push to main or a pull request to main that is open, synchronized, reopened, or closed - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy - steps: - # Checkout the repository - - uses: actions/checkout@v3 - with: - submodules: true - # Build and deploy the app - - name: Build And Deploy - uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} - repo_token: ${{ secrets.STATIC_WEB_CONFIG_PACFILE }} - action: "upload" - app_location: ${{ env.APP_LOCATION }} - app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }} - close: - # Run when a pull request to main is closed - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close - steps: - # Close the pull request - - name: Close - run: echo ${{ toJson(github.event.pull_request) }} \ No newline at end of file diff --git a/build/webconfig.xml b/build/webconfig.xml new file mode 100644 index 0000000..a4b5999 --- /dev/null +++ b/build/webconfig.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/staticwebconfig.yml b/staticwebconfig.yml deleted file mode 100644 index e47159c..0000000 --- a/staticwebconfig.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Deploy web app to Azure Static Web Apps -# Environment variables -env: - APP_LOCATION: "/" # location of your client code - APP_ARTIFACT_LOCATION: "build" # location of client code build output -# Triggers -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main -# Permissions -permissions: - issues: write - contents: read -# Jobs -jobs: - build_and_deploy: - # Run when there is a push to main or a pull request to main that is open, synchronized, reopened, or closed - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy - steps: - # Checkout the repository - - uses: actions/checkout@v3 - with: - submodules: true - # Build and deploy the app - - name: Build And Deploy - uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} - repo_token: ${{ secrets.STATIC_WEB_CONFIG_PACFILE }} - action: "upload" - app_location: ${{ env.APP_LOCATION }} - app_artifact_location: ${{ env.APP_ARTIFACT_LOCATION }} - close: - # Run when a pull request to main is closed - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close - steps: - # Close the pull request - - name: Close - run: echo ${{ toJson(github.event.pull_request) }} \ No newline at end of file From 0d565afa194e18428508c9cdc262a2738710829a Mon Sep 17 00:00:00 2001 From: MissAlleyCat <139533512+MissAlleyCat@users.noreply.github.com> Date: Sun, 23 Jul 2023 05:31:53 -0300 Subject: [PATCH 5/5] Update README.md Commit