Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cce4f17cd8 | ||
|
|
0bf73e49c9 | ||
|
|
a84d54c095 | ||
|
|
68f4a1b9b2 | ||
|
|
23ccd3ac67 | ||
|
|
d4823c15f7 | ||
|
|
fc01e79337 | ||
|
|
fa9c902af7 | ||
|
|
ed762ea03e | ||
|
|
3675af3dca | ||
|
|
1830e01ad6 | ||
|
|
ffe057d7ee | ||
|
|
bafdfb1af5 | ||
|
|
3d907e9569 | ||
|
|
c8ef6e8714 | ||
|
|
92a493251a | ||
|
|
c7c63d01f8 | ||
|
|
62a18a8b09 | ||
|
|
d1a9eb62c3 | ||
|
|
407222d06a | ||
|
|
044283709c | ||
|
|
be86fbfcba | ||
|
|
63b3037ede | ||
|
|
d239b16d33 | ||
|
|
a9ab0446c4 | ||
|
|
366ed2ed2f | ||
|
|
fb304c26b6 | ||
|
|
7b11e70e76 | ||
|
|
f50a8ae83e | ||
|
|
aa0864416f | ||
|
|
05a1b7adda | ||
|
|
f833598cdd | ||
|
|
dfd1c59554 | ||
|
|
83b70073e9 | ||
|
|
11025cc39a |
@@ -126,8 +126,8 @@ module Data =
|
||||
.ToListAsync()
|
||||
return
|
||||
jrnl
|
||||
|> Seq.map (fun r -> r.history <- []; r.notes <- []; r)
|
||||
|> List.ofSeq
|
||||
|> List.map (fun r -> r.history <- []; r.notes <- []; r)
|
||||
}
|
||||
|
||||
/// Save changes in the current document session
|
||||
@@ -166,7 +166,9 @@ module Data =
|
||||
.Where(fun x -> x.Id = (RequestId.toString reqId) && x.userId = userId)
|
||||
.ProjectInto<JournalRequest>()
|
||||
.FirstOrDefaultAsync ()
|
||||
return Option.fromObject req
|
||||
return
|
||||
Option.fromObject req
|
||||
|> Option.map (fun r -> r.history <- []; r.notes <- []; r)
|
||||
}
|
||||
|
||||
/// Update the recurrence for a request
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<Version>2.1.2.0</Version>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<Version>2.2.0.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -14,19 +14,15 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="FunctionalCuid" Version="1.0.0" />
|
||||
<PackageReference Include="Giraffe" Version="3.6.0" />
|
||||
<PackageReference Include="Giraffe" Version="4.1.0" />
|
||||
<PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
|
||||
<PackageReference Include="Microsoft.FSharpLu" Version="0.10.29" />
|
||||
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.10.29" />
|
||||
<PackageReference Include="RavenDb.Client" Version="4.2.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
|
||||
<PackageReference Include="Microsoft.FSharpLu" Version="0.11.6" />
|
||||
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
|
||||
<PackageReference Include="RavenDb.Client" Version="4.2.102" />
|
||||
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Update="FSharp.Core" Version="4.7.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="wwwroot\" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "my-prayer-journal",
|
||||
"version": "2.1.2",
|
||||
"version": "2.2.0",
|
||||
"description": "myPrayerJournal - Front End",
|
||||
"author": "Daniel J. Summers <daniel@bitbadger.solutions>",
|
||||
"private": true,
|
||||
@@ -13,11 +13,11 @@
|
||||
"publish": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet publish -c Release -r linux-x64 --self-contained false"
|
||||
},
|
||||
"dependencies": {
|
||||
"auth0-js": "^9.7.3",
|
||||
"axios": "^0.19.0",
|
||||
"auth0-js": "^9.13.2",
|
||||
"axios": "^0.21.1",
|
||||
"moment": "^2.18.1",
|
||||
"vue": "^2.5.15",
|
||||
"vue-material": "^1.0.0-beta-11",
|
||||
"vue-material": "^1.0.0-beta-13",
|
||||
"vue-router": "^3.0.0",
|
||||
"vuex": "^3.0.1"
|
||||
},
|
||||
@@ -27,7 +27,7 @@
|
||||
"@vue/cli-service": "^3.0.0",
|
||||
"@vue/eslint-config-standard": "^4.0.0",
|
||||
"node-sass": "^4.12.0",
|
||||
"pug": "^2.0.1",
|
||||
"pug": "^3.0.1",
|
||||
"pug-plain-loader": "^1.0.0",
|
||||
"sass-loader": "^7.3.1",
|
||||
"vue-template-compiler": "^2.5.17",
|
||||
|
||||
+11
-4
@@ -2,6 +2,9 @@
|
||||
#app.page-container
|
||||
md-app(md-waterfall md-mode='fixed-last' role='application')
|
||||
md-app-toolbar.md-large.md-dense.md-primary
|
||||
md-progress-bar(v-if='progress.visible'
|
||||
:md-mode='progress.mode')
|
||||
.md-no-progress-bar(v-if='!progress.visible')
|
||||
.md-toolbar-row
|
||||
.md-toolbar-section-start
|
||||
router-link(to='/').md-title
|
||||
@@ -10,8 +13,6 @@
|
||||
span(style='font-weight:700;') Journal
|
||||
navigation
|
||||
md-app-content
|
||||
md-progress-bar(v-if='progress.visible'
|
||||
:md-mode='progress.mode')
|
||||
router-view
|
||||
md-snackbar(:md-active.sync='snackbar.visible'
|
||||
md-position='center'
|
||||
@@ -153,6 +154,12 @@ p.mpj-request-text
|
||||
margin: auto
|
||||
.mpj-full-width
|
||||
width: 100%
|
||||
.md-progress-bar
|
||||
margin: 24px
|
||||
.md-toolbar > .md-progress-bar
|
||||
height: 2px
|
||||
width: 100%
|
||||
background-color: rgba(255, 255, 255, .8) !important
|
||||
margin: 0
|
||||
.md-toolbar > .md-no-progress-bar
|
||||
height: 2px
|
||||
width: 100%
|
||||
</style>
|
||||
|
||||
+2193
-2202
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user