Merge pull request #233 from isaacrlevin/FixBug-IsaacLevin-

.github/workflows/regular_appservice.yaml

@@ -1,45 +1,53 @@
-name: Web regular AppService
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-
-    - uses: actions/checkout@master
-
-    - name: Install dependencies in client app
-      working-directory: Source/Tailwind.Traders.Web/ClientApp
-      run: npm install
-
-    - name: Build and publish with dotnet
-      working-directory: Source/Tailwind.Traders.Web
-      run: |
-        dotnet build --configuration Release
-        dotnet publish -c Release -o publish
-
-    - name: 'Login via Azure CLI'
-      uses: azure/login@v1
-      with:
-        creds: ${{ secrets.AZURE_CREDENTIALS_2 }}
-
-    - uses: azure/appservice-settings@v1
-      with:
-        app-name: ${{ secrets.WEBAPP_APPSERVICE_NAME }}
-        app-settings-json: '${{ secrets.WEBAPP_APP_SETTINGS }}'
-
-
-    - name: Run Azure webapp deploy action
-      uses: azure/webapps-deploy@v2
-      with:
-        app-name: ${{ secrets.WEBAPP_APPSERVICE_NAME }}
-        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE  }}
-        package: Source/Tailwind.Traders.Web/publish
-
-    - name: Azure logout
-      run: |
-        az logout
+name: .NET Core
+
+on:
+  push:
+    branches: 
+    - main 
+  pull_request:
+    branches: 
+    - main 
+
+env:
+  CI: false
+  AZURE_WEBAPP_NAME: demom4579  # set this to your application's name
+  AZURE_WEBAPP_PACKAGE_PATH: 'd:\a\TailwindTraders-Website-Drop'    
+  AZURE_WEBAPP_PROJECT_PATH: 'd:\a\TailwindTraders-Website\TailwindTraders-Website\Source\Tailwind.Traders.Web\Tailwind.Traders.Web.csproj'    
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+
+    - uses: actions/checkout@master
+
+    - name: Install dependencies in client app
+      working-directory: Source/Tailwind.Traders.Web/ClientApp
+      run: npm install
+
+    - name: Build and publish with dotnet
+      working-directory: Source/Tailwind.Traders.Web
+      run: |
+        dotnet build --configuration Release
+        dotnet publish -c Release -o publish
+
+    - name: 'Login via Azure CLI'
+      uses: azure/login@v1
+      with:
+        creds: ${{ secrets.AZURE_CREDENTIALS_2 }}
+
+    - uses: azure/appservice-settings@v1
+      with:
+        app-name: ${{ secrets.WEBAPP_APPSERVICE_NAME }}
+        app-settings-json: '${{ secrets.WEBAPP_APP_SETTINGS }}'
+
+
+    - name: Run Azure webapp deploy action
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: ${{ secrets.WEBAPP_APPSERVICE_NAME }}
+        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE  }}
+        package: Source/Tailwind.Traders.Web/publish
+
+    - name: Azure logout
+      run: |
+        az logout

Source/Tailwind.Traders.Web/ClientApp/src/assets/locales/translation.json

@@ -2,7 +2,7 @@
     "en": {
       "translation": {
         "home.hero.shiping": "Free Shipping",
-        "home.hero.orders": "For $100 or more orders",
+        "home.hero.orders": "For orders worth $100 or more",
 
         "home.recommended.recommended": "Recommended",
         "home.recommended.uploadPhotoTitle": "By uploading a photo",