Merge branch 'simple_exercise_form' of https://github.com/ReCodEx/web…

…-app into simple_exercise_form
ReCodEx · Dec 14, 2017 · 8d867c4 · 8d867c4
2 parents 88273fa + 9a1c1fb
commit 8d867c4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "react-datetime": "^2.8.10",
     "react-dom": "^16.2.0",
     "react-dropzone": "^3.5.3",
-    "react-fontawesome": "^1.1.0",
+    "react-fontawesome": "1.6.1",
     "react-height": "^3.0.0",
     "react-helmet": "^5.0.3",
     "react-immutable-proptypes": "^2.1.0",

diff --git a/src/components/Submissions/TestResultsTable/TestResultsTable.js b/src/components/Submissions/TestResultsTable/TestResultsTable.js
@@ -88,7 +88,7 @@ const TestResultsTable = ({ results, runtimeEnvironmentId }) =>
               </Tooltip>
             }
           >
-            <Icon name="stack-overflow" />
+            <Icon name="microchip" />
           </OverlayTrigger>
         </th>
         <th className="text-center">
@@ -103,7 +103,7 @@ const TestResultsTable = ({ results, runtimeEnvironmentId }) =>
               </Tooltip>
             }
           >
-            <Icon name="rocket" />
+            <Icon name="hourglass-end" />
           </OverlayTrigger>
         </th>
         <th className="text-center">

diff --git a/src/components/forms/Fields/CheckboxField.js b/src/components/forms/Fields/CheckboxField.js
@@ -6,8 +6,6 @@ import { FormGroup, HelpBlock, Checkbox } from 'react-bootstrap';
 
 import OnOffCheckbox from '../OnOffCheckbox';
 
-import styles from './commonStyles.less';
-
 const CheckboxField = ({
   input,
   onOff = false,

diff --git a/src/components/forms/RegistrationForm/RegistrationForm.js b/src/components/forms/RegistrationForm/RegistrationForm.js
@@ -6,6 +6,7 @@ import { Alert } from 'react-bootstrap';
 import isEmail from 'validator/lib/isEmail';
 
 import ResourceRenderer from '../../helpers/ResourceRenderer';
+import { eventAggregator } from '../../../helpers/eventAggregator';
 import FormBox from '../../widgets/FormBox';
 import {
   EmailField,

diff --git a/views/index.ejs b/views/index.ejs
@@ -1,24 +1,30 @@
 <!DOCTYPE html>
 <html>
-  <head <%- head.htmlAttributes.toString() %>>
-    <meta charset="utf-8">
-    <%- head.title.toString() %>
+
+<head <%- head.htmlAttributes.toString() %>>
+  <meta charset="utf-8">
+  <%- head.title.toString() %>
     <%- head.meta.toString() %>
-    <%- head.link.toString() %>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/png" href="/public/favicon.ico" />
+      <%- head.link.toString() %>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link rel="icon" type="image/png" href="/public/favicon.ico" />
+
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
+          crossorigin="anonymous">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+        <link rel="stylesheet" href="<%= style %>">
+</head>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.2/css/font-awesome.min.css">
-    <link rel="stylesheet" href="<%= style %>">
-  </head>
-  <body class="skin-green fixed">
-    <div id="root"><%- html %></div>
-    <% if (reduxState) { %>
+<body class="skin-green fixed">
+  <div id="root">
+    <%- html %>
+  </div>
+  <% if (reduxState) { %>
     <script>
-      window.__INITIAL_STATE__ = <%- reduxState  %>;
+      window.__INITIAL_STATE__ = <% - reduxState %>;
     </script>
     <% } %>
-    <script src="<%= bundle %>"></script>
-  </body>
+      <script src="<%= bundle %>"></script>
+</body>
+
 </html>
diff --git a/yarn.lock b/yarn.lock
@@ -5918,7 +5918,7 @@ react-dropzone@^3.5.3:
     attr-accept "^1.0.3"
     prop-types "^15.5.7"
 
-react-fontawesome@^1.1.0:
+react-fontawesome@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/react-fontawesome/-/react-fontawesome-1.6.1.tgz#eddce17e7dc731aa09fd4a186688a61793a16c5c"
   dependencies: