Compare commits
71 Commits
2.1
...
4.0.0-alph
| Author | SHA1 | Date | |
|---|---|---|---|
| ff34bb9743 | |||
| 61127676a2 | |||
| 5beeee4819 | |||
| a2feaff4da | |||
| e121701250 | |||
| 20ad50928a | |||
| 9421bb2035 | |||
| d6e8cf66cc | |||
| 2369827033 | |||
| 3ebb03d470 | |||
| b759c3494e | |||
| 0b7fa77247 | |||
| 4ea55d4d25 | |||
| 4aa6e832c7 | |||
| 41853a7645 | |||
| 24c503385e | |||
| b393a86bb5 | |||
| 8ee3c6b483 | |||
| b07532ab50 | |||
| b3f62c2586 | |||
| 20dcaf6e1b | |||
| b9d81fb7aa | |||
| 3df5c71d81 | |||
| c697001736 | |||
|
|
6c28cfc1ec | ||
| 8702723e01 | |||
| d621ede7bb | |||
| a826275510 | |||
| 2a86e41fe3 | |||
| babc77bbd0 | |||
| 997279783f | |||
| 77c85f516c | |||
| ca622aa4b7 | |||
| cce4f17cd8 | |||
| 0bf73e49c9 | |||
| a84d54c095 | |||
|
|
68f4a1b9b2 | ||
| 23ccd3ac67 | |||
| d4823c15f7 | |||
| fc01e79337 | |||
| fa9c902af7 | |||
|
|
ed762ea03e | ||
| 3675af3dca | |||
|
|
1830e01ad6 | ||
|
|
ffe057d7ee | ||
|
|
bafdfb1af5 | ||
|
|
3d907e9569 | ||
|
|
c8ef6e8714 | ||
| 266243423c | |||
| 92a493251a | |||
| c7c63d01f8 | |||
|
|
62a18a8b09 | ||
| d1a9eb62c3 | |||
| 407222d06a | |||
| 044283709c | |||
|
|
be86fbfcba | ||
|
|
63b3037ede | ||
| d239b16d33 | |||
| a9ab0446c4 | |||
| 366ed2ed2f | |||
|
|
fb304c26b6 | ||
|
|
7b11e70e76 | ||
|
|
f50a8ae83e | ||
|
|
aa0864416f | ||
|
|
05a1b7adda | ||
|
|
f833598cdd | ||
|
|
dfd1c59554 | ||
|
|
83b70073e9 | ||
|
|
11025cc39a | ||
|
|
fb908a1cef | ||
|
|
6a6f7b35c7 |
265
.gitignore
vendored
265
.gitignore
vendored
@@ -1,266 +1,7 @@
|
|||||||
## Ignore Visual Studio temporary files, build results, and
|
|
||||||
## files generated by popular Visual Studio add-ons.
|
|
||||||
|
|
||||||
# User-specific files
|
|
||||||
*.suo
|
|
||||||
*.user
|
|
||||||
*.userosscache
|
|
||||||
*.sln.docstates
|
|
||||||
|
|
||||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
|
||||||
*.userprefs
|
|
||||||
|
|
||||||
# Build results
|
|
||||||
[Dd]ebug/
|
|
||||||
[Dd]ebugPublic/
|
|
||||||
[Rr]elease/
|
|
||||||
[Rr]eleases/
|
|
||||||
x64/
|
|
||||||
x86/
|
|
||||||
bld/
|
|
||||||
[Bb]in/
|
|
||||||
[Oo]bj/
|
|
||||||
[Ll]og/
|
|
||||||
|
|
||||||
# Visual Studio 2015 cache/options directory
|
|
||||||
.vs/
|
|
||||||
.vscode/
|
|
||||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
|
||||||
#wwwroot/
|
|
||||||
|
|
||||||
# MSTest test Results
|
|
||||||
[Tt]est[Rr]esult*/
|
|
||||||
[Bb]uild[Ll]og.*
|
|
||||||
|
|
||||||
# NUNIT
|
|
||||||
*.VisualState.xml
|
|
||||||
TestResult.xml
|
|
||||||
|
|
||||||
# Build Results of an ATL Project
|
|
||||||
[Dd]ebugPS/
|
|
||||||
[Rr]eleasePS/
|
|
||||||
dlldata.c
|
|
||||||
|
|
||||||
# DNX
|
|
||||||
project.lock.json
|
|
||||||
artifacts/
|
|
||||||
|
|
||||||
*_i.c
|
|
||||||
*_p.c
|
|
||||||
*_i.h
|
|
||||||
*.ilk
|
|
||||||
*.meta
|
|
||||||
*.obj
|
|
||||||
*.pch
|
|
||||||
*.pdb
|
|
||||||
*.pgc
|
|
||||||
*.pgd
|
|
||||||
*.rsp
|
|
||||||
*.sbr
|
|
||||||
*.tlb
|
|
||||||
*.tli
|
|
||||||
*.tlh
|
|
||||||
*.tmp
|
|
||||||
*.tmp_proj
|
|
||||||
*.log
|
|
||||||
*.vspscc
|
|
||||||
*.vssscc
|
|
||||||
.builds
|
|
||||||
*.pidb
|
|
||||||
*.svclog
|
|
||||||
*.scc
|
|
||||||
|
|
||||||
# Chutzpah Test files
|
|
||||||
_Chutzpah*
|
|
||||||
|
|
||||||
# Visual C++ cache files
|
|
||||||
ipch/
|
|
||||||
*.aps
|
|
||||||
*.ncb
|
|
||||||
*.opendb
|
|
||||||
*.opensdf
|
|
||||||
*.sdf
|
|
||||||
*.cachefile
|
|
||||||
*.VC.db
|
|
||||||
*.VC.VC.opendb
|
|
||||||
|
|
||||||
# Visual Studio profiler
|
|
||||||
*.psess
|
|
||||||
*.vsp
|
|
||||||
*.vspx
|
|
||||||
*.sap
|
|
||||||
|
|
||||||
# TFS 2012 Local Workspace
|
|
||||||
$tf/
|
|
||||||
|
|
||||||
# Guidance Automation Toolkit
|
|
||||||
*.gpState
|
|
||||||
|
|
||||||
# ReSharper is a .NET coding add-in
|
|
||||||
_ReSharper*/
|
|
||||||
*.[Rr]e[Ss]harper
|
|
||||||
*.DotSettings.user
|
|
||||||
|
|
||||||
# JustCode is a .NET coding add-in
|
|
||||||
.JustCode
|
|
||||||
|
|
||||||
# TeamCity is a build add-in
|
|
||||||
_TeamCity*
|
|
||||||
|
|
||||||
# DotCover is a Code Coverage Tool
|
|
||||||
*.dotCover
|
|
||||||
|
|
||||||
# NCrunch
|
|
||||||
_NCrunch_*
|
|
||||||
.*crunch*.local.xml
|
|
||||||
nCrunchTemp_*
|
|
||||||
|
|
||||||
# MightyMoose
|
|
||||||
*.mm.*
|
|
||||||
AutoTest.Net/
|
|
||||||
|
|
||||||
# Web workbench (sass)
|
|
||||||
.sass-cache/
|
|
||||||
|
|
||||||
# Installshield output folder
|
|
||||||
[Ee]xpress/
|
|
||||||
|
|
||||||
# DocProject is a documentation generator add-in
|
|
||||||
DocProject/buildhelp/
|
|
||||||
DocProject/Help/*.HxT
|
|
||||||
DocProject/Help/*.HxC
|
|
||||||
DocProject/Help/*.hhc
|
|
||||||
DocProject/Help/*.hhk
|
|
||||||
DocProject/Help/*.hhp
|
|
||||||
DocProject/Help/Html2
|
|
||||||
DocProject/Help/html
|
|
||||||
|
|
||||||
# Click-Once directory
|
|
||||||
publish/
|
|
||||||
|
|
||||||
# Publish Web Output
|
|
||||||
*.[Pp]ublish.xml
|
|
||||||
*.azurePubxml
|
|
||||||
# TODO: Comment the next line if you want to checkin your web deploy settings
|
|
||||||
# but database connection strings (with potential passwords) will be unencrypted
|
|
||||||
*.pubxml
|
|
||||||
*.publishproj
|
|
||||||
|
|
||||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
|
||||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
|
||||||
# in these scripts will be unencrypted
|
|
||||||
PublishScripts/
|
|
||||||
|
|
||||||
# NuGet Packages
|
|
||||||
*.nupkg
|
|
||||||
# The packages folder can be ignored because of Package Restore
|
|
||||||
**/packages/*
|
|
||||||
# except build/, which is used as an MSBuild target.
|
|
||||||
!**/packages/build/
|
|
||||||
# Uncomment if necessary however generally it will be regenerated when needed
|
|
||||||
#!**/packages/repositories.config
|
|
||||||
# NuGet v3's project.json files produces more ignoreable files
|
|
||||||
*.nuget.props
|
|
||||||
*.nuget.targets
|
|
||||||
|
|
||||||
# Microsoft Azure Build Output
|
|
||||||
csx/
|
|
||||||
*.build.csdef
|
|
||||||
|
|
||||||
# Microsoft Azure Emulator
|
|
||||||
ecf/
|
|
||||||
rcf/
|
|
||||||
|
|
||||||
# Windows Store app package directories and files
|
|
||||||
AppPackages/
|
|
||||||
BundleArtifacts/
|
|
||||||
Package.StoreAssociation.xml
|
|
||||||
_pkginfo.txt
|
|
||||||
|
|
||||||
# Visual Studio cache files
|
|
||||||
# files ending in .cache can be ignored
|
|
||||||
*.[Cc]ache
|
|
||||||
# but keep track of directories ending in .cache
|
|
||||||
!*.[Cc]ache/
|
|
||||||
|
|
||||||
# Others
|
|
||||||
ClientBin/
|
|
||||||
~$*
|
|
||||||
*~
|
|
||||||
*.dbmdl
|
|
||||||
*.dbproj.schemaview
|
|
||||||
*.pfx
|
|
||||||
*.publishsettings
|
|
||||||
node_modules/
|
|
||||||
orleans.codegen.cs
|
|
||||||
|
|
||||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
|
||||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
|
||||||
#bower_components/
|
|
||||||
|
|
||||||
# RIA/Silverlight projects
|
|
||||||
Generated_Code/
|
|
||||||
|
|
||||||
# Backup & report files from converting an old project file
|
|
||||||
# to a newer Visual Studio version. Backup files are not needed,
|
|
||||||
# because we have git ;-)
|
|
||||||
_UpgradeReport_Files/
|
|
||||||
Backup*/
|
|
||||||
UpgradeLog*.XML
|
|
||||||
UpgradeLog*.htm
|
|
||||||
|
|
||||||
# SQL Server files
|
|
||||||
*.mdf
|
|
||||||
*.ldf
|
|
||||||
|
|
||||||
# Business Intelligence projects
|
|
||||||
*.rdl.data
|
|
||||||
*.bim.layout
|
|
||||||
*.bim_*.settings
|
|
||||||
|
|
||||||
# Microsoft Fakes
|
|
||||||
FakesAssemblies/
|
|
||||||
|
|
||||||
# GhostDoc plugin setting file
|
|
||||||
*.GhostDoc.xml
|
|
||||||
|
|
||||||
# Node.js Tools for Visual Studio
|
|
||||||
.ntvs_analysis.dat
|
|
||||||
|
|
||||||
# Visual Studio 6 build log
|
|
||||||
*.plg
|
|
||||||
|
|
||||||
# Visual Studio 6 workspace options file
|
|
||||||
*.opt
|
|
||||||
|
|
||||||
# Visual Studio LightSwitch build output
|
|
||||||
**/*.HTMLClient/GeneratedArtifacts
|
|
||||||
**/*.DesktopClient/GeneratedArtifacts
|
|
||||||
**/*.DesktopClient/ModelManifest.xml
|
|
||||||
**/*.Server/GeneratedArtifacts
|
|
||||||
**/*.Server/ModelManifest.xml
|
|
||||||
_Pvt_Extensions
|
|
||||||
|
|
||||||
# Paket dependency manager
|
|
||||||
.paket/paket.exe
|
|
||||||
paket-files/
|
|
||||||
|
|
||||||
# FAKE - F# Make
|
|
||||||
.fake/
|
|
||||||
|
|
||||||
# JetBrains Rider
|
# JetBrains Rider
|
||||||
.idea/
|
.idea/
|
||||||
*.sln.iml
|
*.sln.iml
|
||||||
|
|
||||||
# Ionide VSCode extension
|
# PHP ignore files
|
||||||
.ionide
|
src/vendor
|
||||||
|
src/.env
|
||||||
# Compiled files / application
|
|
||||||
src/build
|
|
||||||
src/MyPrayerJournal.Api/wwwroot/favicon.ico
|
|
||||||
src/MyPrayerJournal.Api/wwwroot/index.html
|
|
||||||
src/MyPrayerJournal.Api/wwwroot/css
|
|
||||||
src/MyPrayerJournal.Api/wwwroot/js
|
|
||||||
src/MyPrayerJournal.Api/appsettings.development.json
|
|
||||||
/build
|
|
||||||
src/*.exe
|
|
||||||
|
|||||||
@@ -6,6 +6,6 @@ Journaling has a long history; it helps people remember what happened, and the a
|
|||||||
|
|
||||||
myPrayerJournal was borne of out of a personal desire [Daniel](https://github.com/danieljsummers) had to have something that would help him with his prayer life. When it's time to pray, it's not really time to use an app, so the design goal here is to keep it simple and unobtrusive. It will also help eliminate some of the downsides to a paper prayer journal, like not remembering whether you've prayed for a request, or running out of room to write another update on one.
|
myPrayerJournal was borne of out of a personal desire [Daniel](https://github.com/danieljsummers) had to have something that would help him with his prayer life. When it's time to pray, it's not really time to use an app, so the design goal here is to keep it simple and unobtrusive. It will also help eliminate some of the downsides to a paper prayer journal, like not remembering whether you've prayed for a request, or running out of room to write another update on one.
|
||||||
|
|
||||||
## Futher Reading
|
## Further Reading
|
||||||
|
|
||||||
The documentation for the site is at <https://bit-badger.github.io/myPrayerJournal/>.
|
The documentation for the site is at <https://prayerjournal.me/docs>.
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
docs.prayerjournal.me
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
theme: jekyll-theme-architect
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
# Documentation
|
|
||||||
|
|
||||||
## About myPrayerJournal
|
|
||||||
|
|
||||||
Journaling has a long history; it helps people remember what happened, and the act of writing helps people think about what happened and process it. A prayer journal is not a new concept; it helps you keep track of the requests for which you've prayed, you can use it to pray over things repeatedly, and you can write the result when the answer comes _(or it was "no")_.
|
|
||||||
|
|
||||||
myPrayerJournal was borne of out of a personal desire [Daniel](https://github.com/danieljsummers) had to have something that would help him with his prayer life. When it's time to pray, it's not really time to use an app, so the design goal here is to keep it simple and unobtrusive. It will also help eliminate some of the downsides to a paper prayer journal, like not remembering whether you've prayed for a request, or running out of room to write another update on one.
|
|
||||||
|
|
||||||
## Finding the Site
|
|
||||||
|
|
||||||
The application is at <https://prayerjournal.me>.
|
|
||||||
|
|
||||||
## Signing Up
|
|
||||||
|
|
||||||
myPrayerJournal uses login services using Google or Microsoft accounts. The only information the application stores in its database is your user Id token it receives from these services, so there are no permissions you should have to accept from these provider other than establishing that you can log on with that account. Because of this, you'll want to pick the same one each time; the tokens between the two accounts are different, even if you use the same e-mail address to log on to both.
|
|
||||||
|
|
||||||
## Your Prayer Journal
|
|
||||||
|
|
||||||
Your current requests will be presented in columns (usually three, but it could be more or less, depending on the size of your screen or device). Each request is in its own card, and the buttons at the top of each card apply to that request. The last line of each request also tells you how long it has been since anything has been done on that request. Any time you see something like "a few minutes ago," you can hover over that to see the actual date/time the action was taken.
|
|
||||||
|
|
||||||
## Adding a Request
|
|
||||||
|
|
||||||
To add a request, click the "Add a New Request" button at the top of your journal. Then, enter the text of the request as you see fit; there is no right or wrong way, and you are the only person who will see the text you enter. When you save the request, it will go to the bottom of the list of requests.
|
|
||||||
|
|
||||||
## Setting Request Recurrence
|
|
||||||
|
|
||||||
When you add or update a request, you can choose whether requests go to the bottom of the journal once they have been marked "Prayed" or whether they will reappear after a delay. You can set recurrence in terms of hours, days, or weeks, but it cannot be longer than 365 days. If you decide you want a request to reappear sooner, you can skip the current delay; click the "Active" menu link, find the request in the list (likely near the bottom), and click the "Show Now" button.
|
|
||||||
|
|
||||||
## Praying for Requests
|
|
||||||
|
|
||||||
The first button for each request has a checkmark icon; clicking this button will mark the request as "Prayed" and move it to the bottom of the list (or off, if you've set a recurrence period for the request). This allows you, if you're praying through your requests, to start at the top left (with the request that it's been the longest since you've prayed) and click the button as you pray; when the request move below or away, the next-least-recently-prayed request will take the top spot.
|
|
||||||
|
|
||||||
## Editing Requests
|
|
||||||
|
|
||||||
The second button for each request has a pencil icon. This allows you to edit the text of the request, pretty much the same way you entered it; it starts with the current text, and you can add to it, modify it, or completely replace it. By default, updates will go in with an "Updated" status; you have the option to also mark this update as "Prayed" or "Answered." Answered requests will drop off the journal list.
|
|
||||||
|
|
||||||
## Adding Notes
|
|
||||||
|
|
||||||
The third button for each request has an icon that looks like a speech bubble with lines on it; this lets you record notes about the request. If there is something you want to record that doesn't change the text of the request, this is the place to do it. For example, you may be praying for a long-term health issue, and that person tells you that their status is the same; or, you may want to record something God said to you while you were praying for that request.
|
|
||||||
|
|
||||||
## Snoozing Requests
|
|
||||||
|
|
||||||
There may be a time where a request does not need to appear. The fourth button, with the clock icon, allows you to snooze requests until the day you specify. Additionally, if you have any snoozed requests, a "Snoozed" menu item will appear next to the "Journal" one; this page allows you to see what requests are snoozed, and return them to your journal by canceling the snooze.
|
|
||||||
|
|
||||||
## Viewing a Request and Its History
|
|
||||||
|
|
||||||
myPrayerJournal tracks all of the actions related to a request; from the "Active" and "Answered" menu links (and "Snoozed", if it's showing), there is a "View Full Request" button. That page will show the current text of the request; how many times it has been marked as prayed; how long it has been an active request; and a log of all updates, prayers, and notes you have recorded. That log is listed from most recent to least recent; if you want to read it chronologically, just press the "End" key on your keyboard and read it from the bottom up.
|
|
||||||
|
|
||||||
The "Active" link will show all requests that have not yet been marked answered, including snoozed and recurring requests. If requests are snoozed, or in a recurrence period off the journal, there will be a button where you can return the request to the list (either "Cancel Snooze" or "Show Now"). The "Answered" link shows all requests that have been marked answered. The "Snoozed" link just shows snoozed requests.
|
|
||||||
|
|
||||||
## Final Notes
|
|
||||||
|
|
||||||
- If you encounter errors, please [file an issue on GitHub](https://github.com/bit-badger/myPrayerJournal/issues) with as much detail as possible. You can also provide suggestions, or browse the list of currently open issues.
|
|
||||||
- Prayer requests and their history are securely backed up nightly along with other Bit Badger Solutions data.
|
|
||||||
- Prayer changes things - most of all, the one doing the praying. I pray that this tool enables you to deepen and strengthen your prayer life.
|
|
||||||
9
src/Caddyfile
Normal file
9
src/Caddyfile
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
frankenphp
|
||||||
|
order php_server before file_server
|
||||||
|
}
|
||||||
|
http://localhost:3000 {
|
||||||
|
root * ./public
|
||||||
|
try_files {path} {path}.php
|
||||||
|
php_server
|
||||||
|
}
|
||||||
17
src/Dockerfile
Normal file
17
src/Dockerfile
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
|
||||||
|
WORKDIR /mpj
|
||||||
|
COPY ./MyPrayerJournal/MyPrayerJournal.fsproj ./
|
||||||
|
RUN dotnet restore
|
||||||
|
|
||||||
|
COPY ./MyPrayerJournal ./
|
||||||
|
RUN dotnet publish -c Release -r linux-x64
|
||||||
|
RUN rm bin/Release/net8.0/linux-x64/publish/appsettings.*.json || true
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine as final
|
||||||
|
WORKDIR /app
|
||||||
|
RUN apk add --no-cache icu-libs
|
||||||
|
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
|
||||||
|
COPY --from=build /mpj/bin/Release/net8.0/linux-x64/publish/ ./
|
||||||
|
|
||||||
|
EXPOSE 80
|
||||||
|
CMD [ "dotnet", "/app/MyPrayerJournal.dll" ]
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
namespace MyPrayerJournal
|
|
||||||
|
|
||||||
open System
|
|
||||||
open System.Collections.Generic
|
|
||||||
|
|
||||||
/// JSON converters for various DUs
|
|
||||||
module Converters =
|
|
||||||
|
|
||||||
open Microsoft.FSharpLu.Json
|
|
||||||
open Newtonsoft.Json
|
|
||||||
|
|
||||||
/// JSON converter for request IDs
|
|
||||||
type RequestIdJsonConverter () =
|
|
||||||
inherit JsonConverter<RequestId> ()
|
|
||||||
override __.WriteJson(writer : JsonWriter, value : RequestId, _ : JsonSerializer) =
|
|
||||||
(RequestId.toString >> writer.WriteValue) value
|
|
||||||
override __.ReadJson(reader: JsonReader, _ : Type, _ : RequestId, _ : bool, _ : JsonSerializer) =
|
|
||||||
(string >> RequestId.fromIdString) reader.Value
|
|
||||||
|
|
||||||
/// JSON converter for user IDs
|
|
||||||
type UserIdJsonConverter () =
|
|
||||||
inherit JsonConverter<UserId> ()
|
|
||||||
override __.WriteJson(writer : JsonWriter, value : UserId, _ : JsonSerializer) =
|
|
||||||
(UserId.toString >> writer.WriteValue) value
|
|
||||||
override __.ReadJson(reader: JsonReader, _ : Type, _ : UserId, _ : bool, _ : JsonSerializer) =
|
|
||||||
(string >> UserId) reader.Value
|
|
||||||
|
|
||||||
/// JSON converter for Ticks
|
|
||||||
type TicksJsonConverter () =
|
|
||||||
inherit JsonConverter<Ticks> ()
|
|
||||||
override __.WriteJson(writer : JsonWriter, value : Ticks, _ : JsonSerializer) =
|
|
||||||
(Ticks.toLong >> writer.WriteValue) value
|
|
||||||
override __.ReadJson(reader: JsonReader, _ : Type, _ : Ticks, _ : bool, _ : JsonSerializer) =
|
|
||||||
(string >> int64 >> Ticks) reader.Value
|
|
||||||
|
|
||||||
/// A sequence of all custom converters needed for myPrayerJournal
|
|
||||||
let all : JsonConverter seq =
|
|
||||||
seq {
|
|
||||||
yield RequestIdJsonConverter ()
|
|
||||||
yield UserIdJsonConverter ()
|
|
||||||
yield TicksJsonConverter ()
|
|
||||||
yield CompactUnionJsonConverter true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// RavenDB index declarations
|
|
||||||
module Indexes =
|
|
||||||
|
|
||||||
open Raven.Client.Documents.Indexes
|
|
||||||
|
|
||||||
/// Index requests for a journal view
|
|
||||||
type Requests_AsJournal () as this =
|
|
||||||
inherit AbstractJavaScriptIndexCreationTask ()
|
|
||||||
do
|
|
||||||
this.Maps <- HashSet<string> [
|
|
||||||
"""docs.Requests.Select(req => new {
|
|
||||||
requestId = req.Id.Replace("Requests/", ""),
|
|
||||||
userId = req.userId,
|
|
||||||
text = req.history.Where(hist => hist.text != null).OrderByDescending(hist => hist.asOf).First().text,
|
|
||||||
asOf = req.history.OrderByDescending(hist => hist.asOf).First().asOf,
|
|
||||||
lastStatus = req.history.OrderByDescending(hist => hist.asOf).First().status,
|
|
||||||
snoozedUntil = req.snoozedUntil,
|
|
||||||
showAfter = req.showAfter,
|
|
||||||
recurType = req.recurType,
|
|
||||||
recurCount = req.recurCount
|
|
||||||
})"""
|
|
||||||
]
|
|
||||||
this.Fields <-
|
|
||||||
[ "requestId", IndexFieldOptions (Storage = Nullable FieldStorage.Yes)
|
|
||||||
"text", IndexFieldOptions (Storage = Nullable FieldStorage.Yes)
|
|
||||||
"asOf", IndexFieldOptions (Storage = Nullable FieldStorage.Yes)
|
|
||||||
"lastStatus", IndexFieldOptions (Storage = Nullable FieldStorage.Yes)
|
|
||||||
]
|
|
||||||
|> dict
|
|
||||||
|> Dictionary<string, IndexFieldOptions>
|
|
||||||
|
|
||||||
|
|
||||||
/// All data manipulations within myPrayerJournal
|
|
||||||
module Data =
|
|
||||||
|
|
||||||
open FSharp.Control.Tasks.V2.ContextInsensitive
|
|
||||||
open Indexes
|
|
||||||
open Microsoft.FSharpLu
|
|
||||||
open Raven.Client.Documents
|
|
||||||
open Raven.Client.Documents.Linq
|
|
||||||
open Raven.Client.Documents.Session
|
|
||||||
|
|
||||||
/// Add a history entry
|
|
||||||
let addHistory reqId (hist : History) (sess : IAsyncDocumentSession) =
|
|
||||||
sess.Advanced.Patch<Request, History> (
|
|
||||||
RequestId.toString reqId,
|
|
||||||
(fun r -> r.history :> IEnumerable<History>),
|
|
||||||
fun (h : JavaScriptArray<History>) -> h.Add (hist) :> obj)
|
|
||||||
|
|
||||||
/// Add a note
|
|
||||||
let addNote reqId (note : Note) (sess : IAsyncDocumentSession) =
|
|
||||||
sess.Advanced.Patch<Request, Note> (
|
|
||||||
RequestId.toString reqId,
|
|
||||||
(fun r -> r.notes :> IEnumerable<Note>),
|
|
||||||
fun (h : JavaScriptArray<Note>) -> h.Add (note) :> obj)
|
|
||||||
|
|
||||||
/// Add a request
|
|
||||||
let addRequest req (sess : IAsyncDocumentSession) =
|
|
||||||
sess.StoreAsync (req, req.Id)
|
|
||||||
|
|
||||||
/// Retrieve all answered requests for the given user
|
|
||||||
let answeredRequests userId (sess : IAsyncDocumentSession) =
|
|
||||||
task {
|
|
||||||
let! reqs =
|
|
||||||
sess.Query<JournalRequest, Requests_AsJournal>()
|
|
||||||
.Where(fun r -> r.userId = userId && r.lastStatus = "Answered")
|
|
||||||
.OrderByDescending(fun r -> r.asOf)
|
|
||||||
.ProjectInto<JournalRequest>()
|
|
||||||
.ToListAsync ()
|
|
||||||
return List.ofSeq reqs
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Retrieve the user's current journal
|
|
||||||
let journalByUserId userId (sess : IAsyncDocumentSession) =
|
|
||||||
task {
|
|
||||||
let! jrnl =
|
|
||||||
sess.Query<JournalRequest, Requests_AsJournal>()
|
|
||||||
.Where(fun r -> r.userId = userId && r.lastStatus <> "Answered")
|
|
||||||
.OrderBy(fun r -> r.asOf)
|
|
||||||
.ProjectInto<JournalRequest>()
|
|
||||||
.ToListAsync()
|
|
||||||
return
|
|
||||||
jrnl
|
|
||||||
|> List.ofSeq
|
|
||||||
|> List.map (fun r -> r.history <- []; r.notes <- []; r)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Save changes in the current document session
|
|
||||||
let saveChanges (sess : IAsyncDocumentSession) =
|
|
||||||
sess.SaveChangesAsync ()
|
|
||||||
|
|
||||||
/// Retrieve a request, including its history and notes, by its ID and user ID
|
|
||||||
let tryFullRequestById reqId userId (sess : IAsyncDocumentSession) =
|
|
||||||
task {
|
|
||||||
let! req = RequestId.toString reqId |> sess.LoadAsync
|
|
||||||
return match Option.fromObject req with Some r when r.userId = userId -> Some r | _ -> None
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// Retrieve a request by its ID and user ID (without notes and history)
|
|
||||||
let tryRequestById reqId userId (sess : IAsyncDocumentSession) =
|
|
||||||
task {
|
|
||||||
match! tryFullRequestById reqId userId sess with
|
|
||||||
| Some r -> return Some { r with history = []; notes = [] }
|
|
||||||
| _ -> return None
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Retrieve notes for a request by its ID and user ID
|
|
||||||
let notesById reqId userId (sess : IAsyncDocumentSession) =
|
|
||||||
task {
|
|
||||||
match! tryFullRequestById reqId userId sess with
|
|
||||||
| Some req -> return req.notes
|
|
||||||
| None -> return []
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Retrieve a journal request by its ID and user ID
|
|
||||||
let tryJournalById reqId userId (sess : IAsyncDocumentSession) =
|
|
||||||
task {
|
|
||||||
let! req =
|
|
||||||
sess.Query<Request, Requests_AsJournal>()
|
|
||||||
.Where(fun x -> x.Id = (RequestId.toString reqId) && x.userId = userId)
|
|
||||||
.ProjectInto<JournalRequest>()
|
|
||||||
.FirstOrDefaultAsync ()
|
|
||||||
return Option.fromObject req
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Update the recurrence for a request
|
|
||||||
let updateRecurrence reqId recurType recurCount (sess : IAsyncDocumentSession) =
|
|
||||||
sess.Advanced.Patch<Request, Recurrence> (RequestId.toString reqId, (fun r -> r.recurType), recurType)
|
|
||||||
sess.Advanced.Patch<Request, int16> (RequestId.toString reqId, (fun r -> r.recurCount), recurCount)
|
|
||||||
|
|
||||||
/// Update a snoozed request
|
|
||||||
let updateSnoozed reqId until (sess : IAsyncDocumentSession) =
|
|
||||||
sess.Advanced.Patch<Request, Ticks> (RequestId.toString reqId, (fun r -> r.snoozedUntil), until)
|
|
||||||
sess.Advanced.Patch<Request, Ticks> (RequestId.toString reqId, (fun r -> r.showAfter), until)
|
|
||||||
|
|
||||||
/// Update the "show after" timestamp for a request
|
|
||||||
let updateShowAfter reqId showAfter (sess : IAsyncDocumentSession) =
|
|
||||||
sess.Advanced.Patch<Request, Ticks> (RequestId.toString reqId, (fun r -> r.showAfter), showAfter)
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
[<AutoOpen>]
|
|
||||||
/// The data model for myPrayerJournal
|
|
||||||
module MyPrayerJournal.Domain
|
|
||||||
|
|
||||||
open Cuid
|
|
||||||
|
|
||||||
/// Request ID is a CUID
|
|
||||||
type RequestId =
|
|
||||||
| RequestId of Cuid
|
|
||||||
module RequestId =
|
|
||||||
/// The string representation of the request ID
|
|
||||||
let toString x = match x with RequestId y -> (Cuid.toString >> sprintf "Requests/%s") y
|
|
||||||
/// Create a request ID from a string representation
|
|
||||||
let fromIdString (y : string) = (Cuid >> RequestId) <| y.Replace("Requests/", "")
|
|
||||||
|
|
||||||
|
|
||||||
/// User ID is a string (the "sub" part of the JWT)
|
|
||||||
type UserId =
|
|
||||||
| UserId of string
|
|
||||||
module UserId =
|
|
||||||
/// The string representation of the user ID
|
|
||||||
let toString x = match x with UserId y -> y
|
|
||||||
|
|
||||||
|
|
||||||
/// A long integer representing seconds since the epoch
|
|
||||||
type Ticks =
|
|
||||||
| Ticks of int64
|
|
||||||
module Ticks =
|
|
||||||
/// The int64 (long) representation of ticks
|
|
||||||
let toLong x = match x with Ticks y -> y
|
|
||||||
|
|
||||||
|
|
||||||
/// How frequently a request should reappear after it is marked "Prayed"
|
|
||||||
type Recurrence =
|
|
||||||
| Immediate
|
|
||||||
| Hours
|
|
||||||
| Days
|
|
||||||
| Weeks
|
|
||||||
module Recurrence =
|
|
||||||
/// Create a recurrence value from a string
|
|
||||||
let fromString x =
|
|
||||||
match x with
|
|
||||||
| "Immediate" -> Immediate
|
|
||||||
| "Hours" -> Hours
|
|
||||||
| "Days" -> Days
|
|
||||||
| "Weeks" -> Weeks
|
|
||||||
| _ -> invalidOp (sprintf "%s is not a valid recurrence" x)
|
|
||||||
/// The duration of the recurrence
|
|
||||||
let duration x =
|
|
||||||
match x with
|
|
||||||
| Immediate -> 0L
|
|
||||||
| Hours -> 3600000L
|
|
||||||
| Days -> 86400000L
|
|
||||||
| Weeks -> 604800000L
|
|
||||||
|
|
||||||
|
|
||||||
/// The action taken on a request as part of a history entry
|
|
||||||
type RequestAction =
|
|
||||||
| Created
|
|
||||||
| Prayed
|
|
||||||
| Updated
|
|
||||||
| Answered
|
|
||||||
module RequestAction =
|
|
||||||
/// Create a RequestAction from a string
|
|
||||||
let fromString x =
|
|
||||||
match x with
|
|
||||||
| "Created" -> Created
|
|
||||||
| "Prayed" -> Prayed
|
|
||||||
| "Updated" -> Updated
|
|
||||||
| "Answered" -> Answered
|
|
||||||
| _ -> (sprintf "Bad request action %s" >> invalidOp) x
|
|
||||||
|
|
||||||
|
|
||||||
/// History is a record of action taken on a prayer request, including updates to its text
|
|
||||||
[<CLIMutable; NoComparison; NoEquality>]
|
|
||||||
type History =
|
|
||||||
{ /// The time when this history entry was made
|
|
||||||
asOf : Ticks
|
|
||||||
/// The status for this history entry
|
|
||||||
status : RequestAction
|
|
||||||
/// The text of the update, if applicable
|
|
||||||
text : string option
|
|
||||||
}
|
|
||||||
with
|
|
||||||
/// An empty history entry
|
|
||||||
static member empty =
|
|
||||||
{ asOf = Ticks 0L
|
|
||||||
status = Created
|
|
||||||
text = None
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Note is a note regarding a prayer request that does not result in an update to its text
|
|
||||||
[<CLIMutable; NoComparison; NoEquality>]
|
|
||||||
type Note =
|
|
||||||
{ /// The time when this note was made
|
|
||||||
asOf : Ticks
|
|
||||||
/// The text of the notes
|
|
||||||
notes : string
|
|
||||||
}
|
|
||||||
with
|
|
||||||
/// An empty note
|
|
||||||
static member empty =
|
|
||||||
{ asOf = Ticks 0L
|
|
||||||
notes = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Request is the identifying record for a prayer request
|
|
||||||
[<CLIMutable; NoComparison; NoEquality>]
|
|
||||||
type Request =
|
|
||||||
{ /// The ID of the request
|
|
||||||
Id : string
|
|
||||||
/// The time this request was initially entered
|
|
||||||
enteredOn : Ticks
|
|
||||||
/// The ID of the user to whom this request belongs ("sub" from the JWT)
|
|
||||||
userId : UserId
|
|
||||||
/// The time at which this request should reappear in the user's journal by manual user choice
|
|
||||||
snoozedUntil : Ticks
|
|
||||||
/// The time at which this request should reappear in the user's journal by recurrence
|
|
||||||
showAfter : Ticks
|
|
||||||
/// The type of recurrence for this request
|
|
||||||
recurType : Recurrence
|
|
||||||
/// How many of the recurrence intervals should occur between appearances in the journal
|
|
||||||
recurCount : int16
|
|
||||||
/// The history entries for this request
|
|
||||||
history : History list
|
|
||||||
/// The notes for this request
|
|
||||||
notes : Note list
|
|
||||||
}
|
|
||||||
with
|
|
||||||
/// An empty request
|
|
||||||
static member empty =
|
|
||||||
{ Id = ""
|
|
||||||
enteredOn = Ticks 0L
|
|
||||||
userId = UserId ""
|
|
||||||
snoozedUntil = Ticks 0L
|
|
||||||
showAfter = Ticks 0L
|
|
||||||
recurType = Immediate
|
|
||||||
recurCount = 0s
|
|
||||||
history = []
|
|
||||||
notes = []
|
|
||||||
}
|
|
||||||
|
|
||||||
/// JournalRequest is the form of a prayer request returned for the request journal display. It also contains
|
|
||||||
/// properties that may be filled for history and notes.
|
|
||||||
// RavenDB doesn't like the "@"-suffixed properties from record types in a ProjectInto clause
|
|
||||||
[<NoComparison; NoEquality>]
|
|
||||||
type JournalRequest () =
|
|
||||||
/// The ID of the request (just the CUID part)
|
|
||||||
[<DefaultValue>] val mutable requestId : string
|
|
||||||
/// The ID of the user to whom the request belongs
|
|
||||||
[<DefaultValue>] val mutable userId : UserId
|
|
||||||
/// The current text of the request
|
|
||||||
[<DefaultValue>] val mutable text : string
|
|
||||||
/// The last time action was taken on the request
|
|
||||||
[<DefaultValue>] val mutable asOf : Ticks
|
|
||||||
/// The last status for the request
|
|
||||||
[<DefaultValue>] val mutable lastStatus : string
|
|
||||||
/// The time that this request should reappear in the user's journal
|
|
||||||
[<DefaultValue>] val mutable snoozedUntil : Ticks
|
|
||||||
/// The time after which this request should reappear in the user's journal by configured recurrence
|
|
||||||
[<DefaultValue>] val mutable showAfter : Ticks
|
|
||||||
/// The type of recurrence for this request
|
|
||||||
[<DefaultValue>] val mutable recurType : Recurrence
|
|
||||||
/// How many of the recurrence intervals should occur between appearances in the journal
|
|
||||||
[<DefaultValue>] val mutable recurCount : int16
|
|
||||||
/// History entries for the request
|
|
||||||
[<DefaultValue>] val mutable history : History list
|
|
||||||
/// Note entries for the request
|
|
||||||
[<DefaultValue>] val mutable notes : Note list
|
|
||||||
@@ -1,378 +0,0 @@
|
|||||||
/// HTTP handlers for the myPrayerJournal API
|
|
||||||
[<RequireQualifiedAccess>]
|
|
||||||
module MyPrayerJournal.Handlers
|
|
||||||
|
|
||||||
open Giraffe
|
|
||||||
|
|
||||||
/// Handler to return Vue files
|
|
||||||
module Vue =
|
|
||||||
|
|
||||||
/// The application index page
|
|
||||||
let app : HttpHandler = htmlFile "wwwroot/index.html"
|
|
||||||
|
|
||||||
open System
|
|
||||||
|
|
||||||
/// Handlers for error conditions
|
|
||||||
module Error =
|
|
||||||
|
|
||||||
open Microsoft.Extensions.Logging
|
|
||||||
|
|
||||||
/// Handle errors
|
|
||||||
let error (ex : Exception) (log : ILogger) =
|
|
||||||
log.LogError (EventId(), ex, "An unhandled exception has occurred while executing the request.")
|
|
||||||
clearResponse >=> setStatusCode 500 >=> json ex.Message
|
|
||||||
|
|
||||||
/// Handle 404s from the API, sending known URL paths to the Vue app so that they can be handled there
|
|
||||||
let notFound : HttpHandler =
|
|
||||||
fun next ctx ->
|
|
||||||
[ "/journal"; "/legal"; "/request"; "/user" ]
|
|
||||||
|> List.filter ctx.Request.Path.Value.StartsWith
|
|
||||||
|> List.length
|
|
||||||
|> function
|
|
||||||
| 0 -> (setStatusCode 404 >=> json ([ "error", "not found" ] |> dict)) next ctx
|
|
||||||
| _ -> Vue.app next ctx
|
|
||||||
|
|
||||||
open Cuid
|
|
||||||
|
|
||||||
/// Handler helpers
|
|
||||||
[<AutoOpen>]
|
|
||||||
module private Helpers =
|
|
||||||
|
|
||||||
open Microsoft.AspNetCore.Http
|
|
||||||
open Raven.Client.Documents
|
|
||||||
open System.Threading.Tasks
|
|
||||||
open System.Security.Claims
|
|
||||||
|
|
||||||
/// Create a RavenDB session
|
|
||||||
let session (ctx : HttpContext) =
|
|
||||||
let sess = ctx.GetService<IDocumentStore>().OpenAsyncSession ()
|
|
||||||
sess.Advanced.WaitForIndexesAfterSaveChanges ()
|
|
||||||
sess
|
|
||||||
|
|
||||||
/// Get the user's "sub" claim
|
|
||||||
let user (ctx : HttpContext) =
|
|
||||||
ctx.User.Claims |> Seq.tryFind (fun u -> u.Type = ClaimTypes.NameIdentifier)
|
|
||||||
|
|
||||||
/// Get the current user's ID
|
|
||||||
// NOTE: this may raise if you don't run the request through the authorize handler first
|
|
||||||
let userId ctx =
|
|
||||||
((user >> Option.get) ctx).Value |> UserId
|
|
||||||
|
|
||||||
/// Create a request ID from a string
|
|
||||||
let toReqId x =
|
|
||||||
let reqId =
|
|
||||||
match Cuid.ofString x with
|
|
||||||
| Ok cuid -> cuid
|
|
||||||
| Error msg -> invalidOp msg
|
|
||||||
RequestId reqId
|
|
||||||
|
|
||||||
/// Return a 201 CREATED response
|
|
||||||
let created next ctx =
|
|
||||||
setStatusCode 201 next ctx
|
|
||||||
|
|
||||||
/// The "now" time in JavaScript as Ticks
|
|
||||||
let jsNow () =
|
|
||||||
(int64 >> (*) 1000L >> Ticks) <| DateTime.UtcNow.Subtract(DateTime (1970, 1, 1, 0, 0, 0)).TotalSeconds
|
|
||||||
|
|
||||||
/// Handler to return a 403 Not Authorized reponse
|
|
||||||
let notAuthorized : HttpHandler =
|
|
||||||
setStatusCode 403 >=> fun _ _ -> Task.FromResult<HttpContext option> None
|
|
||||||
|
|
||||||
/// Handler to require authorization
|
|
||||||
let authorize : HttpHandler =
|
|
||||||
fun next ctx -> match user ctx with Some _ -> next ctx | None -> notAuthorized next ctx
|
|
||||||
|
|
||||||
/// Flip JSON result so we can pipe into it
|
|
||||||
let asJson<'T> next ctx (o : 'T) =
|
|
||||||
json o next ctx
|
|
||||||
|
|
||||||
/// Work-around to let the Json.NET serializer synchronously deserialize from the request stream
|
|
||||||
// TODO: Remove this once there is an async serializer
|
|
||||||
let allowSyncIO : HttpHandler =
|
|
||||||
fun next ctx ->
|
|
||||||
match ctx.Features.Get<Features.IHttpBodyControlFeature>() with
|
|
||||||
| null -> ()
|
|
||||||
| f -> f.AllowSynchronousIO <- true
|
|
||||||
next ctx
|
|
||||||
|
|
||||||
|
|
||||||
/// Strongly-typed models for post requests
|
|
||||||
module Models =
|
|
||||||
|
|
||||||
/// A history entry addition (AKA request update)
|
|
||||||
[<CLIMutable>]
|
|
||||||
type HistoryEntry =
|
|
||||||
{ /// The status of the history update
|
|
||||||
status : string
|
|
||||||
/// The text of the update
|
|
||||||
updateText : string
|
|
||||||
}
|
|
||||||
|
|
||||||
/// An additional note
|
|
||||||
[<CLIMutable>]
|
|
||||||
type NoteEntry =
|
|
||||||
{ /// The notes being added
|
|
||||||
notes : string
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recurrence update
|
|
||||||
[<CLIMutable>]
|
|
||||||
type Recurrence =
|
|
||||||
{ /// The recurrence type
|
|
||||||
recurType : string
|
|
||||||
/// The recurrence cound
|
|
||||||
recurCount : int16
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A prayer request
|
|
||||||
[<CLIMutable>]
|
|
||||||
type Request =
|
|
||||||
{ /// The text of the request
|
|
||||||
requestText : string
|
|
||||||
/// The recurrence type
|
|
||||||
recurType : string
|
|
||||||
/// The recurrence count
|
|
||||||
recurCount : int16
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The time until which a request should not appear in the journal
|
|
||||||
[<CLIMutable>]
|
|
||||||
type SnoozeUntil =
|
|
||||||
{ /// The time at which the request should reappear
|
|
||||||
until : int64
|
|
||||||
}
|
|
||||||
|
|
||||||
open FSharp.Control.Tasks.V2.ContextInsensitive
|
|
||||||
|
|
||||||
/// /api/journal URLs
|
|
||||||
module Journal =
|
|
||||||
|
|
||||||
/// GET /api/journal
|
|
||||||
let journal : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let! jrnl = Data.journalByUserId usrId sess
|
|
||||||
return! json jrnl next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// /api/request URLs
|
|
||||||
module Request =
|
|
||||||
|
|
||||||
/// POST /api/request
|
|
||||||
let add : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> allowSyncIO
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
let! r = ctx.BindJsonAsync<Models.Request> ()
|
|
||||||
use sess = session ctx
|
|
||||||
let reqId = (Cuid.generate >> RequestId) ()
|
|
||||||
let usrId = userId ctx
|
|
||||||
let now = jsNow ()
|
|
||||||
do! Data.addRequest
|
|
||||||
{ Request.empty with
|
|
||||||
Id = RequestId.toString reqId
|
|
||||||
userId = usrId
|
|
||||||
enteredOn = now
|
|
||||||
showAfter = Ticks 0L
|
|
||||||
recurType = Recurrence.fromString r.recurType
|
|
||||||
recurCount = r.recurCount
|
|
||||||
history = [
|
|
||||||
{ asOf = now
|
|
||||||
status = Created
|
|
||||||
text = Some r.requestText
|
|
||||||
}
|
|
||||||
]
|
|
||||||
} sess
|
|
||||||
do! Data.saveChanges sess
|
|
||||||
match! Data.tryJournalById reqId usrId sess with
|
|
||||||
| Some req -> return! (setStatusCode 201 >=> json req) next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// POST /api/request/[req-id]/history
|
|
||||||
let addHistory requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> allowSyncIO
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let reqId = toReqId requestId
|
|
||||||
match! Data.tryRequestById reqId usrId sess with
|
|
||||||
| Some req ->
|
|
||||||
let! hist = ctx.BindJsonAsync<Models.HistoryEntry> ()
|
|
||||||
let now = jsNow ()
|
|
||||||
let act = RequestAction.fromString hist.status
|
|
||||||
Data.addHistory reqId
|
|
||||||
{ asOf = now
|
|
||||||
status = act
|
|
||||||
text = match hist.updateText with null | "" -> None | x -> Some x
|
|
||||||
} sess
|
|
||||||
match act with
|
|
||||||
| Prayed ->
|
|
||||||
let nextShow =
|
|
||||||
match Recurrence.duration req.recurType with
|
|
||||||
| 0L -> 0L
|
|
||||||
| duration -> (Ticks.toLong now) + (duration * int64 req.recurCount)
|
|
||||||
Data.updateShowAfter reqId (Ticks nextShow) sess
|
|
||||||
| _ -> ()
|
|
||||||
do! Data.saveChanges sess
|
|
||||||
return! created next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// POST /api/request/[req-id]/note
|
|
||||||
let addNote requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> allowSyncIO
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let reqId = toReqId requestId
|
|
||||||
match! Data.tryRequestById reqId usrId sess with
|
|
||||||
| Some _ ->
|
|
||||||
let! notes = ctx.BindJsonAsync<Models.NoteEntry> ()
|
|
||||||
Data.addNote reqId { asOf = jsNow (); notes = notes.notes } sess
|
|
||||||
do! Data.saveChanges sess
|
|
||||||
return! created next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/requests/answered
|
|
||||||
let answered : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let! reqs = Data.answeredRequests usrId sess
|
|
||||||
return! json reqs next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/request/[req-id]
|
|
||||||
let get requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
match! Data.tryJournalById (toReqId requestId) usrId sess with
|
|
||||||
| Some req -> return! json req next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/request/[req-id]/full
|
|
||||||
let getFull requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
match! Data.tryFullRequestById (toReqId requestId) usrId sess with
|
|
||||||
| Some req -> return! json req next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// GET /api/request/[req-id]/notes
|
|
||||||
let getNotes requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let! notes = Data.notesById (toReqId requestId) usrId sess
|
|
||||||
return! json notes next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// PATCH /api/request/[req-id]/show
|
|
||||||
let show requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let reqId = toReqId requestId
|
|
||||||
match! Data.tryRequestById reqId usrId sess with
|
|
||||||
| Some _ ->
|
|
||||||
Data.updateShowAfter reqId (Ticks 0L) sess
|
|
||||||
do! Data.saveChanges sess
|
|
||||||
return! setStatusCode 204 next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// PATCH /api/request/[req-id]/snooze
|
|
||||||
let snooze requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> allowSyncIO
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let reqId = toReqId requestId
|
|
||||||
match! Data.tryRequestById reqId usrId sess with
|
|
||||||
| Some _ ->
|
|
||||||
let! until = ctx.BindJsonAsync<Models.SnoozeUntil> ()
|
|
||||||
Data.updateSnoozed reqId (Ticks until.until) sess
|
|
||||||
do! Data.saveChanges sess
|
|
||||||
return! setStatusCode 204 next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
/// PATCH /api/request/[req-id]/recurrence
|
|
||||||
let updateRecurrence requestId : HttpHandler =
|
|
||||||
authorize
|
|
||||||
>=> allowSyncIO
|
|
||||||
>=> fun next ctx ->
|
|
||||||
task {
|
|
||||||
use sess = session ctx
|
|
||||||
let usrId = userId ctx
|
|
||||||
let reqId = toReqId requestId
|
|
||||||
match! Data.tryRequestById reqId usrId sess with
|
|
||||||
| Some _ ->
|
|
||||||
let! recur = ctx.BindJsonAsync<Models.Recurrence> ()
|
|
||||||
let recurrence = Recurrence.fromString recur.recurType
|
|
||||||
Data.updateRecurrence reqId recurrence recur.recurCount sess
|
|
||||||
match recurrence with Immediate -> Data.updateShowAfter reqId (Ticks 0L) sess | _ -> ()
|
|
||||||
do! Data.saveChanges sess
|
|
||||||
return! setStatusCode 204 next ctx
|
|
||||||
| None -> return! Error.notFound next ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
open Giraffe.TokenRouter
|
|
||||||
|
|
||||||
/// The routes for myPrayerJournal
|
|
||||||
let webApp : HttpHandler =
|
|
||||||
router Error.notFound [
|
|
||||||
route "/" Vue.app
|
|
||||||
subRoute "/api/" [
|
|
||||||
GET [
|
|
||||||
route "journal" Journal.journal
|
|
||||||
subRoute "request" [
|
|
||||||
route "s/answered" Request.answered
|
|
||||||
routef "/%s/full" Request.getFull
|
|
||||||
routef "/%s/notes" Request.getNotes
|
|
||||||
routef "/%s" Request.get
|
|
||||||
]
|
|
||||||
]
|
|
||||||
PATCH [
|
|
||||||
subRoute "request" [
|
|
||||||
routef "/%s/recurrence" Request.updateRecurrence
|
|
||||||
routef "/%s/show" Request.show
|
|
||||||
routef "/%s/snooze" Request.snooze
|
|
||||||
]
|
|
||||||
]
|
|
||||||
POST [
|
|
||||||
subRoute "request" [
|
|
||||||
route "" Request.add
|
|
||||||
routef "/%s/history" Request.addHistory
|
|
||||||
routef "/%s/note" Request.addNote
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
|
||||||
<Version>2.1.0.0</Version>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="Domain.fs" />
|
|
||||||
<Compile Include="Data.fs" />
|
|
||||||
<Compile Include="Handlers.fs" />
|
|
||||||
<Compile Include="Program.fs" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="FunctionalCuid" Version="1.0.0" />
|
|
||||||
<PackageReference Include="Giraffe" Version="3.6.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="TaskBuilder.fs" Version="2.1.0" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Update="FSharp.Core" Version="4.7.0" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Folder Include="wwwroot\" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,145 +0,0 @@
|
|||||||
module MyPrayerJournal.Api
|
|
||||||
|
|
||||||
open Microsoft.AspNetCore.Builder
|
|
||||||
open Microsoft.AspNetCore.Hosting
|
|
||||||
open System.IO
|
|
||||||
|
|
||||||
/// Configuration functions for the application
|
|
||||||
module Configure =
|
|
||||||
|
|
||||||
/// Configure the content root
|
|
||||||
let contentRoot root (bldr : IWebHostBuilder) =
|
|
||||||
bldr.UseContentRoot root
|
|
||||||
|
|
||||||
open Microsoft.Extensions.Configuration
|
|
||||||
|
|
||||||
/// Configure the application configuration
|
|
||||||
let appConfiguration (bldr : IWebHostBuilder) =
|
|
||||||
let configuration (ctx : WebHostBuilderContext) (cfg : IConfigurationBuilder) =
|
|
||||||
cfg.SetBasePath(ctx.HostingEnvironment.ContentRootPath)
|
|
||||||
.AddJsonFile("appsettings.json", optional = true, reloadOnChange = true)
|
|
||||||
.AddJsonFile(sprintf "appsettings.%s.json" ctx.HostingEnvironment.EnvironmentName)
|
|
||||||
.AddEnvironmentVariables ()
|
|
||||||
|> ignore
|
|
||||||
bldr.ConfigureAppConfiguration configuration
|
|
||||||
|
|
||||||
open Microsoft.AspNetCore.Server.Kestrel.Core
|
|
||||||
|
|
||||||
/// Configure Kestrel from appsettings.json
|
|
||||||
let kestrel (bldr : IWebHostBuilder) =
|
|
||||||
let kestrelOpts (ctx : WebHostBuilderContext) (opts : KestrelServerOptions) =
|
|
||||||
(ctx.Configuration.GetSection >> opts.Configure >> ignore) "Kestrel"
|
|
||||||
bldr.UseKestrel().ConfigureKestrel kestrelOpts
|
|
||||||
|
|
||||||
/// Configure the web root directory
|
|
||||||
let webRoot pathSegments (bldr : IWebHostBuilder) =
|
|
||||||
(Path.Combine >> bldr.UseWebRoot) pathSegments
|
|
||||||
|
|
||||||
open Giraffe
|
|
||||||
open Giraffe.Serialization
|
|
||||||
open Microsoft.AspNetCore.Authentication.JwtBearer
|
|
||||||
open Microsoft.Extensions.DependencyInjection
|
|
||||||
open MyPrayerJournal.Indexes
|
|
||||||
open Newtonsoft.Json
|
|
||||||
open Newtonsoft.Json.Serialization
|
|
||||||
open Raven.Client.Documents
|
|
||||||
open Raven.Client.Documents.Indexes
|
|
||||||
open System.Security.Cryptography.X509Certificates
|
|
||||||
|
|
||||||
/// Configure dependency injection
|
|
||||||
let services (bldr : IWebHostBuilder) =
|
|
||||||
let svcs (sc : IServiceCollection) =
|
|
||||||
/// Custom settings for the JSON serializer (uses compact representation for options and DUs)
|
|
||||||
let jsonSettings =
|
|
||||||
let x = NewtonsoftJsonSerializer.DefaultSettings
|
|
||||||
Converters.all |> List.ofSeq |> List.iter x.Converters.Add
|
|
||||||
x.NullValueHandling <- NullValueHandling.Ignore
|
|
||||||
x.MissingMemberHandling <- MissingMemberHandling.Error
|
|
||||||
x.Formatting <- Formatting.Indented
|
|
||||||
x.ContractResolver <- DefaultContractResolver ()
|
|
||||||
x
|
|
||||||
|
|
||||||
use sp = sc.BuildServiceProvider ()
|
|
||||||
let cfg = sp.GetRequiredService<IConfiguration> ()
|
|
||||||
sc.AddGiraffe()
|
|
||||||
.AddAuthentication(
|
|
||||||
/// Use HTTP "Bearer" authentication with JWTs
|
|
||||||
fun opts ->
|
|
||||||
opts.DefaultAuthenticateScheme <- JwtBearerDefaults.AuthenticationScheme
|
|
||||||
opts.DefaultChallengeScheme <- JwtBearerDefaults.AuthenticationScheme)
|
|
||||||
.AddJwtBearer(
|
|
||||||
/// Configure JWT options with Auth0 options from configuration
|
|
||||||
fun opts ->
|
|
||||||
let jwtCfg = cfg.GetSection "Auth0"
|
|
||||||
opts.Authority <- sprintf "https://%s/" jwtCfg.["Domain"]
|
|
||||||
opts.Audience <- jwtCfg.["Id"]
|
|
||||||
)
|
|
||||||
|> ignore
|
|
||||||
sc.AddSingleton<IJsonSerializer> (NewtonsoftJsonSerializer jsonSettings)
|
|
||||||
|> ignore
|
|
||||||
let config = sc.BuildServiceProvider().GetRequiredService<IConfiguration>().GetSection "RavenDB"
|
|
||||||
let store = new DocumentStore ()
|
|
||||||
store.Urls <- [| config.["URL"] |]
|
|
||||||
store.Database <- config.["Database"]
|
|
||||||
match isNull config.["Certificate"] with
|
|
||||||
| true -> ()
|
|
||||||
| false -> store.Certificate <- new X509Certificate2 (config.["Certificate"], config.["Password"])
|
|
||||||
store.Conventions.CustomizeJsonSerializer <- fun x -> Converters.all |> List.ofSeq |> List.iter x.Converters.Add
|
|
||||||
store.Initialize () |> (sc.AddSingleton >> ignore)
|
|
||||||
IndexCreation.CreateIndexes (typeof<Requests_AsJournal>.Assembly, store)
|
|
||||||
bldr.ConfigureServices svcs
|
|
||||||
|
|
||||||
open Microsoft.Extensions.Logging
|
|
||||||
open Microsoft.Extensions.Hosting
|
|
||||||
|
|
||||||
/// Configure logging
|
|
||||||
let logging (bldr : IWebHostBuilder) =
|
|
||||||
let logz (log : ILoggingBuilder) =
|
|
||||||
let env = log.Services.BuildServiceProvider().GetService<IWebHostEnvironment> ()
|
|
||||||
match env.IsDevelopment () with
|
|
||||||
| true -> log
|
|
||||||
| false -> log.AddFilter(fun l -> l > LogLevel.Information)
|
|
||||||
|> function l -> l.AddConsole().AddDebug()
|
|
||||||
|> ignore
|
|
||||||
bldr.ConfigureLogging logz
|
|
||||||
|
|
||||||
open System
|
|
||||||
|
|
||||||
/// Configure the web application
|
|
||||||
let application (bldr : IWebHostBuilder) =
|
|
||||||
let appConfig =
|
|
||||||
Action<IApplicationBuilder> (
|
|
||||||
fun (app : IApplicationBuilder) ->
|
|
||||||
let env = app.ApplicationServices.GetService<IWebHostEnvironment> ()
|
|
||||||
match env.IsDevelopment () with
|
|
||||||
| true -> app.UseDeveloperExceptionPage ()
|
|
||||||
| false -> app.UseGiraffeErrorHandler Handlers.Error.error
|
|
||||||
|> function
|
|
||||||
| a ->
|
|
||||||
a.UseAuthentication()
|
|
||||||
.UseStaticFiles()
|
|
||||||
.UseGiraffe Handlers.webApp
|
|
||||||
|> ignore)
|
|
||||||
bldr.Configure appConfig
|
|
||||||
|
|
||||||
/// Compose all the configurations into one
|
|
||||||
let webHost appRoot pathSegments =
|
|
||||||
contentRoot appRoot
|
|
||||||
>> appConfiguration
|
|
||||||
>> kestrel
|
|
||||||
>> webRoot (Array.concat [ [| appRoot |]; pathSegments ])
|
|
||||||
>> services
|
|
||||||
>> logging
|
|
||||||
>> application
|
|
||||||
|
|
||||||
/// Build the web host from the given configuration
|
|
||||||
let buildHost (bldr : IWebHostBuilder) = bldr.Build ()
|
|
||||||
|
|
||||||
let exitCode = 0
|
|
||||||
|
|
||||||
[<EntryPoint>]
|
|
||||||
let main _ =
|
|
||||||
let appRoot = Directory.GetCurrentDirectory ()
|
|
||||||
use host = WebHostBuilder() |> (Configure.webHost appRoot [| "wwwroot" |] >> Configure.buildHost)
|
|
||||||
host.Run ()
|
|
||||||
exitCode
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
"iisSettings": {
|
|
||||||
"windowsAuthentication": false,
|
|
||||||
"anonymousAuthentication": true,
|
|
||||||
"iisExpress": {
|
|
||||||
"applicationUrl": "http://localhost:61905",
|
|
||||||
"sslPort": 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"profiles": {
|
|
||||||
"IIS Express": {
|
|
||||||
"commandName": "IISExpress",
|
|
||||||
"launchBrowser": true,
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"MyPrayerJournal.Api": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"launchBrowser": true,
|
|
||||||
"applicationUrl": "http://localhost:5000",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"Kestrel": {
|
|
||||||
"EndPoints": {
|
|
||||||
"Http": {
|
|
||||||
"Url": "http://localhost:3000"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 16
|
|
||||||
VisualStudioVersion = 16.0.28721.148
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "MyPrayerJournal.Api", "MyPrayerJournal.Api\MyPrayerJournal.Api.fsproj", "{1887D1E1-544A-4F54-B266-38E7867DC842}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
|
||||||
Debug|iPhone = Debug|iPhone
|
|
||||||
Debug|iPhoneSimulator = Debug|iPhoneSimulator
|
|
||||||
Release|Any CPU = Release|Any CPU
|
|
||||||
Release|iPhone = Release|iPhone
|
|
||||||
Release|iPhoneSimulator = Release|iPhoneSimulator
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Debug|iPhone.Build.0 = Debug|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Release|iPhone.ActiveCfg = Release|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Release|iPhone.Build.0 = Release|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
|
||||||
{1887D1E1-544A-4F54-B266-38E7867DC842}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {8E2447D9-52F0-4A0D-BB61-A83C19353D7C}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
> 1%
|
|
||||||
last 2 versions
|
|
||||||
not ie <= 8
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
root: true,
|
|
||||||
env: {
|
|
||||||
node: true
|
|
||||||
},
|
|
||||||
'extends': [
|
|
||||||
'plugin:vue/essential',
|
|
||||||
'@vue/standard'
|
|
||||||
],
|
|
||||||
rules: {
|
|
||||||
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
|
||||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
|
|
||||||
},
|
|
||||||
parserOptions: {
|
|
||||||
parser: 'babel-eslint'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
24
src/app/.gitignore
vendored
24
src/app/.gitignore
vendored
@@ -1,24 +0,0 @@
|
|||||||
.DS_Store
|
|
||||||
node_modules
|
|
||||||
/dist
|
|
||||||
|
|
||||||
# local env files
|
|
||||||
.env.local
|
|
||||||
.env.*.local
|
|
||||||
|
|
||||||
# Log files
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
|
|
||||||
# Editor directories and files
|
|
||||||
.idea
|
|
||||||
.vscode
|
|
||||||
*.suo
|
|
||||||
*.ntvs*
|
|
||||||
*.njsproj
|
|
||||||
*.sln
|
|
||||||
*.sw*
|
|
||||||
|
|
||||||
# Auth0 settings
|
|
||||||
src/auth/auth0-variables.*
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
plugins: {
|
|
||||||
autoprefixer: {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2017 Daniel J. Summers
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
presets: [
|
|
||||||
'@vue/app'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "my-prayer-journal",
|
|
||||||
"version": "2.1.0",
|
|
||||||
"description": "myPrayerJournal - Front End",
|
|
||||||
"author": "Daniel J. Summers <daniel@bitbadger.solutions>",
|
|
||||||
"private": true,
|
|
||||||
"scripts": {
|
|
||||||
"serve": "vue-cli-service serve --port 8081",
|
|
||||||
"build": "vue-cli-service build --modern",
|
|
||||||
"lint": "vue-cli-service lint",
|
|
||||||
"apistart": "cd ../MyPrayerJournal.Api && dotnet run",
|
|
||||||
"vue": "vue-cli-service build --modern && cd ../MyPrayerJournal.Api && dotnet run",
|
|
||||||
"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",
|
|
||||||
"moment": "^2.18.1",
|
|
||||||
"vue": "^2.5.15",
|
|
||||||
"vue-material": "^1.0.0-beta-11",
|
|
||||||
"vue-router": "^3.0.0",
|
|
||||||
"vuex": "^3.0.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@vue/cli-plugin-babel": "^3.0.0",
|
|
||||||
"@vue/cli-plugin-eslint": "^3.0.0",
|
|
||||||
"@vue/cli-service": "^3.0.0",
|
|
||||||
"@vue/eslint-config-standard": "^4.0.0",
|
|
||||||
"node-sass": "^4.12.0",
|
|
||||||
"pug": "^2.0.1",
|
|
||||||
"pug-plain-loader": "^1.0.0",
|
|
||||||
"sass-loader": "^7.3.1",
|
|
||||||
"vue-template-compiler": "^2.5.17",
|
|
||||||
"webpack-bundle-analyzer": "^3.4.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
@@ -1,19 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
|
||||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
|
||||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="preload" as="style">
|
|
||||||
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
|
||||||
<title>myPrayerJournal</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<noscript>
|
|
||||||
<strong>We're sorry but newapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
|
|
||||||
</noscript>
|
|
||||||
<div id="app"></div>
|
|
||||||
<!-- built files will be auto injected -->
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
#app.page-container
|
|
||||||
md-app(md-waterfall md-mode='fixed-last' role='application')
|
|
||||||
md-app-toolbar.md-large.md-dense.md-primary
|
|
||||||
.md-toolbar-row
|
|
||||||
.md-toolbar-section-start
|
|
||||||
router-link(to='/').md-title
|
|
||||||
span(style='font-weight:100;') my
|
|
||||||
span(style='font-weight:400;') Prayer
|
|
||||||
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'
|
|
||||||
:md-duration='snackbar.interval'
|
|
||||||
ref='snackbar') {{ snackbar.message }}
|
|
||||||
footer
|
|
||||||
p.mpj-muted-text.mpj-text-right
|
|
||||||
| myPrayerJournal v{{ version }}
|
|
||||||
br
|
|
||||||
em: small.
|
|
||||||
#[router-link(to='/legal/privacy-policy') Privacy Policy] •
|
|
||||||
#[router-link(to='/legal/terms-of-service') Terms of Service] •
|
|
||||||
#[a(href='https://github.com/bit-badger/myprayerjournal' target='_blank') Developed] and hosted by
|
|
||||||
#[a(href='https://bitbadger.solutions' target='_blank') Bit Badger Solutions]
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import Vue from 'vue'
|
|
||||||
|
|
||||||
import Navigation from '@/components/common/Navigation'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
import { version } from '../package.json'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'app',
|
|
||||||
components: {
|
|
||||||
Navigation
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
progress: {
|
|
||||||
events: new Vue(),
|
|
||||||
visible: false,
|
|
||||||
mode: 'query'
|
|
||||||
},
|
|
||||||
snackbar: {
|
|
||||||
events: new Vue(),
|
|
||||||
visible: false,
|
|
||||||
message: '',
|
|
||||||
interval: 4000
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async mounted () {
|
|
||||||
this.progress.events.$on('show', this.showProgress)
|
|
||||||
this.progress.events.$on('done', this.hideProgress)
|
|
||||||
this.snackbar.events.$on('info', this.showInfo)
|
|
||||||
this.snackbar.events.$on('error', this.showError)
|
|
||||||
await this.$store.dispatch(actions.CHECK_AUTHENTICATION)
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
version () {
|
|
||||||
return version.endsWith('.0')
|
|
||||||
? version.endsWith('.0.0')
|
|
||||||
? version.substr(0, version.length - 4)
|
|
||||||
: version.substr(0, version.length - 2)
|
|
||||||
: version
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
showSnackbar (message) {
|
|
||||||
this.snackbar.message = message
|
|
||||||
this.snackbar.visible = true
|
|
||||||
},
|
|
||||||
showInfo (message) {
|
|
||||||
this.snackbar.interval = 4000
|
|
||||||
this.showSnackbar(message)
|
|
||||||
},
|
|
||||||
showError (message) {
|
|
||||||
this.snackbar.interval = Infinity
|
|
||||||
this.showSnackbar(message)
|
|
||||||
},
|
|
||||||
showProgress (mode) {
|
|
||||||
this.progress.mode = mode
|
|
||||||
this.progress.visible = true
|
|
||||||
},
|
|
||||||
hideProgress () {
|
|
||||||
this.progress.visible = false
|
|
||||||
},
|
|
||||||
handleLoginEvent (data) {
|
|
||||||
if (!data.loggedIn) {
|
|
||||||
this.showInfo('Logged out successfully')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
provide () {
|
|
||||||
return {
|
|
||||||
messages: this.snackbar.events,
|
|
||||||
progress: this.progress.events
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="sass">
|
|
||||||
@import "~vue-material/dist/theme/engine"
|
|
||||||
@include md-register-theme("default", (primary: md-get-palette-color(green, 800), accent: md-get-palette-color(gray, 700)))
|
|
||||||
@import "~vue-material/dist/theme/all"
|
|
||||||
|
|
||||||
html, body
|
|
||||||
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
|
|
||||||
font-size: 1rem
|
|
||||||
p
|
|
||||||
margin-bottom: 0
|
|
||||||
footer
|
|
||||||
border-top: solid 1px lightgray
|
|
||||||
margin: 1rem -1rem 0
|
|
||||||
padding: 0 1rem
|
|
||||||
footer p
|
|
||||||
margin: 0
|
|
||||||
.mpj-full-page-card
|
|
||||||
font-size: 1rem
|
|
||||||
line-height: 1.25rem
|
|
||||||
.mpj-main-content
|
|
||||||
max-width: 60rem
|
|
||||||
margin: auto
|
|
||||||
.mpj-request-text
|
|
||||||
white-space: pre-line
|
|
||||||
p.mpj-request-text
|
|
||||||
margin-top: 0
|
|
||||||
.mpj-text-center
|
|
||||||
text-align: center
|
|
||||||
.mpj-text-nowrap
|
|
||||||
white-space: nowrap
|
|
||||||
.mpj-text-right
|
|
||||||
text-align: right
|
|
||||||
.mpj-muted-text
|
|
||||||
color: rgba(0, 0, 0, .6)
|
|
||||||
.mpj-valign-top
|
|
||||||
vertical-align: top
|
|
||||||
.mpj-narrow
|
|
||||||
max-width: 40rem
|
|
||||||
margin: auto
|
|
||||||
.mpj-skinny
|
|
||||||
max-width: 20rem
|
|
||||||
margin: auto
|
|
||||||
.mpj-full-width
|
|
||||||
width: 100%
|
|
||||||
.md-progress-bar
|
|
||||||
margin: 24px
|
|
||||||
</style>
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
import axios from 'axios'
|
|
||||||
|
|
||||||
const http = axios.create({
|
|
||||||
baseURL: `${location.protocol}//${location.host}/api/`
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* API access for myPrayerJournal
|
|
||||||
*/
|
|
||||||
export default {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the bearer token for all future requests
|
|
||||||
* @param {string} token The token to use to identify the user to the server
|
|
||||||
*/
|
|
||||||
setBearer: token => { http.defaults.headers.common['Authorization'] = `Bearer ${token}` },
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove the bearer token
|
|
||||||
*/
|
|
||||||
removeBearer: () => delete http.defaults.headers.common['Authorization'],
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a note for a prayer request
|
|
||||||
* @param {string} requestId The Id of the request to which the note applies
|
|
||||||
* @param {string} notes The notes to be added
|
|
||||||
*/
|
|
||||||
addNote: (requestId, notes) => http.post(`request/${requestId}/note`, { notes }),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a new prayer request
|
|
||||||
* @param {string} requestText The text of the request to be added
|
|
||||||
* @param {string} recurType The type of recurrence for this request
|
|
||||||
* @param {number} recurCount The number of intervals of recurrence
|
|
||||||
*/
|
|
||||||
addRequest: (requestText, recurType, recurCount) => http.post('request', { requestText, recurType, recurCount }),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get all answered requests, along with the text they had when it was answered
|
|
||||||
*/
|
|
||||||
getAnsweredRequests: () => http.get('requests/answered'),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a prayer request (full; includes all history and notes)
|
|
||||||
* @param {string} requestId The Id of the request to retrieve
|
|
||||||
*/
|
|
||||||
getFullRequest: requestId => http.get(`request/${requestId}/full`),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get past notes for a prayer request
|
|
||||||
* @param {string} requestId The Id of the request for which notes should be retrieved
|
|
||||||
*/
|
|
||||||
getNotes: requestId => http.get(`request/${requestId}/notes`),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a prayer request (journal-style; only latest update)
|
|
||||||
* @param {string} requestId The Id of the request to retrieve
|
|
||||||
*/
|
|
||||||
getRequest: requestId => http.get(`request/${requestId}`),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get all prayer requests and their most recent updates
|
|
||||||
*/
|
|
||||||
journal: () => http.get('journal'),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show a request after the given date (used for "show now")
|
|
||||||
* @param {string} requestId The ID of the request which should be shown
|
|
||||||
* @param {number} showAfter The ticks after which the request should be shown
|
|
||||||
*/
|
|
||||||
showRequest: (requestId, showAfter) => http.patch(`request/${requestId}/show`, { showAfter }),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Snooze a request until the given time
|
|
||||||
* @param {string} requestId The ID of the prayer request to be snoozed
|
|
||||||
* @param {number} until The ticks until which the request should be snoozed
|
|
||||||
*/
|
|
||||||
snoozeRequest: (requestId, until) => http.patch(`request/${requestId}/snooze`, { until }),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update recurrence for a prayer request
|
|
||||||
* @param {string} requestId The ID of the prayer request for which recurrence is being updated
|
|
||||||
* @param {string} recurType The type of recurrence to set
|
|
||||||
* @param {number} recurCount The number of recurrence intervals to set
|
|
||||||
*/
|
|
||||||
updateRecurrence: (requestId, recurType, recurCount) =>
|
|
||||||
http.patch(`request/${requestId}/recurrence`, { recurType, recurCount }),
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update a prayer request
|
|
||||||
* @param {string} requestId The ID of the request to be updated
|
|
||||||
* @param {string} status The status of the update
|
|
||||||
* @param {string} updateText The text of the update (optional)
|
|
||||||
*/
|
|
||||||
updateRequest: (requestId, status, updateText) => http.post(`request/${requestId}/history`, { status, updateText })
|
|
||||||
}
|
|
||||||
@@ -1,194 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
/* eslint-disable */
|
|
||||||
import auth0 from 'auth0-js'
|
|
||||||
import EventEmitter from 'events'
|
|
||||||
|
|
||||||
import AUTH_CONFIG from './auth0-variables'
|
|
||||||
import mutations from '@/store/mutation-types'
|
|
||||||
/* es-lint-enable*/
|
|
||||||
|
|
||||||
// Auth0 web authentication instance to use for our calls
|
|
||||||
const webAuth = new auth0.WebAuth({
|
|
||||||
domain: AUTH_CONFIG.domain,
|
|
||||||
clientID: AUTH_CONFIG.clientId,
|
|
||||||
redirectUri: AUTH_CONFIG.appDomain + AUTH_CONFIG.callbackUrl,
|
|
||||||
audience: `https://${AUTH_CONFIG.domain}/userinfo`,
|
|
||||||
responseType: 'token id_token',
|
|
||||||
scope: 'openid profile email'
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A class to handle all authentication calls and determinations
|
|
||||||
*/
|
|
||||||
class AuthService extends EventEmitter {
|
|
||||||
|
|
||||||
// Local storage key for our session data
|
|
||||||
AUTH_SESSION = 'auth-session'
|
|
||||||
|
|
||||||
// Received and calculated values for our ssesion (initially loaded from local storage if present)
|
|
||||||
session = {}
|
|
||||||
|
|
||||||
constructor() {
|
|
||||||
super()
|
|
||||||
this.refreshSession()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts the user log in flow
|
|
||||||
*/
|
|
||||||
login (customState) {
|
|
||||||
webAuth.authorize({
|
|
||||||
appState: customState
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Promisified parseHash function
|
|
||||||
*/
|
|
||||||
parseHash () {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
webAuth.parseHash((err, authResult) => {
|
|
||||||
if (err) {
|
|
||||||
reject(err)
|
|
||||||
} else {
|
|
||||||
resolve(authResult)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle authentication replies from Auth0
|
|
||||||
*
|
|
||||||
* @param store The Vuex store
|
|
||||||
*/
|
|
||||||
async handleAuthentication (store) {
|
|
||||||
try {
|
|
||||||
const authResult = await this.parseHash()
|
|
||||||
if (authResult && authResult.accessToken && authResult.idToken) {
|
|
||||||
this.setSession(authResult)
|
|
||||||
store.commit(mutations.USER_LOGGED_ON, this.session.profile)
|
|
||||||
}
|
|
||||||
} catch(err) {
|
|
||||||
console.error(err)
|
|
||||||
alert(`Error: ${err.error}. Check the console for further details.`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set up the session and commit it to local storage
|
|
||||||
*
|
|
||||||
* @param authResult The authorization result
|
|
||||||
*/
|
|
||||||
setSession (authResult) {
|
|
||||||
this.session.profile = authResult.idTokenPayload
|
|
||||||
this.session.id.token = authResult.idToken
|
|
||||||
this.session.id.expiry = this.session.profile.exp * 1000
|
|
||||||
this.session.access.token = authResult.accessToken
|
|
||||||
this.session.access.expiry = authResult.expiresIn * 1000 + Date.now()
|
|
||||||
|
|
||||||
localStorage.setItem(this.AUTH_SESSION, JSON.stringify(this.session))
|
|
||||||
|
|
||||||
this.emit('loginEvent', {
|
|
||||||
loggedIn: true,
|
|
||||||
profile: authResult.idTokenPayload,
|
|
||||||
state: authResult.appState || {}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Refresh this instance's session from the one in local storage
|
|
||||||
*/
|
|
||||||
refreshSession () {
|
|
||||||
this.session =
|
|
||||||
localStorage.getItem(this.AUTH_SESSION)
|
|
||||||
? JSON.parse(localStorage.getItem(this.AUTH_SESSION))
|
|
||||||
: { profile: {},
|
|
||||||
id: {
|
|
||||||
token: null,
|
|
||||||
expiry: null
|
|
||||||
},
|
|
||||||
access: {
|
|
||||||
token: null,
|
|
||||||
expiry: null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Renew authorzation tokens with Auth0
|
|
||||||
*/
|
|
||||||
renewTokens () {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
this.refreshSession()
|
|
||||||
if (this.session.id.token !== null) {
|
|
||||||
webAuth.checkSession({}, (err, authResult) => {
|
|
||||||
if (err) {
|
|
||||||
reject(err)
|
|
||||||
} else {
|
|
||||||
this.setSession(authResult)
|
|
||||||
resolve(authResult)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
reject('Not logged in')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Log out of myPrayerJournal
|
|
||||||
*
|
|
||||||
* @param store The Vuex store
|
|
||||||
*/
|
|
||||||
logout (store) {
|
|
||||||
// Clear access token and ID token from local storage
|
|
||||||
localStorage.removeItem(this.AUTH_SESSION)
|
|
||||||
this.refreshSession()
|
|
||||||
|
|
||||||
store.commit(mutations.USER_LOGGED_OFF)
|
|
||||||
|
|
||||||
webAuth.logout({
|
|
||||||
returnTo: `${AUTH_CONFIG.appDomain}/`,
|
|
||||||
clientID: AUTH_CONFIG.clientId
|
|
||||||
})
|
|
||||||
this.emit('loginEvent', { loggedIn: false })
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check expiration for a token (the way it's stored in the session)
|
|
||||||
*/
|
|
||||||
checkExpiry = (it) => it.token && it.expiry && Date.now() < it.expiry
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is there a user authenticated?
|
|
||||||
*/
|
|
||||||
isAuthenticated () {
|
|
||||||
return this.checkExpiry(this.session.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Is the current access token valid?
|
|
||||||
*/
|
|
||||||
isAccessTokenValid () {
|
|
||||||
return this.checkExpiry(this.session.access)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the user's access token, renewing it if required
|
|
||||||
*/
|
|
||||||
async getAccessToken () {
|
|
||||||
if (this.isAccessTokenValid()) {
|
|
||||||
return this.session.access.token
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
const authResult = await this.renewTokens()
|
|
||||||
return authResult.accessToken
|
|
||||||
} catch (reject) {
|
|
||||||
throw reject
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default new AuthService()
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content
|
|
||||||
page-title(title='Welcome!'
|
|
||||||
hideOnPage=true)
|
|
||||||
p
|
|
||||||
p.
|
|
||||||
myPrayerJournal is a place where individuals can record their prayer requests, record that they prayed for them,
|
|
||||||
update them as God moves in the situation, and record a final answer received on that request. It also allows
|
|
||||||
individuals to review their answered prayers.
|
|
||||||
p.
|
|
||||||
This site is open and available to the general public. To get started, simply click the “Log On” link
|
|
||||||
above, and log on with either a Microsoft or Google account. You can also learn more about the site at the
|
|
||||||
“Docs” link, also above.
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'home'
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content-wide
|
|
||||||
page-title(:title='title')
|
|
||||||
p(v-if='isLoadingJournal') Loading your prayer journal...
|
|
||||||
template(v-else)
|
|
||||||
md-empty-state(v-if='journal.length === 0'
|
|
||||||
md-icon='done_all'
|
|
||||||
md-label='No Requests to Show'
|
|
||||||
md-description='You have no requests to be shown; see the “Active” link above for snoozed/deferred requests, and the “Answered” link for answered requests')
|
|
||||||
md-button(:to="{ name: 'EditRequest', params: { id: 'new' } }").md-primary.md-raised Add a New Request
|
|
||||||
template(v-else)
|
|
||||||
.mpj-text-center
|
|
||||||
md-button(:to="{ name: 'EditRequest', params: { id: 'new' } }"
|
|
||||||
role='button').md-raised.md-accent #[md-icon add_box] Add a New Request
|
|
||||||
br
|
|
||||||
.mpj-journal
|
|
||||||
request-card(v-for='request in journal'
|
|
||||||
:key='request.requestId'
|
|
||||||
:request='request')
|
|
||||||
notes-edit
|
|
||||||
snooze-request
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import Vue from 'vue'
|
|
||||||
import { mapState } from 'vuex'
|
|
||||||
|
|
||||||
import NotesEdit from './request/NotesEdit'
|
|
||||||
import RequestCard from './request/RequestCard'
|
|
||||||
import SnoozeRequest from './request/SnoozeRequest'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'journal',
|
|
||||||
inject: [
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
components: {
|
|
||||||
NotesEdit,
|
|
||||||
RequestCard,
|
|
||||||
SnoozeRequest
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
eventBus: new Vue()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
title () {
|
|
||||||
return `${this.user.given_name}’s Prayer Journal`
|
|
||||||
},
|
|
||||||
snackbar () {
|
|
||||||
return this.$parent.$refs.snackbar
|
|
||||||
},
|
|
||||||
...mapState(['user', 'journal', 'isLoadingJournal'])
|
|
||||||
},
|
|
||||||
async created () {
|
|
||||||
await this.$store.dispatch(actions.LOAD_JOURNAL, this.progress)
|
|
||||||
this.messages.$emit('info', `Loaded ${this.journal.length} prayer requests`)
|
|
||||||
},
|
|
||||||
provide () {
|
|
||||||
return {
|
|
||||||
journalEvents: this.eventBus
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="sass">
|
|
||||||
.mpj-journal
|
|
||||||
display: flex
|
|
||||||
flex-flow: row wrap
|
|
||||||
justify-content: center
|
|
||||||
align-items: flex-start
|
|
||||||
.mpj-dialog-content
|
|
||||||
padding: 0 1rem
|
|
||||||
</style>
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import moment from 'moment'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'date-from-now',
|
|
||||||
props: {
|
|
||||||
tag: {
|
|
||||||
type: String,
|
|
||||||
default: 'span'
|
|
||||||
},
|
|
||||||
value: {
|
|
||||||
type: Number,
|
|
||||||
default: 0
|
|
||||||
},
|
|
||||||
interval: {
|
|
||||||
type: Number,
|
|
||||||
default: 10000
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
fromNow: moment(this.value).fromNow(),
|
|
||||||
intervalId: null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
actual () {
|
|
||||||
return moment(this.value).format('LLLL')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted () {
|
|
||||||
this.intervalId = setInterval(this.updateFromNow, this.interval)
|
|
||||||
this.$watch('value', this.updateFromNow)
|
|
||||||
},
|
|
||||||
beforeDestroy () {
|
|
||||||
clearInterval(this.intervalId)
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
updateFromNow () {
|
|
||||||
let newFromNow = moment(this.value).fromNow()
|
|
||||||
if (newFromNow !== this.fromNow) this.fromNow = newFromNow
|
|
||||||
}
|
|
||||||
},
|
|
||||||
render (createElement) {
|
|
||||||
return createElement(this.tag, {
|
|
||||||
domProps: {
|
|
||||||
title: this.actual,
|
|
||||||
innerText: this.fromNow
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
.md-toolbar-row
|
|
||||||
md-tabs(md-sync-route).md-primary
|
|
||||||
template(v-if='isAuthenticated')
|
|
||||||
md-tab(md-label='Journal'
|
|
||||||
to='/journal')
|
|
||||||
md-tab(md-label='Active'
|
|
||||||
to='/requests/active')
|
|
||||||
md-tab(v-if='hasSnoozed'
|
|
||||||
md-label='Snoozed'
|
|
||||||
to='/requests/snoozed')
|
|
||||||
md-tab(md-label='Answered'
|
|
||||||
to='/requests/answered')
|
|
||||||
md-tab(md-label='Log Off'
|
|
||||||
href='/user/log-off'
|
|
||||||
@click.prevent='logOff()')
|
|
||||||
md-tab(md-label='Docs'
|
|
||||||
href='https://docs.prayerjournal.me'
|
|
||||||
@click.prevent='showHelp()')
|
|
||||||
template(v-else)
|
|
||||||
md-tab(md-label='Log On'
|
|
||||||
href='/user/log-on'
|
|
||||||
@click.prevent='logOn()')
|
|
||||||
md-tab(md-label='Docs'
|
|
||||||
href='https://docs.prayerjournal.me'
|
|
||||||
@click.prevent='showHelp()')
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import { mapState } from 'vuex'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'navigation',
|
|
||||||
data () {
|
|
||||||
return {}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
hasSnoozed () {
|
|
||||||
return this.isAuthenticated &&
|
|
||||||
Array.isArray(this.journal) &&
|
|
||||||
this.journal.filter(req => req.snoozedUntil > Date.now()).length > 0
|
|
||||||
},
|
|
||||||
...mapState([ 'isAuthenticated', 'journal' ])
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
logOn () {
|
|
||||||
this.$auth.login()
|
|
||||||
},
|
|
||||||
logOff () {
|
|
||||||
this.$auth.logout(this.$store, this.$router)
|
|
||||||
},
|
|
||||||
showHelp () {
|
|
||||||
window.open('https://docs.prayerjournal.me', '_blank')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
h1(v-if='!hideOnPage'
|
|
||||||
v-html='title').md-title
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
name: 'page-title',
|
|
||||||
props: {
|
|
||||||
title: {
|
|
||||||
type: String,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
hideOnPage: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
watch: {
|
|
||||||
title () {
|
|
||||||
document.title = `${this.title.replace('’', "'")} « myPrayerJournal`
|
|
||||||
}
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
document.title = `${this.title.replace('’', "'")} « myPrayerJournal`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content
|
|
||||||
page-title(title='Privacy Policy'
|
|
||||||
hide-on-page=true)
|
|
||||||
md-card
|
|
||||||
md-card-header
|
|
||||||
.md-title Privacy Policy
|
|
||||||
.md-subhead as of May 21, 2018
|
|
||||||
md-card-content.mpj-full-page-card
|
|
||||||
p.
|
|
||||||
The nature of the service is one where privacy is a must. The items below will help you understand the data we
|
|
||||||
collect, access, and store on your behalf as you use this service.
|
|
||||||
hr
|
|
||||||
h3 Third Party Services
|
|
||||||
p.
|
|
||||||
myPrayerJournal utilizes a third-party authentication and identity provider. You should familiarize yourself
|
|
||||||
with the privacy policy for #[a(href='https://auth0.com/privacy' target='_blank') Auth0], as well as your
|
|
||||||
chosen provider (#[a(href='https://privacy.microsoft.com/en-us/privacystatement' target='_blank') Microsoft] or
|
|
||||||
#[a(href='https://policies.google.com/privacy' target='_blank') Google]).
|
|
||||||
hr
|
|
||||||
h3 What We Collect
|
|
||||||
h4 Identifying Data
|
|
||||||
ul
|
|
||||||
li.
|
|
||||||
The only identifying data myPrayerJournal stores is the subscriber (“sub”) field from the token we
|
|
||||||
receive from Auth0, once you have signed in through their hosted service. All information is associated with
|
|
||||||
you via this field.
|
|
||||||
li.
|
|
||||||
While you are signed in, within your browser, the service has access to your first and last names, along with
|
|
||||||
a URL to the profile picture (provided by your selected identity provider). This information is not
|
|
||||||
transmitted to the server, and is removed when “Log Off” is clicked.
|
|
||||||
h4 User Provided Data
|
|
||||||
ul
|
|
||||||
li.
|
|
||||||
myPrayerJournal stores the information you provide, including the text of prayer requests, updates, and notes;
|
|
||||||
and the date/time when certain actions are taken.
|
|
||||||
hr
|
|
||||||
h3 How Your Data Is Accessed / Secured
|
|
||||||
ul
|
|
||||||
li.
|
|
||||||
Your provided data is returned to you, as required, to display your journal or your answered requests. On the
|
|
||||||
server, it is stored in a controlled-access database.
|
|
||||||
li.
|
|
||||||
Your data is backed up, along with other Bit Badger Solutions hosted systems, in a rolling manner; backups are
|
|
||||||
preserved for the prior 7 days, and backups from the 1st and 15th are preserved for 3 months. These backups
|
|
||||||
are stored in a private cloud data repository.
|
|
||||||
li.
|
|
||||||
The data collected and stored is the absolute minimum necessary for the functionality of the service. There
|
|
||||||
are no plans to “monetize” this service, and storing the minimum amount of information means that
|
|
||||||
the data we have is not interesting to purchasers (or those who may have more nefarious purposes).
|
|
||||||
li Access to servers and backups is strictly controlled and monitored for unauthorized access attempts.
|
|
||||||
hr
|
|
||||||
h3 Removing Your Data
|
|
||||||
p.
|
|
||||||
At any time, you may choose to discontinue using this service. Both Microsoft and Google provide ways to revoke
|
|
||||||
access from this application. However, if you want your data removed from the database, please contact daniel at
|
|
||||||
bitbadger.solutions (via e-mail, replacing at with @) prior to doing so, to ensure we can determine which
|
|
||||||
subscriber ID belongs to you.
|
|
||||||
</template>
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content
|
|
||||||
page-title(title='Terms of Service'
|
|
||||||
hide-on-page=true)
|
|
||||||
md-card
|
|
||||||
md-card-header
|
|
||||||
.md-title Terms of Service
|
|
||||||
.md-subhead as of May 21, 2018
|
|
||||||
md-card-content.mpj-full-page-card
|
|
||||||
h3 1. Acceptance of Terms
|
|
||||||
p.
|
|
||||||
By accessing this web site, you are agreeing to be bound by these Terms and Conditions, and that you are
|
|
||||||
responsible to ensure that your use of this site complies with all applicable laws. Your continued use of this
|
|
||||||
site implies your acceptance of these terms.
|
|
||||||
h3 2. Description of Service and Registration
|
|
||||||
p.
|
|
||||||
myPrayerJournal is a service that allows individuals to enter and amend their prayer requests. It requires no
|
|
||||||
registration by itself, but access is granted based on a successful login with an external identity provider.
|
|
||||||
See #[router-link(:to="{ name: 'PrivacyPolicy' }") our privacy policy] for details on how that information is
|
|
||||||
accessed and stored.
|
|
||||||
h3 3. Third Party Services
|
|
||||||
p.
|
|
||||||
This service utilizes a third-party service provider for identity management. Review the terms of service for
|
|
||||||
#[a(href='https://auth0.com/terms' target='_blank') Auth0], as well as those for the selected authorization
|
|
||||||
provider (#[a(href='https://www.microsoft.com/en-us/servicesagreement' target='_blank') Microsoft] or
|
|
||||||
#[a(href='https://policies.google.com/terms' target='_blank') Google]).
|
|
||||||
h3 4. Liability
|
|
||||||
p.
|
|
||||||
This service is provided "as is", and no warranty (express or implied) exists. The service and its developers
|
|
||||||
may not be held liable for any damages that may arise through the use of this service.
|
|
||||||
h3 5. Updates to Terms
|
|
||||||
p.
|
|
||||||
These terms and conditions may be updated at any time, and this service does not have the capability to notify
|
|
||||||
users when these change. The date at the top of the page will be updated when any of the text of these terms is
|
|
||||||
updated.
|
|
||||||
hr
|
|
||||||
p.
|
|
||||||
You may also wish to review our #[router-link(:to="{ name: 'PrivacyPolicy' }") privacy policy] to learn how we
|
|
||||||
handle your data.
|
|
||||||
</template>
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content
|
|
||||||
page-title(title='Active Requests'
|
|
||||||
hide-on-page=true)
|
|
||||||
template(v-if='loaded')
|
|
||||||
md-empty-state(v-if='requests.length === 0'
|
|
||||||
md-icon='sentiment_dissatisfied'
|
|
||||||
md-label='No Active Requests'
|
|
||||||
md-description='Your prayer journal has no active requests')
|
|
||||||
md-button(to='/journal').md-primary.md-raised Return to your journal
|
|
||||||
request-list(v-if='requests.length !== 0'
|
|
||||||
title='Active Requests'
|
|
||||||
:requests='requests')
|
|
||||||
p(v-else) Loading journal...
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import { mapState } from 'vuex'
|
|
||||||
|
|
||||||
import RequestList from '@/components/request/RequestList'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'active-requests',
|
|
||||||
inject: ['progress'],
|
|
||||||
components: {
|
|
||||||
RequestList
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
requests: [],
|
|
||||||
loaded: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
...mapState(['journal', 'isLoadingJournal'])
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
this.$on('requestUnsnoozed', this.ensureJournal)
|
|
||||||
this.$on('requestNowShown', this.ensureJournal)
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
async ensureJournal () {
|
|
||||||
if (!Array.isArray(this.journal)) {
|
|
||||||
this.loaded = false
|
|
||||||
await this.$store.dispatch(actions.LOAD_JOURNAL, this.progress)
|
|
||||||
}
|
|
||||||
this.requests = this.journal
|
|
||||||
.sort((a, b) => a.showAfter - b.showAfter)
|
|
||||||
this.loaded = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async mounted () {
|
|
||||||
await this.ensureJournal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content
|
|
||||||
page-title(title='Answered Requests'
|
|
||||||
hide-on-page=true)
|
|
||||||
template(v-if='loaded')
|
|
||||||
md-empty-state(v-if='requests.length === 0'
|
|
||||||
md-icon='sentiment_dissatisfied'
|
|
||||||
md-label='No Answered Requests'
|
|
||||||
md-description='Your prayer journal has no answered requests; once you have marked one as “Answered”, it will appear here')
|
|
||||||
request-list(v-if='requests.length !== 0'
|
|
||||||
title='Answered Requests'
|
|
||||||
:requests='requests')
|
|
||||||
p(v-else) Loading answered requests...
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import api from '@/api'
|
|
||||||
|
|
||||||
import RequestList from '@/components/request/RequestList'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'answered-requests',
|
|
||||||
inject: [
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
components: {
|
|
||||||
RequestList
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
requests: [],
|
|
||||||
loaded: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async mounted () {
|
|
||||||
this.progress.$emit('show', 'query')
|
|
||||||
try {
|
|
||||||
const reqs = await api.getAnsweredRequests()
|
|
||||||
this.requests = reqs.data
|
|
||||||
this.progress.$emit('done')
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
this.messages.$emit('error', 'Error loading requests; check console for details')
|
|
||||||
this.progress.$emit('done')
|
|
||||||
} finally {
|
|
||||||
this.loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,174 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-narrow
|
|
||||||
page-title(:title='title')
|
|
||||||
md-field
|
|
||||||
label(for='request_text') Prayer Request
|
|
||||||
md-textarea(v-model='form.requestText'
|
|
||||||
@blur='trimText()'
|
|
||||||
md-autogrow
|
|
||||||
autofocus).mpj-full-width
|
|
||||||
br
|
|
||||||
template(v-if='!isNew')
|
|
||||||
label Also Mark As
|
|
||||||
br
|
|
||||||
md-radio(v-model='form.status'
|
|
||||||
value='Updated') Updated
|
|
||||||
md-radio(v-model='form.status'
|
|
||||||
value='Prayed') Prayed
|
|
||||||
md-radio(v-model='form.status'
|
|
||||||
value='Answered') Answered
|
|
||||||
br
|
|
||||||
label Recurrence
|
|
||||||
|
|
|
||||||
em.mpj-muted-text After prayer, request reappears...
|
|
||||||
br
|
|
||||||
.md-layout
|
|
||||||
.md-layout-item.md-size-30
|
|
||||||
md-radio(v-model='form.recur.typ'
|
|
||||||
value='Immediate') Immediately
|
|
||||||
.md-layout-item.md-size-20
|
|
||||||
md-radio(v-model='form.recur.typ'
|
|
||||||
value='other') Every...
|
|
||||||
.md-layout-item.md-size-10
|
|
||||||
md-field(md-inline)
|
|
||||||
label Count
|
|
||||||
md-input(v-model='form.recur.count'
|
|
||||||
type='number'
|
|
||||||
:disabled='!showRecurrence')
|
|
||||||
.md-layout-item.md-size-20
|
|
||||||
md-field
|
|
||||||
label Interval
|
|
||||||
md-select(v-model='form.recur.other'
|
|
||||||
:disabled='!showRecurrence')
|
|
||||||
md-option(value='Hours') hours
|
|
||||||
md-option(value='Days') days
|
|
||||||
md-option(value='Weeks') weeks
|
|
||||||
.mpj-text-right
|
|
||||||
md-button(:disabled='!isValidRecurrence'
|
|
||||||
@click.stop='saveRequest()').md-primary.md-raised #[md-icon save] Save
|
|
||||||
md-button(@click.stop='goBack()').md-raised #[md-icon arrow_back] Cancel
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import { mapState } from 'vuex'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'edit-request',
|
|
||||||
inject: [
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
props: {
|
|
||||||
id: {
|
|
||||||
type: String,
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
title: 'Edit Prayer Request',
|
|
||||||
isNew: false,
|
|
||||||
form: {
|
|
||||||
requestId: '',
|
|
||||||
requestText: '',
|
|
||||||
status: 'Updated',
|
|
||||||
recur: {
|
|
||||||
typ: 'Immediate',
|
|
||||||
other: '',
|
|
||||||
count: ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
isValidRecurrence () {
|
|
||||||
if (this.form.recur.typ === 'Immediate') return true
|
|
||||||
const count = Number.parseInt(this.form.recur.count)
|
|
||||||
if (isNaN(count) || this.form.recur.other === '') return false
|
|
||||||
if (this.form.recur.other === 'Hours' && count > (365 * 24)) return false
|
|
||||||
if (this.form.recur.other === 'Days' && count > 365) return false
|
|
||||||
if (this.form.recur.other === 'Weeks' && count > 52) return false
|
|
||||||
return true
|
|
||||||
},
|
|
||||||
showRecurrence () {
|
|
||||||
return this.form.recur.typ !== 'Immediate'
|
|
||||||
},
|
|
||||||
...mapState(['journal'])
|
|
||||||
},
|
|
||||||
async mounted () {
|
|
||||||
await this.ensureJournal()
|
|
||||||
if (this.id === 'new') {
|
|
||||||
this.title = 'Add Prayer Request'
|
|
||||||
this.isNew = true
|
|
||||||
this.form.requestId = ''
|
|
||||||
this.form.requestText = ''
|
|
||||||
this.form.status = 'Created'
|
|
||||||
this.form.recur.typ = 'Immediate'
|
|
||||||
this.form.recur.other = ''
|
|
||||||
this.form.recur.count = ''
|
|
||||||
} else {
|
|
||||||
this.title = 'Edit Prayer Request'
|
|
||||||
this.isNew = false
|
|
||||||
if (this.journal.length === 0) {
|
|
||||||
await this.$store.dispatch(actions.LOAD_JOURNAL, this.progress)
|
|
||||||
}
|
|
||||||
const req = this.journal.filter(r => r.requestId === this.id)[0]
|
|
||||||
this.form.requestId = this.id
|
|
||||||
this.form.requestText = req.text
|
|
||||||
this.form.status = 'Updated'
|
|
||||||
if (req.recurType === 'Immediate') {
|
|
||||||
this.form.recur.typ = 'Immediate'
|
|
||||||
this.form.recur.other = ''
|
|
||||||
this.form.recur.count = ''
|
|
||||||
} else {
|
|
||||||
this.form.recur.typ = 'other'
|
|
||||||
this.form.recur.other = req.recurType
|
|
||||||
this.form.recur.count = req.recurCount
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
goBack () {
|
|
||||||
this.$router.go(-1)
|
|
||||||
},
|
|
||||||
trimText () {
|
|
||||||
this.form.requestText = this.form.requestText.trim()
|
|
||||||
},
|
|
||||||
async ensureJournal () {
|
|
||||||
if (!Array.isArray(this.journal)) {
|
|
||||||
await this.$store.dispatch(actions.LOAD_JOURNAL, this.progress)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async saveRequest () {
|
|
||||||
if (this.isNew) {
|
|
||||||
await this.$store.dispatch(actions.ADD_REQUEST, {
|
|
||||||
progress: this.progress,
|
|
||||||
requestText: this.form.requestText,
|
|
||||||
recurType: this.form.recur.typ === 'Immediate' ? 'Immediate' : this.form.recur.other,
|
|
||||||
recurCount: this.form.recur.typ === 'Immediate' ? 0 : Number.parseInt(this.form.recur.count)
|
|
||||||
})
|
|
||||||
this.messages.$emit('info', 'New prayer request added')
|
|
||||||
} else {
|
|
||||||
await this.$store.dispatch(actions.UPDATE_REQUEST, {
|
|
||||||
progress: this.progress,
|
|
||||||
requestId: this.form.requestId,
|
|
||||||
updateText: this.form.requestText,
|
|
||||||
status: this.form.status,
|
|
||||||
recurType: this.form.recur.typ === 'Immediate' ? 'Immediate' : this.form.recur.other,
|
|
||||||
recurCount: this.form.recur.typ === 'Immediate' ? 0 : Number.parseInt(this.form.recur.count)
|
|
||||||
})
|
|
||||||
if (this.form.status === 'Answered') {
|
|
||||||
this.messages.$emit('info', 'Request updated and removed from active journal')
|
|
||||||
} else {
|
|
||||||
this.messages.$emit('info', 'Request updated')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.goBack()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-content(role='main').mpj-main-content
|
|
||||||
page-title(title='Full Prayer Request'
|
|
||||||
hide-on-page=true)
|
|
||||||
md-card(v-if='request')
|
|
||||||
md-card-header
|
|
||||||
.md-title Full Prayer Request
|
|
||||||
.md-subhead
|
|
||||||
span(v-if='isAnswered') Answered {{ formatDate(answered) }} (#[date-from-now(:value='answered')]) !{' • '}
|
|
||||||
| Prayed {{ prayedCount }} times • Open {{ openDays }} days
|
|
||||||
md-card-content.mpj-full-page-card
|
|
||||||
p.mpj-request-text {{ lastText }}
|
|
||||||
md-table
|
|
||||||
md-table-row
|
|
||||||
md-table-head Action
|
|
||||||
md-table-head Update / Notes
|
|
||||||
md-table-row(v-for='item in log'
|
|
||||||
:key='item.asOf')
|
|
||||||
md-table-cell.mpj-valign-top {{ item.status }} on #[span.mpj-text-nowrap {{ formatDate(item.asOf) }}]
|
|
||||||
md-table-cell(v-if='item.text').mpj-request-text.mpj-valign-top {{ item.text }}
|
|
||||||
md-table-cell(v-else)
|
|
||||||
p(v-else) Loading request...
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import moment from 'moment'
|
|
||||||
|
|
||||||
import api from '@/api'
|
|
||||||
|
|
||||||
const asOfDesc = (a, b) => b.asOf - a.asOf
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'full-request',
|
|
||||||
inject: ['progress'],
|
|
||||||
props: {
|
|
||||||
id: {
|
|
||||||
type: String,
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
request: null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
answered () {
|
|
||||||
return this.request.history.find(hist => hist.status === 'Answered').asOf
|
|
||||||
},
|
|
||||||
isAnswered () {
|
|
||||||
return this.request.history.filter(hist => hist.status === 'Answered').length > 0
|
|
||||||
},
|
|
||||||
lastText () {
|
|
||||||
return this.request.history
|
|
||||||
.filter(hist => hist.text)
|
|
||||||
.sort(asOfDesc)[0].text
|
|
||||||
},
|
|
||||||
log () {
|
|
||||||
const allHistory = (this.request.notes || [])
|
|
||||||
.map(note => ({ asOf: note.asOf, text: note.notes, status: 'Notes' }))
|
|
||||||
.concat(this.request.history)
|
|
||||||
.sort(asOfDesc)
|
|
||||||
// Skip the first entry for answered requests; that info is already displayed
|
|
||||||
return this.isAnswered ? allHistory.slice(1) : allHistory
|
|
||||||
},
|
|
||||||
openDays () {
|
|
||||||
const asOf = this.isAnswered ? this.answered : Date.now()
|
|
||||||
return Math.floor(
|
|
||||||
(asOf - this.request.history.find(hist => hist.status === 'Created').asOf) / 1000 / 60 / 60 / 24)
|
|
||||||
},
|
|
||||||
prayedCount () {
|
|
||||||
return this.request.history.filter(hist => hist.status === 'Prayed').length
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async mounted () {
|
|
||||||
this.progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
const req = await api.getFullRequest(this.id)
|
|
||||||
this.request = req.data
|
|
||||||
this.progress.$emit('done')
|
|
||||||
} catch (e) {
|
|
||||||
console.log(e)
|
|
||||||
this.progress.$emit('done')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
formatDate (asOf) {
|
|
||||||
return moment(asOf).format('LL')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-dialog(:md-active.sync='notesVisible').mpj-note-dialog
|
|
||||||
md-dialog-title Add Notes to Prayer Request
|
|
||||||
md-content.mpj-dialog-content
|
|
||||||
md-field
|
|
||||||
label Notes
|
|
||||||
md-textarea(v-model='form.notes'
|
|
||||||
md-autogrow
|
|
||||||
@blur='trimText()')
|
|
||||||
md-dialog-actions
|
|
||||||
md-button(@click='saveNotes()').md-primary #[md-icon save] Save
|
|
||||||
md-button(@click='closeDialog()') #[md-icon undo] Cancel
|
|
||||||
.mpj-dialog-content
|
|
||||||
div(v-if='hasPriorNotes')
|
|
||||||
p.mpj-text-center: strong Prior Notes for This Request
|
|
||||||
.mpj-note-list
|
|
||||||
p(v-for='note in priorNotes'
|
|
||||||
:key='note.asOf')
|
|
||||||
small.mpj-muted-text: date-from-now(:value='note.asOf')
|
|
||||||
br
|
|
||||||
span.mpj-request-text {{ note.notes }}
|
|
||||||
div(v-else-if='noPriorNotes').mpj-text-center.mpj-muted-text There are no prior notes for this request
|
|
||||||
div(v-else).mpj-text-center
|
|
||||||
hr
|
|
||||||
md-button(@click='loadNotes()') #[md-icon cloud_download] Load Prior Notes
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import api from '@/api'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'notes-edit',
|
|
||||||
inject: [
|
|
||||||
'journalEvents',
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
notesVisible: false,
|
|
||||||
form: {
|
|
||||||
requestId: '',
|
|
||||||
notes: ''
|
|
||||||
},
|
|
||||||
priorNotes: [],
|
|
||||||
priorNotesLoaded: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
hasPriorNotes () {
|
|
||||||
return this.priorNotesLoaded && this.priorNotes.length > 0
|
|
||||||
},
|
|
||||||
noPriorNotes () {
|
|
||||||
return this.priorNotesLoaded && this.priorNotes.length === 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
this.journalEvents.$on('notes', this.openDialog)
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
closeDialog () {
|
|
||||||
this.form.requestId = ''
|
|
||||||
this.form.notes = ''
|
|
||||||
this.priorNotes = []
|
|
||||||
this.priorNotesLoaded = false
|
|
||||||
this.notesVisible = false
|
|
||||||
},
|
|
||||||
async loadNotes () {
|
|
||||||
this.progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
const notes = await api.getNotes(this.form.requestId)
|
|
||||||
this.priorNotes = notes.data
|
|
||||||
this.progress.$emit('done')
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e)
|
|
||||||
this.progress.$emit('done')
|
|
||||||
} finally {
|
|
||||||
this.priorNotesLoaded = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
openDialog (request) {
|
|
||||||
this.form.requestId = request.requestId
|
|
||||||
this.notesVisible = true
|
|
||||||
},
|
|
||||||
async saveNotes () {
|
|
||||||
this.progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
await api.addNote(this.form.requestId, this.form.notes)
|
|
||||||
this.progress.$emit('done')
|
|
||||||
this.messages.$emit('info', 'Added notes')
|
|
||||||
this.closeDialog()
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e)
|
|
||||||
this.progress.$emit('done')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
trimText () {
|
|
||||||
this.form.notes = this.form.notes.trim()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="sass">
|
|
||||||
.mpj-note-dialog
|
|
||||||
width: 40rem
|
|
||||||
padding-bottom: 1.5rem
|
|
||||||
@media screen and (max-width: 40rem)
|
|
||||||
@media screen and (max-width: 20rem)
|
|
||||||
.mpj-note-dialog
|
|
||||||
width: 100%
|
|
||||||
.mpj-note-dialog
|
|
||||||
width: 20rem
|
|
||||||
.mpj-note-list p
|
|
||||||
border-top: dotted 1px lightgray
|
|
||||||
</style>
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-card(v-if='shouldDisplay'
|
|
||||||
md-with-hover).mpj-request-card
|
|
||||||
md-card-actions(md-alignment='space-between')
|
|
||||||
md-button(@click='markPrayed()').md-icon-button.md-raised.md-primary
|
|
||||||
md-icon done
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=1000) Mark as Prayed
|
|
||||||
span
|
|
||||||
md-button(@click.stop='showEdit()').md-icon-button.md-raised
|
|
||||||
md-icon edit
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=1000) Edit Request
|
|
||||||
md-button(@click.stop='showNotes()').md-icon-button.md-raised
|
|
||||||
md-icon comment
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=1000) Add Notes
|
|
||||||
md-button(@click.stop='snooze()').md-icon-button.md-raised
|
|
||||||
md-icon schedule
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=1000) Snooze Request
|
|
||||||
md-card-content
|
|
||||||
p.mpj-request-text {{ request.text }}
|
|
||||||
p.mpj-text-right: small.mpj-muted-text: em (last activity #[date-from-now(:value='request.asOf')])
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'request-card',
|
|
||||||
inject: [
|
|
||||||
'journalEvents',
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
props: {
|
|
||||||
request: { required: true }
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
shouldDisplay () {
|
|
||||||
const now = Date.now()
|
|
||||||
return Math.max(now, this.request.showAfter, this.request.snoozedUntil) === now
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
async markPrayed () {
|
|
||||||
await this.$store.dispatch(actions.UPDATE_REQUEST, {
|
|
||||||
progress: this.progress,
|
|
||||||
requestId: this.request.requestId,
|
|
||||||
status: 'Prayed',
|
|
||||||
updateText: ''
|
|
||||||
})
|
|
||||||
this.messages.$emit('info', 'Request marked as prayed')
|
|
||||||
},
|
|
||||||
showEdit () {
|
|
||||||
this.$router.push({ name: 'EditRequest', params: { id: this.request.requestId } })
|
|
||||||
},
|
|
||||||
showNotes () {
|
|
||||||
this.journalEvents.$emit('notes', this.request)
|
|
||||||
},
|
|
||||||
snooze () {
|
|
||||||
this.journalEvents.$emit('snooze', this.request.requestId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="sass">
|
|
||||||
.mpj-request-card
|
|
||||||
width: 20rem
|
|
||||||
margin-bottom: 1rem
|
|
||||||
@media screen and (max-width: 20rem)
|
|
||||||
.mpj-request-card
|
|
||||||
width: 100%
|
|
||||||
</style>
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-table(md-card)
|
|
||||||
md-table-toolbar
|
|
||||||
h1.md-title {{ title }}
|
|
||||||
md-table-row
|
|
||||||
md-table-head Actions
|
|
||||||
md-table-head Request
|
|
||||||
request-list-item(v-for='req in requests'
|
|
||||||
:key='req.requestId'
|
|
||||||
:request='req')
|
|
||||||
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import RequestListItem from '@/components/request/RequestListItem'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'request-list',
|
|
||||||
components: { RequestListItem },
|
|
||||||
props: {
|
|
||||||
title: {
|
|
||||||
type: String,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
requests: {
|
|
||||||
type: Array,
|
|
||||||
required: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return { }
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
this.$on('requestUnsnoozed', this.$parent.$emit('requestUnsnoozed'))
|
|
||||||
this.$on('requestNowShown', this.$parent.$emit('requestNowShown'))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-table-row
|
|
||||||
md-table-cell.mpj-action-cell.mpj-valign-top
|
|
||||||
md-button(@click='viewFull').md-icon-button.md-raised
|
|
||||||
md-icon description
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=250) View Full Request
|
|
||||||
template(v-if='!isAnswered')
|
|
||||||
md-button(@click='editRequest').md-icon-button.md-raised
|
|
||||||
md-icon edit
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=250) Edit Request
|
|
||||||
template(v-if='isSnoozed')
|
|
||||||
md-button(@click='cancelSnooze()').md-icon-button.md-raised
|
|
||||||
md-icon restore
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=250) Cancel Snooze
|
|
||||||
template(v-if='isPending')
|
|
||||||
md-button(@click='showNow()').md-icon-button.md-raised
|
|
||||||
md-icon restore
|
|
||||||
md-tooltip(md-direction='top'
|
|
||||||
md-delay=250) Show Now
|
|
||||||
md-table-cell.mpj-valign-top
|
|
||||||
p.mpj-request-text {{ request.text }}
|
|
||||||
br(v-if='isSnoozed || isPending || isAnswered')
|
|
||||||
small(v-if='isSnoozed').mpj-muted-text: em Snooze expires #[date-from-now(:value='request.snoozedUntil')]
|
|
||||||
small(v-if='isPending').mpj-muted-text: em Request appears next #[date-from-now(:value='request.showAfter')]
|
|
||||||
small(v-if='isAnswered').mpj-muted-text: em Answered #[date-from-now(:value='request.asOf')]
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'request-list-item',
|
|
||||||
inject: [
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
props: {
|
|
||||||
request: { required: true }
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
answered () {
|
|
||||||
return this.request.history.find(hist => hist.status === 'Answered').asOf
|
|
||||||
},
|
|
||||||
isAnswered () {
|
|
||||||
return this.request.lastStatus === 'Answered'
|
|
||||||
},
|
|
||||||
isPending () {
|
|
||||||
return !this.isSnoozed && this.request.showAfter > Date.now()
|
|
||||||
},
|
|
||||||
isSnoozed () {
|
|
||||||
return this.request.snoozedUntil > Date.now()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
async cancelSnooze () {
|
|
||||||
await this.$store.dispatch(actions.SNOOZE_REQUEST, {
|
|
||||||
progress: this.progress,
|
|
||||||
requestId: this.request.requestId,
|
|
||||||
until: 0
|
|
||||||
})
|
|
||||||
this.messages.$emit('info', 'Request un-snoozed')
|
|
||||||
this.$parent.$emit('requestUnsnoozed')
|
|
||||||
},
|
|
||||||
editRequest () {
|
|
||||||
this.$router.push({ name: 'EditRequest', params: { id: this.request.requestId } })
|
|
||||||
},
|
|
||||||
async showNow () {
|
|
||||||
await this.$store.dispatch(actions.SHOW_REQUEST_NOW, {
|
|
||||||
progress: this.progress,
|
|
||||||
requestId: this.request.requestId,
|
|
||||||
showAfter: 0
|
|
||||||
})
|
|
||||||
this.messages.$emit('info', 'Recurrence skipped; request now shows in journal')
|
|
||||||
this.$parent.$emit('requestNowShown')
|
|
||||||
},
|
|
||||||
viewFull () {
|
|
||||||
this.$router.push({ name: 'FullRequest', params: { id: this.request.requestId } })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="sass">
|
|
||||||
.mpj-action-cell
|
|
||||||
width: 1%
|
|
||||||
white-space: nowrap
|
|
||||||
</style>
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
md-dialog(:md-active.sync='snoozeVisible').mpj-skinny
|
|
||||||
md-dialog-title Snooze Prayer Request
|
|
||||||
md-content.mpj-dialog-content
|
|
||||||
span.mpj-text-muted Until
|
|
||||||
md-datepicker(v-model='form.snoozedUntil'
|
|
||||||
:md-disabled-dates='datesInPast'
|
|
||||||
md-immediately)
|
|
||||||
md-dialog-actions
|
|
||||||
md-button(:disabled='!isValid'
|
|
||||||
@click='snoozeRequest()').md-primary #[md-icon snooze] Snooze
|
|
||||||
md-button(@click='closeDialog()') #[md-icon undo] Cancel
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'snooze-request',
|
|
||||||
inject: [
|
|
||||||
'journalEvents',
|
|
||||||
'messages',
|
|
||||||
'progress'
|
|
||||||
],
|
|
||||||
props: {
|
|
||||||
events: { required: true }
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
snoozeVisible: false,
|
|
||||||
datesInPast: date => date < new Date(),
|
|
||||||
form: {
|
|
||||||
requestId: '',
|
|
||||||
snoozedUntil: ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
this.journalEvents.$on('snooze', this.openDialog)
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
isValid () {
|
|
||||||
return !isNaN(Date.parse(this.form.snoozedUntil))
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
closeDialog () {
|
|
||||||
this.form.requestId = ''
|
|
||||||
this.form.snoozedUntil = ''
|
|
||||||
this.snoozeVisible = false
|
|
||||||
},
|
|
||||||
openDialog (requestId) {
|
|
||||||
this.form.requestId = requestId
|
|
||||||
this.snoozeVisible = true
|
|
||||||
},
|
|
||||||
async snoozeRequest () {
|
|
||||||
await this.$store.dispatch(actions.SNOOZE_REQUEST, {
|
|
||||||
progress: this.progress,
|
|
||||||
requestId: this.form.requestId,
|
|
||||||
until: Date.parse(this.form.snoozedUntil)
|
|
||||||
})
|
|
||||||
this.messages.$emit('info', `Request snoozed until ${this.form.snoozedUntil}`)
|
|
||||||
this.closeDialog()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
article.mpj-main-content(role='main')
|
|
||||||
page-title(title='Snoozed Requests'
|
|
||||||
hide-on-page=true)
|
|
||||||
template(v-if='loaded')
|
|
||||||
md-empty-state(v-if='requests.length === 0'
|
|
||||||
md-icon='sentiment_dissatisfied'
|
|
||||||
md-label='No Snoozed Requests'
|
|
||||||
md-description='Your prayer journal has no snoozed requests')
|
|
||||||
md-button(to='/journal').md-primary.md-raised Return to your journal
|
|
||||||
request-list(v-if='requests.length !== 0'
|
|
||||||
title='Snoozed Requests'
|
|
||||||
:requests='requests')
|
|
||||||
p(v-else) Loading journal...
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
import { mapState } from 'vuex'
|
|
||||||
|
|
||||||
import actions from '@/store/action-types'
|
|
||||||
|
|
||||||
import RequestList from '@/components/request/RequestList'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'snoozed-requests',
|
|
||||||
inject: ['progress'],
|
|
||||||
components: {
|
|
||||||
RequestList
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
requests: [],
|
|
||||||
loaded: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
...mapState(['journal', 'isLoadingJournal'])
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
this.$on('requestUnsnoozed', this.ensureJournal)
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
async ensureJournal () {
|
|
||||||
if (!Array.isArray(this.journal)) {
|
|
||||||
this.loaded = false
|
|
||||||
await this.$store.dispatch(actions.LOAD_JOURNAL, this.progress)
|
|
||||||
}
|
|
||||||
this.requests = this.journal
|
|
||||||
.filter(req => req.snoozedUntil > Date.now())
|
|
||||||
.sort((a, b) => a.snoozedUntil - b.snoozedUntil)
|
|
||||||
this.loaded = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async mounted () {
|
|
||||||
await this.ensureJournal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<template lang="pug">
|
|
||||||
article.mpj-main-content(role='main')
|
|
||||||
pageTitle(title='Logging On')
|
|
||||||
p Logging you on...
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'log-on',
|
|
||||||
inject: ['progress'],
|
|
||||||
async created () {
|
|
||||||
this.progress.$emit('show', 'indeterminate')
|
|
||||||
await this.$auth.handleAuthentication(this.$store)
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
handleLoginEvent (data) {
|
|
||||||
this.$router.push(data.state.target || '/journal')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
/* eslint-disable */
|
|
||||||
|
|
||||||
// Vue packages and components
|
|
||||||
import Vue from 'vue'
|
|
||||||
import { MdApp,
|
|
||||||
MdButton,
|
|
||||||
MdCard,
|
|
||||||
MdContent,
|
|
||||||
MdDatepicker,
|
|
||||||
MdDialog,
|
|
||||||
MdEmptyState,
|
|
||||||
MdField,
|
|
||||||
MdIcon,
|
|
||||||
MdLayout,
|
|
||||||
MdProgress,
|
|
||||||
MdRadio,
|
|
||||||
MdSnackbar,
|
|
||||||
MdTable,
|
|
||||||
MdTabs,
|
|
||||||
MdToolbar,
|
|
||||||
MdTooltip } from 'vue-material/dist/components'
|
|
||||||
|
|
||||||
// myPrayerJournal components
|
|
||||||
import App from './App'
|
|
||||||
import router from './router'
|
|
||||||
import store from './store'
|
|
||||||
import DateFromNow from './components/common/DateFromNow'
|
|
||||||
import PageTitle from './components/common/PageTitle'
|
|
||||||
import AuthPlugin from './plugins/auth'
|
|
||||||
|
|
||||||
/* eslint-enable */
|
|
||||||
|
|
||||||
// Styles
|
|
||||||
import 'vue-material/dist/vue-material.min.css'
|
|
||||||
import 'vue-material/dist/theme/default.css'
|
|
||||||
|
|
||||||
Vue.config.productionTip = false
|
|
||||||
|
|
||||||
Vue.use(MdApp)
|
|
||||||
Vue.use(MdButton)
|
|
||||||
Vue.use(MdCard)
|
|
||||||
Vue.use(MdContent)
|
|
||||||
Vue.use(MdDatepicker)
|
|
||||||
Vue.use(MdDialog)
|
|
||||||
Vue.use(MdEmptyState)
|
|
||||||
Vue.use(MdField)
|
|
||||||
Vue.use(MdIcon)
|
|
||||||
Vue.use(MdLayout)
|
|
||||||
Vue.use(MdProgress)
|
|
||||||
Vue.use(MdRadio)
|
|
||||||
Vue.use(MdSnackbar)
|
|
||||||
Vue.use(MdTable)
|
|
||||||
Vue.use(MdTabs)
|
|
||||||
Vue.use(MdToolbar)
|
|
||||||
Vue.use(MdTooltip)
|
|
||||||
Vue.use(AuthPlugin)
|
|
||||||
Vue.component('date-from-now', DateFromNow)
|
|
||||||
Vue.component('page-title', PageTitle)
|
|
||||||
|
|
||||||
new Vue({
|
|
||||||
router,
|
|
||||||
store,
|
|
||||||
render: h => h(App)
|
|
||||||
}).$mount('#app')
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
import authService from '../auth/AuthService'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
install (Vue) {
|
|
||||||
Vue.prototype.$auth = authService
|
|
||||||
|
|
||||||
Vue.mixin({
|
|
||||||
created () {
|
|
||||||
if (this.handleLoginEvent) {
|
|
||||||
authService.addListener('loginEvent', this.handleLoginEvent)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
destroyed () {
|
|
||||||
if (this.handleLoginEvent) {
|
|
||||||
authService.removeListener('loginEvent', this.handleLoginEvent)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
/* eslint-disable */
|
|
||||||
import Vue from 'vue'
|
|
||||||
import Router from 'vue-router'
|
|
||||||
|
|
||||||
import auth from './auth/AuthService'
|
|
||||||
import Home from '@/components/Home'
|
|
||||||
/* eslint-enable */
|
|
||||||
|
|
||||||
Vue.use(Router)
|
|
||||||
|
|
||||||
export default new Router({
|
|
||||||
mode: 'history',
|
|
||||||
base: process.env.BASE_URL,
|
|
||||||
scrollBehavior (to, from, savedPosition) {
|
|
||||||
if (savedPosition) {
|
|
||||||
return savedPosition
|
|
||||||
} else {
|
|
||||||
return { x: 0, y: 0 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
beforeEach (to, from, next) {
|
|
||||||
if (to.path === '/' || to.path === '/user/log-on' || auth.isAuthenticated()) {
|
|
||||||
return next()
|
|
||||||
}
|
|
||||||
auth.login({ target: to.path })
|
|
||||||
},
|
|
||||||
routes: [
|
|
||||||
{
|
|
||||||
path: '/',
|
|
||||||
name: 'Home',
|
|
||||||
component: Home
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/journal',
|
|
||||||
name: 'Journal',
|
|
||||||
component: () => import('@/components/Journal')
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/legal/privacy-policy',
|
|
||||||
name: 'PrivacyPolicy',
|
|
||||||
component: () => import('@/components/legal/PrivacyPolicy')
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/legal/terms-of-service',
|
|
||||||
name: 'TermsOfService',
|
|
||||||
component: () => import('@/components/legal/TermsOfService')
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/request/:id/edit',
|
|
||||||
name: 'EditRequest',
|
|
||||||
component: () => import('@/components/request/EditRequest'),
|
|
||||||
props: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/request/:id/full',
|
|
||||||
name: 'FullRequest',
|
|
||||||
component: () => import('@/components/request/FullRequest'),
|
|
||||||
props: true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/requests/active',
|
|
||||||
name: 'ActiveRequests',
|
|
||||||
component: () => import('@/components/request/ActiveRequests')
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/requests/answered',
|
|
||||||
name: 'AnsweredRequests',
|
|
||||||
component: () => import('@/components/request/AnsweredRequests')
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/requests/snoozed',
|
|
||||||
name: 'SnoozedRequests',
|
|
||||||
component: () => import('@/components/request/SnoozedRequests')
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/user/log-on',
|
|
||||||
name: 'LogOn',
|
|
||||||
component: () => import('@/components/user/LogOn')
|
|
||||||
}
|
|
||||||
]
|
|
||||||
})
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
/** Action to add a prayer request (pass request text) */
|
|
||||||
ADD_REQUEST: 'add-request',
|
|
||||||
/** Action to check if a user is authenticated, refreshing the session first if it exists */
|
|
||||||
CHECK_AUTHENTICATION: 'check-authentication',
|
|
||||||
/** Action to load the user's prayer journal */
|
|
||||||
LOAD_JOURNAL: 'load-journal',
|
|
||||||
/** Action to update a request */
|
|
||||||
UPDATE_REQUEST: 'update-request',
|
|
||||||
/** Action to skip the remaining recurrence period */
|
|
||||||
SHOW_REQUEST_NOW: 'show-request-now',
|
|
||||||
/** Action to snooze a request */
|
|
||||||
SNOOZE_REQUEST: 'snooze-request'
|
|
||||||
}
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
/* eslint-disable no-multi-spaces */
|
|
||||||
import Vue from 'vue'
|
|
||||||
import Vuex from 'vuex'
|
|
||||||
|
|
||||||
import api from '@/api'
|
|
||||||
import auth from '@/auth/AuthService'
|
|
||||||
|
|
||||||
import mutations from './mutation-types'
|
|
||||||
import actions from './action-types'
|
|
||||||
/* eslint-enable no-multi-spaces */
|
|
||||||
|
|
||||||
Vue.use(Vuex)
|
|
||||||
|
|
||||||
/* eslint-disable no-console */
|
|
||||||
const logError = function (error) {
|
|
||||||
if (error.response) {
|
|
||||||
// The request was made and the server responded with a status code
|
|
||||||
// that falls out of the range of 2xx
|
|
||||||
console.error(error.response.data)
|
|
||||||
console.error(error.response.status)
|
|
||||||
console.error(error.response.headers)
|
|
||||||
} else if (error.request) {
|
|
||||||
// The request was made but no response was received
|
|
||||||
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
|
|
||||||
// http.ClientRequest in node.js
|
|
||||||
console.error(error.request)
|
|
||||||
} else {
|
|
||||||
// Something happened in setting up the request that triggered an Error
|
|
||||||
console.error('Error', error.message)
|
|
||||||
}
|
|
||||||
console.error(`config: ${error.config}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the "Bearer" authorization header with the current access token
|
|
||||||
*/
|
|
||||||
const setBearer = async function () {
|
|
||||||
try {
|
|
||||||
await auth.getAccessToken()
|
|
||||||
api.setBearer(auth.session.id.token)
|
|
||||||
} catch (err) {
|
|
||||||
if (err === 'Not logged in') {
|
|
||||||
console.warn('API request attempted when user was not logged in')
|
|
||||||
} else {
|
|
||||||
console.error(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* eslint-enable no-console */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the sort value for a prayer request
|
|
||||||
* @param x The prayer request
|
|
||||||
*/
|
|
||||||
const sortValue = x => x.showAfter === 0 ? x.asOf : x.showAfter
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sort journal requests either by asOf or showAfter
|
|
||||||
*/
|
|
||||||
const journalSort = (a, b) => sortValue(a) - sortValue(b)
|
|
||||||
|
|
||||||
export default new Vuex.Store({
|
|
||||||
state: {
|
|
||||||
user: auth.session.profile,
|
|
||||||
isAuthenticated: auth.isAuthenticated(),
|
|
||||||
journal: [],
|
|
||||||
isLoadingJournal: false
|
|
||||||
},
|
|
||||||
mutations: {
|
|
||||||
[mutations.LOADING_JOURNAL] (state, flag) {
|
|
||||||
state.isLoadingJournal = flag
|
|
||||||
},
|
|
||||||
[mutations.LOADED_JOURNAL] (state, journal) {
|
|
||||||
state.journal = journal.sort(journalSort)
|
|
||||||
},
|
|
||||||
[mutations.REQUEST_ADDED] (state, newRequest) {
|
|
||||||
state.journal.push(newRequest)
|
|
||||||
},
|
|
||||||
[mutations.REQUEST_UPDATED] (state, request) {
|
|
||||||
let jrnl = state.journal.filter(it => it.requestId !== request.requestId)
|
|
||||||
if (request.lastStatus !== 'Answered') jrnl.push(request)
|
|
||||||
state.journal = jrnl
|
|
||||||
},
|
|
||||||
[mutations.SET_AUTHENTICATION] (state, value) {
|
|
||||||
state.isAuthenticated = value
|
|
||||||
},
|
|
||||||
[mutations.USER_LOGGED_OFF] (state) {
|
|
||||||
state.user = {}
|
|
||||||
api.removeBearer()
|
|
||||||
state.isAuthenticated = false
|
|
||||||
},
|
|
||||||
[mutations.USER_LOGGED_ON] (state, user) {
|
|
||||||
state.user = user
|
|
||||||
state.isAuthenticated = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
actions: {
|
|
||||||
async [actions.ADD_REQUEST] ({ commit }, { progress, requestText, recurType, recurCount }) {
|
|
||||||
progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
await setBearer()
|
|
||||||
const newRequest = await api.addRequest(requestText, recurType, recurCount)
|
|
||||||
commit(mutations.REQUEST_ADDED, newRequest.data)
|
|
||||||
progress.$emit('done')
|
|
||||||
} catch (err) {
|
|
||||||
logError(err)
|
|
||||||
progress.$emit('done')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async [actions.CHECK_AUTHENTICATION] ({ commit }) {
|
|
||||||
try {
|
|
||||||
await auth.getAccessToken()
|
|
||||||
commit(mutations.SET_AUTHENTICATION, auth.isAuthenticated())
|
|
||||||
} catch (_) {
|
|
||||||
commit(mutations.SET_AUTHENTICATION, false)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async [actions.LOAD_JOURNAL] ({ commit }, progress) {
|
|
||||||
commit(mutations.LOADED_JOURNAL, [])
|
|
||||||
progress.$emit('show', 'query')
|
|
||||||
commit(mutations.LOADING_JOURNAL, true)
|
|
||||||
await setBearer()
|
|
||||||
try {
|
|
||||||
const jrnl = await api.journal()
|
|
||||||
commit(mutations.LOADED_JOURNAL, jrnl.data)
|
|
||||||
progress.$emit('done')
|
|
||||||
} catch (err) {
|
|
||||||
logError(err)
|
|
||||||
progress.$emit('done')
|
|
||||||
} finally {
|
|
||||||
commit(mutations.LOADING_JOURNAL, false)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async [actions.UPDATE_REQUEST] ({ commit, state }, { progress, requestId, status, updateText, recurType, recurCount }) {
|
|
||||||
progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
await setBearer()
|
|
||||||
let oldReq = (state.journal.filter(req => req.requestId === requestId) || [])[0] || {}
|
|
||||||
if (!(status === 'Prayed' && updateText === '')) {
|
|
||||||
if (status !== 'Answered' && (oldReq.recurType !== recurType || oldReq.recurCount !== recurCount)) {
|
|
||||||
await api.updateRecurrence(requestId, recurType, recurCount)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (status !== 'Updated' || oldReq.text !== updateText) {
|
|
||||||
await api.updateRequest(requestId, status, oldReq.text !== updateText ? updateText : '')
|
|
||||||
}
|
|
||||||
const request = await api.getRequest(requestId)
|
|
||||||
commit(mutations.REQUEST_UPDATED, request.data)
|
|
||||||
progress.$emit('done')
|
|
||||||
} catch (err) {
|
|
||||||
logError(err)
|
|
||||||
progress.$emit('done')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async [actions.SHOW_REQUEST_NOW] ({ commit }, { progress, requestId, showAfter }) {
|
|
||||||
progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
await setBearer()
|
|
||||||
await api.showRequest(requestId, showAfter)
|
|
||||||
const request = await api.getRequest(requestId)
|
|
||||||
commit(mutations.REQUEST_UPDATED, request.data)
|
|
||||||
progress.$emit('done')
|
|
||||||
} catch (err) {
|
|
||||||
logError(err)
|
|
||||||
progress.$emit('done')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
async [actions.SNOOZE_REQUEST] ({ commit }, { progress, requestId, until }) {
|
|
||||||
progress.$emit('show', 'indeterminate')
|
|
||||||
try {
|
|
||||||
await setBearer()
|
|
||||||
await api.snoozeRequest(requestId, until)
|
|
||||||
const request = await api.getRequest(requestId)
|
|
||||||
commit(mutations.REQUEST_UPDATED, request.data)
|
|
||||||
progress.$emit('done')
|
|
||||||
} catch (err) {
|
|
||||||
logError(err)
|
|
||||||
progress.$emit('done')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
getters: {},
|
|
||||||
modules: {}
|
|
||||||
})
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
/** Mutation for when the user's prayer journal is being loaded */
|
|
||||||
LOADING_JOURNAL: 'loading-journal',
|
|
||||||
/** Mutation for when the user's prayer journal has been loaded */
|
|
||||||
LOADED_JOURNAL: 'journal-loaded',
|
|
||||||
/** Mutation for adding a new prayer request (pass text) */
|
|
||||||
REQUEST_ADDED: 'request-added',
|
|
||||||
/** Mutation to replace a prayer request at the top of the current journal */
|
|
||||||
REQUEST_UPDATED: 'request-updated',
|
|
||||||
/** Mutation for setting the authentication state */
|
|
||||||
SET_AUTHENTICATION: 'set-authentication',
|
|
||||||
/** Mutation for logging a user off */
|
|
||||||
USER_LOGGED_OFF: 'user-logged-off',
|
|
||||||
/** Mutation for logging a user on (pass user) */
|
|
||||||
USER_LOGGED_ON: 'user-logged-on'
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<script src="https://cdn.auth0.com/js/auth0/8.9/auth0.min.js"></script>
|
|
||||||
<script>
|
|
||||||
var webAuth = new auth0.WebAuth({
|
|
||||||
domain: 'djs-consulting.auth0.com',
|
|
||||||
clientID: 'Of2s0RQCQ3mt3dwIkOBY5h85J9sXbF2n',
|
|
||||||
scope: 'openid profile email',
|
|
||||||
responseType: 'token id_token',
|
|
||||||
redirectUri: location.protocol + '//' + location.host + '/static/silent.html'
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
<script>
|
|
||||||
webAuth.parseHash(window.location.hash, function (err, response) {
|
|
||||||
parent.postMessage(err || response, location.protocol + '//' + location.host);
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body></body>
|
|
||||||
</html>
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
const webpack = require('webpack')
|
|
||||||
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
|
|
||||||
module.exports = {
|
|
||||||
outputDir: '../MyPrayerJournal.Api/wwwroot',
|
|
||||||
configureWebpack: {
|
|
||||||
plugins: [
|
|
||||||
// new BundleAnalyzerPlugin(),
|
|
||||||
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)
|
|
||||||
],
|
|
||||||
optimization: {
|
|
||||||
splitChunks: {
|
|
||||||
chunks: 'all'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
9095
src/app/yarn.lock
9095
src/app/yarn.lock
File diff suppressed because it is too large
Load Diff
27
src/composer.json
Normal file
27
src/composer.json
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"name": "bit-badger/my-prayer-journal",
|
||||||
|
"minimum-stability": "beta",
|
||||||
|
"require": {
|
||||||
|
"php": ">=8.2",
|
||||||
|
"ext-pdo": "*",
|
||||||
|
"ext-sqlite3": "*",
|
||||||
|
"bit-badger/pdo-document": "^1",
|
||||||
|
"guzzlehttp/guzzle": "^7.8",
|
||||||
|
"guzzlehttp/psr7": "^2.6",
|
||||||
|
"http-interop/http-factory-guzzle": "^1.2",
|
||||||
|
"auth0/auth0-php": "^8.11",
|
||||||
|
"vlucas/phpdotenv": "^5.6"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"MyPrayerJournal\\": "lib/",
|
||||||
|
"MyPrayerJournal\\Domain\\": "lib/Domain",
|
||||||
|
"MyPrayerJournal\\UI\\": "lib/UI"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"config": {
|
||||||
|
"allow-plugins": {
|
||||||
|
"php-http/discovery": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2347
src/composer.lock
generated
Normal file
2347
src/composer.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
56
src/convert-from-v3.php
Normal file
56
src/convert-from-v3.php
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{AutoId, Configuration, Custom, Definition, Document, Mode};
|
||||||
|
use BitBadger\PDODocument\Mapper\ArrayMapper;
|
||||||
|
use MyPrayerJournal\Domain\{History, Note, Recurrence, RecurrencePeriod, Request, RequestAction};
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
|
||||||
|
require 'start.php';
|
||||||
|
|
||||||
|
echo 'Retrieving v3 requests...' . PHP_EOL;
|
||||||
|
|
||||||
|
Configuration::resetPDO();
|
||||||
|
Configuration::$pdoDSN = 'pgsql:host=localhost;user=mpj;password=devpassword;dbname=mpj';
|
||||||
|
$reqs = Custom::array('SELECT data FROM mpj.request', [], new ArrayMapper());
|
||||||
|
|
||||||
|
echo 'Found ' . sizeof($reqs) . ' requests; migrating to v4...' . PHP_EOL;
|
||||||
|
|
||||||
|
Configuration::resetPDO();
|
||||||
|
Configuration::$mode = Mode::SQLite;
|
||||||
|
Configuration::$pdoDSN = 'sqlite:./data/mpj.db';
|
||||||
|
Configuration::$autoId = AutoId::RandomString;
|
||||||
|
Configuration::$idStringLength = 12;
|
||||||
|
|
||||||
|
Definition::ensureTable(Table::REQUEST);
|
||||||
|
|
||||||
|
/** Convert dates to the same format */
|
||||||
|
function convertDate(string $date): string
|
||||||
|
{
|
||||||
|
return (new DateTimeImmutable($date))->format('c');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($reqs as $reqJson) {
|
||||||
|
$req = json_decode($reqJson['data']);
|
||||||
|
$recurParts = explode(' ', $req->recurrence);
|
||||||
|
$recurPeriod = RecurrencePeriod::from(end($recurParts));
|
||||||
|
$recur = match ($recurPeriod) {
|
||||||
|
RecurrencePeriod::Immediate => new Recurrence(RecurrencePeriod::Immediate),
|
||||||
|
default => new Recurrence($recurPeriod, (int)$recurParts[0])
|
||||||
|
};
|
||||||
|
Document::insert(Table::REQUEST, new Request(
|
||||||
|
enteredOn: convertDate($req->enteredOn),
|
||||||
|
userId: $req->userId,
|
||||||
|
snoozedUntil: property_exists($req, 'snoozedUntil') ? convertDate($req->snoozedUntil) : null,
|
||||||
|
showAfter: property_exists($req, 'showAfter') ? convertDate($req->showAfter) : null,
|
||||||
|
recurrence: $recur,
|
||||||
|
history: array_map(fn(stdClass $hist) =>
|
||||||
|
new History(
|
||||||
|
asOf: convertDate($hist->asOf),
|
||||||
|
action: RequestAction::from($hist->status),
|
||||||
|
text: property_exists($hist, 'text') ? $hist->text : null),
|
||||||
|
$req->history),
|
||||||
|
notes: array_map(fn(stdClass $note) =>
|
||||||
|
new Note(convertDate($note->asOf), $note->notes), $req->notes ?? [])));
|
||||||
|
}
|
||||||
|
|
||||||
|
echo PHP_EOL . 'done' . PHP_EOL;
|
||||||
88
src/lib/Auth.php
Normal file
88
src/lib/Auth.php
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal;
|
||||||
|
|
||||||
|
use Auth0\SDK\Auth0;
|
||||||
|
use Auth0\SDK\Exception\ConfigurationException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* myPrayerJournal-specific authorization functions
|
||||||
|
*/
|
||||||
|
class Auth
|
||||||
|
{
|
||||||
|
/** @var Auth0|null The Auth0 client to use for requests (initialized on first use) */
|
||||||
|
private static ?Auth0 $auth0 = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current Auth0 client
|
||||||
|
*
|
||||||
|
* @return Auth0 The current Auth0 client
|
||||||
|
*/
|
||||||
|
public static function client(): Auth0
|
||||||
|
{
|
||||||
|
if (is_null(self::$auth0)) {
|
||||||
|
self::$auth0 = new Auth0([
|
||||||
|
'domain' => $_ENV['AUTH0_DOMAIN'],
|
||||||
|
'clientId' => $_ENV['AUTH0_CLIENT_ID'],
|
||||||
|
'clientSecret' => $_ENV['AUTH0_CLIENT_SECRET'],
|
||||||
|
'cookieSecret' => $_ENV['AUTH0_COOKIE_SECRET']
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
return self::$auth0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the logged on user information
|
||||||
|
*
|
||||||
|
* @return array|null The user information (null if no user is logged on)
|
||||||
|
*/
|
||||||
|
public static function user(): ?array
|
||||||
|
{
|
||||||
|
return self::client()->getUser();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initiate a log on with Auth0
|
||||||
|
*
|
||||||
|
* @throws ConfigurationException If the Auth0 client is not configured correctly
|
||||||
|
*/
|
||||||
|
public static function logOn(): never
|
||||||
|
{
|
||||||
|
$params = match (true) {
|
||||||
|
$_SERVER['PHP_SELF'] <> '/user/log-on.php' => ['redirectUri' => $_SERVER['PHP_SELF']],
|
||||||
|
default => []
|
||||||
|
};
|
||||||
|
|
||||||
|
self::client()->clear();
|
||||||
|
header('Location: ' . self::client()->login($_ENV['AUTH0_BASE_URL'] . '/user/log-on/success', $params));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log off from this application and Auth0
|
||||||
|
*
|
||||||
|
* @throws ConfigurationException If the Auth0 client is not configured correctly
|
||||||
|
*/
|
||||||
|
public static function logOff(): never
|
||||||
|
{
|
||||||
|
session_destroy();
|
||||||
|
header('Location: ' . self::client()->logout($_ENV['AUTH0_BASE_URL']));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Require a user be logged on
|
||||||
|
*
|
||||||
|
* @param bool $redirect Whether to redirect to log on if there is not a user logged on
|
||||||
|
* @return void If it returns, there is a user logged on; if not, we will be redirected to log on
|
||||||
|
* @throws ConfigurationException If the Auth0 client is not configured correctly
|
||||||
|
*/
|
||||||
|
public static function requireUser(bool $redirect = true): void
|
||||||
|
{
|
||||||
|
if (is_null(self::user())) {
|
||||||
|
if ($redirect) self::logOn();
|
||||||
|
http_response_code(403);
|
||||||
|
die('Not Authorized');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
25
src/lib/Domain/History.php
Normal file
25
src/lib/Domain/History.php
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\Domain;
|
||||||
|
|
||||||
|
use JsonSerializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A record of an action taken on a request
|
||||||
|
*/
|
||||||
|
class History implements JsonSerializable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param string $asOf The date/time this entry was made
|
||||||
|
* @param RequestAction $action The action taken for this history entry
|
||||||
|
* @param string|null $text The text for this history entry (optional)
|
||||||
|
*/
|
||||||
|
public function __construct(public string $asOf, public RequestAction $action, public ?string $text = null) { }
|
||||||
|
|
||||||
|
public function jsonSerialize(): mixed
|
||||||
|
{
|
||||||
|
$values = ['asOf' => $this->asOf, 'action' => $this->action->value];
|
||||||
|
if (isset($this->text)) $values['text'] = $this->text;
|
||||||
|
return $values;
|
||||||
|
}
|
||||||
|
}
|
||||||
30
src/lib/Domain/Note.php
Normal file
30
src/lib/Domain/Note.php
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\Domain;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\DocumentException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A note entered on a prayer request
|
||||||
|
*/
|
||||||
|
class Note
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param string $asOf The date/time this note was recorded
|
||||||
|
* @param string $text The text of the note
|
||||||
|
*/
|
||||||
|
public function __construct(public string $asOf, public string $text) { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve notes for a given request
|
||||||
|
*
|
||||||
|
* @param string $id The ID of the request for which notes should be retrieved
|
||||||
|
* @return array|Note[] The notes for the request, or an empty array if the request was not found
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function byRequestId(string $id): array
|
||||||
|
{
|
||||||
|
$req = Request::byId($id);
|
||||||
|
return $req->isDefined() ? $req->get()->notes : [];
|
||||||
|
}
|
||||||
|
}
|
||||||
41
src/lib/Domain/Recurrence.php
Normal file
41
src/lib/Domain/Recurrence.php
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\Domain;
|
||||||
|
|
||||||
|
use DateInterval;
|
||||||
|
use JsonSerializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The recurrence for a prayer request
|
||||||
|
*/
|
||||||
|
class Recurrence implements JsonSerializable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param RecurrencePeriod $period The recurrence period
|
||||||
|
* @param int|null $interval How many of the periods will pass before the request is visible again
|
||||||
|
*/
|
||||||
|
public function __construct(public RecurrencePeriod $period, public ?int $interval = null) { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the date/time interval for this recurrence
|
||||||
|
*
|
||||||
|
* @return DateInterval The interval matching the recurrence
|
||||||
|
*/
|
||||||
|
public function interval(): DateInterval
|
||||||
|
{
|
||||||
|
$period = match ($this->period) {
|
||||||
|
RecurrencePeriod::Immediate => 'T0S',
|
||||||
|
RecurrencePeriod::Hours => "T{$this->interval}H",
|
||||||
|
RecurrencePeriod::Days => "{$this->interval}D",
|
||||||
|
RecurrencePeriod::Weeks => ($this->interval * 7) . 'D'
|
||||||
|
};
|
||||||
|
return new DateInterval("P$period");
|
||||||
|
}
|
||||||
|
|
||||||
|
public function jsonSerialize(): mixed
|
||||||
|
{
|
||||||
|
$values = ['period' => $this->period->value];
|
||||||
|
if (isset($this->interval)) $values['interval'] = $this->interval;
|
||||||
|
return $values;
|
||||||
|
}
|
||||||
|
}
|
||||||
21
src/lib/Domain/RecurrencePeriod.php
Normal file
21
src/lib/Domain/RecurrencePeriod.php
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\Domain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type of recurrence a request can have
|
||||||
|
*/
|
||||||
|
enum RecurrencePeriod: string
|
||||||
|
{
|
||||||
|
/** Requests, once prayed, are available again immediately */
|
||||||
|
case Immediate = 'Immediate';
|
||||||
|
|
||||||
|
/** Requests, once prayed, appear again in a number of hours */
|
||||||
|
case Hours = 'Hours';
|
||||||
|
|
||||||
|
/** Requests, once prayed, appear again in a number of days */
|
||||||
|
case Days = 'Days';
|
||||||
|
|
||||||
|
/** Requests, once prayed, appear again in a number of weeks */
|
||||||
|
case Weeks = 'Weeks';
|
||||||
|
}
|
||||||
203
src/lib/Domain/Request.php
Normal file
203
src/lib/Domain/Request.php
Normal file
@@ -0,0 +1,203 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\Domain;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Custom, DocumentException, DocumentList, Find};
|
||||||
|
use BitBadger\PDODocument\Mapper\DocumentMapper;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Exception;
|
||||||
|
use JsonSerializable;
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
use PhpOption\{None, Option};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A prayer request
|
||||||
|
*/
|
||||||
|
class Request implements JsonSerializable
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param string $id The ID for the request
|
||||||
|
* @param string $enteredOn The date/time this request was originally entered
|
||||||
|
* @param string $userId The ID of the user to whom this request belongs
|
||||||
|
* @param string|null $snoozedUntil The date/time the snooze expires for this request (null = not snoozed)
|
||||||
|
* @param string|null $showAfter The date/time the current recurrence period is over (null = immediate)
|
||||||
|
* @param Recurrence $recurrence The recurrence for this request
|
||||||
|
* @param History[] $history The history of this request
|
||||||
|
* @param Note[] $notes Notes regarding this request
|
||||||
|
* @throws Exception If the ID generation fails
|
||||||
|
*/
|
||||||
|
public function __construct(public string $id = '', public string $enteredOn = '', public string $userId = '',
|
||||||
|
public ?string $snoozedUntil = null, public ?string $showAfter = null,
|
||||||
|
public Recurrence $recurrence = new Recurrence(RecurrencePeriod::Immediate),
|
||||||
|
public array $history = [], public array $notes = []) { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current text for this request
|
||||||
|
*
|
||||||
|
* @return string The most recent text for the request
|
||||||
|
*/
|
||||||
|
public function currentText(): string
|
||||||
|
{
|
||||||
|
foreach ($this->history as $hist) if (isset($hist->text)) return $hist->text;
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the date/time this request was last marked as prayed
|
||||||
|
*
|
||||||
|
* @return string|null The date/time this request was last marked as prayed
|
||||||
|
*/
|
||||||
|
public function lastPrayed(): ?string
|
||||||
|
{
|
||||||
|
foreach ($this->history as $hist) if ($hist->action == RequestAction::Prayed) return $hist->asOf;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Has this request been answered?
|
||||||
|
*
|
||||||
|
* @return bool True if the request is answered, false if not
|
||||||
|
*/
|
||||||
|
public function isAnswered(): bool
|
||||||
|
{
|
||||||
|
return $this->history[0]->action == RequestAction::Answered;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this request currently snoozed?
|
||||||
|
*
|
||||||
|
* @return bool True if the request is snoozed, false if not
|
||||||
|
* @throws Exception If the snoozed until date/time is not valid
|
||||||
|
*/
|
||||||
|
public function isSnoozed(): bool
|
||||||
|
{
|
||||||
|
return isset($this->snoozedUntil) && new DateTimeImmutable($this->snoozedUntil) > new DateTimeImmutable('now');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this request currently not shown due to recurrence?
|
||||||
|
*
|
||||||
|
* @return bool True if the request is pending, false if not
|
||||||
|
* @throws Exception If the snoozed or show-after date/times are not valid
|
||||||
|
*/
|
||||||
|
public function isPending(): bool
|
||||||
|
{
|
||||||
|
return !$this->isSnoozed()
|
||||||
|
&& isset($this->showAfter)
|
||||||
|
&& new DateTimeImmutable($this->showAfter) > new DateTimeImmutable('now');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function jsonSerialize(): mixed
|
||||||
|
{
|
||||||
|
$values = [
|
||||||
|
'id' => $this->id,
|
||||||
|
'enteredOn' => $this->enteredOn,
|
||||||
|
'userId' => $this->userId,
|
||||||
|
'recurrence' => $this->recurrence,
|
||||||
|
'history' => $this->history,
|
||||||
|
'notes' => $this->notes
|
||||||
|
];
|
||||||
|
if (isset($this->snoozedUntil)) $values['snoozedUntil'] = $this->snoozedUntil;
|
||||||
|
if (isset($this->showAfter)) $values['showAfter'] = $this->showAfter;
|
||||||
|
return $values;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find a request by its ID
|
||||||
|
*
|
||||||
|
* @param string $id The ID of the request
|
||||||
|
* @return Option<Request> The request (if it is found and belongs to the current user)
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function byId(string $id): Option
|
||||||
|
{
|
||||||
|
$req = Find::byId(Table::REQUEST, $id, self::class);
|
||||||
|
return ($req->getOrElse(new Request('x'))->userId == $_SESSION['user_id']) ? $req : None::create();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the user's active journal requests
|
||||||
|
*
|
||||||
|
* @return DocumentList<Request> The requests for the user's journal
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function forJournal(): DocumentList
|
||||||
|
{
|
||||||
|
$table = Table::REQUEST;
|
||||||
|
return Custom::list(<<<SQL
|
||||||
|
SELECT data, (
|
||||||
|
SELECT h.value->>'asOf' as_of
|
||||||
|
FROM $table i LEFT JOIN json_each(i.data, '$.history') h
|
||||||
|
WHERE r.data->>'id' = i.data->>'id' AND h.value->>'action' = 'Prayed'
|
||||||
|
LIMIT 1) last_prayed
|
||||||
|
FROM $table r
|
||||||
|
WHERE data->>'userId' = :userId
|
||||||
|
AND data->>'$.history[0].action' <> 'Answered'
|
||||||
|
AND (data->>'snoozedUntil' IS NULL OR data->>'snoozedUntil' < datetime('now'))
|
||||||
|
AND (data->>'showAfter' IS NULL OR data->>'showAfter' < datetime('now'))
|
||||||
|
ORDER BY coalesce(last_prayed, data->>'snoozedUntil', data->>'showAfter', data->>'$.history[0].asOf')
|
||||||
|
SQL, [':userId' => $_SESSION['user_id']], new DocumentMapper(self::class));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get either the user's active or answered requests
|
||||||
|
*
|
||||||
|
* @param bool $active True to retrieve active requests, false to retrieve answered requests
|
||||||
|
* @param bool $snoozed True to retrieve only snoozed requests
|
||||||
|
* @return DocumentList<Request> The requests matching the criteria
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
private static function forUser(bool $active = true, bool $snoozed = false): DocumentList
|
||||||
|
{
|
||||||
|
$table = Table::REQUEST;
|
||||||
|
$op = $active ? '<>' : '=';
|
||||||
|
$extra = $snoozed ? "AND datetime(data->>'snoozedUntil') > datetime('now')" : '';
|
||||||
|
$order = $active
|
||||||
|
? "coalesce(data->>'snoozedUntil', data->>'showAfter', last_prayed, data->>'$.history[0].asOf')"
|
||||||
|
: "data->>'$.history[0].asOf' DESC";
|
||||||
|
return Custom::list(<<<SQL
|
||||||
|
SELECT data, (
|
||||||
|
SELECT h.value->>'asOf' as_of
|
||||||
|
FROM $table i LEFT JOIN json_each(i.data, '$.history') h
|
||||||
|
WHERE r.data->>'id' = i.data->>'id' AND h.value->>'action' = 'Prayed'
|
||||||
|
LIMIT 1) last_prayed
|
||||||
|
FROM $table r
|
||||||
|
WHERE data->>'userId' = :userId
|
||||||
|
AND data->>'$.history[0].action' $op 'Answered' $extra
|
||||||
|
ORDER BY $order
|
||||||
|
SQL, [':userId' => $_SESSION['user_id']], new DocumentMapper(self::class));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a list of active requests for a user
|
||||||
|
*
|
||||||
|
* @return DocumentList<Request> The user's active requests
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function active(): DocumentList
|
||||||
|
{
|
||||||
|
return self::forUser();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a list of answered requests for a user
|
||||||
|
*
|
||||||
|
* @return DocumentList<Request> The user's answered requests
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function answered(): DocumentList
|
||||||
|
{
|
||||||
|
return self::forUser(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a list of snoozed requests for a user
|
||||||
|
*
|
||||||
|
* @return DocumentList<Request> The user's snoozed requests
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function snoozed(): DocumentList
|
||||||
|
{
|
||||||
|
return self::forUser(snoozed: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
21
src/lib/Domain/RequestAction.php
Normal file
21
src/lib/Domain/RequestAction.php
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\Domain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An action taken on a prayer request
|
||||||
|
*/
|
||||||
|
enum RequestAction: string
|
||||||
|
{
|
||||||
|
/** The request was created */
|
||||||
|
case Created = 'Created';
|
||||||
|
|
||||||
|
/** The request was marked as having been prayed for */
|
||||||
|
case Prayed = 'Prayed';
|
||||||
|
|
||||||
|
/** The request was updated */
|
||||||
|
case Updated = 'Updated';
|
||||||
|
|
||||||
|
/** The request was marked as answered */
|
||||||
|
case Answered = 'Answered';
|
||||||
|
}
|
||||||
12
src/lib/Table.php
Normal file
12
src/lib/Table.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constants for table names
|
||||||
|
*/
|
||||||
|
class Table
|
||||||
|
{
|
||||||
|
/** @var string The prayer request table used by myPrayerJournal */
|
||||||
|
const REQUEST = 'request';
|
||||||
|
}
|
||||||
175
src/lib/UI/Component.php
Normal file
175
src/lib/UI/Component.php
Normal file
@@ -0,0 +1,175 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\UI;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{DocumentException, DocumentList};
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use DateTimeZone;
|
||||||
|
use Exception;
|
||||||
|
use MyPrayerJournal\Domain\Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* User interface building blocks
|
||||||
|
*/
|
||||||
|
class Component
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Generate a material icon
|
||||||
|
*
|
||||||
|
* @param string $name The name of the material icon
|
||||||
|
* @return string The material icon wrapped in a `span` tag
|
||||||
|
*/
|
||||||
|
public static function icon(string $name): string {
|
||||||
|
return "<span class=material-icons>$name</span>";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render the journal items for the current user
|
||||||
|
*
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
public static function journal(): void
|
||||||
|
{
|
||||||
|
Layout::bareHead();
|
||||||
|
$reqs = Request::forJournal();
|
||||||
|
if ($reqs->hasItems()) { ?>
|
||||||
|
<section id=journalItems class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3" hx-target=this
|
||||||
|
hx-swap=outerHTML aria-label="Prayer Requests"><?php
|
||||||
|
$spacer = '<span> </span>';
|
||||||
|
foreach ($reqs->items() as /** @var Request $req */ $req) { ?>
|
||||||
|
<div class=col>
|
||||||
|
<div class="card h-100">
|
||||||
|
<div class="card-header p-0 d-flex" role=toolbar>
|
||||||
|
<?=self::pageLink("/request/edit?id=$req->id", self::icon('edit'),
|
||||||
|
['class' => 'btn btn-secondary', 'title' => 'Edit Request'])?>
|
||||||
|
<?=$spacer?>
|
||||||
|
<button type=button class="btn btn-secondary" title="Add Notes" data-bs-toggle=modal
|
||||||
|
data-bs-target=#notesModal hx-get="/components/request/add-note?id=<?=$req->id?>"
|
||||||
|
hx-target=#notesBody hx-swap=innerHTML><?=self::icon('comment');?></button>
|
||||||
|
<?=$spacer?>
|
||||||
|
<button type=button class="btn btn-secondary" title="Snooze Request" data-bs-toggle=modal
|
||||||
|
data-bs-target=#snoozeModal hx-get="/components/request/snooze?id=<?=$req->id?>"
|
||||||
|
hx-target=#snoozeBody hx-swap=innerHTML><?=self::icon('schedule');?></button>
|
||||||
|
<div class=flex-grow-1></div>
|
||||||
|
<button type=button class="btn btn-success w-25" hx-patch="/request/prayed?id=<?=$req->id?>"
|
||||||
|
title="Mark as Prayed"><?=self::icon('done');?></button>
|
||||||
|
</div>
|
||||||
|
<div class=card-body>
|
||||||
|
<p class=request-text><?=htmlentities($req->currentText());?>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer text-end text-muted px-1 py-0">
|
||||||
|
<em><?php
|
||||||
|
$lastPrayed = $req->lastPrayed();
|
||||||
|
echo 'last ' . (is_null($lastPrayed) ? 'activity': 'prayed') . ' '
|
||||||
|
. self::relativeDate($lastPrayed ?? $req->history[0]->asOf); ?>
|
||||||
|
</em>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div><?php
|
||||||
|
} ?>
|
||||||
|
</section><?php
|
||||||
|
} else {
|
||||||
|
Component::noResults('No Active Requests', '/request/edit?id=new', 'Add a Request', <<<'TEXT'
|
||||||
|
You have no requests to be shown; see the “Active” link above for snoozed or deferred
|
||||||
|
requests, and the “Answered” link for answered requests
|
||||||
|
TEXT);
|
||||||
|
}
|
||||||
|
Layout::bareFoot();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a card when there are no results found
|
||||||
|
*/
|
||||||
|
public static function noResults(string $heading, string $link, string $buttonText, string $text): void
|
||||||
|
{ ?>
|
||||||
|
<div class=card>
|
||||||
|
<h5 class=card-header><?=$heading?></h5>
|
||||||
|
<div class="card-body text-center">
|
||||||
|
<p class=card-text><?=$text?></p>
|
||||||
|
<?=self::pageLink($link, $buttonText, ['class' => 'btn btn-primary'])?>
|
||||||
|
</div>
|
||||||
|
</div><?php
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a link to a page within myPrayerJournal
|
||||||
|
*
|
||||||
|
* @param string $href The URL for the link
|
||||||
|
* @param string $text The text for the link
|
||||||
|
* @param array $attrs Any additional attributes that should be placed on the `a` tag
|
||||||
|
*/
|
||||||
|
public static function pageLink(string $href, string $text, array $attrs = []): string
|
||||||
|
{
|
||||||
|
$extraAttrs = array_reduce(array_keys($attrs),
|
||||||
|
fn($acc, $key) => $acc . sprintf(' %s="%s"', $key, $attrs[$key]), '');
|
||||||
|
return sprintf('<a href="%s" hx-get="%s" hx-target=#top hx-swap=innerHTML hx-push-url=true%s>%s</a>', $href,
|
||||||
|
$href, $extraAttrs, $text);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a relative date with a tooltip with the actual date/time
|
||||||
|
*
|
||||||
|
* @return string The HTML for the relative date
|
||||||
|
* @throws Exception If the date/time cannot be parsed
|
||||||
|
*/
|
||||||
|
public static function relativeDate(string $date): string
|
||||||
|
{
|
||||||
|
$parsed = new DateTimeImmutable($date);
|
||||||
|
$inZone = $parsed->setTimezone(new DateTimeZone($_REQUEST['time_zone']));
|
||||||
|
return sprintf('<span title="%s">%s</span>', date_format($inZone, 'l, F j, Y \a\t g:ia T'),
|
||||||
|
RelativeDate::between('now', $parsed));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render a request list item
|
||||||
|
*
|
||||||
|
* @param Request $req The request on which the list items should be based
|
||||||
|
* @throws Exception If date/time values cannot be parsed
|
||||||
|
*/
|
||||||
|
public static function requestItem(Request $req): void
|
||||||
|
{
|
||||||
|
$btnClass = "btn btn-light mx-2";
|
||||||
|
$restoreBtn = fn(string $id, string $link, string $title) => sprintf(
|
||||||
|
'<button class="%s" hx-patch="/request/%s?id=%s" title="%s" hx-target=#req-%s hx-swap=outerHTML>%s</button>',
|
||||||
|
$btnClass, $link, $id, htmlspecialchars($title), $id, self::icon('restore')); ?>
|
||||||
|
<div class="list-group-item px-0 d-flex flex-row align-items-start" id=req-<?=$req->id?>><?php
|
||||||
|
echo self::pageLink("/request/full?id=$req->id", self::icon('description'),
|
||||||
|
['class' => $btnClass, 'title' => 'View Full Request']);
|
||||||
|
if (!$req->isAnswered()) {
|
||||||
|
echo self::pageLink("/request/edit?id=$req->id", self::icon('edit'),
|
||||||
|
['class' => $btnClass, 'title' => 'Edit Request']);
|
||||||
|
}
|
||||||
|
if ($req->isSnoozed()) {
|
||||||
|
echo $restoreBtn($req->id, 'cancel-snooze', 'Cancel Snooze');
|
||||||
|
} elseif ($req->isPending()) {
|
||||||
|
echo $restoreBtn($req->id, 'show', 'Show Now');
|
||||||
|
}
|
||||||
|
echo '<p class="request-text mb-0">' . $req->currentText();
|
||||||
|
if ($req->isSnoozed() || $req->isPending() || $req->isAnswered()) { ?>
|
||||||
|
<br>
|
||||||
|
<small class=text-muted><em><?php
|
||||||
|
if ($req->isSnoozed()) {
|
||||||
|
echo 'Snooze expires ' . self::relativeDate($req->snoozedUntil);
|
||||||
|
} elseif ($req->isPending()) {
|
||||||
|
echo 'Request appears next ' . self::relativeDate($req->showAfter);
|
||||||
|
} else {
|
||||||
|
echo 'Answered ' . self::relativeDate($req->history[0]->asOf);
|
||||||
|
} ?>
|
||||||
|
</em></small><?php
|
||||||
|
} ?>
|
||||||
|
</div><?php
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render the given list of requests
|
||||||
|
*
|
||||||
|
* @param DocumentList<Request> $reqs The list of requests to render
|
||||||
|
* @throws Exception If date/time instances are not valid
|
||||||
|
*/
|
||||||
|
public static function requestList(DocumentList $reqs): void
|
||||||
|
{
|
||||||
|
echo '<div class=list-group>';
|
||||||
|
foreach ($reqs->items() as $req) self::requestItem($req);
|
||||||
|
echo '</div>';
|
||||||
|
}
|
||||||
|
}
|
||||||
180
src/lib/UI/Layout.php
Normal file
180
src/lib/UI/Layout.php
Normal file
@@ -0,0 +1,180 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\UI;
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\Custom;
|
||||||
|
use BitBadger\PDODocument\Mapper\ExistsMapper;
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
|
||||||
|
class Layout
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Generate the heading for a bare result
|
||||||
|
*/
|
||||||
|
public static function bareHead(): void
|
||||||
|
{
|
||||||
|
echo '<!DOCTYPE html><html lang=en><head><title></title></head><body>';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate the end of a bare result
|
||||||
|
*/
|
||||||
|
public static function bareFoot(): void
|
||||||
|
{
|
||||||
|
echo '</body></html>';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this an htmx request?
|
||||||
|
*
|
||||||
|
* @return bool True if this is an htmx request, false if not
|
||||||
|
*/
|
||||||
|
private static function isHtmx(): bool
|
||||||
|
{
|
||||||
|
return key_exists('HTTP_HX_REQUEST', $_SERVER) && !key_exists('HTTP_HX_HISTORY_RESTORE_REQUEST', $_SERVER);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the `DOCTYPE` declaration, `html`, and `head` tags for the page
|
||||||
|
*
|
||||||
|
* @param string $title The title of the page
|
||||||
|
*/
|
||||||
|
public static function htmlHead(string $title): void
|
||||||
|
{
|
||||||
|
if (self::isHtmx()) {
|
||||||
|
echo "<!DOCTYPE html><html lang=en><head lang=en><title>$title « myPrayerJournal</title></head>";
|
||||||
|
} else {
|
||||||
|
echo <<<HEAD
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang=en>
|
||||||
|
<head>
|
||||||
|
<meta name=viewport content="width=device-width, initial-scale=1">
|
||||||
|
<meta name=description content="Online prayer journal - free w/Google or Microsoft account">
|
||||||
|
<meta name=htmx-config content='{"historyCacheSize":0}'>
|
||||||
|
<title>$title « myPrayerJournal</title>
|
||||||
|
<link href=https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css rel=stylesheet
|
||||||
|
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
|
||||||
|
crossorigin=anonymous>
|
||||||
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel=stylesheet>
|
||||||
|
<link href=/style/style.css rel=stylesheet>
|
||||||
|
</head>
|
||||||
|
HEAD;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function navLink(string $url, string $text): void
|
||||||
|
{
|
||||||
|
$classAttr = match (true) {
|
||||||
|
str_starts_with($_SERVER['PHP_SELF'], $url) => ['class' => 'is-active-route'],
|
||||||
|
default => []
|
||||||
|
};
|
||||||
|
echo '<li class=nav-item>' . Component::pageLink($url, $text, $classAttr);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The default navigation bar, which will load the items on page load, and whenever a refresh event occurs
|
||||||
|
*/
|
||||||
|
public static function navBar(): void
|
||||||
|
{
|
||||||
|
$table = Table::REQUEST;
|
||||||
|
$hasSnoozed = key_exists('user_id', $_SESSION)
|
||||||
|
? Custom::scalar(<<<SQL
|
||||||
|
SELECT EXISTS (
|
||||||
|
SELECT 1 FROM $table
|
||||||
|
WHERE data->>'userId' = :userId AND datetime(data->>'snoozedUntil') > datetime('now'))
|
||||||
|
SQL, [':userId' => $_SESSION['user_id']], new ExistsMapper())
|
||||||
|
: false; ?>
|
||||||
|
<nav class="navbar navbar-dark" role="navigation">
|
||||||
|
<div class=container-fluid>
|
||||||
|
<?=Component::pageLink('/',
|
||||||
|
'<span class=m>my</span><span class=p>Prayer</span><span class=j>Journal</span>',
|
||||||
|
['class' => 'navbar-brand'])?>
|
||||||
|
<ul class="navbar-nav me-auto d-flex flex-row"><?php
|
||||||
|
if (key_exists('user_id', $_SESSION)) {
|
||||||
|
self::navLink('/journal', 'Journal');
|
||||||
|
self::navLink('/requests/active', 'Active');
|
||||||
|
if ($hasSnoozed) self::navLink('/requests/snoozed', 'Snoozed');
|
||||||
|
self::navLink('/requests/answered', 'Answered'); ?>
|
||||||
|
<li class=nav-item><a href=/user/log-off>Log Off</a><?php
|
||||||
|
} else { ?>
|
||||||
|
<li class=nav-item><a href=/user/log-on>Log On</a><?php
|
||||||
|
}
|
||||||
|
self::navLink('/docs', 'Docs'); ?>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</nav><?php
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Drop .0 or .0.0 from the end of the version to format it for display
|
||||||
|
*
|
||||||
|
* @return string The version of the application for user display
|
||||||
|
*/
|
||||||
|
private static function displayVersion(): string {
|
||||||
|
[$major, $minor, $rev] = explode('.', MPJ_VERSION);
|
||||||
|
$minor = $minor == '0' ? '' : ".$minor";
|
||||||
|
$rev = match (true) {
|
||||||
|
$rev == '0' => '',
|
||||||
|
str_starts_with($rev, '0-') => substr($rev, 1),
|
||||||
|
default => ".$rev"
|
||||||
|
};
|
||||||
|
return "v$major$minor$rev";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create the footer
|
||||||
|
*/
|
||||||
|
public static function htmlFoot(): void
|
||||||
|
{ ?>
|
||||||
|
<footer class=container-fluid>
|
||||||
|
<p class="text-muted text-end">
|
||||||
|
myPrayerJournal <?=self::displayVersion();?><br>
|
||||||
|
<em><small>
|
||||||
|
<?=Component::pageLink('/legal/privacy-policy', 'Privacy Policy')?> •
|
||||||
|
<?=Component::pageLink('/legal/terms-of-service', 'Terms of Service')?> •
|
||||||
|
<a href=https://git.bitbadger.solutions/bit-badger/myPrayerJournal target=_blank
|
||||||
|
rel=noopener>Developed</a> and hosted by
|
||||||
|
<a href=https://bitbadger.solutions target=_blank rel=noopener>Bit Badger Solutions</a>
|
||||||
|
</small></em>
|
||||||
|
<script src=https://unpkg.com/htmx.org@2.0.0 crossorigin=anonymous
|
||||||
|
integrity="sha384-wS5l5IKJBvK6sPTKa2WZ1js3d947pvWXbPJ1OmWfEuxLgeHcEbjUUA5i9V5ZkpCw"></script>
|
||||||
|
<script>if (!htmx) document.write('<script src=\"/script/htmx.min.js\"><\/script>')</script>
|
||||||
|
<script async src=https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js
|
||||||
|
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
|
||||||
|
crossorigin=anonymous></script>
|
||||||
|
<script>
|
||||||
|
setTimeout(function () {
|
||||||
|
if (!bootstrap) document.write('<script src=\"/script/bootstrap.bundle.min.js\"><\/script>')
|
||||||
|
}, 2000)
|
||||||
|
</script>
|
||||||
|
<script src=/script/mpj.js></script>
|
||||||
|
</footer><?php
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate the heading for a full or partial page result
|
||||||
|
*
|
||||||
|
* @param string $title The title of the page
|
||||||
|
*/
|
||||||
|
public static function pageHead(string $title): void
|
||||||
|
{
|
||||||
|
self::htmlHead($title);
|
||||||
|
echo '<body>';
|
||||||
|
if (!self::isHtmx()) echo '<section id=top aria-label="Top navigation">';
|
||||||
|
self::navBar();
|
||||||
|
echo '<main role=main>';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate the end of the page for a full or partial page result
|
||||||
|
*/
|
||||||
|
public static function pageFoot(): void
|
||||||
|
{
|
||||||
|
echo '</main>';
|
||||||
|
if (!self::isHtmx()) {
|
||||||
|
echo '</section>';
|
||||||
|
self::htmlFoot();
|
||||||
|
}
|
||||||
|
echo '</body></html>';
|
||||||
|
}
|
||||||
|
}
|
||||||
66
src/lib/UI/RelativeDate.php
Normal file
66
src/lib/UI/RelativeDate.php
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace MyPrayerJournal\UI;
|
||||||
|
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A type of relative date, along with the formatting strings
|
||||||
|
*/
|
||||||
|
enum RelativeDate: string
|
||||||
|
{
|
||||||
|
case LessThanXMinutes = 'less than a minute|less than %d minutes';
|
||||||
|
case XMinutes = 'a minute|%d minutes';
|
||||||
|
case AboutXHours = 'about an hour|about %d hours';
|
||||||
|
case XHours = 'an hour|%d hours';
|
||||||
|
case XDays = 'a day|%d days';
|
||||||
|
case AboutXWeeks = 'about a week|about %d weeks';
|
||||||
|
case XWeeks = 'a week|%d weeks';
|
||||||
|
case AboutXMonths = 'about a month|about %d months';
|
||||||
|
case XMonths = 'a month|%d months';
|
||||||
|
case AboutXYears = 'about a year|about %d years';
|
||||||
|
case XYears = 'a year|%d years';
|
||||||
|
case OverXYears = 'over a year|over %d years';
|
||||||
|
case AlmostXYears = 'almost a year|almost %d years';
|
||||||
|
|
||||||
|
// Many thanks to date-fns (https://date-fns.org) for this logic
|
||||||
|
/**
|
||||||
|
* Format the distance between two dates
|
||||||
|
*
|
||||||
|
* @param string|DateTimeImmutable $from The starting date/time
|
||||||
|
* @param string|DateTimeImmutable $to The ending date/time
|
||||||
|
* @return string The distance between two dates
|
||||||
|
* @throws Exception If date/time objects cannot be created
|
||||||
|
*/
|
||||||
|
public static function between(string|DateTimeImmutable $from, string|DateTimeImmutable $to): string
|
||||||
|
{
|
||||||
|
$aDay = 1_440.0;
|
||||||
|
$almost2Days = 2_520.0;
|
||||||
|
$aMonth = 43_200.0;
|
||||||
|
$twoMonths = 86_400.0;
|
||||||
|
|
||||||
|
$dtFrom = is_string($from) ? new DateTimeImmutable($from) : $from;
|
||||||
|
$dtTo = is_string($to) ? new DateTimeImmutable($to) : $to;
|
||||||
|
$minutes = abs($dtFrom->getTimestamp() - $dtTo->getTimestamp()) / 60;
|
||||||
|
$months = round($minutes / $aMonth);
|
||||||
|
$years = round($months / 12);
|
||||||
|
|
||||||
|
[$type, $number] = match (true) {
|
||||||
|
$minutes < 1.0 => [RelativeDate::LessThanXMinutes, 1],
|
||||||
|
$minutes < 45.0 => [RelativeDate::XMinutes, round($minutes)],
|
||||||
|
$minutes < 90.0 => [RelativeDate::AboutXHours, 1],
|
||||||
|
$minutes < $aDay => [RelativeDate::AboutXHours, round($minutes / 60)],
|
||||||
|
$minutes < $almost2Days => [RelativeDate::XDays, 1],
|
||||||
|
$minutes < $aMonth => [RelativeDate::XDays, round($minutes / $aDay)],
|
||||||
|
$minutes < $twoMonths => [RelativeDate::AboutXMonths, round($minutes / $aMonth)],
|
||||||
|
$months < 12 => [RelativeDate::XMonths, round($minutes / $aMonth)],
|
||||||
|
$months % 12 < 3 => [RelativeDate::AboutXYears, $years],
|
||||||
|
$months % 12 < 9 => [RelativeDate::OverXYears, $years],
|
||||||
|
default => [RelativeDate::AlmostXYears, $years]
|
||||||
|
};
|
||||||
|
[$singular, $plural] = explode('|', $type->value);
|
||||||
|
$value = $number == 1 ? $singular : sprintf($plural, $number);
|
||||||
|
return $dtFrom > $dtTo ? "$value ago" : "in $value";
|
||||||
|
}
|
||||||
|
}
|
||||||
11
src/public/components/journal-items.php
Normal file
11
src/public/components/journal-items.php
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
use MyPrayerJournal\UI\Component;
|
||||||
|
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
Auth::requireUser(false);
|
||||||
|
|
||||||
|
Component::journal();
|
||||||
24
src/public/components/request/add-note.php
Normal file
24
src/public/components/request/add-note.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\Layout;
|
||||||
|
|
||||||
|
require '../../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['GET'], false);
|
||||||
|
|
||||||
|
Layout::bareHead(); ?>
|
||||||
|
<form hx-post="/request/note?id=<?=$req->id?>">
|
||||||
|
<div class="form-floating pb-3">
|
||||||
|
<textarea id=notes name=notes class=form-control style="min-height: 8rem;" placeholder=Notes autofocus
|
||||||
|
required></textarea>
|
||||||
|
<label for=notes>Notes</label>
|
||||||
|
</div>
|
||||||
|
<p class=text-end><button type=submit class="btn btn-primary">Add Notes</button>
|
||||||
|
</form>
|
||||||
|
<hr style="margin: .5rem -1rem">
|
||||||
|
<div id=priorNotes>
|
||||||
|
<p class="text-center pt-3">
|
||||||
|
<button type=button class="btn btn-secondary" hx-get="/components/request/notes?id=<?=$req->id?>"
|
||||||
|
hx-swap=outerHTML hx-target=#priorNotes>Load Prior Notes</button>
|
||||||
|
</div><?php
|
||||||
|
Layout::bareFoot();
|
||||||
19
src/public/components/request/notes.php
Normal file
19
src/public/components/request/notes.php
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['GET'], false);
|
||||||
|
|
||||||
|
Layout::bareHead();?>
|
||||||
|
<p class=text-center><strong>Prior Notes for This Request</strong><?php
|
||||||
|
if (sizeof($req->notes) > 0) {
|
||||||
|
foreach ($req->notes as $note) { ?>
|
||||||
|
<p><small class=text-muted><?=Component::relativeDate($note->asOf)?></small><br>
|
||||||
|
<?=htmlentities($note->text)?><?php
|
||||||
|
}
|
||||||
|
} else { ?>
|
||||||
|
<p class="text-center text-muted">There are no prior notes for this request<?php
|
||||||
|
}
|
||||||
|
Layout::bareFoot();
|
||||||
18
src/public/components/request/snooze.php
Normal file
18
src/public/components/request/snooze.php
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\Layout;
|
||||||
|
|
||||||
|
require '../../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['GET'], false);
|
||||||
|
|
||||||
|
Layout::bareHead(); ?>
|
||||||
|
<form hx-patch="/request/snooze?id=<?=$req->id?>" hx-target=#journalItems hx-swap=outerHTML>
|
||||||
|
<div class="form-floating pb-3">
|
||||||
|
<input type=date id=until name=until class=form-control
|
||||||
|
min="<?=(new DateTimeImmutable('now'))->format('Y-m-d')?>" required>
|
||||||
|
<label for=until>Until</label>
|
||||||
|
</div>
|
||||||
|
<p class="text-end mb-0"><button type=submit class="btn btn-primary">Snooze</button>
|
||||||
|
</form><?php
|
||||||
|
Layout::bareFoot();
|
||||||
102
src/public/docs.php
Normal file
102
src/public/docs.php
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\Layout;
|
||||||
|
|
||||||
|
require '../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Layout::pageHead('Documentation'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<h2 class=mb-3>Documentation</h2>
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">About myPrayerJournal</h3>
|
||||||
|
<p>Journaling has a long history; it helps people remember what happened, and the act of writing helps people think
|
||||||
|
about what happened and process it. A prayer journal is not a new concept; it helps you keep track of the
|
||||||
|
requests for which you’ve prayed, you can use it to pray over things repeatedly, and you can write the
|
||||||
|
result when the answer comes <em>(or it was “no”)</em>.
|
||||||
|
<p>myPrayerJournal was borne of out of a personal desire
|
||||||
|
<a href=https://daniel.summershome.org target=_blank rel=noopener>Daniel</a> had to have something that would
|
||||||
|
help him with his prayer life. When it’s time to pray, it’s not really time to use an app, so the
|
||||||
|
design goal here is to keep it simple and unobtrusive. It will also help eliminate some of the downsides to a
|
||||||
|
paper prayer journal, like not remembering whether you’ve prayed for a request, or running out of room to
|
||||||
|
write another update on one.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Signing Up</h3>
|
||||||
|
<p>myPrayerJournal uses login services using Google or Microsoft accounts. The only information the application
|
||||||
|
stores in its database is your user ID token it receives from these services, so there are no permissions you
|
||||||
|
should have to accept from these provider other than establishing that you can log on with that account. Because
|
||||||
|
of this, you’ll want to pick the same one each time; the tokens between the two accounts are different,
|
||||||
|
even if you use the same e-mail address to log on to both.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Your Prayer Journal</h3>
|
||||||
|
<p>Your current requests will be presented in columns (usually three, but it could be more or less, depending on the
|
||||||
|
size of your screen or device). Each request is in its own card, and the buttons at the top of each card apply
|
||||||
|
to that request. The last line of each request also tells you how long it has been since anything has been done
|
||||||
|
on that request. Any time you see something like “a few minutes ago,” you can hover over that to see
|
||||||
|
the actual date/time the action was taken.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Adding a Request</h3>
|
||||||
|
<p>To add a request, click the “Add a New Request” button at the top of your journal. Then, enter the
|
||||||
|
text of the request as you see fit; there is no right or wrong way, and you are the only person who will see the
|
||||||
|
text you enter. When you save the request, it will go to the bottom of the list of requests.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Setting Request Recurrence</h3>
|
||||||
|
<p>When you add or update a request, you can choose whether requests go to the bottom of the journal once they have
|
||||||
|
been marked “Prayed” or whether they will reappear after a delay. You can set recurrence in terms of
|
||||||
|
hours, days, or weeks, but it cannot be longer than 365 days. If you decide you want a request to reappear
|
||||||
|
sooner, you can skip the current delay; click the “Active” menu link, find the request in the list
|
||||||
|
(likely near the bottom), and click the “Show Now” button.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Praying for Requests</h3>
|
||||||
|
<p>The first button for each request has a checkmark icon; clicking this button will mark the request as
|
||||||
|
“Prayed” and move it to the bottom of the list (or off, if you’ve set a recurrence period for
|
||||||
|
the request). This allows you, if you’re praying through your requests, to start at the top left (with the
|
||||||
|
request that it’s been the longest since you’ve prayed) and click the button as you pray; when the
|
||||||
|
request move below or away, the next-least-recently-prayed request will take the top spot.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Editing Requests</h3>
|
||||||
|
<p>The second button for each request has a pencil icon. This allows you to edit the text of the request, pretty
|
||||||
|
much the same way you entered it; it starts with the current text, and you can add to it, modify it, or
|
||||||
|
completely replace it. By default, updates will go in with an “Updated” status; you have the option
|
||||||
|
to also mark this update as “Prayed” or “Answered”. Answered requests will drop off the
|
||||||
|
journal list.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Adding Notes</h3>
|
||||||
|
<p>The third button for each request has an icon that looks like a speech bubble with lines on it; this lets you
|
||||||
|
record notes about the request. If there is something you want to record that doesn’t change the text of
|
||||||
|
the request, this is the place to do it. For example, you may be praying for a long-term health issue, and that
|
||||||
|
person tells you that their status is the same; or, you may want to record something God said to you while you
|
||||||
|
were praying for that request."
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Snoozing Requests</h3>
|
||||||
|
<p>There may be a time when a request does not need to appear. The fourth button, with the clock icon, allows you to
|
||||||
|
snooze requests until the day you specify. Additionally, if you have any snoozed requests, a
|
||||||
|
“Snoozed” menu item will appear next to the “Journal” one; this page allows you to see
|
||||||
|
what requests are snoozed, and return them to your journal by canceling the snooze.
|
||||||
|
|
||||||
|
<h3 class="mb-3 mt-4">Viewing a Request and Its History</h3>
|
||||||
|
<p>myPrayerJournal tracks all actions related to a request; from the “Active” and “Answered”
|
||||||
|
menu links (and “Snoozed”, if it’s showing), there is a “View Full Request”
|
||||||
|
button. That page will show the current text of the request; how many times it has been marked as prayed; how
|
||||||
|
long it has been an active request; and a log of all updates, prayers, and notes you have recorded. That log is
|
||||||
|
listed from most recent to least recent; if you want to read it chronologically, press the “End” key
|
||||||
|
on your keyboard and read it from the bottom up.
|
||||||
|
<p>The “Active” link will show all requests that have not yet been marked answered, including snoozed
|
||||||
|
and recurring requests. If requests are snoozed, or in a recurrence period off the journal, there will be a
|
||||||
|
button where you can return the request to the list (either “Cancel Snooze” or “Show
|
||||||
|
Now”). The “Answered” link shows all requests that have been marked answered. The
|
||||||
|
“Snoozed” link only shows snoozed requests.
|
||||||
|
|
||||||
|
<h3 id=notes class="mb-3 mt-4">Final Notes</h3>
|
||||||
|
<ul>
|
||||||
|
<li>If you encounter errors, please
|
||||||
|
<a href=https://git.bitbadger.solutions/bit-badger/myPrayerJournal/issues target=_blank rel=noopener>file an
|
||||||
|
issue</a> (or <a href="mailto:daniel@bitbadger.solutions?subject=myPrayerJournal+Issue">e-mail Daniel</a> if
|
||||||
|
you do not have an account on that server) with as much detail as possible. You can also provide
|
||||||
|
suggestions, or browse the list of currently open issues.
|
||||||
|
<li>Prayer requests and their history are securely backed up nightly along with other Bit Badger Solutions data.
|
||||||
|
<li>Prayer changes things - most of all, the one doing the praying. I pray that this tool enables you to deepen
|
||||||
|
and strengthen your prayer life.
|
||||||
|
</ul>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
21
src/public/index.php
Normal file
21
src/public/index.php
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\Component;use MyPrayerJournal\UI\Layout;
|
||||||
|
|
||||||
|
require '../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Layout::pageHead('Welcome'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<p>
|
||||||
|
<p>myPrayerJournal is a place where individuals can record their prayer requests, record that they prayed for them,
|
||||||
|
update them as God moves in the situation, and record a final answer received on that request. It also allows
|
||||||
|
individuals to review their answered prayers.
|
||||||
|
<p>This site is open and available for anyone who wants to use it. To get started, simply click the “Log
|
||||||
|
On” link above, and log on with either a Microsoft or Google account. You can also learn more about the
|
||||||
|
site at the “Docs” link, also above.
|
||||||
|
<hr>
|
||||||
|
<p><em>This is an in-progress upgrade from v3 to v4; if you encounter errors, see
|
||||||
|
<?=Component::pageLink('/docs#notes', 'the documentation')?> on reporting them.</em>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
51
src/public/journal.php
Normal file
51
src/public/journal.php
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::requireUser();
|
||||||
|
|
||||||
|
$user = Auth::user();
|
||||||
|
$name = $user['given_name'] ?? 'Your';
|
||||||
|
Layout::pageHead('Journal'); ?>
|
||||||
|
<article class="container-fluid mt-3">
|
||||||
|
<h2 class=pb-3><?=$name?><?=$name == 'Your' ? '' : '’s'?> Prayer Journal</h2>
|
||||||
|
<p class="pb-3 text-center">
|
||||||
|
<?=Component::pageLink('/request/edit?id=new', Component::icon('add_box') . ' Add a Prayer Request',
|
||||||
|
['class' => 'btn btn-primary'])?>
|
||||||
|
<p hx-get=/components/journal-items hx-swap=outerHTML hx-trigger=load hx-target=this>
|
||||||
|
Loading your prayer journal…
|
||||||
|
<div id=notesModal class="modal fade" tabindex=-1 aria-labelledby=nodesModalLabel aria-hidden=true>
|
||||||
|
<div class="modal-dialog modal-dialog-scrollable">
|
||||||
|
<div class=modal-content>
|
||||||
|
<div class=modal-header>
|
||||||
|
<h5 class=modal-title id=nodesModalLabel>Add Notes to Prayer Request</h5>
|
||||||
|
<button type=button class=btn-close data-bs-dismiss=modal aria-label=Close></button>
|
||||||
|
</div>
|
||||||
|
<div class=modal-body id=notesBody></div>
|
||||||
|
<div class=modal-footer>
|
||||||
|
<button type=button id=notesDismiss class="btn btn-secondary" data-bs-dismiss=modal>Close</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id=snoozeModal class="modal fade" tabindex=-1 aria-labelledby=snoozeModalLabel aria-hidden=true>
|
||||||
|
<div class="modal-dialog modal-sm">
|
||||||
|
<div class=modal-content>
|
||||||
|
<div class=modal-header>
|
||||||
|
<h5 class=modal-title id=snoozeModalLabel>Snooze Prayer Request</h5>
|
||||||
|
<button type=button class=btn-close data-bs-dismiss=modal aria-label=Close></button>
|
||||||
|
</div>
|
||||||
|
<div class=modal-body id=snoozeBody></div>
|
||||||
|
<div class=modal-footer>
|
||||||
|
<button type=button id=snoozeDismiss class="btn btn-secondary" data-bs-dismiss=modal>Close</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
|
|
||||||
72
src/public/legal/privacy-policy.php
Normal file
72
src/public/legal/privacy-policy.php
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\Layout;
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Layout::pageHead('Privacy Policy'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<h2 class=mb-2>Privacy Policy</h2>
|
||||||
|
<h6 class="text-muted pb-3">as of May 21<sup>st</sup>, 2018</h6>
|
||||||
|
<p>The nature of the service is one where privacy is a must. The items below will help you understand the data we
|
||||||
|
collect, access, and store on your behalf as you use this service.
|
||||||
|
<div class=card>
|
||||||
|
<div class="list-group list-group-flush">
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>Third Party Services</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
myPrayerJournal utilizes a third-party authentication and identity provider. You should familiarize
|
||||||
|
yourself with the privacy policy for
|
||||||
|
<a href=https://auth0.com/privacy target=_blank rel=noopener>Auth0</a>, as well as your chosen
|
||||||
|
provider
|
||||||
|
(<a href=https://privacy.microsoft.com/en-us/privacystatement target=_blank rel=noopener>Microsoft</a>
|
||||||
|
or <a href=https://policies.google.com/privacy target=_blank rel=noopener>Google</a>).
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>What We Collect</h3>
|
||||||
|
<h4>Identifying Data</h4>
|
||||||
|
<ul>
|
||||||
|
<li>The only identifying data myPrayerJournal stores is the subscriber (“sub”) field
|
||||||
|
from the token we receive from Auth0, once you have signed in through their hosted service. All
|
||||||
|
information is associated with you via this field.
|
||||||
|
<li>While you are signed in, within your browser, the service has access to your first and last
|
||||||
|
names, along with a URL to the profile picture (provided by your selected identity provider).
|
||||||
|
This information is not transmitted to the server, and is removed when “Log Off” is
|
||||||
|
clicked.
|
||||||
|
</ul>
|
||||||
|
<h4>User Provided Data</h4>
|
||||||
|
<ul class=mb-0>
|
||||||
|
<li>myPrayerJournal stores the information you provide, including the text of prayer requests,
|
||||||
|
updates, and notes; and the date/time when certain actions are taken.
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>How Your Data Is Accessed / Secured</h3>
|
||||||
|
<ul class=mb-0>
|
||||||
|
<li>Your provided data is returned to you, as required, to display your journal or your answered
|
||||||
|
requests. On the server, it is stored in a controlled-access database.
|
||||||
|
<li>Your data is backed up, along with other Bit Badger Solutions hosted systems, in a rolling
|
||||||
|
manner; backups are preserved for the prior 7 days, and backups from the 1<sup>st</sup> and
|
||||||
|
15<sup>th</sup> are preserved for 3 months. These backups are stored in a private cloud data
|
||||||
|
repository.
|
||||||
|
<li>The data collected and stored is the absolute minimum necessary for the functionality of the
|
||||||
|
service. There are no plans to “monetize” this service, and storing the minimum
|
||||||
|
amount of information means that the data we have is not interesting to purchasers (or those who
|
||||||
|
may have more nefarious purposes).
|
||||||
|
<li>Access to servers and backups is strictly controlled and monitored for unauthorized access
|
||||||
|
attempts.
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>Removing Your Data</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
At any time, you may choose to discontinue using this service. Both Microsoft and Google provide
|
||||||
|
ways to revoke access from this application. However, if you want your data removed from the
|
||||||
|
database, please contact daniel at bitbadger.solutions (via e-mail, replacing at with @) prior to
|
||||||
|
doing so, to ensure we can determine which subscriber ID belongs to you.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
59
src/public/legal/terms-of-service.php
Normal file
59
src/public/legal/terms-of-service.php
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Layout::pageHead('Terms of Service'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<h2 class=mb-2>Terms of Service</h2>
|
||||||
|
<h6 class="text-muted pb-3">as of May 21<sup>st</sup>, 2018</h6>
|
||||||
|
<div class=card>
|
||||||
|
<div class="list-group list-group-flush">
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>1. Acceptance of Terms</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
By accessing this web site, you are agreeing to be bound by these Terms and Conditions, and that you
|
||||||
|
are responsible to ensure that your use of this site complies with all applicable laws. Your
|
||||||
|
continued use of this site implies your acceptance of these terms.
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>2. Description of Service and Registration</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
myPrayerJournal is a service that allows individuals to enter and amend their prayer requests. It
|
||||||
|
requires no registration by itself, but access is granted based on a successful login with an
|
||||||
|
external identity provider. See
|
||||||
|
<?=Component::pageLink('/legal/privacy-policy', 'our privacy policy')?> for details on how that
|
||||||
|
information is accessed and stored.
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>3. Third Party Services</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
This service utilizes a third-party service provider for identity management. Review the terms of
|
||||||
|
service for <a href=https://auth0.com/terms target=_blank rel=noopener>Auth0</a>, as well as those
|
||||||
|
for the selected authorization provider
|
||||||
|
(<a href=https://www.microsoft.com/en-us/servicesagreement target=_blank rel=noopener>Microsoft</a>
|
||||||
|
or <a href=https://policies.google.com/terms target=_blank rel=noopener>Google</a>).
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>4. Liability</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
This service is provided “as is”, and no warranty (express or implied) exists. The
|
||||||
|
service and its developers may not be held liable for any damages that may arise through the use of
|
||||||
|
this service.
|
||||||
|
</div>
|
||||||
|
<div class=list-group-item>
|
||||||
|
<h3>5. Updates to Terms</h3>
|
||||||
|
<p class=card-text>
|
||||||
|
These terms and conditions may be updated at any time, and this service does not have the capability
|
||||||
|
to notify users when these change. The date at the top of the page will be updated when any of the
|
||||||
|
text of these terms is updated."
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class=pt-3>
|
||||||
|
You may also wish to review our <?=Component::pageLink('/legal/privacy-policy', 'privacy policy')?> to learn how
|
||||||
|
we handle your data.
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
17
src/public/request/cancel-snooze.php
Normal file
17
src/public/request/cancel-snooze.php
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\RemoveFields;
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['PATCH'], false);
|
||||||
|
|
||||||
|
RemoveFields::byId(Table::REQUEST, $req->id, ['snoozedUntil']);
|
||||||
|
$req->snoozedUntil = null;
|
||||||
|
|
||||||
|
// TODO: message
|
||||||
|
Layout::bareHead();
|
||||||
|
Component::requestItem($req);
|
||||||
|
Layout::bareFoot();
|
||||||
107
src/public/request/edit.php
Normal file
107
src/public/request/edit.php
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
use MyPrayerJournal\Domain\{RecurrencePeriod, Request, RequestAction};
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::requireUser();
|
||||||
|
|
||||||
|
$isNew = $_GET['id'] == 'new';
|
||||||
|
|
||||||
|
$req = match ($isNew) {
|
||||||
|
true => new Request('new'),
|
||||||
|
false => Request::byId($_GET['id'])->getOrCall(not_found(...))
|
||||||
|
};
|
||||||
|
|
||||||
|
$cancelLink = match (true) {
|
||||||
|
str_ends_with($_SERVER['HTTP_REFERER'] ?? '', 'active') => '/requests/active',
|
||||||
|
str_ends_with($_SERVER['HTTP_REFERER'] ?? '', 'snoozed') => '/requests/snoozed',
|
||||||
|
default => '/journal'
|
||||||
|
};
|
||||||
|
$action = $_GET['id'] == 'new' ? 'Add' : 'Edit';
|
||||||
|
|
||||||
|
Layout::pageHead("$action Prayer Request");?>
|
||||||
|
<article class=container>
|
||||||
|
<h2 class=pb-3><?=$action?> Prayer Request</h2>
|
||||||
|
<form <?=$isNew ? 'hx-post' : 'hx-patch'?>=/request/save hx-target=#top hx-push-url=true>
|
||||||
|
<input type=hidden name=requestId value=<?=$req->id?>>
|
||||||
|
<input type=hidden name=returnTo value=<?=$cancelLink?>>
|
||||||
|
<div class="form-floating pb-3">
|
||||||
|
<textarea id=requestText name=requestText class=form-control style="min-height: 8rem;"
|
||||||
|
placeholder="Enter the text of the request" autofocus required><?=$req->currentText()?></textarea>
|
||||||
|
<label for=requestText>Prayer Request</label>
|
||||||
|
</div><br><?php
|
||||||
|
if (!$isNew) { ?>
|
||||||
|
<div class=pb-3>
|
||||||
|
<label>Also Mark As</label><br>
|
||||||
|
<div class="form-check form-check-inline">
|
||||||
|
<input type=radio class=form-check-input id=sU name=status value=<?=RequestAction::Updated->value?>
|
||||||
|
checked>
|
||||||
|
<label for=sU>Updated</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-check form-check-inline">
|
||||||
|
<input type=radio class=form-check-input id=sP name=status value=<?=RequestAction::Prayed->value?>>
|
||||||
|
<label for=sP>Prayed</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-check form-check-inline">
|
||||||
|
<input type=radio class=form-check-input id=sA name=status
|
||||||
|
value=<?=RequestAction::Answered->value?>>
|
||||||
|
<label for=sA>Answered</label>
|
||||||
|
</div>
|
||||||
|
</div><?php
|
||||||
|
} ?>
|
||||||
|
<div class=row">
|
||||||
|
<div class="col-12 offset-md-2 col-md-8 offset-lg-3 col-lg-6">
|
||||||
|
<p><strong>Recurrence </strong> <em class=text-muted>After prayer, request reappears…</em>
|
||||||
|
<div class="d-flex flex-row flex-wrap justify-content-center align-items-center">
|
||||||
|
<div class="form-check mx-2">
|
||||||
|
<input type=radio class=form-check-input id=rI name=recurType
|
||||||
|
value=<?=RecurrencePeriod::Immediate->value?>
|
||||||
|
onclick="mpj.edit.toggleRecurrence(event)"<?php
|
||||||
|
if ($req->recurrence->period == RecurrencePeriod::Immediate) echo ' checked'; ?>>
|
||||||
|
<label for=rI>Immediately</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-check mx-2">
|
||||||
|
<input type=radio class=form-check-input id=rO name=recurType value=Other
|
||||||
|
onclick="mpj.edit.toggleRecurrence(event)"<?php
|
||||||
|
if ($req->recurrence->period <> RecurrencePeriod::Immediate) echo ' checked'; ?>>
|
||||||
|
<label for=rO>Every…</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating mx-2">
|
||||||
|
<input type=number class=form-control id=recurCount name=recurCount placeholder=0 required
|
||||||
|
value=<?=$req->recurrence->interval ?? 0?> style="width:6rem;"<?php
|
||||||
|
if ($req->recurrence->period == RecurrencePeriod::Immediate) echo ' disabled'; ?>>
|
||||||
|
<label for=recurCount>Count</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating mx-2">
|
||||||
|
<select class=form-control id=recurInterval name=recurInterval style="width:6rem;" required<?php
|
||||||
|
if ($req->recurrence->period == RecurrencePeriod::Immediate) echo ' disabled'; ?>>
|
||||||
|
<option value=<?=RecurrencePeriod::Hours->value?><?php
|
||||||
|
if ($req->recurrence->period == RecurrencePeriod::Hours) echo ' selected'; ?>>
|
||||||
|
hours
|
||||||
|
</option>
|
||||||
|
<option value=<?=RecurrencePeriod::Days->value?><?php
|
||||||
|
if ($req->recurrence->period == RecurrencePeriod::Days) echo ' selected'; ?>>
|
||||||
|
days
|
||||||
|
</option>
|
||||||
|
<option value=<?=RecurrencePeriod::Weeks->value?><?php
|
||||||
|
if ($req->recurrence->period == RecurrencePeriod::Weeks) echo ' selected'; ?>>
|
||||||
|
weeks
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<label for=recurInterval>Interval</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="text-end pt-3">
|
||||||
|
<button class="btn btn-primary me-2" type=submit><?=Component::icon('save');?> Save</button>
|
||||||
|
<?=Component::pageLink($cancelLink, Component::icon('arrow_back') . ' Cancel',
|
||||||
|
['class' => 'btn btn-secondary ms-2'])?>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
46
src/public/request/full.php
Normal file
46
src/public/request/full.php
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Domain\{History, Note, RequestAction};
|
||||||
|
use MyPrayerJournal\UI\{Layout, RelativeDate};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['GET']);
|
||||||
|
|
||||||
|
$answered = $req->isAnswered() ? new DateTimeImmutable($req->history[0]->asOf) : null;
|
||||||
|
$prayed = sizeof(array_filter($req->history, fn(History $hist) => $hist->action == RequestAction::Prayed));
|
||||||
|
$daysOpen =
|
||||||
|
(($answered ?? new DateTimeImmutable('now'))->getTimestamp()
|
||||||
|
- (new DateTimeImmutable(end($req->history)->asOf))->getTimestamp()) / 86400;
|
||||||
|
|
||||||
|
$logs = array_merge(
|
||||||
|
array_map(fn(Note $note) => [new DateTimeImmutable($note->asOf), 'Notes', $note->text], $req->notes),
|
||||||
|
array_map(fn(History $hist) => [new DateTimeImmutable($hist->asOf), $hist->action->value, $hist->text ?? ''],
|
||||||
|
$req->history));
|
||||||
|
usort($logs, fn($a, $b) => $a[0] > $b[0] ? -1 : 1);
|
||||||
|
if ($req->isAnswered()) array_shift($logs);
|
||||||
|
|
||||||
|
Layout::pageHead('Full Request');?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<div class=card>
|
||||||
|
<h5 class=card-header>Full Prayer Request</h5>
|
||||||
|
<div class=card-body>
|
||||||
|
<h6 class="card-subtitle text-muted mb-2"><?php
|
||||||
|
if (!is_null($answered)) { ?>
|
||||||
|
Answered <?=$answered->format('F j, Y')?>
|
||||||
|
(<?= RelativeDate::between('now', $req->history[0]->asOf);?>) •<?php
|
||||||
|
} ?>
|
||||||
|
Prayed <?=number_format($prayed)?> times • Open <?=number_format($daysOpen)?> days
|
||||||
|
</h6>
|
||||||
|
<p class=card-text><?=htmlentities($req->currentText())?>
|
||||||
|
</div>
|
||||||
|
<ul class="list-group list-group-flush"><?php
|
||||||
|
foreach ($logs as $log) { ?>
|
||||||
|
<li class=list-group-item>
|
||||||
|
<p class=m-0><?=$log[1]?> <small><em><?=$log[0]->format('F j, Y')?></em></small><?php
|
||||||
|
if ($log[2] <> '') echo '<p class="mt-2 mb-0">' . htmlentities($log[2]);
|
||||||
|
} ?>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
15
src/public/request/note.php
Normal file
15
src/public/request/note.php
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\Patch;
|
||||||
|
use MyPrayerJournal\Domain\Note;
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['POST'], false);
|
||||||
|
|
||||||
|
array_unshift($req->notes, new Note((new DateTimeImmutable('now'))->format('c'), $_POST['notes']));
|
||||||
|
Patch::byId(Table::REQUEST, $req->id, ['notes' => $req->notes]);
|
||||||
|
|
||||||
|
hide_modal('notes');
|
||||||
|
http_response_code(202);
|
||||||
21
src/public/request/prayed.php
Normal file
21
src/public/request/prayed.php
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\Patch;
|
||||||
|
use MyPrayerJournal\Domain\{History, RecurrencePeriod, RequestAction};
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
use MyPrayerJournal\UI\Component;
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['PATCH'], false);
|
||||||
|
$now = new DateTimeImmutable('now');
|
||||||
|
|
||||||
|
array_unshift($req->history, new History($now->format('c'), RequestAction::Prayed));
|
||||||
|
$patch = ['history' => $req->history];
|
||||||
|
|
||||||
|
if ($req->recurrence->period <> RecurrencePeriod::Immediate) {
|
||||||
|
$patch['showAfter'] = $now->add($req->recurrence->interval())->format('c');
|
||||||
|
}
|
||||||
|
Patch::byId(Table::REQUEST, $req->id, $patch);
|
||||||
|
|
||||||
|
Component::journal();
|
||||||
46
src/public/request/save.php
Normal file
46
src/public/request/save.php
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\{Document, Patch, RemoveFields};
|
||||||
|
use MyPrayerJournal\{Auth, Table};
|
||||||
|
use MyPrayerJournal\Domain\{History, Recurrence, RecurrencePeriod, Request, RequestAction};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'POST' && $_SERVER['REQUEST_METHOD'] <> 'PATCH') not_found();
|
||||||
|
|
||||||
|
Auth::requireUser(false);
|
||||||
|
|
||||||
|
$now = new DateTimeImmutable('now');
|
||||||
|
$recurrence = new Recurrence(RecurrencePeriod::from($_POST['recurType'] ?? $_PATCH['recurType']));
|
||||||
|
if ($recurrence->period <> RecurrencePeriod::Immediate) {
|
||||||
|
$recurrence->interval = (int)($_POST['recurCount'] ?? $_PATCH['recurCount']);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch ($_SERVER['REQUEST_METHOD']) {
|
||||||
|
case 'POST':
|
||||||
|
Document::insert(Table::REQUEST, new Request(
|
||||||
|
enteredOn: $now->format('c'),
|
||||||
|
userId: $_SESSION['user_id'],
|
||||||
|
recurrence: $recurrence,
|
||||||
|
history: [new History($now->format('c'), RequestAction::Created, $_POST['requestText'])]));
|
||||||
|
//Messages.pushSuccess ctx "Added prayer request" "/journal"
|
||||||
|
see_other('/journal');
|
||||||
|
|
||||||
|
case 'PATCH':
|
||||||
|
$req = Request::byId($_PATCH['requestId'])->getOrCall(not_found(...));
|
||||||
|
$patch = [];
|
||||||
|
// update recurrence if changed
|
||||||
|
if ($recurrence != $req->recurrence) {
|
||||||
|
$patch['recurrence'] = $recurrence;
|
||||||
|
if ($recurrence->period == RecurrencePeriod::Immediate) {
|
||||||
|
RemoveFields::byId(Table::REQUEST, $req->id, ['showAfter']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// append history
|
||||||
|
$upd8Text = trim($_PATCH['requestText']);
|
||||||
|
$text = $upd8Text == '' || $upd8Text == $req->currentText() ? null : $upd8Text;
|
||||||
|
array_unshift($req->history, new History($now->format('c'), RequestAction::from($_PATCH['status']), $text));
|
||||||
|
$patch['history'] = $req->history;
|
||||||
|
Patch::byId(Table::REQUEST, $req->id, $patch);
|
||||||
|
//Messages.pushSuccess ctx "Prayer request updated successfully" nextUrl
|
||||||
|
see_other($_PATCH['returnTo']);
|
||||||
|
}
|
||||||
17
src/public/request/show.php
Normal file
17
src/public/request/show.php
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\RemoveFields;
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['PATCH'], false);
|
||||||
|
|
||||||
|
RemoveFields::byId(Table::REQUEST, $req->id, ['showAfter']);
|
||||||
|
$req->showAfter = null;
|
||||||
|
|
||||||
|
// TODO: message
|
||||||
|
Layout::bareHead();
|
||||||
|
Component::requestItem($req);
|
||||||
|
Layout::bareFoot();
|
||||||
18
src/public/request/snooze.php
Normal file
18
src/public/request/snooze.php
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use BitBadger\PDODocument\Patch;
|
||||||
|
use MyPrayerJournal\Table;
|
||||||
|
use MyPrayerJournal\UI\Component;
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
|
||||||
|
$req = validate_request($_GET['id'], ['PATCH'], false);
|
||||||
|
|
||||||
|
$until = (new DateTimeImmutable($_PATCH['until'] . 'T00:00:00', new DateTimeZone($_REQUEST['time_zone'])))
|
||||||
|
->setTimezone(new DateTimeZone('Etc/UTC'));
|
||||||
|
Patch::byId(Table::REQUEST, $req->id, ['snoozedUntil' => $until->format('c')]);
|
||||||
|
|
||||||
|
// TODO: message
|
||||||
|
|
||||||
|
hide_modal('snooze');
|
||||||
|
Component::journal();
|
||||||
24
src/public/requests/active.php
Normal file
24
src/public/requests/active.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
use MyPrayerJournal\Domain\Request;
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::requireUser();
|
||||||
|
|
||||||
|
$reqs = Request::active();
|
||||||
|
|
||||||
|
Layout::pageHead('Active Requests'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<h2 class=pb-3>Active Requests</h2><?php
|
||||||
|
if ($reqs->hasItems()) {
|
||||||
|
Component::requestList($reqs);
|
||||||
|
} else {
|
||||||
|
Component::noResults('No Active Requests', '/journal', 'Return to your journal',
|
||||||
|
'Your prayer journal has no active requests');
|
||||||
|
} ?>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
26
src/public/requests/answered.php
Normal file
26
src/public/requests/answered.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
use MyPrayerJournal\Domain\Request;
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::requireUser();
|
||||||
|
|
||||||
|
$reqs = Request::answered();
|
||||||
|
|
||||||
|
Layout::pageHead('Answered Requests'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<h2 class=pb-3>Answered Requests</h2><?php
|
||||||
|
if ($reqs->hasItems()) {
|
||||||
|
Component::requestList($reqs);
|
||||||
|
} else {
|
||||||
|
Component::noResults('No Answered Requests', '/journal', 'Return to your journal', <<<'TEXT'
|
||||||
|
Your prayer journal has no answered requests; once you have marked one as “Answered”, it will
|
||||||
|
appear here
|
||||||
|
TEXT);
|
||||||
|
} ?>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
24
src/public/requests/snoozed.php
Normal file
24
src/public/requests/snoozed.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
use MyPrayerJournal\Domain\Request;
|
||||||
|
use MyPrayerJournal\UI\{Component, Layout};
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::requireUser();
|
||||||
|
|
||||||
|
$reqs = Request::snoozed();
|
||||||
|
|
||||||
|
Layout::pageHead('Snoozed Requests'); ?>
|
||||||
|
<article class="container mt-3">
|
||||||
|
<h2 class=pb-3>Snoozed Requests</h2><?php
|
||||||
|
if ($reqs->hasItems()) {
|
||||||
|
Component::requestList($reqs);
|
||||||
|
} else {
|
||||||
|
Component::noResults('No Snoozed Requests', '/journal', 'Return to your journal',
|
||||||
|
'Your prayer journal has no snoozed requests');
|
||||||
|
} ?>
|
||||||
|
</article><?php
|
||||||
|
Layout::pageFoot();
|
||||||
7
src/public/script/bootstrap.bundle.min.js
vendored
Normal file
7
src/public/script/bootstrap.bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
src/public/script/htmx.min.js
vendored
Normal file
1
src/public/script/htmx.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
104
src/public/script/mpj.js
Normal file
104
src/public/script/mpj.js
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
"use strict"
|
||||||
|
|
||||||
|
/** myPrayerJournal script */
|
||||||
|
this.mpj = {
|
||||||
|
/**
|
||||||
|
* Show a message via toast
|
||||||
|
* @param {string} message The message to show
|
||||||
|
*/
|
||||||
|
showToast (message) {
|
||||||
|
const [level, msg] = message.split("|||")
|
||||||
|
|
||||||
|
let header
|
||||||
|
if (level !== "success") {
|
||||||
|
const heading = typ => `<span class="me-auto"><strong>${typ.toUpperCase()}</strong></span>`
|
||||||
|
|
||||||
|
header = document.createElement("div")
|
||||||
|
header.className = "toast-header"
|
||||||
|
header.innerHTML = heading(level === "warning" ? level : "error")
|
||||||
|
|
||||||
|
const close = document.createElement("button")
|
||||||
|
close.type = "button"
|
||||||
|
close.className = "btn-close"
|
||||||
|
close.setAttribute("data-bs-dismiss", "toast")
|
||||||
|
close.setAttribute("aria-label", "Close")
|
||||||
|
header.appendChild(close)
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = document.createElement("div")
|
||||||
|
body.className = "toast-body"
|
||||||
|
body.innerText = msg
|
||||||
|
|
||||||
|
const toastEl = document.createElement("div")
|
||||||
|
toastEl.className = `toast bg-${level === "error" ? "danger" : level} text-white`
|
||||||
|
toastEl.setAttribute("role", "alert")
|
||||||
|
toastEl.setAttribute("aria-live", "assertlive")
|
||||||
|
toastEl.setAttribute("aria-atomic", "true")
|
||||||
|
toastEl.addEventListener("hidden.bs.toast", e => e.target.remove())
|
||||||
|
if (header) toastEl.appendChild(header)
|
||||||
|
|
||||||
|
toastEl.appendChild(body)
|
||||||
|
document.getElementById("toasts").appendChild(toastEl)
|
||||||
|
new bootstrap.Toast(toastEl, { autohide: level === "success" }).show()
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Load local version of Bootstrap CSS if the CDN load failed
|
||||||
|
*/
|
||||||
|
ensureCss () {
|
||||||
|
let loaded = false
|
||||||
|
for (let i = 0; !loaded && i < document.styleSheets.length; i++) {
|
||||||
|
loaded = document.styleSheets[i].href.endsWith("bootstrap.min.css")
|
||||||
|
}
|
||||||
|
if (!loaded) {
|
||||||
|
const css = document.createElement("link")
|
||||||
|
css.rel = "stylesheet"
|
||||||
|
css.href = "/style/bootstrap.min.css"
|
||||||
|
document.getElementsByTagName("head")[0].appendChild(css)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
/** Script for the request edit component */
|
||||||
|
edit: {
|
||||||
|
/**
|
||||||
|
* Toggle the recurrence input fields
|
||||||
|
* @param {Event} e The click event
|
||||||
|
*/
|
||||||
|
toggleRecurrence ({ target }) {
|
||||||
|
const isDisabled = target.value === "Immediate"
|
||||||
|
;["recurCount", "recurInterval"].forEach(it => document.getElementById(it).disabled = isDisabled)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* The time zone of the current browser
|
||||||
|
* @type {string}
|
||||||
|
**/
|
||||||
|
timeZone: undefined,
|
||||||
|
/**
|
||||||
|
* Derive the time zone from the current browser
|
||||||
|
*/
|
||||||
|
deriveTimeZone () {
|
||||||
|
try {
|
||||||
|
this.timeZone = (new Intl.DateTimeFormat()).resolvedOptions().timeZone
|
||||||
|
} catch (_) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
htmx.on("htmx:afterOnLoad", function (evt) {
|
||||||
|
const hdrs = evt.detail.xhr.getAllResponseHeaders()
|
||||||
|
// Show a message if there was one in the response
|
||||||
|
if (hdrs.indexOf("x-toast") >= 0) {
|
||||||
|
mpj.showToast(evt.detail.xhr.getResponseHeader("x-toast"))
|
||||||
|
}
|
||||||
|
// Hide a modal window if requested
|
||||||
|
if (hdrs.indexOf("x-hide-modal") >= 0) {
|
||||||
|
document.getElementById(evt.detail.xhr.getResponseHeader("x-hide-modal") + "Dismiss").click()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
htmx.on("htmx:configRequest", function (evt) {
|
||||||
|
// Send the user's current time zone so that we can display local time
|
||||||
|
if (mpj.timeZone) {
|
||||||
|
evt.detail.headers["X-Time-Zone"] = mpj.timeZone
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
mpj.deriveTimeZone()
|
||||||
57
src/public/style/style.css
Normal file
57
src/public/style/style.css
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
|
||||||
|
nav {
|
||||||
|
background-color: green;
|
||||||
|
}
|
||||||
|
nav .m {
|
||||||
|
font-weight: 100;
|
||||||
|
}
|
||||||
|
nav .p {
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
nav .j {
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
.nav-item a:link,
|
||||||
|
.nav-item a:visited {
|
||||||
|
padding: .5rem 1rem;
|
||||||
|
margin: 0 .5rem;
|
||||||
|
border-radius: .5rem;
|
||||||
|
color: white;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
.nav-item a:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: rgba(255, 255, 255, .2);
|
||||||
|
}
|
||||||
|
.nav-item a.is-active-route {
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
border-top-right-radius: 0;
|
||||||
|
border-top: solid 4px rgba(255, 255, 255, .3);
|
||||||
|
}
|
||||||
|
|
||||||
|
form {
|
||||||
|
max-width: 60rem;
|
||||||
|
margin: auto;
|
||||||
|
}
|
||||||
|
.action-cell .material-icons {
|
||||||
|
font-size: 1.1rem ;
|
||||||
|
}
|
||||||
|
.material-icons {
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
|
#toastHost {
|
||||||
|
position: sticky;
|
||||||
|
bottom: 0;
|
||||||
|
}
|
||||||
|
.request-text {
|
||||||
|
white-space: pre-line
|
||||||
|
}
|
||||||
|
|
||||||
|
footer {
|
||||||
|
border-top: solid 1px lightgray;
|
||||||
|
margin: 1rem -1rem 0;
|
||||||
|
padding: 0 1rem;
|
||||||
|
}
|
||||||
|
footer p {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
8
src/public/user/log-off.php
Normal file
8
src/public/user/log-off.php
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::logOff();
|
||||||
8
src/public/user/log-on.php
Normal file
8
src/public/user/log-on.php
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
|
||||||
|
require '../../start.php';
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] <> 'GET') not_found();
|
||||||
|
|
||||||
|
Auth::logOn();
|
||||||
11
src/public/user/log-on/success.php
Normal file
11
src/public/user/log-on/success.php
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use MyPrayerJournal\Auth;
|
||||||
|
|
||||||
|
require '../../../start.php';
|
||||||
|
|
||||||
|
Auth::client()->exchange($_ENV['AUTH0_BASE_URL'] . '/user/log-on/success');
|
||||||
|
|
||||||
|
// TODO: get the possible redirect URL
|
||||||
|
header('Location: /journal');
|
||||||
|
exit();
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
ALTER TABLE mpj.request
|
|
||||||
ADD COLUMN "showAfter" BIGINT NOT NULL DEFAULT 0;
|
|
||||||
ALTER TABLE mpj.request
|
|
||||||
ADD COLUMN "recurType" VARCHAR(10) NOT NULL DEFAULT 'immediate';
|
|
||||||
ALTER TABLE mpj.request
|
|
||||||
ADD COLUMN "recurCount" SMALLINT NOT NULL DEFAULT 0;
|
|
||||||
CREATE OR REPLACE VIEW mpj.journal AS
|
|
||||||
SELECT
|
|
||||||
request."requestId",
|
|
||||||
request."userId",
|
|
||||||
(SELECT "text"
|
|
||||||
FROM mpj.history
|
|
||||||
WHERE history."requestId" = request."requestId"
|
|
||||||
AND "text" IS NOT NULL
|
|
||||||
ORDER BY "asOf" DESC
|
|
||||||
LIMIT 1) AS "text",
|
|
||||||
(SELECT "asOf"
|
|
||||||
FROM mpj.history
|
|
||||||
WHERE history."requestId" = request."requestId"
|
|
||||||
ORDER BY "asOf" DESC
|
|
||||||
LIMIT 1) AS "asOf",
|
|
||||||
(SELECT "status"
|
|
||||||
FROM mpj.history
|
|
||||||
WHERE history."requestId" = request."requestId"
|
|
||||||
ORDER BY "asOf" DESC
|
|
||||||
LIMIT 1) AS "lastStatus",
|
|
||||||
request."snoozedUntil",
|
|
||||||
request."showAfter",
|
|
||||||
request."recurType",
|
|
||||||
request."recurCount"
|
|
||||||
FROM mpj.request;
|
|
||||||
86
src/start.php
Normal file
86
src/start.php
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
<?php declare(strict_types=1);
|
||||||
|
|
||||||
|
use Auth0\SDK\Exception\ConfigurationException;
|
||||||
|
use BitBadger\PDODocument\{AutoId, Configuration, Definition, DocumentException, Mode};
|
||||||
|
use Dotenv\Dotenv;
|
||||||
|
use MyPrayerJournal\{Auth, Table};
|
||||||
|
use MyPrayerJournal\Domain\Request;
|
||||||
|
|
||||||
|
require __DIR__ . '/vendor/autoload.php';
|
||||||
|
|
||||||
|
/** The version of this application */
|
||||||
|
const MPJ_VERSION = '4.0.0-alpha1';
|
||||||
|
|
||||||
|
(Dotenv::createImmutable(__DIR__))->load();
|
||||||
|
|
||||||
|
if (php_sapi_name() != 'cli') {
|
||||||
|
session_start();
|
||||||
|
|
||||||
|
$auth0_user = Auth::user();
|
||||||
|
if (!is_null($auth0_user)) {
|
||||||
|
$_SESSION['user_id'] = $auth0_user['sub'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$_REQUEST['time_zone'] = $_SERVER['HTTP_X_TIME_ZONE'] ?? 'Etc/UTC';
|
||||||
|
}
|
||||||
|
|
||||||
|
Configuration::$pdoDSN = 'sqlite:' . implode(DIRECTORY_SEPARATOR, [__DIR__, 'data', 'mpj.db']);
|
||||||
|
Configuration::$mode = Mode::SQLite;
|
||||||
|
Configuration::$autoId = AutoId::RandomString;
|
||||||
|
Configuration::$idStringLength = 12;
|
||||||
|
|
||||||
|
Definition::ensureTable(Table::REQUEST);
|
||||||
|
Definition::ensureFieldIndex(Table::REQUEST, 'user', ['userId']);
|
||||||
|
|
||||||
|
$_PATCH = [];
|
||||||
|
if ($_SERVER['REQUEST_METHOD'] ?? '' == 'PATCH') parse_str(file_get_contents('php://input'), $_PATCH);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a 404 and exit
|
||||||
|
*/
|
||||||
|
function not_found(): never
|
||||||
|
{
|
||||||
|
http_response_code(404);
|
||||||
|
die('Not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a 303 redirect ("see other" - redirects to a GET)
|
||||||
|
*
|
||||||
|
* @param string $url The URL to which the browser should be redirected
|
||||||
|
*/
|
||||||
|
function see_other(string $url): never
|
||||||
|
{
|
||||||
|
header('Location: ' . (str_starts_with($url, 'http') ? '/' : $url));
|
||||||
|
http_response_code(303);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a header that instructs the browser to close an open modal dialog
|
||||||
|
*
|
||||||
|
* @param string $name The name of the dialog to be closed
|
||||||
|
*/
|
||||||
|
function hide_modal(string $name): void
|
||||||
|
{
|
||||||
|
header("X-Hide-Modal: $name");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validate the user, HTTP method, and request
|
||||||
|
*
|
||||||
|
* @param string $id The ID of the prayer request to retrieve
|
||||||
|
* @param array $methods The allowable HTTP methods
|
||||||
|
* @param bool $redirect Whether to redirect not-logged-on users (optional, defaults to true)
|
||||||
|
* @return Request The request (failures will not return)
|
||||||
|
* @throws ConfigurationException If any is encountered
|
||||||
|
* @throws DocumentException If any is encountered
|
||||||
|
*/
|
||||||
|
function validate_request(string $id, array $methods, bool $redirect = true): Request
|
||||||
|
{
|
||||||
|
if (sizeof(array_filter($methods, fn($it) => $_SERVER['REQUEST_METHOD'] == $it)) == 0) not_found();
|
||||||
|
|
||||||
|
Auth::requireUser($redirect);
|
||||||
|
|
||||||
|
return Request::byId($id)->getOrCall(not_found(...));
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user