Skip to content

Commit

Permalink
fix auto deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
trangiabach committed Nov 15, 2023
1 parent 1aa9add commit 606bede
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 8 deletions.
1 change: 0 additions & 1 deletion .github/workflows/fly.yml → .github/workflows/fly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: superfly/flyctl-actions/setup-flyctl@master
- run: flyctl deploy --remote-only
- run: |
cd server
flyctl deploy --remote-only
Expand Down
34 changes: 28 additions & 6 deletions client/src/FormPage/PageOne.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ import {
MenuItem,
Select,
TextField,
Box,
Button,
} from '@mui/material';
import React from 'react';
import { Theme, useTheme } from '@mui/material/styles';
import OutlinedInput from '@mui/material/OutlinedInput';
import { IReferral } from '../util/types/referral';
import { DesktopDatePicker, LocalizationProvider } from '@mui/x-date-pickers';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import { Dayjs } from 'dayjs';
import { IReferral } from '../util/types/referral';

const ITEM_HEIGHT = 48;
const ITEM_PADDING_TOP = 8;
Expand Down Expand Up @@ -153,7 +152,13 @@ export default function PageOne({ data, setData }: Props) {
</LocalizationProvider>
</FormControl>
<br />
<FormControl sx={{ m: 1, width: 600 }} required={(data.serviceRequestedVictim.length < 1 || data.serviceRequested.length > 0)}>
<FormControl
sx={{ m: 1, width: 600 }}
required={
data.serviceRequestedVictim.length < 1 ||
data.serviceRequested.length > 0
}
>
<InputLabel id="demo-multiple-name-label">
Counseling & Therapy
</InputLabel>
Expand All @@ -179,7 +184,13 @@ export default function PageOne({ data, setData }: Props) {
</Select>
</FormControl>
<br />
<FormControl sx={{ m: 1, width: 600 }} required={(data.serviceRequested.length < 1 || data.serviceRequestedVictim.length > 0)}>
<FormControl
sx={{ m: 1, width: 600 }}
required={
data.serviceRequested.length < 1 ||
data.serviceRequestedVictim.length > 0
}
>
<InputLabel id="demo-multiple-name-label">Victim Services</InputLabel>
<Select
labelId="demo-multiple-name-label"
Expand Down Expand Up @@ -208,12 +219,23 @@ export default function PageOne({ data, setData }: Props) {
</FormControl>
<br />
<FormControl style={{ marginBottom: '30px' }} sx={{ m: 1, width: 400 }}>
<InputLabel style={{ marginBottom: '30px' }} id="demo-multiple-name-label">Referral PDF</InputLabel>
<InputLabel
style={{ marginBottom: '30px' }}
id="demo-multiple-name-label"
>
Referral PDF
</InputLabel>
<Button
variant="contained"
component="label"
size="small"
style={{ margin: 'auto', background: '#4EA0B3', height: '26px', marginTop: '10px', padding: '15px 10px'}}
style={{
margin: 'auto',
background: '#4EA0B3',
height: '26px',
marginTop: '10px',
padding: '15px 10px',
}}
>
Upload
<input type="file" hidden />
Expand Down
2 changes: 1 addition & 1 deletion client/src/util/types/referral.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/

import mongoose from 'mongoose';
import dayjs, { Dayjs } from 'dayjs';
import IUser from './user';
import dayjs, { Dayjs } from 'dayjs';

interface ICommunicationItem {
dateOfCommunication: Date;
Expand Down

0 comments on commit 606bede

Please sign in to comment.