Merge pull request #56 from ITPNYU/feature/samantha_language

update languages

media_commons_booking_app/src/client/booking/components/Calendars.tsx

@@ -46,11 +46,11 @@ export const Calendars = ({
     }
     if (bookingTimeEvent) {
       const isConfirmed = window.confirm(
-        `You are requesting to book the following rooms${selectedRooms.map(
+        `Confirming that you are requesting to book the following rooms: ${selectedRooms.map(
           (room) => `${room.roomId} ${room.name}`
-        )}  for the time slot ${formatDate(
+        )}  starting at ${formatDate(
           bookingTimeEvent.startStr
-        )} ~ ${formatDate(bookingTimeEvent.endStr)}`
+        )} and ending at ${formatDate(bookingTimeEvent.endStr)}`
       );
       if (isConfirmed) handleSetDate(bookingTimeEvent);
     }
@@ -160,13 +160,14 @@ export const Calendars = ({
   };
   return (
     <div className="mt-5 flex flex-col justify-center">
-      <div className="flex justify-center items-center space-x-4 my-8">
+      <div className="">Select date</div>
+      <div className="flex justify-center items-center space-x-4 ">
         <CalendarDatePicker handleChange={handleChange} />
         <input
           id="default-checkbox"
           type="checkbox"
           value=""
-          className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
+          className="pt-4 w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
           onChange={(e) => setEnrolledThesis(!enrolledThisis)}
         />
         <label

media_commons_booking_app/src/client/booking/components/FormInput.tsx

@@ -448,11 +448,10 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
           Attendee Affiliation(s)
         </label>
         <p className="text-xs">
-          Due to COVID policies, Non-NYU members will need to gain access
-          clearance through certain NYU processes. For more information about
-          visitor, vendor, and affiliate access,{' '}
+          Non-NYU guests will need to be sponsored through JRNY. For more
+          information about visitor, vendor, and affiliate access,
           <a
-            href="https://www.nyu.edu/life/safety-health-wellness/coronavirus-information/campus-visitors.html"
+            href="https://www.nyu.edu/about/visitor-information/sponsoring-visitors.html"
             className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
             target="_blank"
           >
@@ -490,18 +489,13 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
           Room setup needed?
         </label>
         <p className="text-xs">
-          If your event or reservation is in 233 or 1201 and requires a specific
-          room setup that is different from the standard configuration, it is
-          your responsibility to{' '}
-          <a
-            href="https://nyu.service-now.com/csmp?id=sc_cat_item&sys_id=c78a46241bb234901416ea02b24bcb26&referrer=popular_items"
-            target="_blank"
-          >
+          If your reservation is in 233 or 1201 and requires a specific room
+          setup that is different from the standard configuration, it is the
+          <a href="https://nyu.service-now.com/csmp?id=sc_home" target="_blank">
             submit a work order with CBS
           </a>
-          . It is also the reservation holder's responsibility to ensure the
-          room is reset after use. Failure to do either will result in the
-          restriction of reservation privileges.
+          .It is also the reservation holder's responsibility to ensure the room
+          is reset after use.
         </p>
         {errors.roomSetup && <ErrorMessage errors={errors.roomSetup.message} />}
         <div className="flex items-center mb-4">
@@ -618,7 +612,7 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
                 name="mediaServices"
                 {...register('mediaServices')}
               />
-              (For 220-224) Using lights in ceiling grid
+              (For 220-224) Using DMX lights in ceiling grid
             </label>
           )}
           {roomNumber.includes('202') ||
@@ -643,8 +637,26 @@ const FormInput = ({ hasEmail, roomNumber, handleParentSubmit }) => {
             className="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
           >
             If you selected any of the Media Services above, please describe
-            your needs in detail. (Ie. what kind of equipment you need to check
-            out or the type of assistance you need from an audio technician)
+            your needs in detail. If you need to check out equipment, you can
+            check our inventory and include your request below. (Ie. 2x Small
+            Mocap Suits)
+            <br />-{' '}
+            <a
+              href="https://docs.google.com/document/d/1oRtvZ0SR52Mq_ykoNXelwqat4JFgdado5JDY6A746VY/edit#heading=h.iv9c7z15bn0t"
+              target="_blank"
+              className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
+            >
+              Inventory for Black Box 220 and Ballrooms 221-224
+            </a>
+            <br />-{' '}
+            <a
+              href="https://docs.google.com/spreadsheets/d/1fziyVrzeytQJyZ8585Wtqxer-PBt6L-u-Z0LHVavK5k/edit#gid=870626522"
+              target="_blank"
+              className="text-blue-600 hover:underline dark:text-blue-500 mx-1"
+            >
+              Inventory for Garage 103
+            </a>
+            <br />
           </label>
           <p className="text-xs"></p>
           <input

media_commons_booking_app/src/client/booking/components/InitialModal.tsx

@@ -13,6 +13,10 @@ export const InitialModal = ({ handleClick }) => {
         <div className="relative bg-white rounded-lg shadow dark:bg-gray-700">
           <div className="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">
             <h3 className="text-xl font-semibold text-gray-900 dark:text-white">
+              370🅙 Media Commons Reservation Form
+              <br />
+              Thank you for your interest in booking with the Media Commons.
+              <br />
               Please read our Policy for using the 370 Jay Street Shared Spaces
             </h3>
           </div>

media_commons_booking_app/src/client/utils/date.tsx

@@ -4,8 +4,13 @@ export const formatDate = (oldDate) => {
   const year = oldDateObject.getFullYear();
   const month = String(oldDateObject.getMonth() + 1).padStart(2, '0');
   const date = String(oldDateObject.getDate()).padStart(2, '0');
-  const hours = String(oldDateObject.getHours()).padStart(2, '0');
+  let hours = oldDateObject.getHours();
+
+  const ampm = hours >= 12 ? 'PM' : 'AM';
+  hours = hours % 12;
+  hours = hours ? hours : 12;
+  const strHours = String(hours).padStart(2, '0');
   const minutes = String(oldDateObject.getMinutes()).padStart(2, '0');
 
-  return `${year}-${month}-${date} ${hours}:${minutes}`;
+  return `${month}-${date}-${year} ${strHours}:${minutes} ${ampm}`;
 };