Test commit, stash then force

SerhiiNahornyi · Dec 9, 2020 · acdcf71 · acdcf71
1 parent ce29e47
commit acdcf71
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 4 deletions.
diff --git 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
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8"/>
     <meta content="width=device-width, initial-scale=1" name="viewport"/>
-    <title>YouFace</title>
+    <title>social-network</title>
 </head>
 <body>
 <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git 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 (
-        <h1>test</h1>
+           <Login/>
     );
 }
 

diff --git a/client-web/src/pages/Login/Login.tsx b/client-web/src/pages/Login/Login.tsx
@@ -0,0 +1,4 @@
+import * as React from 'react';
+
+export const Login = () => <h1>Login page</h1>
+
diff --git a/client-web/src/react-app-env.d.ts b/client-web/src/react-app-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="react-scripts" />
diff --git a/client-web/tsconfig.json 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
@@ -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");
+    }
 }