Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix config.json path #80

Merged
merged 3 commits into from
Feb 16, 2025
Merged

Fix config.json path #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0614f5a
remove hint wording from profile
januschung Feb 16, 2025
1e140d4
fix deploy path
januschung Feb 16, 2025
edb6e62
fix config.json path
januschung Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
name: Deploy to Demo Server

on:
push:
pull_request:
types:
- closed
branches:
- main

Expand All @@ -23,7 +25,7 @@ jobs:
run: npm install

- name: Create Custom Config File
run: echo '${{ secrets.CUSTOM_CONFIG_JSON }}' > config.json
run: echo '${{ secrets.CUSTOM_CONFIG_JSON }}' > src/config.json

- name: Build Project
run: npm run build
Expand All @@ -37,10 +39,11 @@ jobs:

- name: Upload artifact via SCP
run: |
scp -i ~/.ssh/deploy_key -r ./build ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/opc/build
scp -i ~/.ssh/deploy_key -r ./build/* ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }}:/home/opc/build

- name: Move to Nginx Folder
run: |
ssh -i ~/.ssh/deploy_key ${{ secrets.REMOTE_USER }}@${{ secrets.REMOTE_HOST }} << 'EOF'
sudo cp -r /home/opc/build/* /usr/share/nginx/html/
rm -rf /home/opc/build
EOF
5 changes: 1 addition & 4 deletions src/components/ProfileDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogTitleBar from './DialogTitleBar'
import { Typography, Grid } from '@mui/material';
import { Grid } from '@mui/material';
import { UPDATE_PROFILE } from '../graphql/mutation';
import { GET_PROFILE } from '../graphql/query';
import ProfileTextField from './ProfileTextField';
Expand Down Expand Up @@ -102,9 +102,6 @@ export default function ProfileDialog({ profile, handleClose, open, setOpen }) {
/>
))}
</Grid>
<Typography variant="overline" align="right" paragraph>
* Click the copy icon to copy to clipboard
</Typography>
</DialogContent>
<DialogActions>
<Button color="info" variant="outlined" startIcon={<CancelIcon />} onClick={handleClose}>
Expand Down