Redirect to previous path after login

deploy-stg.sh

@@ -0,0 +1,7 @@
+BASEDIR=$(dirname "$0")
+
+npx webpack --mode production --progress || exit $?
+
+rsync -azv $BASEDIR/public/* system-praktyk@kadet.net:~/stg/front
+rsync -azv $BASEDIR/build/* system-praktyk@kadet.net:~/stg/front
+

src/api/type.ts

@@ -2,7 +2,7 @@ import { InternshipType } from "@/data";
 import { axios } from "@/api/index";
 import { InternshipTypeDTO, internshipTypeDtoTransformer } from "@/api/dto/type";
 
-const AVAILABLE_INTERNSHIP_TYPES = '/internshipTypes';
+const AVAILABLE_INTERNSHIP_TYPES = '/internshipTypes/current';
 
 export async function available(): Promise<InternshipType[]> {
     const response = await axios.get<InternshipTypeDTO[]>(AVAILABLE_INTERNSHIP_TYPES);

src/app.tsx

@@ -98,9 +98,12 @@ function App() {
         </header>
         <main id="content">
             { <Switch>
-                { routes.map(({ name, content, middlewares = [], ...route }) => <Route { ...route } key={ name }>
-                    { processMiddlewares([ ...middlewares, content ]) }
-                </Route>) }
+                { routes.map(({ name, content, middlewares = [], ...route }) =>
+                    <Route { ...route } key={ name } render={ () => {
+                        const Next = () => processMiddlewares([ ...middlewares, content ])
+                        return <Next />
+                    } } />
+                ) }
             </Switch> }
         </main>
         <footer className="footer">

src/middleware.tsx

@@ -1,8 +1,8 @@
 import { Middleware, route } from "@/routing";
 import { useSelector } from "react-redux";
 import { AppState, isReady } from "@/state/reducer";
-import { Redirect } from "react-router-dom";
-import React from "react";
+import { Redirect, useRouteMatch } from "react-router-dom";
+import React, { useEffect } from "react";
 import { UserState } from "@/state/reducer/user";
 
 export const isReadyMiddleware: Middleware<any, any> = Next => isLoggedInMiddleware(() => {
@@ -22,5 +22,7 @@ export const isLoggedInMiddleware: Middleware<any, any> = Next => {
         return <Next />;
     }
 
+    window.sessionStorage.setItem('back-path', window.location.pathname);
+
     return <Redirect to={ route("user_login") } />;
 }

src/pages/edition/register.tsx

@@ -12,18 +12,19 @@ import { Alert } from "@material-ui/lab";
 import { Subset } from "@/helpers";
 import { useDispatch } from "@/state/actions";
 import { loginToEdition } from "@/pages/edition/pick";
-import { useHistory } from "react-router-dom";
+import { useHistory, useRouteMatch } from "react-router-dom";
 import { useDebouncedEffect } from "@/hooks/useDebouncedEffect";
 
 export const RegisterEditionPage = () => {
     const { t } = useTranslation();
 
-    const [key, setKey] = useState<string>("");
-    const [{ value: edition, isLoading }, setEdition] = useAsyncState<Subset<Edition> | null>(undefined);
-
     const classes = useVerticalSpacing(3);
     const dispatch = useDispatch();
     const history = useHistory();
+    const match = useRouteMatch<any>();
+
+    const [key, setKey] = useState<string>(match.params['edition'] || "");
+    const [{ value: edition, isLoading }, setEdition] = useAsyncState<Subset<Edition> | null>(undefined);
 
     useDebouncedEffect(() => {
         setEdition(api.edition.get(key));

src/pages/user/login.tsx

@@ -45,6 +45,10 @@ export const UserLoginPage = () => {
     const query    = new URLSearchParams(useLocation().search);
     const { t }    = useTranslation();
 
+    const redirectAfterLogin = () => {
+        history.push(window.sessionStorage.getItem('back-path') || "/");
+    }
+
     const handleSampleAdminLogin = async () => {
         await dispatch(authorizeUser(undefined, { isManager: true }));
 
@@ -53,8 +57,7 @@ export const UserLoginPage = () => {
 
     const handleSampleStudentLogin = async () => {
         await dispatch(authorizeUser());
-
-        history.push(route("home"));
+        redirectAfterLogin();
     }
 
     const handlePgLogin = async () => {
@@ -67,7 +70,7 @@ export const UserLoginPage = () => {
         (async function() {
             if (location.pathname === `${match.path}/check/pg`) {
                 await dispatch(authorizeUser(query.get("code") as string));
-                history.push("/");
+                redirectAfterLogin();
             }
         })();
     }, [ match.path ]);

src/routing.tsx

@@ -37,6 +37,7 @@ export const routes: Route[] = [
 
     // edition
     { name: "edition_register", path: "/edition/register", exact: true, content: () => <RegisterEditionPage/>, middlewares: [ isLoggedInMiddleware ] },
+    { name: "edition_register_exact", path: "/edition/register/:edition", exact: true, content: () => <RegisterEditionPage/>, middlewares: [ isLoggedInMiddleware ] },
     { name: "edition_pick", path: "/edition/pick", exact: true, content: () => <PickEditionPage/>, middlewares: [ isLoggedInMiddleware ] },
 
     // internship

translations/pl.yaml

@@ -224,6 +224,8 @@ validation:
   api:
     GreaterThanOrEqualValidator: Wartość pola "{{ PropertyName }}" musi być większa bądź równa {{ ComparisonValue }}.
     NotEmptyValidator: Wartosć pola "{{ PropertyName }}" nie może być pusta.
+    NotNullValidator: Wartosć pola "{{ PropertyName }}" nie może być pusta.
+    PredicateValidator: Wartosć pola "{{ PropertyName }}" nie spełnia warunków walidacji.
   required: "To pole jest wymagane"
   email: "Wprowadź poprawny adres e-mail"
   phone: "Wprowadź poprawny numer telefonu"

webpack.config.js

@@ -59,7 +59,7 @@ const config = {
         port: parseInt(process.env.APP_PORT || "3000"),
         proxy: {
             "/api": {
-                target: "https://system-praktyk.stg.kadet.net/api/",
+                target: "https://system-praktyk.dev.kadet.net/api/",
                 changeOrigin: true,
                 pathRewrite: {
                     "^/api": ''