diff --git a/.env b/.env index 50917d9..af834b0 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -REACT_APP_API_HOST="https://nachhilfe.gymhaan.de" \ No newline at end of file +REACT_APP_API_HOST="https://nachhilfe.gymhaan.de/api" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3727e29..46d5b69 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ .env.development.local .env.test.local .env.production.local +.env npm-debug.log* yarn-debug.log* diff --git a/public/index.html b/public/index.html index 496e879..809ece6 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,8 @@ + + + aktivieren, um diese Website zu benutzen.
diff --git a/src/Components/ExternalLink.tsx b/src/Components/ExternalLink.tsx new file mode 100644 index 0000000..e930481 --- /dev/null +++ b/src/Components/ExternalLink.tsx @@ -0,0 +1,14 @@ +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons"; + +const ExternalLink = (): JSX.Element => { + return ( + + ); +}; + +export default ExternalLink; diff --git a/src/Components/Page.tsx b/src/Components/Page.tsx index 13f1029..1412d07 100644 --- a/src/Components/Page.tsx +++ b/src/Components/Page.tsx @@ -9,7 +9,7 @@ const Page = (props: { return (
-

{props.title}

+

{props.title}

{ // eslint-disable-next-line no-control-regex diff --git a/src/pages/AdminDashboard.tsx b/src/pages/AdminDashboard.tsx index ff1a7c8..df9eab1 100644 --- a/src/pages/AdminDashboard.tsx +++ b/src/pages/AdminDashboard.tsx @@ -9,7 +9,6 @@ import { ResponsivePie } from "@nivo/pie"; import { Fragment, useContext, useEffect, useState } from "react"; import { useNavigate } from "react-router"; import { Link } from "react-router-dom"; -import { visitFunctionBody } from "typescript"; import { API_HOST } from ".."; import Alert from "../Components/Alert"; import LoadingScreen from "../Components/LoadingScreen"; diff --git a/src/pages/Find.tsx b/src/pages/Find.tsx index 6119a7c..2d34323 100644 --- a/src/pages/Find.tsx +++ b/src/pages/Find.tsx @@ -504,7 +504,7 @@ const Find = (): JSX.Element => {

{result.name}, - Stufe/Klasse {result.grade} + Stufe {result.grade}

{result.misc}

@@ -513,7 +513,7 @@ const Find = (): JSX.Element => {

- {result.subjectName} bis Stufe/Klasse {result.maxGrade} + {result.subjectName} bis Stufe {result.maxGrade}

{ document.title = "Nachhilfe GymHaan"; @@ -23,25 +24,27 @@ const Home = (): JSX.Element => {

Durch die Nutzung dieser Seite erklärst du dich mit den{" "} - Datenschutzbestimmungen einverstanden. - + Datenschutzbestimmungen + {" "} + einverstanden.

- Link zur SV + + Link zur SV +

- Ich brauche Nachhilfe + Nachhilfe finden

- Ich möchte{" "} Nachhilfe geben

diff --git a/src/pages/Imprint.tsx b/src/pages/Imprint.tsx index bcfb109..b2f1724 100644 --- a/src/pages/Imprint.tsx +++ b/src/pages/Imprint.tsx @@ -1,13 +1,14 @@ +import ExternalLink from "../Components/ExternalLink"; import Page from "../Components/Page"; -import css from "../styles/Imprint.module.scss"; const Imprint = (): JSX.Element => { - const imprint: string = "https://gymhaan.de/unsere-schule/impressum/"; - return ( - Das Impressum unserer Schule ist zu finden auf:{" "} - {imprint} + Das Impressum unserer Schule ist{" "} + + hier + {" "} + zu finden. ); }; diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx index 5f9c6c2..91ad0cb 100644 --- a/src/pages/LoginPage.tsx +++ b/src/pages/LoginPage.tsx @@ -8,6 +8,8 @@ import lottie from "lottie-web"; import { API_HOST, checkEmail } from "../index"; import Alert from "../Components/Alert"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons"; const Required = (): JSX.Element => { return ; @@ -68,12 +70,10 @@ const LoginPage = (): JSX.Element => { {displayAnimation ? (
) : null} -

Anmelden mit Link per E-Mail

- Wenn du dich so anmeldest, kriegt du einen Link per E-Mail (deine - Schul-E-Mail-Adresse) zugeschickt womit du dich für 30 Tage auf einem + Du kriegst einen Link per E-Mail (an deine hinterlegte E-Mail-Adresse) zugeschickt, mit dem du dich 30 Tage lang auf einem Gerät authentifizieren kannst.{" "} - Link zu Outlook + Link zu Outlook

{
diff --git a/src/pages/Privacy.tsx b/src/pages/Privacy.tsx index 5c4c56a..c34291a 100644 --- a/src/pages/Privacy.tsx +++ b/src/pages/Privacy.tsx @@ -730,14 +730,6 @@ const Privacy = () => { Löschen.{" "} -

- -

); }; diff --git a/src/pages/UserDashboard.tsx b/src/pages/UserDashboard.tsx index 9ae4f5c..97d0ab6 100644 --- a/src/pages/UserDashboard.tsx +++ b/src/pages/UserDashboard.tsx @@ -280,7 +280,7 @@ const UserDashboard = (): JSX.Element => {
-

Dein Profil

+

Mein Profil

{ @@ -306,6 +306,7 @@ const UserDashboard = (): JSX.Element => { emailButtonRef.current.scrollIntoView(); } }} + style={{ cursor: "default" }} /> { ...{ grade: parseInt(e.target.value) }, }); }} + style={{ cursor: "pointer" }} > {[...Array(13 - 4).keys()].map((grade, index) => { diff --git a/src/pages/UserPage.tsx b/src/pages/UserPage.tsx index bd50714..23e3df2 100644 --- a/src/pages/UserPage.tsx +++ b/src/pages/UserPage.tsx @@ -7,7 +7,6 @@ import { Rank } from "../Components/Rank"; import { RequestState, User } from "../Models"; import css from "../styles/userPage.module.scss"; import FourOFourPage from "./404"; -import UserDashboard from "./UserDashboard"; export const UserPage = () => { const userId = useParams()["id"]; @@ -37,8 +36,10 @@ export const UserPage = () => { {user.name} #{user.id} -

Klasse/Stufe {user.grade}

-

E-Mail: {user.email}

+

Stufe {user.grade}

+

+ E-Mail: {user.email} +