humenius/ts-onlinetime-ranks
1
1
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Clean up code and add logging framework for backend
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Humenius
2020-06-02 10:33:59 +02:00
parent bb828386b9
commit aa1c3d1464
6 changed files with 262 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
frontend/src/App.tsx
View File

@@ -4,6 +4,7 @@ import UserStatsMockService from "./mock/UserStatsMockService";
import UserStats from "./models/TableEntry";
import UserStatsService from "./services/UserStatsService";
import {findDOMNode} from "react-dom";
import TableEntry from "./models/TableEntry";
interface State {
error?: any,
@@ -49,39 +50,29 @@ export default class App extends React.Component {
}
}
createTableEntries(entries: TableEntry[]) {
return entries.map((entry, index) => {
const placement = index + 1;
const placementClassName = placement === 1 ? "first-place"
: (placement === 2 ? "second-place"
: (placement === 3 ? "third-place"
: undefined))
return (
<tr key={index} className={placementClassName}>
<td>{placement}</td>
<td>{entry.name}</td>
<td>{entry.onlineTime}</td>
</tr>
)
});
}
renderTableData() {
const { error, isLoaded, users, mock } = this.state;
console.log(`${users} + ${isLoaded} + ${error}`)
if (users != null && isLoaded && error == null) {
return users.map((entry, index) => {
const placement = index + 1;
const placementClassName = placement === 1 ? "first-place"
: (placement === 2 ? "second-place"
: (placement === 3 ? "third-place"
: undefined))
return (
<tr key={index} className={placementClassName}>
<td>{placement}</td>
<td>{entry.name}</td>
<td>{entry.onlineTime}</td>
</tr>
)
});
return this.createTableEntries(users);
} else if (isLoaded && error != null && mock != null) {
return mock.map((entry, index) => {
const placement = index + 1;
const placementClassName = placement === 1 ? "first-place"
: (placement === 2 ? "second-place"
: (placement === 3 ? "third-place"
: undefined))
return (
<tr key={index} className={placementClassName}>
<td>{placement}</td>
<td>{entry.name}</td>
<td>{entry.onlineTime}</td>
</tr>
)
});
return this.createTableEntries(mock);
}
}
@@ -116,73 +107,3 @@ export default class App extends React.Component {
);
}
}
// const App = () => {
// return (
// <div className="App">
// <table>
// <tr>
// <th>Placement</th>
// <th>Name</th>
// <th>Online time</th>
// </tr>
// <tr className="first-place">
// <td>1</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// <tr className="second-place">
// <td>2</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// <tr className="third-place">
// <td>3</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// <tr>
// <td>4</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// </table>
// </div>
// );
// }
// function App() {
// return (
// <div className="App">
// <table>
// <tr>
// <th>Placement</th>
// <th>Name</th>
// <th>Online time</th>
// </tr>
// <tr className="first-place">
// <td>1</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// <tr className="second-place">
// <td>2</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// <tr className="third-place">
// <td>3</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// <tr>
// <td>4</td>
// <td>Humen</td>
// <td>0d 1h 0m 0m</td>
// </tr>
// </table>
// </div>
// );
// }
// export default App;

1
frontend/src/services/UserStatsService.ts
View File

@@ -13,7 +13,6 @@ export default class UserStatsService {
async getStats(): Promise<TableEntry[]> {
return fetch(this.apiURL, this.requestInit)
.then(res => { console.log(res); return res; })
.then(res => this.checkResponse(res))
.then(data => data.json())
}