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.

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

Format fix #147

Merged
merged 3 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
- name: Test the backend
run: cd backend; npm i && npm run test run

# - name: Format files
# run: cd ..; npm i && npm run prettier:fix

# - name: Commit changes
# uses: stefanzweifel/git-auto-commit-action@v4
# with:
# commit_message: Apply formatting changes
# branch: ${{ github.head_ref }}
- name: Format files
run: npm i && npm run prettier:fix

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply formatting
branch: ${{ github.head_ref }}
7 changes: 5 additions & 2 deletions frontend/src/pages/VideoCallPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Socket } from "socket.io-client";
import stunServers from "../stun/stunServers";
import Meeting from "../models/Meeting";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faPhoneSlash} from "@fortawesome/free-solid-svg-icons";
import { faPhoneSlash } from "@fortawesome/free-solid-svg-icons";

function VideoCallPage() {
const { userId, socket, meeting, leaveMeeting } = useUser();
Expand Down Expand Up @@ -170,7 +170,10 @@ function VideoCallPage() {
</div>
</div>
<div className=" flex justify-center">
<button onClick={() => handleLeaveMeeting()} className="btn bg-my-red p-6">
<button
onClick={() => handleLeaveMeeting()}
className="btn bg-my-red p-6"
>
<FontAwesomeIcon icon={faPhoneSlash}></FontAwesomeIcon>
<span className="ml-2">Leave</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"description": "Projekt zespołowy - Zespół 6",
"scripts": {
"prettier:fix": "prettier --write .",
"prettier:fix": "prettier --write frontend/ backend/",
"prettier:check": "prettier --check ."
},
"author": {
Expand Down
Loading