Merge conflicts

arthurfiorette · Mar 22, 2021 · c206b4d · c206b4d
2 parents 455be89 + 66563c1
commit c206b4d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -73,9 +73,10 @@ This application can be run in different ways.
 
 2. If you are thinking of hosting it on any hosting platform, use the docker implementation to your advantage and host it easily. Maybe you will need to change the volumes at the **docker-compose** file.
 
-3. Or, in the most complicated way, you must have **Node.JS** installed on your pc. 
-  - To start the server, open the app folder, install and compile by running `npm install` and after `npm run build`. Start by running `npm start`.
-  - To start the web page, open the web folder, install with `npm install` and build running `npm run build` and `npm run build:server`. Start by running `npm start`.
+3. Or, in the most complicated way, you must have **Node.JS** installed on your pc.
+
+- To start the server, open the app folder, install and compile by running `npm install` and after `npm run build`. Start by running `npm start`.
+- To start the web page, open the web folder, install with `npm install` and build running `npm run build` and `npm run build:server`. Start by running `npm start`.
 
 ## License
 

diff --git a/web/public/index.html b/web/public/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Steam Trader</title>
-</head>
-<body>
-  <div id="app"></div>
-</body>
-</html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Steam Trader</title>
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/web/src/app/index.tsx b/web/src/app/index.tsx
@@ -7,7 +7,7 @@ import Trades from '../components/Logs'
 
 import {Container} from 'react-bootstrap';
 
-export default function() {
+export default function () {
   return (
     <Fragment>
       <Header />
@@ -16,4 +16,4 @@ export default function() {
       </Container>
     </Fragment>
   );
-}
+}
diff --git a/web/src/index.css b/web/src/index.css
@@ -2,5 +2,4 @@
   margin: 0;
   font-family: sans-serif;
   box-sizing: border-box;
-}
-
+}
diff --git a/web/tsconfig.json b/web/tsconfig.json
@@ -6,10 +6,10 @@
     // "incremental": true,                         /* Enable incremental compilation */
     "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-    "lib": ["DOM", "DOM.Iterable", "ESNext"],                                   /* Specify library files to be included in the compilation. */
-    "allowJs": true,                             /* Allow javascript files to be compiled. */
+    "lib": ["DOM", "DOM.Iterable", "ESNext"] /* Specify library files to be included in the compilation. */,
+    "allowJs": true /* Allow javascript files to be compiled. */,
     // "checkJs": true,                             /* Report errors in .js files. */
-    "jsx": "react-jsx",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
+    "jsx": "react-jsx" /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */,
     // "declaration": true,                         /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                           /* Generates corresponding '.map' file. */