resolved conflicts

Author: wilc0519

.dockerignore

@@ -6,3 +6,6 @@ Makefile
 .gitignore
 *keys.ts
 *.keys.json
+.git-crypt
+.git
+Dockerfile

.env

@@ -0,0 +1,2 @@
+�
���aȞiި
�q�y���3T���H�1�m�*le���	xl��[P)q�骋�*�+����5"���,��Oؓ�E0u��apڊ
֡��cj����
`��N����0j�
���b��̠a��1�s���>����_ �@˽,u���s&�j��~�W1iUyc���\�����Ϊ��i˛���E͛�h��js��%�R#��w)ñ���֊PC��s��̸H巊�b�Y B<�6E�f��(��������5���t\U6\S�I5��'�8��L�*��yx2��WIlC<�
+"	�F�*���h���5~���2Y�?b�F�a�ӡ�&!�$8���,�͕_���q26J��JyaOA�=A���Q�:j�gS6��͠`�$X��w�˴��	
���H |V��4*g|�*s�uc�DZ��m�����c�LG��2Ξ;�`�^��I�d& ԓ�  ��>�d��ɥ7g�����C��)B"?��A��K���<�el�@��&$�5�2��8 `�V���.�A��?�6#!�):57�4#��Xr<Ƥp��&��E� �M�K^�����z�WM~�X��Cp���ˣ��$�e.&��

.git-crypt/keys/PROD/0/4FAFCE02C2C17F0DAE54B12ED3E873F11CC2872D.gpg

@@ -1,3 +1,3 @@
 .dev.env filter=git-crypt diff=git-crypt
-src/environments/.keys.json filter=git-crypt diff=git-crypt
-src/environments/keys.ts filter=git-crypt diff=git-crypt
+.prod.env filter=git-crypt-PROD diff=git-crypt-PROD
+.stage.env filter=git-crypt-STAGE diff=git-crypt-STAGE

.git-crypt/keys/PROD/0/5C7F6A3EDA5D36861AE5FB87ABC9B3EFF295BDD1.gpg

@@ -28,9 +28,11 @@ jobs:
 
     - name: Inject Secrets
       env:
+        AUTHORITY: ${{ secrets.authority }}
+        API_URL: ${{ secrets.api_url }}
         SCOPES: ${{ secrets.scopes }}
         CLIENT_ID: ${{ secrets.client_id }}
-        AUTHORITY: ${{ secrets.authority }}
+        CLIENT_URL: ${{ secrets.client_url }}
         STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.azure_app_configuration_connection_string }}
@@ -44,7 +46,7 @@ jobs:
         source .env
         set +a
         npm install
-        npm run build --prod --if-present
+        npm run build-legacy --if-present
         cp scripts/default-static-site.js ${BUILD_PATH}
 
     - name: 'Deploy to Azure Web App'

.git-crypt/keys/STAGE/0/4FAFCE02C2C17F0DAE54B12ED3E873F11CC2872D.gpg

@@ -41,9 +41,11 @@ jobs:
 
     - name: Inject Secrets
       env:
+        AUTHORITY: ${{ secrets.AUTHORITY }}
+        API_URL : ${{ secrets.API_URL }}
         SCOPES: ${{ secrets.SCOPES }}
         CLIENT_ID: ${{ secrets.CLIENT_ID }}
-        AUTHORITY: ${{ secrets.AUTHORITY }}
+        CLIENT_URL : ${{ secrets.CLIENT_URL }}
         STACK_EXCHANGE_ID: ${{ secrets.STACK_EXCHANGE_ID }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}