Skip to content

Commit 1bee7f5

Browse files
author
Alexandra Zwinger
committed
Clean file structure
1 parent 68a19da commit 1bee7f5

24 files changed

+65
-102
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "study-buddies-web-new",
33
"version": "0.1.0",
4-
"homepage": "https://halbes-byte.github.io/study-buddies-web/",
4+
"homepage": "https://halbes-byte.github.io/",
55
"private": true,
66
"proxy": "http://localhost:8080",
77
"dependencies": {

src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Homepage from './pages/Homepage';
1111
import Settings from './pages/YourStudies';
1212
import Page404 from './pages/Page404';
1313
import Score from './pages/Score';
14-
import keycloak from "./Keycloak";
14+
import keycloak from "./auth/Keycloak";
1515

1616
function App() {
1717
return (

src/RefineWrapper.tsx

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/api/MeetingApi.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,3 @@ export function getMeetingsForModule(axios: AxiosInstance, module: string): Prom
4545
});
4646
}
4747

48-
export function updateCreator(axios: AxiosInstance, meetingId: string, newCreatorId: string): Promise<CreateMeetingDto> {
49-
const meetingUpdate = {creator: newCreatorId};
50-
51-
return axios.put(`/${Resources.MEETING}?id=${meetingId}`, meetingUpdate)
52-
.then(handleSuccessResponse, handleErrorResponse);
53-
}
54-
55-

src/api/ModuleApi.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ export function getModules(axios: AxiosInstance): Promise<UserModule[]> {
1111

1212
export function createModule(axios: AxiosInstance, moduleName: string) {
1313
const url = `/${Resources.MODULES}`;
14-
axios.post(url, {name: moduleName})
14+
return axios.post(url, {name: moduleName})
1515
.then(handleSuccessResponse, handleErrorResponse);
1616
}

src/api/UserGroupApi.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ export function joinSuperStudyGroup(axios: AxiosInstance, superMeetingId: string
1616
export async function getUserIdsForMeeting(axios: AxiosInstance, uuid: string): Promise<string[]> {
1717
const res = await axios.get(`/studygroup?uuid=${uuid}`);
1818
const data = res.data;
19-
const userIds = data.map((entry: { userId: string }) => entry.userId);
20-
return userIds;
19+
return data.map((entry: { userId: string }) => entry.userId);
2120
}
2221

2322
export function leaveStudyGroup(axios: AxiosInstance, targetUUID: string): Promise<void> {
File renamed without changes.

src/components/CalendarComponent.tsx renamed to src/components/calendar/CalendarComponent.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import React, {useEffect, useState} from 'react';
22
import FullCalendar from '@fullcalendar/react';
33
import timeGridPlugin from '@fullcalendar/timegrid';
44
import MeetingDetails from './meeting/MeetingDetails';
5-
import {MeetingDto} from '../dtos/MeetingDto';
6-
import '../styles/Calendar.css';
5+
import {MeetingDto} from '../../dtos/MeetingDto';
6+
import '../../styles/Calendar.css';
77
import {useTheme} from '@mui/material/styles';
88
import useMediaQuery from '@mui/material/useMediaQuery';
9-
import {getAttendedMeetings} from "../api/MeetingApi";
10-
import axiosInstance from "../AxiosConfig";
11-
import {CreateOrUpdateMeetingForm} from "../form/CreateOrUpdateMeetingForm";
9+
import {getAttendedMeetings} from "../../api/MeetingApi";
10+
import axiosInstance from "../../auth/AxiosConfig";
11+
import {CreateOrUpdateMeetingForm} from "./forms/CreateOrUpdateMeetingForm";
1212
import {EventSourceInput} from '@fullcalendar/core';
13-
import {ChooseMeetingForm} from "../form/ChooseMeetingForm";
13+
import {ChooseMeetingForm} from "./forms/ChooseMeetingForm";
1414

1515
export default function CalendarComponent(props: { isDialogOpen: boolean }) {
1616
const [selectedMeeting, setSelectedMeeting] = useState<MeetingDto | null>(null);

src/form/ChooseMeetingForm.tsx renamed to src/components/calendar/forms/ChooseMeetingForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Dialog, DialogContent, DialogTitle, IconButton} from "@mui/material";
2-
import CloseIconPath from "../data/close_icon_red.png";
2+
import CloseIconPath from "../../../data/close_icon_red.png";
33
import React from "react";
4-
import {CuteButton} from "../components/CuteButton";
4+
import {CuteButton} from "../../CuteButton";
55

66
export function ChooseMeetingForm(props: {
77
onClose: () => void,

0 commit comments

Comments
 (0)