From 9fa259f81de9802edc12d20aa6ce486bb70979a4 Mon Sep 17 00:00:00 2001
From: Katerina881 <mr.alodov@mail.ru>
Date: Mon, 13 Feb 2023 16:23:44 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=D0=B5=20=D1=81=D0=BE=D1=85=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 react_online_calculator/src/App.js            | 19 +++++++++++++++--
 .../SpringOnlineCalculatorApplication.java    | 21 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/react_online_calculator/src/App.js b/react_online_calculator/src/App.js
index dae68dd..f8982a4 100644
--- a/react_online_calculator/src/App.js
+++ b/react_online_calculator/src/App.js
@@ -3,14 +3,29 @@ import React, { useEffect } from 'react';
 function App() {
 
   useEffect(() =>{
-    fetch('http:/localhost:8080/String')
+    fetch('http:/localhost:8080')
     .then(response => response.text())
     .then(result => console.log(result))
   }, []);
 
   return (
     <div className="App">
-      
+      <div for="number_one">Введите первое число:</div>
+      <input id="number_one"></input>
+
+      <div for="number_two">Введите второе число:</div>
+      <input id="number_two"></input>
+
+      <div>
+        <button id="Sum">+</button>
+        <button id="Minus">-</button>
+        <button id="Division">/</button>
+        <button id="Multiplication">x</button>
+      </div>
+
+      <div>
+        <p>Итог: {}</p>
+      </div>
     </div>
   );
 }
diff --git a/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java b/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java
index 8577dbf..25aa4a2 100644
--- a/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java
+++ b/spring_online_calculator/src/main/java/com/example/spring_online_calculator/SpringOnlineCalculatorApplication.java
@@ -14,8 +14,27 @@ public class SpringOnlineCalculatorApplication {
 		SpringApplication.run(SpringOnlineCalculatorApplication.class, args);
 	}
 
+	/*@CrossOrigin
 	@GetMapping("/String")
-	public String PrintName(@RequestParam(value="Егор", defaultValue = "Егор") String str) {
+	public Integer Sum(@RequestParam(Integer value_one, defaultValue = "Егор") String str) {
 		return String.format("Привет, %s!", str);
 	}
+
+	@CrossOrigin
+	@GetMapping("/String")
+	public Integer Minus(@RequestParam(value="Егор", defaultValue = "Егор") String str) {
+		return String.format("Привет, %s!", str);
+	}
+
+	@CrossOrigin
+	@GetMapping("/String")
+	public Integer Implements(@RequestParam(value="Егор", defaultValue = "Егор") String str) {
+		return String.format("Привет, %s!", str);
+	}
+
+	@CrossOrigin
+	@GetMapping("/String")
+	public Integer Multiplication(@RequestParam(value="Егор", defaultValue = "Егор") String str) {
+		return String.format("Привет, %s!", str);
+	}*/
 }