From dfb8c61b0f257fcc9c07a034f1b080afc9a381db Mon Sep 17 00:00:00 2001 From: s85708 <s85708@bht-berlin.de> Date: Thu, 26 Jan 2023 12:53:44 +0100 Subject: [PATCH] done now --- my-app/src/App.js | 2 +- .../{entity => authentication/components}/TopMenu.js | 10 +++++----- .../components}/loginButton.js | 2 +- my-app/src/react/pages/PublicPage.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename my-app/src/react/{entity => authentication/components}/TopMenu.js (91%) rename my-app/src/react/{entity => authentication/components}/loginButton.js (88%) diff --git a/my-app/src/App.js b/my-app/src/App.js index 42c8a21..d146b48 100644 --- a/my-app/src/App.js +++ b/my-app/src/App.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import './App.css'; -import TopMenu from './react/entity/TopMenu'; +import TopMenu from './react/authentication/components/TopMenu'; import PublicPage from './react/pages/PublicPage'; import PrivatePage from './react/pages/PrivatePage'; import UserManagement from '../src/react/user/UserManagement'; diff --git a/my-app/src/react/entity/TopMenu.js b/my-app/src/react/authentication/components/TopMenu.js similarity index 91% rename from my-app/src/react/entity/TopMenu.js rename to my-app/src/react/authentication/components/TopMenu.js index 35ff473..f75fc45 100644 --- a/my-app/src/react/entity/TopMenu.js +++ b/my-app/src/react/authentication/components/TopMenu.js @@ -1,15 +1,15 @@ import React, { Component } from "react"; import Nav from 'react-bootstrap/Nav'; import Navbar from 'react-bootstrap/Navbar'; -import UserSessionWidget from "../user/components/userSessionWidget"; +import UserSessionWidget from "../../user/components/userSessionWidget"; import Container from 'react-bootstrap/Container'; import { LinkContainer } from 'react-router-bootstrap'; import { connect } from "react-redux"; import { bindActionCreators } from "redux"; -import * as authenticationActions from '../authentication/state/AuthenticationActions' -import * as userManagementActions from '../user/state/UserManagementActions'; -import * as degreeCourseManagementActions from '../degreeCourse/state/DegreeCourseManagementActions'; -import * as applicationManagementActions from '../degreeCourseApplication/state/ApplicationManagementActions'; +import * as authenticationActions from '../../authentication/state/AuthenticationActions' +import * as userManagementActions from '../../user/state/UserManagementActions'; +import * as degreeCourseManagementActions from '../../degreeCourse/state/DegreeCourseManagementActions'; +import * as applicationManagementActions from '../../degreeCourseApplication/state/ApplicationManagementActions'; const mapStateToProps = state => { return { diff --git a/my-app/src/react/entity/loginButton.js b/my-app/src/react/authentication/components/loginButton.js similarity index 88% rename from my-app/src/react/entity/loginButton.js rename to my-app/src/react/authentication/components/loginButton.js index 86bbc62..3521efe 100644 --- a/my-app/src/react/entity/loginButton.js +++ b/my-app/src/react/authentication/components/loginButton.js @@ -3,7 +3,7 @@ import Button from "react-bootstrap/esm/Button"; import { connect } from "react-redux"; -import { getShowLoginDialogAction } from "../authentication/state/AuthenticationActions"; +import { getShowLoginDialogAction } from "../state/AuthenticationActions"; class loginButton extends Component { constructor(props) { diff --git a/my-app/src/react/pages/PublicPage.js b/my-app/src/react/pages/PublicPage.js index e19a349..9fd66e5 100644 --- a/my-app/src/react/pages/PublicPage.js +++ b/my-app/src/react/pages/PublicPage.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import LoginButton from "../entity/loginButton"; +import LoginButton from "../authentication/components/loginButton"; class PublicPage extends Component { render() { -- GitLab