Merge branch 'hl-prefer-box' of https://github.com/gorstdon-cs/gordon…

…-360-ui into hl-prefer-box

.env.development

@@ -4,7 +4,7 @@
 # VITE_API_URL=https://360Api.gordon.edu/
 
 # @TRAIN
- VITE_API_URL=https://360ApiTrain.gordon.edu/
+ VITE_API_URL=https://360ApiSP.gordon.edu/
 
 # @LOCALHOST
 # VITE_API_URL=http://localhost:51626/

.env.production

@@ -5,4 +5,4 @@
 VITE_ANALYTICS_ID=G-2FE78G0CBN
 
 # @TRAIN
-VITE_API_URL=https://360ApiTrain.gordon.edu/
+VITE_API_URL=https://360ApiSP.gordon.edu/

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - develop
       - master
+      - senior-project
 
 jobs:
   build:
@@ -59,3 +60,10 @@ jobs:
         with:
           name: build-prod
           path: dist
+
+      - name: Upload senior-project build artifacts for deployment
+        if: ${{ github.ref == 'refs/heads/senior-project' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-senior-project
+          path: dist

src/routes.jsx

@@ -1,5 +1,5 @@
 import About from './views/About';
-import HousingLottery from './views/HousingLottery/HousingLottery.jsx';
+import HousingLottery from './views/HousingLottery';
 import Admin from './views/Admin';
 import ApartmentApp from './views/ApartmentApp';
 import BannerSubmission from './views/BannerSubmission';

src/services/housing.ts

@@ -164,9 +164,7 @@ const getSubmittedApartmentApplications = async (): Promise<ApplicationDetails[]
 const submitApplication = (applicationID: number): Promise<boolean> =>
   http.put(`housing/apartment/applications/${applicationID}/submit`);
 
-const addRoommate = (value: string) => http.put(`housing/housing_lottery/roommate/${value}`);
-const addHall = (rank: number, hall: string) =>
-  http.put(`housing/housing_lottery/hall/${rank}`, hall);
+const addRoommate = (value: string) => http.put(`housing/housing_lottery/${value}`);
 
 const housingService = {
   getApartmentSelectionDate,
@@ -179,7 +177,6 @@ const housingService = {
   getSubmittedApartmentApplications,
   submitApplication,
   addRoommate,
-  addHall,
 };
 
 export default housingService;

src/views/HousingLottery/components/PreferenceBox/index.jsx

@@ -0,0 +1,57 @@
+import React, { useEffect, useState } from 'react';
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  Grid,
+  Table,
+  TableBody,
+  TableContainer,
+  Typography,
+  FormControl,
+  RadioGroup,
+  FormControlLabel,
+  Radio,
+} from '@mui/material';
+import housing from 'services/housing';
+import styles from '../../../../HousingLottery.module.css';
+
+function SurveyQuestionBox() {
+  const [selectedOption, setSelectedOption] = useState(''); // Store the selected option
+
+  // Handle the change of the selected option
+  const handleOptionChange = (event) => {
+    setSelectedOption(event.target.value);
+  };
+
+  // Your survey question text can go here
+  const questionText = 'Are you a night owl or a morning bird?';
+
+  return (
+    <Card>
+      <CardHeader title={questionText} />
+      <CardContent>
+        <FormControl component="fieldset">
+          <RadioGroup
+            aria-label="morning-or-night"
+            name="morning-or-night"
+            value={selectedOption}
+            onChange={handleOptionChange}
+          >
+            <FormControlLabel value="night-owl" control={<Radio />} label="Night Owl" />
+            <FormControlLabel value="morning-bird" control={<Radio />} label="Morning Bird" />
+          </RadioGroup>
+          <RadioGroup
+            aria-label="quiet-or-loud"
+            name="quiet-or-loud"
+            value={selectedOption}
+            onChange={handleOptionChange}
+          >
+            <FormControlLabel value="quiet" control={<Radio />} label="Quiet" />
+            <FormControlLabel value="loud" control={<Radio />} label="Loud" />
+          </RadioGroup>
+        </FormControl>
+      </CardContent>
+    </Card>
+  );
+}

src/views/HousingLottery/index.jsx

@@ -0,0 +1,64 @@
+import React, { useState } from 'react';
+import { Input, Button, Radio, RadioGroup, FormControlLabel } from '@mui/material';
+import housingService from 'services/housing';
+
+const HousingLottery = () => {
+  const [message, setMessage] = useState('');
+  const [morningOrNight, setMorningOrNight] = useState('');
+  const [loudOrQuiet, setLoudOrQuiet] = useState('');
+
+  const handleChange = (event) => {
+    setMessage(event.target.value);
+  };
+
+  const handleMorningOrNightChange = (event) => {
+    setMorningOrNight(event.target.value);
+  };
+
+  const handleLoudOrQuietChange = (event) => {
+    setLoudOrQuiet(event.target.value);
+  };
+
+  const handleClick = async () => {
+    // You can access message, morningOrNight, and loudOrQuiet to submit to your housing service
+    await housingService.addRoommate({ message, morningOrNight, loudOrQuiet });
+  };
+
+  return (
+    <div>
+      <div>
+        <label>Are you a night owl or a morning bird?</label>
+        <RadioGroup
+          aria-label="morning-or-night"
+          name="morning-or-night"
+          value={morningOrNight}
+          onChange={handleMorningOrNightChange}
+        >
+          <FormControlLabel value="night-owl" control={<Radio />} label="Night Owl" />
+          <FormControlLabel value="morning-bird" control={<Radio />} label="Morning Bird" />
+        </RadioGroup>
+      </div>
+
+      <div>
+        <label>Do you consider yourself quiet or loud in the dorm?</label>
+        <RadioGroup
+          aria-label="loud-or-quiet"
+          name="loud-or-quiet"
+          value={loudOrQuiet}
+          onChange={handleLoudOrQuietChange}
+        >
+          <FormControlLabel value="quiet" control={<Radio />} label="Quiet" />
+          <FormControlLabel value="loud" control={<Radio />} label="Loud" />
+        </RadioGroup>
+      </div>
+
+      <Input onChange={handleChange} placeholder="Enter your message" />
+
+      <Button variant="contained" onClick={handleClick}>
+        Submit
+      </Button>
+    </div>
+  );
+};
+
+export default HousingLottery;