PapaTutuWawa/Lateinicus
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Move to the new API scheme

Browse Source
This commit is contained in:
Alexander Polynomdivision 2018-09-23 22:22:22 +02:00
parent 2c4011f631
commit 11bbdc627f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/Makefile
View File

@ -17,7 +17,7 @@ watch: node_modules
.PHONY: build .PHONY: build
build: node_modules dist/minified build: node_modules dist/minified
@echo Building with parcel @echo Building with parcel
./node_modules/.bin/parcel build ./node_modules/.bin/parcel build src/index.html
@echo Minifying @echo Minifying
$(foreach file, $(wildcard dist/*.js), $(call minify, $(file))) $(foreach file, $(wildcard dist/*.js), $(call minify, $(file)))

9
frontend/src/components/app.tsx
View File

@ -40,6 +40,7 @@ export default class Application extends React.Component<IProps> {
// TODO: When asking the server if our session is still valid, a spinner // TODO: When asking the server if our session is still valid, a spinner
// should be shown // should be shown
if (getSessionToken(window) !== null) { if (getSessionToken(window) !== null) {
// TODO: We still need to fetch the user data
this.props.setAuthenticated(true); this.props.setAuthenticated(true);
} }
} }
@ -143,7 +144,7 @@ export default class Application extends React.Component<IProps> {
getTopTenLearners = (): Promise<TopTen[]> => { getTopTenLearners = (): Promise<TopTen[]> => {
const id = this.props.user.classId; const id = this.props.user.classId;
return new Promise((res, rej) => { return new Promise((res, rej) => {
fetch(`${BACKEND_URL}/auth/class/${id}/topTen`, { fetch(`${BACKEND_URL}/api/class/${id}/topTen`, {
headers: new Headers({ headers: new Headers({
"Content-Type": "application/json", "Content-Type": "application/json",
"Token": this.props.user.sessionToken, "Token": this.props.user.sessionToken,
@ -162,7 +163,7 @@ export default class Application extends React.Component<IProps> {
getNextLevel = (): Promise<ILevel> => { getNextLevel = (): Promise<ILevel> => {
return new Promise((res, rej) => { return new Promise((res, rej) => {
fetch(`${BACKEND_URL}/auth/user/nextLevel`, { fetch(`${BACKEND_URL}/api/user/nextLevel`, {
headers: new Headers({ headers: new Headers({
"Content-Type": "application/json", "Content-Type": "application/json",
"Token": this.props.user.sessionToken, "Token": this.props.user.sessionToken,
@ -181,7 +182,7 @@ export default class Application extends React.Component<IProps> {
getLevelVocab = (id: number): Promise<IVocab[]> => { getLevelVocab = (id: number): Promise<IVocab[]> => {
return new Promise((res, rej) => { return new Promise((res, rej) => {
fetch(`${BACKEND_URL}/auth/level/${id}/vocab`, { fetch(`${BACKEND_URL}/api/level/${id}/vocab`, {
method: "GET", method: "GET",
headers: new Headers({ headers: new Headers({
"Content-Type": "application/json", "Content-Type": "application/json",
@ -201,7 +202,7 @@ export default class Application extends React.Component<IProps> {
login = (username: string, password: string): Promise<IUser | IResponse> => { login = (username: string, password: string): Promise<IUser | IResponse> => {
return new Promise((res, rej) => { return new Promise((res, rej) => {
fetch(`${BACKEND_URL}/login`, { fetch(`${BACKEND_URL}/api/login`, {
method: "POST", method: "POST",
headers: new Headers({ headers: new Headers({
"Content-Type": "application/json", "Content-Type": "application/json",