- Member paused or not allowed entry, {cards.length} card{cards.length === 1 ? '' : 's'} ignored anyway.
+ Member paused, unvetted or not allowed entry. {cards.length} card{cards.length === 1 ? '' : 's'} ignored anyway.
Pause / Unpause Membership
-
Pause members who are inactive, former, or on vacation.
-
{result.member.paused_date ?
-
+ result.member.vetted_date && moment().diff(moment(result.member.paused_date), 'days') > 370 ?
+ <>
+
+ {result.member.preferred_name} has been away for more than a year and will need to be re-vetted according to our
+ policy.
+
+
+ setTold1(v.checked)}
+ />
+
+
+ setTold2(v.checked)}
+ />
+
+
+
+
+ :
+ result.member.status == 'Expired Member' ?
+ <>
+
+ {result.member.preferred_name} has expired due to lapse of payment.
+
+
+ setTold1(v.checked)}
+ />
+
+
+ setTold2(v.checked)}
+ />
+
+
+
+
+ :
+
:
<>
+
Pause members who are inactive, former, or on vacation.
+
setInput({ ...input, month: v });
- const handleExcludePayPal = (e, v) => {
- setExcludePayPal(v.checked);
- excludePayPalCache = v.checked;
- };
-
- const handleSubmit = (e) => {
+ const makeRequest = () => {
if (loading) return;
setLoading(true);
const month = input.month.format('YYYY-MM');
- requester('/transactions/?month=' + month, 'GET', token)
+ requester('/transactions/?month=' + month + '&exclude_paypal=' + excludePayPal + '&exclude_snacks=' + excludeSnacks, 'GET', token)
.then(res => {
setLoading(false);
setError(false);
@@ -75,8 +72,37 @@ export function AdminHistoricalTransactions(props) {
console.log(err);
setError(true);
});
+
+ requester('/transactions/summary/?month=' + month, 'GET', token)
+ .then(res => {
+ setLoading(false);
+ setError(false);
+ setSummary(res);
+ summaryCache = res;
+ })
+ .catch(err => {
+ setLoading(false);
+ console.log(err);
+ setError(true);
+ });
};
+ const handleSubmit = (e) => {
+ makeRequest();
+ };
+
+ const handleExcludePayPal = (e, v) => {
+ setExcludePayPal(v.checked);
+ };
+
+ const handleExcludeSnacks = (e, v) => {
+ setExcludeSnacks(v.checked);
+ };
+
+ useEffect(() => {
+ makeRequest();
+ }, [excludePayPal, excludeSnacks]);
+
return (
+ {transactions &&
Found {transactions.length} transactions.
}
+
+ {!error ?
+ summary &&
+
+
+
+
+
+ Category
+ Dollar
+ Protocoin
+
+
+
+
+ {summary.map(x =>
+
+ {x.category}
+ {'$ ' + x.dollar.toFixed(2)}
+ {'₱ ' + x.protocoin.toFixed(2)}
+
+ )}
+
+
+
+ :
+
Error loading summary.
+ }
+
+
{!error ?
transactions &&
-
Found {transactions.length} transactions.
{!!transactions.length &&
{moment(transactions[0].date, 'YYYY-MM-DD').format('MMMM YYYY')} Transactions
}
-
!excludePayPal || x.account_type !== 'PayPal')} />
+
+
+
:
Error loading transactions.
diff --git a/webclient/src/App.js b/webclient/src/App.js
index e6d11de..1d6d8ac 100644
--- a/webclient/src/App.js
+++ b/webclient/src/App.js
@@ -29,7 +29,7 @@ import { NotFound, PleaseLogin } from './Misc.js';
import { Debug } from './Debug.js';
import { Garden } from './Garden.js';
import { Footer } from './Footer.js';
-import { LCARS1Display } from './Display.js';
+import { LCARS1Display, LCARS2Display } from './Display.js';
const APP_VERSION = 5; // TODO: automate this
@@ -98,7 +98,8 @@ function App() {
right: '16px',
buttonColorDark: '#666',
buttonColorLight: '#aaa',
- label: '🌙',
+ label: '🌓',
+ autoMatchOsTheme: false,
}
const darkmode = new Darkmode(options);
darkmode.showWidget();
@@ -129,6 +130,10 @@ function App() {
+
+
+
+
diff --git a/webclient/src/Cards.js b/webclient/src/Cards.js
index d424ddd..89a77d7 100644
--- a/webclient/src/Cards.js
+++ b/webclient/src/Cards.js
@@ -20,8 +20,8 @@ export function Cards(props) {
{user.member.card_photo ?
- Click here
- to view your card image.
+ View your card image.
+
:
Upload a photo to generate a card image.
diff --git a/webclient/src/Charts.js b/webclient/src/Charts.js
index 3096699..980239a 100644
--- a/webclient/src/Charts.js
+++ b/webclient/src/Charts.js
@@ -310,7 +310,7 @@ export function Charts(props) {
-
+
moment(t).format('YYYY-MM-DD ddd')} />
Loading...
}
+
+
);
};
@@ -691,6 +694,20 @@ export function ClassDetail(props) {
name={clazz.course_data.name}
custom={JSON.stringify({ training: userTraining.id })}
/>
+
+
+
+ Current balance: ₱ {user.member.protocoin.toFixed(2)}
+
+ {
+ refreshUser();
+ refreshClass();
+ }}
+ custom={{ category: 'OnAcct', training: userTraining.id }}
+ />
diff --git a/webclient/src/Courses.js b/webclient/src/Courses.js
index 364d007..c696875 100644
--- a/webclient/src/Courses.js
+++ b/webclient/src/Courses.js
@@ -235,7 +235,7 @@ export function CourseDetail(props) {
{course.sessions.length ?
- course.sessions.sort((a, b) => a.datetime < b.datetime ? 1 : -1).slice(0,10).map(x =>
+ course.sessions.sort((a, b) => a.datetime < b.datetime ? 1 : -1).map(x =>
diff --git a/webclient/src/Debug.js b/webclient/src/Debug.js
index ce62fc4..350719f 100644
--- a/webclient/src/Debug.js
+++ b/webclient/src/Debug.js
@@ -26,6 +26,10 @@ export function Debug(props) {
Trotec Usage
+ LCARS1 Display
+
+ LCARS2 Display
+
);
diff --git a/webclient/src/Display.js b/webclient/src/Display.js
index 471cbc4..a4388f9 100644
--- a/webclient/src/Display.js
+++ b/webclient/src/Display.js
@@ -34,7 +34,17 @@ export function LCARS1Display(props) {
}
-
+
+
+
+
+
+
+
+
+
+
+
@@ -44,6 +54,43 @@ export function LCARS1Display(props) {
);
};
+export function LCARS2Display(props) {
+ const { token } = props;
+ const [fullElement, setFullElement] = useState(false);
+ const ref = useRef(null);
+
+ const goFullScreen = () => {
+ if ('wakeLock' in navigator) {
+ navigator.wakeLock.request('screen');
+ }
+
+ ref.current.requestFullscreen({ navigationUI: 'hide' }).then(() => {
+ setFullElement(true);
+ });
+ };
+
+ return (
+
+
+
+ {!fullElement &&
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+ );
+};
+
export function DisplayUsage(props) {
const { token, name } = props;
const title = deviceNames[name].title;
@@ -67,21 +114,128 @@ export function DisplayUsage(props) {
return () => clearInterval(interval);
}, []);
- const showUsage = usage && usage.track.username === usage.username;
+ const inUse = usage && moment().unix() - usage.track.time <= 60;
+ const showUsage = usage && inUse && usage.track.username === usage.username;
return (
<>
+
+
{showUsage ?
:
- <>
-
-
-
- Waiting for job
-
-
+
+ Waiting for job
+
}
);
};
+
+export function DisplayScores(props) {
+ const { token, name } = props;
+ const [scores, setScores] = useState(false);
+
+ const getScores = () => {
+ requester('/pinball/high_scores/', 'GET')
+ .then(res => {
+ setScores(res);
+ })
+ .catch(err => {
+ console.log(err);
+ setScores(false);
+ });
+ };
+
+ useEffect(() => {
+ getScores();
+ const interval = setInterval(getScores, 60000);
+ return () => clearInterval(interval);
+ }, []);
+
+ return (
+ <>
+
+
+ {scores && scores.slice(0, 5).map((x, i) =>
+
+
#{i+1} — {x.name}. {i === 0 ? '👑' : ''}
+
{x.score.toLocaleString()}
+
+ )}
+
+
+ );
+};
+
+export function DisplayMonthlyScores(props) {
+ const { token, name } = props;
+ const [scores, setScores] = useState(false);
+
+ const getScores = () => {
+ requester('/pinball/monthly_high_scores/', 'GET')
+ .then(res => {
+ setScores(res);
+ })
+ .catch(err => {
+ console.log(err);
+ setScores(false);
+ });
+ };
+
+ useEffect(() => {
+ getScores();
+ const interval = setInterval(getScores, 60000);
+ return () => clearInterval(interval);
+ }, []);
+
+ return (
+ <>
+
+
+ {scores && scores.slice(0, 5).map((x, i) =>
+
+
#{i+1} — {x.name}. {i === 0 ? '🧙' : ''}
+
{x.score.toLocaleString()}
+
+ )}
+
+
+ );
+};
+
+export function DisplayHosting(props) {
+ const { token, name } = props;
+ const [scores, setScores] = useState(false);
+
+ const getScores = () => {
+ requester('/hosting/high_scores/', 'GET')
+ .then(res => {
+ setScores(res);
+ })
+ .catch(err => {
+ console.log(err);
+ setScores(false);
+ });
+ };
+
+ useEffect(() => {
+ getScores();
+ const interval = setInterval(getScores, 60000);
+ return () => clearInterval(interval);
+ }, []);
+
+ return (
+ <>
+
+
+ {scores && scores.slice(0, 5).map((x, i) =>
+
+
#{i+1} — {x.name}. {i === 0 ? 
: ''}
+
{x.hours.toFixed(2)} hours
+
+ )}
+
+
+ );
+};
diff --git a/webclient/src/Footer.js b/webclient/src/Footer.js
index 672b248..1668159 100644
--- a/webclient/src/Footer.js
+++ b/webclient/src/Footer.js
@@ -49,9 +49,9 @@ export const Footer = () => {
target="_blank"
rel="noopener noreferrer"
>
- Click here
+ View the source code and license on GitHub.
{' '}
- to view the source code and license.
+
@@ -97,7 +97,7 @@ export const Footer = () => {
-
© 2020 Calgary Protospace Ltd.
+
© 2020-{new Date().getFullYear()} Calgary Protospace Ltd.
);
diff --git a/webclient/src/Home.js b/webclient/src/Home.js
index 6e2aa15..77ceeb9 100644
--- a/webclient/src/Home.js
+++ b/webclient/src/Home.js
@@ -22,6 +22,11 @@ function MemberInfo(props) {
return (
+ {member.protocoin < 0 &&
+ Your Protocoin balance is negative!
+ Visit the Paymaster page or pay a Director to buy Protocoin.
+ }
+
Welcome, new member!
- Click here
- to view your application forms.
+ View your application forms.
+
}
@@ -89,8 +94,6 @@ function MemberInfo(props) {
Latest Training
-
{unpaidTraining.map(x =>
Please pay your course fee!
@@ -98,6 +101,12 @@ function MemberInfo(props) {
)}
+
+
+ {!member.orientation_date &&
+ ⚠️ You need to attend a New Member Orientation to use any tool larger than a screwdriver.
+
}
+
{lastTrain.length ?
@@ -110,7 +119,7 @@ function MemberInfo(props) {
)
:
- None, please sign up for an Orientation
+ None
}
{user.training.length > 3 &&
@@ -231,9 +240,15 @@ export function Home(props) {
const getTrackAgo = (x) => stats && stats.track && stats.track[x] ? moment.unix(stats.track[x]['time']).tz('America/Edmonton').fromNow() : '';
const getTrackName = (x) => stats && stats.track && stats.track[x] && stats.track[x]['first_name'] ? stats.track[x]['first_name'] : 'Unknown';
- const alarmStat = () => stats && stats.alarm && moment().unix() - stats.alarm['time'] < 300 ? stats.alarm['data'] < 270 ? 'Armed' : 'Disarmed' : 'Unknown';
+ //const alarmStat = () => stats && stats.alarm && moment().unix() - stats.alarm['time'] < 300 ? stats.alarm['data'] < 270 ? 'Armed' : 'Disarmed' : 'Unknown';
+ const alarmStat = () => 'Unknown';
- const doorOpenStat = () => alarmStat() === 'Disarmed' && stats.alarm['data'] > 360 ? ', door open' : '';
+ //const doorOpenStat = () => alarmStat() === 'Disarmed' && stats.alarm['data'] > 360 ? ', door open' : '';
+ const doorOpenStat = () => '';
+
+ const closedStat = (x) => stats && stats.closing ? moment().unix() > stats.closing['time'] ? 'Closed' : 'Open until ' + stats.closing['time_str'] : 'Unknown';
+
+ const printer3dStat = (x) => stats && stats.printer3d && stats.printer3d[x] ? stats.printer3d[x].state === 'Printing' ? 'Printing (' + stats.printer3d[x].progress + '%)' : stats.printer3d[x].state : 'Unknown';
const show_signup = stats?.at_protospace;
@@ -261,8 +276,8 @@ export function Home(props) {
{user?.member?.set_details !== false &&
- Main Website
- Protospace Wiki — [register]
+ Main Website
+ Protospace Wiki — [register]
Forum (Spacebar) — [register]
{!!user && Google Drive
}
{!!user && isAdmin(user) && Property Management Portal
}
@@ -348,7 +363,33 @@ export function Home(props) {
} trigger={[more]} />
+
+ Media computer: {getTrackStat('PROTOGRAPH1')}
+
+ Last use:
+ {getTrackLast('PROTOGRAPH1')}
+ {getTrackAgo('PROTOGRAPH1')}
+ by {getTrackName('PROTOGRAPH1')}
+
+
+
+ Last print:
+ {getTrackLast('LASTLARGEPRINT')}
+ {getTrackAgo('LASTLARGEPRINT')}
+ by {getTrackName('LASTLARGEPRINT')}
+
+
+ } trigger={[more]} />
+
+
+ ORD2 printer: {printer3dStat('ord2')}
+
+ ORD3 printer: {printer3dStat('ord3')}
+
{user && Alarm status: {alarmStat()}{doorOpenStat()}
}
+
+ {user && Hosting status: {closedStat()}
}
Pay for materials you use (ie. welding gas, 3D printing, blades, etc).
-
-
+
+
+
+ Pay for materials you use (ie. welding gas, 3D printing, etc).
+
Custom amount:
@@ -188,13 +228,21 @@ export function Paymaster(props) {
name='Protospace Consumables'
custom={JSON.stringify({ category: 'Consumables', member: user.member.id, memo: consumablesMemo })}
/>
+
+
+
+
setConsumables('')}
+ custom={{ category: 'Consumables', memo: consumablesMemo }}
+ />
-
-
-
-
-
+
+
+ Donation of any amount to Protospace.
+
Custom amount:
@@ -221,6 +269,15 @@ export function Paymaster(props) {
name='Protospace Donation'
custom={JSON.stringify({ category: 'Donation', member: user.member.id, memo: memo })}
/>
+
+
+
+
setDonate('')}
+ custom={{ category: 'Donation', memo: memo }}
+ />
diff --git a/webclient/src/Transactions.js b/webclient/src/Transactions.js
index 1c1226b..be03b14 100644
--- a/webclient/src/Transactions.js
+++ b/webclient/src/Transactions.js
@@ -211,66 +211,6 @@ function EditTransaction(props) {
);
};
-function ReportTransaction(props) {
- const { transaction, token, refreshUser } = props;
- const [input, setInput] = useState(transaction);
- const [error, setError] = useState(false);
- const [loading, setLoading] = useState(false);
- const [success, setSuccess] = useState(false);
- const { id } = useParams();
-
- const handleValues = (e, v) => setInput({ ...input, [v.name]: v.value });
- const handleChange = (e) => handleValues(e, e.currentTarget);
-
- const handleSubmit = (e) => {
- if (loading) return;
- setLoading(true);
- setSuccess(false);
- requester('/transactions/'+id+'/report/', 'POST', token, input)
- .then(res => {
- setLoading(false);
- setSuccess(true);
- setError(false);
- if (refreshUser) {
- refreshUser();
- }
- })
- .catch(err => {
- setLoading(false);
- console.log(err);
- setError(err.data);
- });
- };
-
- const makeProps = (name) => ({
- name: name,
- onChange: handleChange,
- value: input[name] || '',
- error: error[name],
- });
-
- return (
-
-
-
-
If this transaction was made in error or there is anything incorrect about it, please report it using this form.
-
A staff member will review the report as soon as possible.
-
Follow up with directors@protospace.ca.
-
-
-
If there's anything wrong with this transaction or it was made in error please email the Protospace Directors:
+ directors@protospace.ca
+ Please include a link to this transaction and any relevant details.
}
diff --git a/webclient/src/light.css b/webclient/src/light.css
index f48b1d0..6a318f5 100644
--- a/webclient/src/light.css
+++ b/webclient/src/light.css
@@ -157,6 +157,11 @@ body {
margin-left: auto;
}
+.adminvetting .ui.button {
+ padding-left: 0.5rem;
+ padding-right: 0.5rem;
+}
+
.interest .ui.button {
padding-left: 0.5rem;
padding-right: 0.5rem;
@@ -184,15 +189,34 @@ body {
height: 100vh;
background-color: black;
color: white;
- font-size: 1em;
+ font-size: 1.75em;
}
.display-usage {
border: 1px solid white;
padding: 0.5em;
align-self: flex-end;
- width: 240px;
- height: 383px;
+ width: 25vw;
+ height: 75vh;
+}
+
+.display-scores {
+ border: 1px solid white;
+ padding: 0.5em;
+ align-self: flex-end;
+ width: 25vw;
+ height: 75vh;
+}
+
+.display-scores p {
+ font-size: 1.5em;
+ text-align: right;
+}
+
+.display .display-scores .toast {
+ width: 40px;
+ height: 40px;
+ margin-bottom: 15px;
}
.usage {
@@ -222,6 +246,10 @@ body {
text-overflow: ellipsis;
}
+.filter-option {
+ margin-right: 1rem;
+}
+
.footer {
margin-top: -20rem;
diff --git a/webclient/src/utils.js b/webclient/src/utils.js
index 36bf4e1..3fc54c0 100644
--- a/webclient/src/utils.js
+++ b/webclient/src/utils.js
@@ -30,6 +30,8 @@ export const statusColor = {
'Due': 'yellow',
'Overdue': 'red',
'Former Member': 'black',
+ 'Paused Member': 'black',
+ 'Expired Member': 'black',
};
export const BasicTable = (props) => (