Merge branch 'master' into dependabot/npm_and_yarn/nanoid-and-mocha-3…

….3.7
SAFE-Stack · Feb 26, 2024 · 5d83d1e · 5d83d1e
2 parents 59dc50c + 313a49f
commit 5d83d1e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,32 +1,28 @@
 name: Safe Bookstore deploy
 
 on:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
-        
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 8.0.x
-        
+
     - name: Restore tools
-      working-directory: ./update
       run: dotnet tool restore
 
     - name: Test
-      working-directory: ./update
       run: dotnet run devopstests
 
     - name: Build
-      working-directory: ./update
       run: dotnet run bundle
 
     - name: Azure Login
@@ -35,5 +31,4 @@ jobs:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
 
     - name: Deploy
-      working-directory: ./update
       run: dotnet run azure
diff --git a/src/Client/Client.fsproj b/src/Client/Client.fsproj
@@ -15,7 +15,7 @@
         <Compile Include="components\NewBook.fs" />
         <Compile Include="pages\Home.fs" />
         <Compile Include="pages\Login.fs" />
-        <Compile Include="pages\Wishlist.fs" />
+        <Compile Include="pages\WishList.fs" />
         <Compile Include="Index.fs" />
         <Compile Include="App.fs" />
         <None Include="vite.config.mts" />

diff --git a/src/Client/Index.fs b/src/Client/Index.fs
@@ -12,7 +12,7 @@ open Shared
 type PageTab =
     | Home of Home.Model
     | Login of Login.Model
-    | Wishlist of Wishlist.Model
+    | Wishlist of WishList.Model
     | NotFound
 
 type User =
@@ -24,7 +24,7 @@ type Model = { Page: PageTab; User: User }
 type Msg =
     | HomePageMsg of Home.Msg
     | LoginPageMsg of Login.Msg
-    | WishlistMsg of Wishlist.Msg
+    | WishlistMsg of WishList.Msg
     | UrlChanged of string list
     | OnSessionChange
     | Logout
@@ -68,7 +68,7 @@ let initFromUrl model url =
         match model.User with
         | User user ->
             let wishlistModel, wishlistMsg =
-                Wishlist.init (wishListApi user.Token) user.UserName
+                WishList.init (wishListApi user.Token) user.UserName
 
             let model = {
                 Page = Wishlist wishlistModel
@@ -110,7 +110,7 @@ let update msg model =
             | User data -> data.Token
             | Guest -> ""
 
-        let newModel, cmd = Wishlist.update (wishListApi token) wishlistMsg wishlistModel
+        let newModel, cmd = WishList.update (wishListApi token) wishlistMsg wishlistModel
 
         {
             Page = Wishlist newModel
@@ -179,7 +179,7 @@ let view model dispatch =
                             match model.Page with
                             | Home homeModel -> Home.view homeModel (HomePageMsg >> dispatch)
                             | Login loginModel -> Login.view loginModel (LoginPageMsg >> dispatch)
-                            | Wishlist wishlistModel -> Wishlist.view wishlistModel (WishlistMsg >> dispatch)
+                            | Wishlist wishlistModel -> WishList.view wishlistModel (WishlistMsg >> dispatch)
                             | NotFound -> Html.div [ prop.text "Not Found" ]
                         ]
                     ]

diff --git a/src/Client/pages/WishList.fs b/src/Client/pages/WishList.fs
@@ -1,4 +1,4 @@
-module Page.Wishlist
+module Page.WishList
 
 open System
 open Elmish