diff --git a/src/Components/HelpComponent.js b/src/Components/HelpComponent.js index de3b8a3..feb20c4 100644 --- a/src/Components/HelpComponent.js +++ b/src/Components/HelpComponent.js @@ -1,11 +1,12 @@ import React from 'react' -import { Row, Col, Button } from 'react-bootstrap' +import { Row, Col, Button, Badge } from 'react-bootstrap' import { availableViews } from '../util/Util'; +import { IconButton } from '@material-ui/core'; const HelpComponent = (props) => { return (
-

How to get married with SOLID in 10 simple steps

+

How to get married with SOLID in 5 simple steps

{availableViews.login.icon} @@ -47,14 +48,14 @@ const HelpComponent = (props) => {

Now that your profile information is filled in, you can start planning your wedding.

-

Tho initiate the marriage procedure, go to the Requests tab.

-

Here, the procedure can be initiated by clicking for the Marriage certificate type

+

Tho initiate the marriage procedure, go to the Procedures tab.

+

Here, the procedure can be initiated by clicking for the Marriage certificate type.

Now, you will find your information already filled out as one of the spouses.

A marriage requires two spouses to be given, as well as one or more witnesses.

-

If a valid webId is filled in, the profile of that person will be filled in automatically.

-

In case the given profile is incomplete, an error message will be shown. Please choose a different webId, or wait for the person to complete their profile.

+

If a valid webId is entered, the associated profile will be shown automatically.

+

In case this profile is incomplete, an error message will be shown. Please choose a different webId, or wait for the person to complete their profile.

If all necessary information is filled in, the proposal is ready to be submitted.

-

You can use the default storage location to store the created marriage proposal, or select a custom location (please make sure the selected location is valid).

+

You can use the default storage location to store the created marriage proposal on your pod, or select a custom location (please make sure the selected location is valid, and read permissions are public. If this is not the case, the people you invite will not be able to see the marriage proposal).

Now, you can submit the marriage proposal using

@@ -68,11 +69,13 @@ const HelpComponent = (props) => {

On creation of a marriage proposal, all parties (spouses and witnesses) are notified of the created proposal.

-

These notifications can be found in the inbox of your data pod (the default location is at /inbox).

- TODO :: proposals folder - check notifications and add running proposal for marriage if notification of that. - TODO :: on accept / rejection - add to hasContracts ! - - +

These notifications can be found by clicking the notification icon + + + {availableViews.notifications.icon} + + + at the top of your screen.

Now, you can see the marriage proposal, and all people involved in the proposal.

In this form, you will see two action buttons next to your name: and .

With these, you can accept or refuse the invitation.

diff --git a/src/Components/MarriageViewComponent.js b/src/Components/MarriageViewComponent.js index e1d9a7c..b55bced 100644 --- a/src/Components/MarriageViewComponent.js +++ b/src/Components/MarriageViewComponent.js @@ -6,6 +6,7 @@ import ns from "../util/NameSpaces" import ProfileCardComponent from './ProfileCardComponent' import { acceptProposal, refuseProposal, deleteProposal, createMarriageContractSubmissionNotification, submitProposal, sendContactInvitation } from '../util/MarriageController' import { availableViews } from '../util/Util' +import ProfileCardSelectorComponent from './ProfileCardSelectorComponent' const { default: data } = require('@solid/query-ldflex'); const INVITATIONACCEPTED = ns.demo('accepted') @@ -162,6 +163,7 @@ const MarriageViewComponent = (props) => { ? isComplete() ? +