Skip to content

Switch UI to daisy #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Target.create "InstallClient" (fun _ -> run npm "install" ".")

Target.create "Bundle" (fun _ ->
[ "server", dotnet $"publish -c Release -o \"{deployPath}\"" serverPath
"client", dotnet "fable -o output --run npm run build" clientPath ]
"client", dotnet "fable -o output --run npm vite build" clientPath ]
|> runParallel
)

Expand Down Expand Up @@ -98,7 +98,7 @@ Target.create "Azure" (fun _ ->
Target.create "Run" (fun _ ->
run dotnet "build" sharedPath
[ "server", dotnet "watch run" serverPath
"client", dotnet "fable watch -o output --run npm run start" clientPath ]
"client", dotnet "fable watch -o output --run npx vite" clientPath ]
|> runParallel
)

Expand Down
151 changes: 115 additions & 36 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,17 @@
"node": "~18 || ~20",
"npm": "~9 || ~10"
},
"scripts": {
"start": "npx vite src/Client",
"build": "npx vite build src/Client"
},
"scripts": {},
"devDependencies": {
"@types/node": "^20.9.1",
"@vitejs/plugin-react": "^4.2.0",
"autoprefixer": "^10.4.16",
"daisyui": "^4.6.0",
"mocha": "^8.3.2",
"postcss": "^8.4.31",
"postcss": "^8.4.33",
"remotedev": "^0.2.9",
"sass": "^1.69.5",
"tailwindcss": "^3.3.5",
"tailwindcss": "^3.4.1",
"vite": "^5.0.5"
},
"dependencies": {
Expand Down
1 change: 1 addition & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ storage: none
nuget Azure.Data.Tables
nuget Azure.Search.Documents
nuget Azure.Storage.Blobs
nuget Feliz.DaisyUI
nuget FSharp.Control.AsyncSeq
nuget FSharp.Data
nuget Fulma
Expand Down
3 changes: 3 additions & 0 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ NUGET
Feliz.CompilerPlugins (2.2)
Fable.AST (>= 4.2.1)
FSharp.Core (>= 4.7.2)
Feliz.DaisyUI (4.2)
Feliz (>= 2.7)
FSharp.Core (>= 4.7.2)
Feliz.PigeonMaps (3.0)
Feliz (>= 2.0)
FSharp.Core (>= 4.7.2)
Expand Down
2 changes: 2 additions & 0 deletions src/Client/Client.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<DefineConstants>FABLE_COMPILER</DefineConstants>
</PropertyGroup>
<ItemGroup>
<None Include="postcss.config.js" />
<None Include="tailwind.config.js" />
<None Include="index.html" />
<None Include="paket.references" />
<Compile Include="Helpers.fs" />
Expand Down
16 changes: 8 additions & 8 deletions src/Client/Index.fs
Original file line number Diff line number Diff line change
Expand Up @@ -391,21 +391,21 @@ open Fable.Core.JsInterop
open Feliz.Recharts
open Feliz.ReactLoadingSkeleton
open Feliz.UseElmish

importAll "./styles.scss"
open Feliz.DaisyUI

module Heading =
let title =
Bulma.title.h3 [
Bulma.icon [
prop.classes [ "has-text-info" ]
prop.children [ Html.i [ prop.className "fas fa-home" ] ]
Html.h3 [
color.textPrimary
prop.className "text-lg"
prop.children [
Html.i [ prop.className "fas fa-home" ]
Html.span [ Html.text " SAFE Search" ]
]
Html.span [ Html.text " SAFE Search" ]
]

let subtitle =
Bulma.subtitle.h5 [ Html.text "Find your unaffordable property in the UK!" ]
Html.h5 [ Html.text "Find your unaffordable property in the UK!" ]

module Facets =
let fromPluralToSingular =
Expand Down
3 changes: 2 additions & 1 deletion src/Client/paket.references
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Feliz.Bulma.Slider
Feliz.ReactLoadingSkeleton
Feliz.Recharts
Feliz.UseElmish
Fulma
Fulma
Feliz.DaisyUI
6 changes: 6 additions & 0 deletions src/Client/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
4 changes: 4 additions & 0 deletions src/Client/styles.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@import "bulma-quickview";

.suggestion:hover {
Expand Down
Loading