From 237977316de8c962d91424ed296e63d4bb2cbca1 Mon Sep 17 00:00:00 2001
From: Michael Winsauer <e1429715@student.tuwien.ac.at>
Date: Sat, 19 Jan 2019 00:21:51 +0100
Subject: [PATCH] Move components to separate dir, remove example CSS and test
---
service-website/.idea/jsLibraryMappings.xml | 1 +
service-website/.idea/service-website.iml | 1 +
service-website/src/App.css | 32 -------------------
service-website/src/App.test.js | 9 ------
service-website/src/{ => components}/App.js | 3 +-
.../src/{ => components}/SearchTerm.js | 2 +-
.../src/{ => components}/SearchTermsInput.js | 4 +--
.../src/{ => components}/SentimentAnalysis.js | 2 +-
service-website/src/index.js | 2 +-
9 files changed, 8 insertions(+), 48 deletions(-)
delete mode 100755 service-website/src/App.css
delete mode 100755 service-website/src/App.test.js
rename service-website/src/{ => components}/App.js (89%)
rename service-website/src/{ => components}/SearchTerm.js (96%)
rename service-website/src/{ => components}/SearchTermsInput.js (91%)
rename service-website/src/{ => components}/SentimentAnalysis.js (98%)
diff --git a/service-website/.idea/jsLibraryMappings.xml b/service-website/.idea/jsLibraryMappings.xml
index d23208f..da0c28b 100644
--- 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 2bfa945..d64bd9b 100644
--- 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
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
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 a16fe71..f56c1b2 100755
--- 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 827268a..d683fc6 100644
--- 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 c49f04f..f28868a 100644
--- 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 74c4ea6..6568460 100644
--- 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 5e3b67e..99116de 100755
--- 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'));
--
2.43.0