diff --git a/apiserver/apiserver/api/models.py b/apiserver/apiserver/api/models.py index 1481f54..f3b4d8e 100644 --- a/apiserver/apiserver/api/models.py +++ b/apiserver/apiserver/api/models.py @@ -12,9 +12,9 @@ class Member(models.Model): set_details = models.BooleanField(default=False) preferred_name = models.CharField(max_length=32, blank=True) phone = models.CharField(max_length=32, blank=True) - current_start_date = models.DateField(blank=True, null=True) - application_date = models.DateField(blank=True, null=True) + current_start_date = models.DateField(auto_now_add=True, blank=True, null=True) + application_date = models.DateField(auto_now_add=True, blank=True, null=True) vetted_date = models.DateField(blank=True, null=True) - monthly_fees = models.IntegerField(blank=True, null=True) + monthly_fees = models.IntegerField(default=55, blank=True, null=True) emergency_contact_name = models.CharField(max_length=64, blank=True) emergency_contact_phone = models.CharField(max_length=32, blank=True) diff --git a/webclient/src/App.js b/webclient/src/App.js index 2be0193..0811e4b 100644 --- a/webclient/src/App.js +++ b/webclient/src/App.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; import './light.css'; import Logo from './logo.svg'; -import { Container, Divider, Form, Grid, Header, Icon, Menu, Message, Segment } from 'semantic-ui-react'; +import { Container, Divider, Form, Grid, Header, Icon, Image, Menu, Message, Segment, Table } from 'semantic-ui-react'; import { requester } from './utils.js'; function LoginForm(props) { @@ -236,11 +236,57 @@ function DetailsForm(props) { } function MemberInfo(props) { - const member = props.user.member; + const user = props.user; + const member = user.member; return (
Preferred Name: {member.preferred_name || '???'}
+Email: {user.email}
+ +