chiefmikey · chiefmikey · Feb 26, 2024 · Feb 26, 2024 · Feb 26, 2024 · Feb 26, 2024
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/workflows/codesee.yml b/.github/workflows/codesee.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,31 +1,79 @@
-name: Deploy to Auth-Server
+name: Deploy
 
 on:
   push:
     branches:
       - main
 
+  workflow_dispatch:
+    inputs:
+      environment:
+        type: choice
+        description: 'Deploy Environment'
+        options:
+        - dev
+        - prod
+      invalidate:
+        description: 'Invalidate CloudFront Cache'
+        type: boolean
+        default: true
+
 jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
+    env:
+      DIST_NAME: ${{ vars.DIST_NAME }}
+      S3_BUCKET: ${{ vars.S3_BUCKET }}
+      DEPLOY_DIR: 'public'
+
     steps:
-      - name: Configure AWS
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-2
-
-      - name: Create Deployment
-        id: deploy
-        env:
-          APP_NAME: auth-server
-          DEPLOY_GROUP: gitlang
-        run: |
-          aws deploy create-deployment --ignore-application-stop-failures \
-            --application-name ${{ env.APP_NAME }} \
-            --deployment-group-name ${{ env.DEPLOY_GROUP }} \
-            --deployment-config-name CodeDeployDefault.AllAtOnce \
-            --file-exists-behavior OVERWRITE \
-            --github-location repository=${{ github.repository }},commitId=${{ github.sha }}
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Build
+      run: |
+        set -x
+        npm i
+        sed -i "1i console.log('Updated:', '$(TZ=PST8PDT date)')" client/src/index.ts
+        npm run build:prod
+
+    - name: Configure AWS
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-2
+
+    - name: Sync to S3
+      id: sync
+      run: |
+        aws s3 sync ${DEPLOY_DIR} s3://${S3_BUCKET} --delete
+
+    - name: Invalidate CloudFront
+      id: invalidate
+      if: ${{ inputs.invalidate == true }}
+      run: |
+        dist_id="$(aws cloudfront list-distributions \
+          --query "DistributionList.Items[?Comment=='${DIST_NAME}'].Id" \
+          --output text)"
+
+        if [ -z "$dist_id" ]; then
+          echo "No distribution found with comment: ${DIST_NAME}"
+          exit 1
+        fi
+
+        echo "Invalidating ${dist_id} for ${DIST_NAME}"
+          invalidation_id="$(aws cloudfront create-invalidation \
+            --distribution-id "$dist_id" \
+            --paths "/*" \
+            --query "Invalidation.Id" \
+            --output text)"
+
+        echo "Invalidation started: ${invalidation_id}"
+
+        aws cloudfront wait invalidation-completed \
+          --distribution-id "$dist_id" \
+          --id "$invalidation_id"
+
+        echo "Invalidation completed"
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CNAME b/docs/CNAME
diff --git a/init.sh b/init.sh
diff --git a/package.json b/package.json
@@ -4,9 +4,9 @@
   "description": "View language usage per repo or total by username",
   "main": "client/src/index.ts",
   "scripts": {
-    "dev": "NODE_ENV=development webpack --mode development -w",
+    "build:dev": "NODE_ENV=development webpack --mode development -w",
+    "build:prod": "NODE_ENV=production webpack --mode production",
     "fix": "eslint --fix '**/*'",
-    "prod": "NODE_ENV=production webpack --mode production",
     "start:client": "ts-node local/client.ts",
     "start:server": "ts-node local/server.ts"
   },

diff --git a/docs/public/assets/favicon.ico → public/assets/favicon.ico b/docs/public/assets/favicon.ico → public/assets/favicon.ico
diff --git a/docs/public/assets/img/gitlang.svg → public/assets/img/gitlang.svg b/docs/public/assets/img/gitlang.svg → public/assets/img/gitlang.svg
diff --git a/docs/public/assets/social.png → public/assets/social.png b/docs/public/assets/social.png → public/assets/social.png
diff --git a/docs/index.html → public/index.html b/docs/index.html → public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <!-- Google Tag Manager -->

diff --git a/stop.sh b/stop.sh
diff --git a/webpack.config.ts b/webpack.config.ts
@@ -11,7 +11,7 @@ const mode = process.env.NODE_ENV as
 const production = mode === 'production';
 
 const SRC_DIR = path.join(path.resolve(), '/client/src');
-const DIST_DIR = path.join(path.resolve(), '/docs/public/dist');
+const DIST_DIR = path.join(path.resolve(), '/public/dist');
 
 const configuration: Configuration = {
   entry: `${SRC_DIR}/index.ts`,