35 Commits
2.1.2 ... 2.2

Author SHA1 Message Date
cce4f17cd8 Update to .NET 5 (#48); update deps 2021-06-19 14:08:49 -04:00
0bf73e49c9 Merge pull request #61 from bit-badger/dependabot/npm_and_yarn/src/app/yargs-parser-5.0.1
Bump yargs-parser from 5.0.0 to 5.0.1 in /src/app
2021-06-19 13:29:57 -04:00
a84d54c095 Merge pull request #60 from bit-badger/dependabot/npm_and_yarn/src/app/ws-6.2.2
Bump ws from 6.2.1 to 6.2.2 in /src/app
2021-06-19 13:29:28 -04:00
dependabot[bot]
68f4a1b9b2 Bump ws from 6.2.1 to 6.2.2 in /src/app
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-19 17:29:13 +00:00
23ccd3ac67 Merge pull request #59 from bit-badger/dependabot/npm_and_yarn/src/app/dns-packet-1.3.4
Bump dns-packet from 1.3.1 to 1.3.4 in /src/app
2021-06-19 13:28:26 -04:00
d4823c15f7 Merge pull request #58 from bit-badger/dependabot/npm_and_yarn/src/app/browserslist-4.16.6
Bump browserslist from 4.11.1 to 4.16.6 in /src/app
2021-06-19 13:27:51 -04:00
fc01e79337 Merge pull request #57 from bit-badger/dependabot/npm_and_yarn/src/app/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.8 to 2.8.9 in /src/app
2021-06-19 13:27:15 -04:00
fa9c902af7 Merge pull request #56 from bit-badger/dependabot/npm_and_yarn/src/app/url-parse-1.5.1
Bump url-parse from 1.4.7 to 1.5.1 in /src/app
2021-06-19 13:26:34 -04:00
dependabot[bot]
ed762ea03e Bump yargs-parser from 5.0.0 to 5.0.1 in /src/app
Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/yargs/yargs-parser/releases)
- [Changelog](https://github.com/yargs/yargs-parser/blob/v5.0.1/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs-parser/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: yargs-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-19 17:26:25 +00:00
3675af3dca Merge pull request #55 from bit-badger/dependabot/npm_and_yarn/src/app/y18n-3.2.2
Bump y18n from 3.2.1 to 3.2.2 in /src/app
2021-06-19 13:25:41 -04:00
dependabot[bot]
1830e01ad6 Bump dns-packet from 1.3.1 to 1.3.4 in /src/app
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-27 07:41:55 +00:00
dependabot[bot]
ffe057d7ee Bump browserslist from 4.11.1 to 4.16.6 in /src/app
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.11.1 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.11.1...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-24 23:59:12 +00:00
dependabot[bot]
bafdfb1af5 Bump hosted-git-info from 2.8.8 to 2.8.9 in /src/app
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-09 23:16:11 +00:00
dependabot[bot]
3d907e9569 Bump url-parse from 1.4.7 to 1.5.1 in /src/app
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 10:02:02 +00:00
dependabot[bot]
c8ef6e8714 Bump y18n from 3.2.1 to 3.2.2 in /src/app
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 13:23:51 +00:00
92a493251a Merge pull request #50 from bit-badger/dependabot/npm_and_yarn/src/app/axios-0.21.1
Bump axios from 0.19.2 to 0.21.1 in /src/app
2021-03-09 10:46:35 -05:00
c7c63d01f8 Merge pull request #54 from bit-badger/dependabot/npm_and_yarn/src/app/lodash-4.17.21
Bump lodash from 4.17.15 to 4.17.21 in /src/app
2021-03-09 10:45:19 -05:00
dependabot[bot]
62a18a8b09 Bump axios from 0.19.2 to 0.21.1 in /src/app
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-09 15:45:18 +00:00
d1a9eb62c3 Merge pull request #49 from bit-badger/dependabot/npm_and_yarn/src/app/highlight.js-9.18.5
Bump highlight.js from 9.18.1 to 9.18.5 in /src/app
2021-03-09 10:44:11 -05:00
407222d06a Merge pull request #47 from bit-badger/dependabot/npm_and_yarn/src/app/node-fetch-2.6.1
Bump node-fetch from 2.6.0 to 2.6.1 in /src/app
2021-03-09 10:43:29 -05:00
044283709c Merge pull request #46 from bit-badger/dependabot/npm_and_yarn/src/app/http-proxy-1.18.1
Bump http-proxy from 1.18.0 to 1.18.1 in /src/app
2021-03-09 10:43:04 -05:00
dependabot[bot]
be86fbfcba Bump highlight.js from 9.18.1 to 9.18.5 in /src/app
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.18.1 to 9.18.5.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/9.18.5/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.18.1...9.18.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-09 15:42:51 +00:00
dependabot[bot]
63b3037ede Bump lodash from 4.17.15 to 4.17.21 in /src/app
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-09 15:42:15 +00:00
d239b16d33 Merge pull request #43 from bit-badger/dependabot/npm_and_yarn/src/app/websocket-extensions-0.1.4
Bump websocket-extensions from 0.1.3 to 0.1.4 in /src/app
2021-03-09 10:41:56 -05:00
a9ab0446c4 Merge pull request #52 from bit-badger/dependabot/npm_and_yarn/src/app/pug-3.0.1
Bump pug from 2.0.4 to 3.0.1 in /src/app
2021-03-09 10:39:59 -05:00
366ed2ed2f Merge pull request #53 from bit-badger/dependabot/npm_and_yarn/src/app/elliptic-6.5.4
Bump elliptic from 6.5.2 to 6.5.4 in /src/app
2021-03-09 10:39:29 -05:00
dependabot[bot]
fb304c26b6 Bump elliptic from 6.5.2 to 6.5.4 in /src/app
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-09 00:56:03 +00:00
dependabot[bot]
7b11e70e76 Bump pug from 2.0.4 to 3.0.1 in /src/app
Bumps [pug](https://github.com/pugjs/pug) from 2.0.4 to 3.0.1.
- [Release notes](https://github.com/pugjs/pug/releases)
- [Commits](https://github.com/pugjs/pug/compare/pug@2.0.4...pug@3.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-03 02:54:57 +00:00
dependabot[bot]
f50a8ae83e Bump node-fetch from 2.6.0 to 2.6.1 in /src/app
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-12 05:25:20 +00:00
dependabot[bot]
aa0864416f Bump http-proxy from 1.18.0 to 1.18.1 in /src/app
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 11:51:40 +00:00
dependabot[bot]
05a1b7adda Bump websocket-extensions from 0.1.3 to 0.1.4 in /src/app
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-06 13:17:04 +00:00
Daniel J. Summers
f833598cdd Fix progress bar style 2020-05-21 08:05:03 -05:00
Daniel J. Summers
dfd1c59554 Fix tryJournalById function (#42)
Also update .NET deps
2020-04-23 10:07:23 -05:00
Daniel J. Summers
83b70073e9 Update deps 2020-04-11 08:51:14 -05:00
dependabot[bot]
11025cc39a Bump auth0-js from 9.12.2 to 9.13.2 in /src/app (#40) 2020-04-11 13:37:32 +00:00
5 changed files with 2220 additions and 2224 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -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",

View File

@@ -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>

File diff suppressed because it is too large Load Diff