diff --git a/src/components/AppDataLoader/index.tsx b/src/components/AppDataLoader/index.tsx
index 883546e5..632eebb5 100644
--- a/src/components/AppDataLoader/index.tsx
+++ b/src/components/AppDataLoader/index.tsx
@@ -2,9 +2,11 @@ import produce, { Immutable, Draft, original, castDraft } from 'immer';
import React, { useCallback, useMemo } from 'react';
import {
- ScheduleContextValue,
TermsContext,
ScheduleContext,
+ ScheduleContextValue,
+ FriendContext,
+ FriendContextValue,
} from '../../contexts';
import { AccountContext, AccountContextValue } from '../../contexts/account';
import { Oscar } from '../../data/beans';
@@ -15,6 +17,10 @@ import {
TermScheduleData,
ScheduleVersion,
ScheduleData,
+ FriendTermData,
+ FriendInfo,
+ FriendScheduleData,
+ FriendShareData,
} from '../../data/types';
import { lexicographicCompare } from '../../utils/misc';
import {
@@ -22,6 +28,7 @@ import {
StageLoadTerms,
StageEnsureValidTerm,
StageLoadAccount,
+ StageLoadRawFriendData,
StageLoadRawScheduleDataHybrid,
StageMigrateScheduleData,
StageCreateScheduleDataProducer,
@@ -29,7 +36,12 @@ import {
StageLoadOscarData,
StageExtractScheduleVersion,
StageSkeletonProps,
+ StageCreateFriendDataProducer,
+ StageExtractFriendTermData,
+ StageLoadRawFriendScheduleDataFromFirebaseFunction,
+ StageExtractFriendInfo,
} from './stages';
+import { softError, ErrorWithFields } from '../../log';
import { Term } from '../../types';
export type DataLoaderProps = {
@@ -100,48 +112,70 @@ export default function DataLoader({
termScheduleData,
updateTermScheduleData,
}): React.ReactElement => (
-
- {({ oscar }): React.ReactElement => (
- (
+
- {({
- currentVersion,
- scheduleVersion,
- updateScheduleVersion,
- }): React.ReactElement => (
- (
+
- {children}
-
+ {({
+ currentVersion,
+ scheduleVersion,
+ updateScheduleVersion,
+ }): React.ReactElement => (
+
+ {children}
+
+ )}
+
)}
-
+
)}
-
+
)}
)}
@@ -204,6 +238,87 @@ function GroupLoadScheduleData({
);
}
+type GroupLoadFriendScheduleDataProps = {
+ skeletonProps?: StageSkeletonProps;
+ accountState: AccountContextValue;
+ currentTerm: string;
+ children: (props: {
+ friendScheduleData: Immutable
;
+ updateFriendTermData: (
+ applyDraft: (
+ draft: Draft
+ ) => void | Immutable
+ ) => void;
+ updateFriendInfo: (
+ applyDraft: (draft: Draft) => void | Immutable
+ ) => void;
+ }) => React.ReactNode;
+};
+
+function GroupLoadFriendScheduleData({
+ skeletonProps,
+ accountState,
+ currentTerm,
+ children,
+}: GroupLoadFriendScheduleDataProps): React.ReactElement {
+ return (
+
+ {({ rawFriendData, setFriendData }): React.ReactElement => (
+
+ {({ updateFriendData }): React.ReactElement => (
+
+ {({
+ termFriendData,
+ updateFriendTermData,
+ }): React.ReactElement => (
+
+ {({ rawFriendScheduleData }): React.ReactElement => (
+
+ {({
+ friendScheduleData,
+ updateFriendInfo,
+ }): React.ReactElement => (
+ <>
+ {children({
+ friendScheduleData,
+ updateFriendTermData,
+ updateFriendInfo,
+ })}
+
+ )}
+
+ )}
+
+ )}
+
+ )}
+
+ )}
+
+ );
+}
+
type ContextProviderProps = {
terms: Term[];
currentTerm: string;
@@ -224,6 +339,15 @@ type ContextProviderProps = {
) => void | Immutable
) => void;
accountState: AccountContextValue;
+ friendScheduleData: Immutable;
+ updateFriendTermData: (
+ applyDraft: (
+ draft: Draft
+ ) => void | Immutable
+ ) => void;
+ updateFriendInfo: (
+ applyDraft: (draft: Draft) => void | Immutable
+ ) => void;
children: React.ReactNode;
};
@@ -245,6 +369,9 @@ function ContextProvider({
termScheduleData,
updateTermScheduleData,
accountState,
+ friendScheduleData,
+ updateFriendTermData,
+ updateFriendInfo,
children,
}: ContextProviderProps): React.ReactElement {
// Create a `updateSchedule` function
@@ -286,13 +413,62 @@ function ContextProvider({
return versions;
}, [termScheduleData.versions]);
+ const allFriends = useMemo<
+ Record>
+ >(() => {
+ const f = {} as Record>;
+ Object.entries(termScheduleData.versions).forEach(
+ ([versionId, { friends }]) => {
+ f[versionId] = friends;
+ }
+ );
+ return f;
+ }, [termScheduleData.versions]);
+
// Get all version-related actions
- const { addNewVersion, deleteVersion, renameVersion, cloneVersion } =
- useVersionActions({
- updateTermScheduleData,
- setVersion,
- currentVersion,
- });
+ const {
+ addNewVersion,
+ deleteVersion,
+ renameVersion,
+ cloneVersion,
+ deleteFriendRecord,
+ } = useVersionActions({
+ updateTermScheduleData,
+ setVersion,
+ currentVersion,
+ });
+
+ // Create a rename friend function.
+ const renameFriend = useCallback(
+ (id: string, newName: string): void => {
+ updateFriendInfo((draft) => {
+ const existingDraft = draft[id];
+ if (existingDraft === undefined) {
+ softError(
+ new ErrorWithFields({
+ message:
+ "renameFriend called with current friend id that doesn't exist; ignoring",
+ fields: {
+ allFriendNames: Object.entries(draft).map(
+ ([friendId, { name }]) => ({
+ id: friendId,
+ name,
+ })
+ ),
+ id,
+ friendCount: Object.keys(draft).length,
+ newName,
+ },
+ })
+ );
+ return;
+ }
+
+ existingDraft.name = newName;
+ });
+ },
+ [updateFriendInfo]
+ );
// Memoize the context values so that they are stable
const scheduleContextValue = useMemo(
@@ -302,7 +478,10 @@ function ContextProvider({
oscar,
currentVersion,
allVersionNames,
+ allFriends,
+ currentFriends: scheduleVersion.friends ?? {},
...castDraft(scheduleVersion.schedule),
+ versions: termScheduleData.versions,
},
{
setTerm,
@@ -311,6 +490,7 @@ function ContextProvider({
setCurrentVersion: setVersion,
addNewVersion,
deleteVersion,
+ deleteFriendRecord,
renameVersion,
cloneVersion,
},
@@ -320,23 +500,43 @@ function ContextProvider({
oscar,
currentVersion,
allVersionNames,
+ allFriends,
+ scheduleVersion.friends,
scheduleVersion.schedule,
setTerm,
patchSchedule,
updateSchedule,
setVersion,
addNewVersion,
+ deleteFriendRecord,
deleteVersion,
renameVersion,
cloneVersion,
+ termScheduleData.versions,
]
);
+ const friendContextValue = useMemo(
+ () => [
+ {
+ friends: friendScheduleData,
+ },
+ {
+ renameFriend,
+ updateFriendTermData,
+ updateFriendInfo,
+ },
+ ],
+ [friendScheduleData, renameFriend, updateFriendTermData, updateFriendInfo]
+ );
+
return (
- {children}
+
+ {children}
+
diff --git a/src/components/AppDataLoader/stages.tsx b/src/components/AppDataLoader/stages.tsx
index a371d749..425b5a0f 100644
--- a/src/components/AppDataLoader/stages.tsx
+++ b/src/components/AppDataLoader/stages.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { Immutable, Draft, castDraft } from 'immer';
+import React, { useMemo } from 'react';
+import { Immutable, Draft, castDraft, castImmutable } from 'immer';
import { Oscar } from '../../data/beans';
import useDownloadOscarData from '../../data/hooks/useDownloadOscarData';
@@ -9,9 +9,16 @@ import LoadingDisplay from '../LoadingDisplay';
import { SkeletonContent, AppSkeleton, AppSkeletonProps } from '../App/content';
import {
AnyScheduleData,
+ defaultFriendData,
+ FriendData,
+ FriendTermData,
+ FriendIds,
+ FriendInfo,
ScheduleData,
ScheduleVersion,
TermScheduleData,
+ RawFriendScheduleData,
+ FriendScheduleData,
} from '../../data/types';
import useRawScheduleDataFromStorage from '../../data/hooks/useRawScheduleDataFromStorage';
import useExtractSchedule from '../../data/hooks/useExtractScheduleVersion';
@@ -23,6 +30,11 @@ import useUIStateFromStorage from '../../data/hooks/useUIStateFromStorage';
import { AccountContextValue, SignedIn } from '../../contexts/account';
import useFirebaseAuth from '../../data/hooks/useFirebaseAuth';
import useRawScheduleDataFromFirebase from '../../data/hooks/useRawScheduleDataFromFirebase';
+import useRawFriendDataFromFirebase from '../../data/hooks/useRawFriendDataFromFirebase';
+import useFriendDataProducer from '../../data/hooks/useFriendDataProducer';
+import useExtractFriendTermData from '../../data/hooks/useExtractFriendTermData';
+import useRawFriendScheduleDataFromFirebaseFunction from '../../data/hooks/useRawFriendScheduleDataFromFirebaseFunction';
+import useExtractFriendInfo from '../../data/hooks/useExtractFriendInfo';
// Each of the components in this file is a "stage" --
// a component that takes in a render function for its `children` prop
@@ -256,7 +268,6 @@ export function StageLoadRawScheduleDataFromFirebase({
children,
}: StageLoadRawScheduleDataFromFirebaseProps): React.ReactElement {
const loadingState = useRawScheduleDataFromFirebase(accountState);
-
if (loadingState.type !== 'loaded') {
return (
@@ -521,3 +532,245 @@ export function StageExtractScheduleVersion({
return <>{children({ ...loadingState.result })};
}
+
+export type StageLoadRawFriendDataProps = {
+ skeletonProps?: StageSkeletonProps;
+ accountState: AccountContextValue;
+ currentTerm: string;
+ children: (props: {
+ rawFriendData: Immutable;
+ setFriendData: (
+ next: ((current: FriendData | null) => FriendData | null) | FriendData
+ ) => void;
+ }) => React.ReactNode;
+};
+
+export function StageLoadRawFriendData({
+ skeletonProps,
+ accountState,
+ currentTerm,
+ children,
+}: StageLoadRawFriendDataProps): React.ReactElement {
+ const friendDataSignedOut = useMemo(() => {
+ const friendData = castDraft({ ...defaultFriendData });
+ friendData.terms[currentTerm] = { accessibleSchedules: {} };
+ return castImmutable(friendData);
+ }, [currentTerm]);
+
+ if (accountState.type === 'signedOut') {
+ return (
+ <>
+ {children({
+ rawFriendData: friendDataSignedOut,
+ setFriendData: () => {
+ /* empty */
+ },
+ })}
+
+ );
+ }
+
+ return StageLoadRawFriendDataFromFirebase({
+ skeletonProps,
+ accountState,
+ children,
+ });
+}
+
+export type StageLoadRawFriendDataFromFirebaseProps = {
+ skeletonProps?: StageSkeletonProps;
+ accountState: SignedIn;
+ children: (props: {
+ rawFriendData: Immutable;
+ setFriendData: (
+ next: ((current: FriendData | null) => FriendData | null) | FriendData
+ ) => void;
+ }) => React.ReactNode;
+};
+
+export function StageLoadRawFriendDataFromFirebase({
+ skeletonProps,
+ accountState,
+ children,
+}: StageLoadRawFriendDataFromFirebaseProps): React.ReactElement {
+ const loadingState = useRawFriendDataFromFirebase(accountState);
+
+ if (loadingState.type !== 'loaded') {
+ return (
+
+
+
+
+
+ );
+ }
+
+ return <>{children({ ...loadingState.result })};
+}
+
+export type StageCreateFriendDataProducerProps = {
+ setFriendData: (
+ next: ((current: FriendData | null) => FriendData | null) | FriendData
+ ) => void;
+ children: (props: {
+ updateFriendData: (
+ applyDraft: (draft: Draft) => void | Immutable
+ ) => void;
+ }) => React.ReactNode;
+};
+
+export function StageCreateFriendDataProducer({
+ setFriendData,
+ children,
+}: StageCreateFriendDataProducerProps): React.ReactElement {
+ const { updateFriendData } = useFriendDataProducer({ setFriendData });
+ return <>{children({ updateFriendData })};
+}
+
+export type StageExtractFriendTermDataProps = {
+ skeletonProps?: StageSkeletonProps;
+ accountState: AccountContextValue;
+ currentTerm: string;
+ rawFriendData: Immutable;
+ updateFriendData: (
+ applyDraft: (draft: Draft) => void | Immutable
+ ) => void;
+ children: (props: {
+ termFriendData: Immutable;
+ updateFriendTermData: (
+ applyDraft: (
+ draft: Draft
+ ) => void | Immutable
+ ) => void;
+ }) => React.ReactNode;
+};
+
+export function StageExtractFriendTermData({
+ skeletonProps,
+ accountState,
+ currentTerm,
+ rawFriendData,
+ updateFriendData,
+ children,
+}: StageExtractFriendTermDataProps): React.ReactElement {
+ const loadingState = useExtractFriendTermData({
+ currentTerm,
+ rawFriendData,
+ updateFriendData,
+ });
+
+ if (loadingState.type !== 'loaded') {
+ return (
+
+
+
+
+
+ );
+ }
+
+ return <>{children({ ...loadingState.result })};
+}
+
+export type StageLoadRawFriendScheduleDataFromFirebaseFunctionProps = {
+ skeletonProps?: StageSkeletonProps;
+ accountState: AccountContextValue;
+ currentTerm: string;
+ termFriendData: Immutable;
+ children: (props: {
+ rawFriendScheduleData: RawFriendScheduleData;
+ }) => React.ReactNode;
+};
+
+export function StageLoadRawFriendScheduleDataFromFirebaseFunction({
+ skeletonProps,
+ accountState,
+ currentTerm,
+ termFriendData,
+ children,
+}: // eslint-disable-next-line max-len
+StageLoadRawFriendScheduleDataFromFirebaseFunctionProps): React.ReactElement {
+ const loadingState = useRawFriendScheduleDataFromFirebaseFunction({
+ currentTerm,
+ termFriendData,
+ });
+
+ if (loadingState.type !== 'loaded') {
+ return (
+
+
+
+
+
+ );
+ }
+
+ return (
+ <>
+ {children({
+ rawFriendScheduleData: { ...loadingState.result.friendScheduleData },
+ })}
+
+ );
+}
+
+export type StageExtractFriendInfo = {
+ skeletonProps?: StageSkeletonProps;
+ accountState: AccountContextValue;
+ rawFriendScheduleData: RawFriendScheduleData;
+ friendInfo: Immutable;
+ updateFriendData: (
+ applyDraft: (draft: Draft) => void | Immutable
+ ) => void;
+ children: (props: {
+ friendScheduleData: Immutable;
+ updateFriendInfo: (
+ applyDraft: (draft: Draft) => void | Immutable
+ ) => void;
+ }) => React.ReactNode;
+};
+
+export function StageExtractFriendInfo({
+ skeletonProps,
+ accountState,
+ rawFriendScheduleData,
+ friendInfo,
+ updateFriendData,
+ children,
+}: StageExtractFriendInfo): React.ReactElement {
+ const loadingState = useExtractFriendInfo({
+ rawFriendScheduleData,
+ friendInfo,
+ updateFriendData,
+ });
+
+ if (loadingState.type !== 'loaded') {
+ return (
+
+
+
+
+
+ );
+ }
+
+ return (
+ <>
+ {children({
+ ...loadingState.result,
+ })}
+
+ );
+}
diff --git a/src/components/Attribution/index.tsx b/src/components/Attribution/index.tsx
index 2f36a8e2..59cb0eb3 100644
--- a/src/components/Attribution/index.tsx
+++ b/src/components/Attribution/index.tsx
@@ -1,5 +1,8 @@
import React from 'react';
+import { faGithub } from '@fortawesome/free-brands-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Button } from '..';
import { classes } from '../../utils/misc';
import { DESKTOP_BREAKPOINT } from '../../constants';
import useScreenWidth from '../../hooks/useScreenWidth';
@@ -10,6 +13,15 @@ export default function Attribution(): React.ReactElement {
const mobile = !useScreenWidth(DESKTOP_BREAKPOINT);
return (
+ {!mobile ? (
+
+ ) : (
+
+ )}
+
Copyright (c) 2023 with{' '}
@@ -22,6 +34,7 @@ export default function Attribution(): React.ReactElement {
.
+
{!preview && hiddenSections.length > 0 && (