From acdcf71f17ac89efff35dd07c86f8ac99b8ed228 Mon Sep 17 00:00:00 2001 From: Serhii Nahornyi Date: Wed, 9 Dec 2020 10:47:36 +0200 Subject: [PATCH] Test commit, stash then force --- client-web/package.json | 2 +- client-web/public/index.html | 2 +- client-web/src/App.js | 3 ++- client-web/src/pages/Login/Login.tsx | 4 +++ client-web/src/react-app-env.d.ts | 1 + client-web/tsconfig.json | 26 +++++++++++++++++++ .../kpi/project/resource/TestController.java | 6 ++++- 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 client-web/src/pages/Login/Login.tsx create mode 100644 client-web/src/react-app-env.d.ts create mode 100644 client-web/tsconfig.json diff --git a/client-web/package.json b/client-web/package.json index 8254acb..38ade89 100644 --- a/client-web/package.json +++ b/client-web/package.json @@ -43,6 +43,6 @@ }, "devDependencies": { "tslint": "^6.1.3", - "typescript": "^4.0.5" + "typescript": "~3.7.2" } } diff --git a/client-web/public/index.html b/client-web/public/index.html index 54ff46a..7ceb623 100644 --- a/client-web/public/index.html +++ b/client-web/public/index.html @@ -3,7 +3,7 @@ - YouFace + social-network diff --git a/client-web/src/App.js b/client-web/src/App.js index 5437f58..401ee13 100644 --- a/client-web/src/App.js +++ b/client-web/src/App.js @@ -1,8 +1,9 @@ import React from "react" +import {Login} from "./pages/Login/Login"; function App() { return ( -

test

+ ); } diff --git a/client-web/src/pages/Login/Login.tsx b/client-web/src/pages/Login/Login.tsx new file mode 100644 index 0000000..ec29278 --- /dev/null +++ b/client-web/src/pages/Login/Login.tsx @@ -0,0 +1,4 @@ +import * as React from 'react'; + +export const Login = () =>

Login page

+ diff --git a/client-web/src/react-app-env.d.ts b/client-web/src/react-app-env.d.ts new file mode 100644 index 0000000..6431bc5 --- /dev/null +++ b/client-web/src/react-app-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/client-web/tsconfig.json b/client-web/tsconfig.json new file mode 100644 index 0000000..7b1d3c6 --- /dev/null +++ b/client-web/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noFallthroughCasesInSwitch": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react" + }, + "include": [ + "src" + ] +} diff --git a/src/main/java/com/kpi/project/resource/TestController.java b/src/main/java/com/kpi/project/resource/TestController.java index 5d5aa42..124085e 100644 --- a/src/main/java/com/kpi/project/resource/TestController.java +++ b/src/main/java/com/kpi/project/resource/TestController.java @@ -5,7 +5,6 @@ @RestController public class TestController { - @RequestMapping("test/string") public String test() { return "string.ok"; @@ -20,4 +19,9 @@ public Object illegalArgument() { public Object exception() throws Exception { throw new Exception("some exception"); } + + @RequestMapping("/test/secured") + public Object getSecured() throws Exception { + throw new Exception("secured point"); + } }