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

93 fix error message when server not available #103

Merged
merged 4 commits into from
Aug 15, 2024
Merged

93 fix error message when server not available #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14797fc
[Fix] #93, offline message improvement
Type-Style Jul 19, 2024
d0537e4
[Task] #93, removed background in status module when no data is present
Type-Style Aug 15, 2024
a3d2ffc
[Task] #61, add cut class to map for styling
Type-Style Aug 15, 2024
31f7797
[Fix] #93 fix tests, be more specific on url, and let test fail non s…
Type-Style Aug 15, 2024
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
2 changes: 1 addition & 1 deletion src/client/components/Status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function Map({ entries }: { entries: Models.IEntry[] }) {
<ul>
<li>datapoints: {entries.length - statusData.ignoredEntries}<i>({statusData.ignoredEntries})</i></li>
<li>Ø upload: {statusData.uploadMean}s </li>
<li>Ø speed: GPS: {statusData.speedGPSMean}km/h Calc: {statusData.speedCalcMean == "NaN" ? " - " : statusData.speedCalcMean }km/h </li>
<li>Ø speed: GPS: {statusData.speedGPSMean}km/h Calc: {statusData.speedCalcMean == "NaN" ? " - " : statusData.speedCalcMean}km/h </li>
<li></li>
</ul>
)
Expand Down
4 changes: 4 additions & 0 deletions src/client/css/start.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
position: relative;
z-index: 0;

&.emptyData::after {
content: none;
}

&::after {
content: "";
position: absolute;
Expand Down
18 changes: 14 additions & 4 deletions src/client/pages/Start.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,21 @@ function Start() {
setMessageObj({ isError: null, status: null, message: null });
setNextFetch(new Date().getTime() + fetchIntervalMs);
} catch (error) {
console.log("error fetching data %o", error);

if (!error.response) {
setMessageObj({ isError: true, status: 499, message: error.message || "offline" });
setNextFetch(new Date().getTime() + fetchIntervalMs);
return;
}

if (error.response.status == 403) { setLogin(false) }

setMessageObj({ isError: true, status: error.response.data.status || error.response.status, message: error.response.data.message || error.message });

clearInterval(intervalID.current); intervalID.current = null;
console.info("cleared Interval");
setNextFetch(null);
if (error.response.status == 403) { setLogin(false) }
setMessageObj({ isError: true, status: error.response.data.status || error.response.status, message: error.response.data.message || error.message });
}
};

Expand Down Expand Up @@ -134,9 +144,9 @@ function Start() {
</Button>
</div>

<div className="grid-item map"><Map entries={entries} /></div>
<div className="grid-item map cut"><Map entries={entries} /></div>
<div className="grid-item theme"><ModeSwitcher /></div>
<div className="grid-item status cut-after"><Status entries={entries} /></div>
<div className={`grid-item status ${entries.length ? "cut-after" : 'emptyData'}`}><Status entries={entries} /></div>
<div className="grid-item images">
<div className="image">image1</div>
<div className="image">image2</div>
Expand Down
6 changes: 4 additions & 2 deletions src/tests/login.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
try {
response = await axios({
method: "post",
url: "/login/csrf",
url: "http://localhost:80/login/csrf",
headers: {
"content-type": "application/x-www-form-urlencoded",
"x-requested-with": "XMLHttpRequest"
Expand All @@ -34,6 +34,7 @@
serverStatus = response.status;
} catch (error) {
console.error(error);
throw Error("fail");
}


Expand Down Expand Up @@ -79,7 +80,8 @@

it('test invalid credentials to return error', async () => {
try {
userDataWithToken.csrfToken = csrfToken
userDataWithToken.csrfToken = csrfToken;
console.log("csrfToken %o", userDataWithToken.csrfToken);
await axios.post('http://localhost:80/login', qs.stringify(userDataWithToken));
} catch (error) {
const axiosError = error as AxiosError;
Expand Down
Loading