Skip to content

Commit 669f939

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 390-bugfix-upload-file-endpoint
2 parents 7085aa0 + 662f29d commit 669f939

File tree

6 files changed

+11
-21
lines changed

6 files changed

+11
-21
lines changed

docker-compose.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ services:
1818
networks:
1919
app_net:
2020
ipv4_address: 192.168.0.2
21-
healthcheck:
22-
test: ["CMD-SHELL", "pg_isready -U balancer -d balancer_dev"]
23-
interval: 5s
24-
timeout: 5s
25-
retries: 5
2621

2722
pgadmin:
2823
image: dpage/pgadmin4

frontend/src/components/Footer/Footer.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ function Footer() {
6262
>
6363
Leave feedback
6464
</Link>
65-
<a href="https://www.flipcause.com/secure/cause_pdetails/MjMyMTIw"
65+
<a href="https://github.com/CodeForPhilly/balancer-main"
6666
target="_blank"
67-
className="flex justify-center text-black hover:border-blue-600 hover:text-blue-600 hover:no-underline"
67+
className="flex justify-center text-center text-black hover:border-blue-600 hover:text-blue-600 hover:no-underline"
6868
>
69-
Donate
69+
Support Development
7070
</a>
7171
<Link
7272
to="/help"

frontend/src/components/Header/Header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ const Header: React.FC<LoginFormProps> = ({ isAuthenticated, isSuperuser }) => {
165165
Leave Feedback
166166
</Link>
167167
<a
168-
href="https://www.flipcause.com/secure/cause_pdetails/MjMyMTIw"
168+
href="https://github.com/CodeForPhilly/balancer-main"
169169
target="_blank"
170170
className="header-nav-item"
171171
>
172-
Donate
172+
Support Development
173173
</a>
174174
{isAuthenticated && isSuperuser && (
175175
<div

frontend/src/components/Header/MdNavBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ const MdNavBar = (props: LoginFormProps) => {
120120
</Link>
121121
</li>
122122
<li className="border-b border-gray-300 p-4">
123-
<a href="https://www.flipcause.com/secure/cause_pdetails/MjMyMTIw"
123+
<a href="https://github.com/CodeForPhilly/balancer-main"
124124
target="_blank"
125125
className="mr-9 text-black hover:border-b-2 hover:border-blue-600 hover:text-black hover:no-underline"
126126
>
127-
Donate
127+
Support Development
128128
</a>
129129
</li>
130130
{isAuthenticated &&

frontend/src/pages/About/About.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ function About() {
7777
</div>
7878
</div>
7979
<div className="mb-20 mt-5 flex flex-row flex-wrap justify-center gap-4">
80-
<a href="https://www.flipcause.com/secure/cause_pdetails/MjMyMTIw" target="_blank">
80+
<a href="https://github.com/CodeForPhilly/balancer-main" target="_blank">
8181
<button className="btnBlue transition-transform focus:outline-none focus:ring focus:ring-blue-200">
82-
Donate
82+
Support Development
8383
</button>
8484
</a>
8585

frontend/src/pages/DocumentManager/UploadFile.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useRef } from "react";
2-
import axios from "axios";
2+
import { adminApi } from "../../api/apiClient";
33
import TypingAnimation from "../../components/Header/components/TypingAnimation.tsx";
44
import Layout from "../Layout/Layout.tsx";
55

@@ -22,14 +22,9 @@ const UploadFile: React.FC = () => {
2222
formData.append("file", file);
2323

2424
try {
25-
const response = await axios.post(
25+
const response = await adminApi.post(
2626
`/api/v1/api/uploadFile`,
2727
formData,
28-
{
29-
headers: {
30-
"Content-Type": "multipart/form-data"
31-
},
32-
}
3328
);
3429
console.log("File uploaded successfully", response.data);
3530
} catch (error) {

0 commit comments

Comments
 (0)