Skip to content
This repository has been archived by the owner on Mar 24, 2024. It is now read-only.

[Front | Hub] useMe - [Front] useErrorToast #71

Merged
merged 7 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions .github/workflows/Azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ on:
- Dev

jobs:
build:
build_deploy:
runs-on: ubuntu-latest
name: Build and Deploy
environment:
name: "Production"
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- uses: actions/checkout@v4
Expand All @@ -21,30 +25,11 @@ jobs:
- name: Build with dotnet
run: dotnet publish SoarCraft.AwaiShop/SoarCraft.AwaiShop.csproj -c Release -o ${{env.DOTNET_ROOT}}/myapp

- name: Upload artifact for deployment job
uses: actions/upload-artifact@v3
with:
name: .net-app
path: ${{env.DOTNET_ROOT}}/myapp

deploy:
runs-on: ubuntu-latest
needs: build
environment:
name: "Production"
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v3
with:
name: .net-app

- name: Deploy to Azure Web App
id: deploy-to-webapp
uses: azure/webapps-deploy@v2
with:
app-name: "Awai"
slot-name: "Production"
package: .
package: ${{env.DOTNET_ROOT}}/myapp
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_C99EA4B4F77A41508E090AF728BF173A }}
1 change: 1 addition & 0 deletions .github/workflows/Web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
build_deploy:
runs-on: ubuntu-latest
name: Build and Deploy

steps:
- uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions SoarCraft.AwaiShop/SoarCraft.AwaiShop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.15.5" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.0" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"update": "npx npm-check-updates -u"
},
"dependencies": {
"@azure/msal-browser": "^3.5.0",
"@azure/msal-common": "^14.4.0",
"@azure/msal-react": "^2.0.7",
"@fluentui/react-components": "^9.41.0",
"@azure/msal-browser": "^3.6.0",
"@azure/msal-common": "^14.5.0",
"@azure/msal-react": "^2.0.8",
"@fluentui/react-components": "^9.42.0",
"@fluentui/react-hooks": "^8.6.33",
"@fluentui/react-icons": "^2.0.223",
"@griffel/react": "^1.5.18",
"@griffel/react": "^1.5.19",
"@lexical/clipboard": "^0.12.4",
"@lexical/code": "^0.12.4",
"@lexical/file": "^0.12.4",
Expand Down Expand Up @@ -51,10 +51,10 @@
},
"devDependencies": {
"@types/lodash-es": "^4.17.12",
"@types/react": "^18.2.38",
"@types/react": "^18.2.42",
"@types/react-dom": "^18.2.17",
"@vitejs/plugin-react-swc": "^3.5.0",
"typescript": "^5.3.2",
"vite": "^5.0.2"
"vite": "^5.0.5"
}
}
Loading
Loading