Merge branch 'template'

itw-creative-works · Jun 25, 2024 · 7820973 · 7820973
2 parents 9d3635c + f153708
commit 7820973
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "$GITHUB_ACTOR"
       - name: Checkout main branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -40,7 +40,7 @@ jobs:
         run: |
           bundle install --path vendor/bundle
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 10
       - name: Run node install
@@ -95,7 +95,7 @@ jobs:
       #       -H "Authorization: token ${{ secrets.GH_TOKEN }}" \
       #       https://api.github.com/repos/$GITHUB_REPOSITORY/git/refs/heads/gh-pages
       - name: Deploy to gh-pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GH_TOKEN }}
           publish_dir: ./_site
@@ -105,4 +105,15 @@ jobs:
         uses: kolpav/purge-artifacts-action@v1
         with:
           token: ${{ secrets.GH_TOKEN }}
-          expire-in: 5 minutes # Set this to 0 to delete all artifacts
+          expire-in: 5 minutes # Set this to 0 to delete instantly
+      # - name: Purge artifacts
+      #   uses: c-hive/gha-remove-artifacts@v1
+      #   with:
+      #     age: '5 minutes' # '<number> <unit>', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js
+      #     # Optional inputs
+      #     # skip-tags: true
+      #     # skip-recent: 5
+      # - name: Purge artifacts
+      #   uses: geekyeggo/delete-artifact@v5
+      #   with:
+      #       name: github-pages
diff --git a/_layouts/master/authentication/account.html b/_layouts/master/authentication/account.html
@@ -1763,27 +1763,29 @@ <h4 class="mb-0">{name} <span class="connect-account-identity text-muted" data-p
         Object.keys(appData.oauth2)
         .forEach(function (provider, i) {
           // console.log('--appData.oauth2[provider]', appData.oauth2[provider]);
-          if (appData.oauth2[provider] && appData.oauth2[provider].enabled) {
-            var details = oauth2Map[provider];
-            if (!details) {
-              return
-            }
+          if (!appData.oauth2[provider] || !appData.oauth2[provider].enabled) {
+            return;
+          }
 
-            var identity = _.get(accountData.oauth2[provider] || {}, 'identity.' + details.identity, '');
-            if (identity) {
-              identity = '- ' + identity;
-            }
+          var details = oauth2Map[provider];
+          if (!details) {
+            return;
+          }
 
-            oauth2EnabledArray = oauth2EnabledArray.concat(provider);
-            connectedAccountsHtml += connectedAccountsTemplate
-              .replace(/{id}/img, provider)
-              .replace(/{icon}/img, details.icon)
-              .replace(/{name}/img, details.name)
-              .replace(/{identity}/img, identity)
-              .replace(/{homepage}/img, details.homepage)
-              .replace(/{description}/img, details.description)
-              .replace(/{scope}/img, encodeURIComponent(JSON.stringify(appData.oauth2[provider].scope || [])))
+          var identity = _.get(accountData.oauth2[provider] || {}, 'identity.' + details.identity, '');
+          if (identity) {
+            identity = '- ' + identity;
           }
+
+          oauth2EnabledArray = oauth2EnabledArray.concat(provider);
+          connectedAccountsHtml += connectedAccountsTemplate
+            .replace(/{id}/img, provider)
+            .replace(/{icon}/img, details.icon)
+            .replace(/{name}/img, details.name)
+            .replace(/{identity}/img, identity)
+            .replace(/{homepage}/img, details.homepage)
+            .replace(/{description}/img, details.description)
+            .replace(/{scope}/img, encodeURIComponent(JSON.stringify(appData.oauth2[provider].scope || [])))
         });
 
         if (oauth2EnabledArray.length === 0) {
@@ -1862,7 +1864,6 @@ <h4 class="mb-0">{name} <span class="connect-account-identity text-muted" data-p
           });
         }
 
-
         document.addEventListener('submit', function (event) {
           handleSubmit(event);
         })