Move components to separate dir, remove example CSS and test

diff --git a/service-website/.idea/jsLibraryMappings.xml b/service-website/.idea/jsLibraryMappings.xml
index d23208fbb7168875464dd7aaff4169c37be615ea..da0c28bd80bee4a43bc8b91473904326f08b9cd1 100644 (file)
--- a/service-website/.idea/jsLibraryMappings.xml
+++ b/service-website/.idea/jsLibraryMappings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
+    <file url="PROJECT" libraries="{@types/prop-types}" />
     <includedPredefinedLibrary name="Node.js Core" />
   </component>
 </project>
\ No newline at end of file

diff --git a/service-website/.idea/service-website.iml b/service-website/.idea/service-website.iml
index 2bfa9454551d80120bd663b5baea1a8eced05d79..d64bd9b4ea169ca3375756c1a4d676b3279173bb 100644 (file)
--- a/service-website/.idea/service-website.iml
+++ b/service-website/.idea/service-website.iml
@@ -9,5 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="@types/prop-types" level="application" />
   </component>
 </module>
\ No newline at end of file

diff --git a/service-website/src/App.css b/service-website/src/App.css
deleted file mode 100755 (executable)
index a69d1fa..0000000
--- a/service-website/src/App.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.App {
-    text-align: center;
-}
-
-.App-logo {
-    animation: App-logo-spin infinite 20s linear;
-    height: 40vmin;
-}
-
-.App-header {
-    background-color: #282c34;
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    font-size: calc(10px + 2vmin);
-    color: white;
-}
-
-.App-link {
-    color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-    from {
-        transform: rotate(0deg);
-    }
-    to {
-        transform: rotate(360deg);
-    }
-}

diff --git a/service-website/src/App.test.js b/service-website/src/App.test.js
deleted file mode 100755 (executable)
index ebda12e..0000000
--- a/service-website/src/App.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-it('renders without crashing', () => {
-    const div = document.createElement('div');
-    ReactDOM.render(<App/>, div);
-    ReactDOM.unmountComponentAtNode(div);
-});

diff --git a/service-website/src/App.js b/service-website/src/components/App.js
similarity index 89%
rename from service-website/src/App.js
rename to service-website/src/components/App.js
index a16fe711f5eb3742f8c404e3011cf09caa2ab59d..f56c1b22f5d3cec9f308dd6c1c51edc2e17b3ad9 100755 (executable)
--- a/service-website/src/App.js
+++ b/service-website/src/components/App.js
@@ -1,5 +1,4 @@
-import React, {Component} from 'react';
-import './App.css';
+import React, {Component} from "react";
 import SentimentAnalysis from "./SentimentAnalysis";
 
 class App extends Component {

diff --git a/service-website/src/SearchTerm.js b/service-website/src/components/SearchTerm.js
similarity index 96%
rename from service-website/src/SearchTerm.js
rename to service-website/src/components/SearchTerm.js
index 827268ae0db3294847efba805dd0a64ac018493c..d683fc69e7d30bc975b73a6ef529f687380ac061 100644 (file)
--- a/service-website/src/SearchTerm.js
+++ b/service-website/src/components/SearchTerm.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component} from "react";
 import PropTypes from "prop-types";
 
 class SearchTerm extends Component {

diff --git a/service-website/src/SearchTermsInput.js b/service-website/src/components/SearchTermsInput.js
similarity index 91%
rename from service-website/src/SearchTermsInput.js
rename to service-website/src/components/SearchTermsInput.js
index c49f04f27c6d105ce64ef38b0c8476d903f0501c..f28868a60416323020e54be87f8ec51024215f3a 100644 (file)
--- a/service-website/src/SearchTermsInput.js
+++ b/service-website/src/components/SearchTermsInput.js
@@ -1,5 +1,5 @@
-import React, {Component} from 'react';
-import PropTypes from 'prop-types';
+import React, {Component} from "react";
+import PropTypes from "prop-types";
 
 class SearchTermsInput extends Component {
     constructor(props, context) {

diff --git a/service-website/src/SentimentAnalysis.js b/service-website/src/components/SentimentAnalysis.js
similarity index 98%
rename from service-website/src/SentimentAnalysis.js
rename to service-website/src/components/SentimentAnalysis.js
index 74c4ea6b0131d59a14083db0ebee2dbca24ac72d..6568460e99caa316db9a805cb9b82a7920b62a7e 100644 (file)
--- a/service-website/src/SentimentAnalysis.js
+++ b/service-website/src/components/SentimentAnalysis.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component} from "react";
 import SearchTermsInput from "./SearchTermsInput";
 import SearchTerm from "./SearchTerm";
 

diff --git a/service-website/src/index.js b/service-website/src/index.js
index 5e3b67e5f15a7c717b88da49e8d0d525326ce83d..99116de58bef5fc6764462365bbdaf7779d88d0f 100755 (executable)
--- a/service-website/src/index.js
+++ b/service-website/src/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import './index.css';
-import App from './App';
+import App from './components/App';
 import * as serviceWorker from './serviceWorker';
 
 ReactDOM.render(<App/>, document.getElementById('root'));