Move values into configuration, stop checking # of slots

Try and bring ACNW and ACUS together through:
 1. Configuration values
 2.

Added configuration settings:

Copyright holder in footer
 - config.copyright (string)

Used to set range on min and max player in creating games
 - config.playerMin (positive integer)
 - config.playerMax (positive integer)
 - config.minPlayersFloor (positive integer)
 - config.minPlayersCeiling (positive integer)
 - config.maxPlayersFloor (positive integer)
 - config.maxPlayersCeiling (positive integer)

Used by ACUS on its hotel page to allow people to book in its
block of rooms:
 - config.hotelBookingCode (string)
 - config.hotelBookingUrl (string)
 - config.hotelBookingLastdate (date)

Resolves: #155, #158, #160, #161
See also: #159

Author: evoskamp

packages/amber/components/Footer.tsx

@@ -55,9 +55,7 @@ export const Footer: React.FC = (_props) => {
   const commitDate = DateTime.fromISO(gitHash.date)
   const id = open ? 'simple-popover' : undefined
   const configuration = useConfiguration()
-  const acus = configuration.numberOfSlots === 8
-  const acnw = !acus
-  const copyrightUrl = acnw ? 'amberconnw.org' : 'ambercon.com'
+  const copyrightUrl = configuration.copyright
   return (
     <Box
       component='footer'

packages/amber/views/GameSignup/GameChoiceSelector.tsx

@@ -8,24 +8,11 @@ import { Game, GameChoice, GameEntry, Maybe } from '../../client'
 import { Perms, useAuth } from '../../components/Auth'
 import { Configuration, useConfiguration } from '../../utils'
 
-export const isNoGame = (configuration: Configuration, id: number) => {
-  const acus = configuration.numberOfSlots === 8
-  if (acus) {
-    return id >= 596 && id <= 603
-  } else {
-    return id <= 7
-  }
-}
+// first N game ids are the No Game in Slot N entries ... :(
+export const isNoGame = (configuration: Configuration, id: number) => id <= configuration.numberOfSlots
 
 // 144 is the magic number of the Any Game entry :(
-export const isAnyGame = (configuration: Configuration, id: number) => {
-  const acus = configuration.numberOfSlots === 8
-  if (acus) {
-    return id === 604
-  } else {
-    return id === 144
-  }
-}
+export const isAnyGame = (configuration: Configuration, id: number) => id === 144
 
 const useStyles = makeStyles()((_theme: Theme) => ({
   spacer: {

packages/amber/views/Games/GamesDialog.tsx

@@ -88,8 +88,9 @@ const getDefaultValues = (configuration: Configuration): GameDialogFormValues =>
   type: '',
   setting: '',
   charInstructions: '',
-  playerMin: configuration.virtual ? 2 : configuration.numberOfSlots === 8 ? 3 : 4,
-  playerMax: configuration.virtual ? 7 : configuration.numberOfSlots === 8 ? 6 : 10,
+  playerMin: configuration.playerMin,
+  playerMax: configuration.playerMax,
+
   playerPreference: '',
   returningPlayers: '',
   playersContactGm: false,
@@ -143,12 +144,6 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
   const handleClose = useDisableBackdropClick(onClose)
   const estimatedLengthOptions = useMemo(() => getEstimatedLengthOptions(configuration), [configuration])
 
-  const slim = configuration.numberOfSlots === 8
-  const minPlayersFloor = slim ? 1 : 1
-  const minPlayersCeiling = slim ? 3 : 10
-  const maxPlayersFloor = slim ? 4 : 1
-  const maxPlayersCeiling = slim ? 20 : 150
-
   const onSubmit = async (values: GameDialogFormValues, _actions: FormikHelpers<GameDialogFormValues>) => {
     await createOrUpdateGame(values)
   }
@@ -284,7 +279,7 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
             <GridItem xs={12} md={12}>
               <TextField name='description' label='Game Description' margin='normal' fullWidth multiline required />
             </GridItem>
-            {!slim && (
+            {configuration.abbr === 'acnw' && (
               <GridItem container spacing={2} xs={12} md={12} style={{ paddingRight: 0 }}>
                 <GridItem xs={12} md={6}>
                   <SelectField
@@ -304,7 +299,7 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
             <GridItem xs={12} md={12}>
               <CheckboxWithLabel label='Is the game Teen Friendly?' name='teenFriendly' />
             </GridItem>
-            {!slim && (
+            {configuration.abbr === 'acnw' && (
               <>
                 <GridItem xs={12} md={12}>
                   <TextField
@@ -338,7 +333,9 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
                   fullWidth
                   type='number'
                   required
-                  InputProps={{ inputProps: { min: minPlayersFloor, max: minPlayersCeiling } }}
+                  InputProps={{
+                    inputProps: { min: configuration.minPlayersFloor, max: configuration.minPlayersCeiling },
+                  }}
                 />
               </GridItem>
               <GridItem xs={12} md={6} style={{ paddingRight: 0 }}>
@@ -349,7 +346,9 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
                   fullWidth
                   type='number'
                   required
-                  InputProps={{ inputProps: { min: maxPlayersFloor, max: maxPlayersCeiling } }}
+                  InputProps={{
+                    inputProps: { min: configuration.maxPlayersFloor, max: configuration.maxPlayersCeiling },
+                  }}
                 />
               </GridItem>
             </GridItem>
@@ -383,7 +382,7 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
                 inputProps={{ autoCapitalize: 'none' }}
               />
             </GridItem>
-            {!slim && (
+            {configuration.abbr === 'acnw' && (
               <GridItem xs={12} md={12}>
                 <p>
                   You are welcome to start and end the game at any time (within reason), but if the game overlaps two
@@ -435,7 +434,7 @@ export const GamesDialog: React.FC<GamesDialogProps> = ({ open, onClose, initial
                 game, and schedule players to your game, please let us know:
               </Typography>
             </GridItem>
-            {!slim && (
+            {configuration.abbr === 'acnw' && (
               <GridItem xs={12} md={12}>
                 <TextField name='slotConflicts' label='Slot Conflicts' margin='normal' fullWidth multiline />
               </GridItem>

packages/amber/views/GmPage/GmPage.tsx

@@ -128,7 +128,7 @@ const VirtualGmBlurb = () => {
 const GmBlurb = () => {
   const { classes } = useStyles()
   const configuration = useConfiguration()
-  const acus = configuration.numberOfSlots === 8
+  const acus = configuration.abbr === 'acus'
   const acnw = !acus
   return (
     <>

packages/amber/views/Payment/Payment.tsx

@@ -34,7 +34,7 @@ export const Payment: React.FC = () => {
   // console.log('Payment', { paymentIntent })
 
   const configuration = useConfiguration()
-  const acus = configuration.numberOfSlots === 8
+  const acus = configuration.abbr === 'acus'
   const acnw = !acus
 
   return (

packages/api/src/utils/configuration.ts

@@ -34,6 +34,7 @@ export const configurationSchema = z.object({
   title: z.string(),
   name: z.string(),
   abbr: z.string(),
+  copyright: z.string(),
   contactEmail: z.string(),
   gameEmail: z.string(),
   webEmail: z.string(),
@@ -68,12 +69,24 @@ export const configurationSchema = z.object({
   deposit: toNumber(),
   virtual: toBoolean(),
   numberOfSlots: toNumber(),
+
+  playerMin: toNumber(),
+  playerMax: toNumber(),
+  minPlayersFloor: toNumber(),
+  minPlayersCeiling: toNumber(),
+  maxPlayersFloor: toNumber(),
+  maxPlayersCeiling: toNumber(),
+
   oregonHotelTax: z.string(),
   virtualCost: z.string(),
   moreThanDoubleOccupancySurcharge: z.string(),
   gameRoomCredit: z.string(),
   useUsAttendanceOptions: toBoolean(),
 
+  hotelBookingCode: z.string(),
+  hotelBookingUrl: z.string(),
+  hotelBookingLastdate: toDateTime(),
+
   startDates: z.record(toNumber(), conventionInfoSchema),
 })