updating frontend project structure to work with IDEA

shawn-mcginty · Jun 4, 2020 · 8cf9a88 · 8cf9a88
1 parent 1e737df
commit 8cf9a88
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@ gradle
 out
 stale_outputs_checked
 src/main/resources/public/dist
-src/main/js/**/*.js
+frontend/**/*.js
 node_modules
 lib
 .merlin
diff --git a/bsconfig.json b/bsconfig.json
@@ -1,22 +1,21 @@
 {
-  "name": "bs",
-  "version": "0.1.0",
+  "name": "reason-react-examples",
+  "reason": {
+    "react-jsx": 3,
+  },
   "sources": {
-    "dir" : "src/main/js",
+    "dir" : "frontend",
     "subdirs" : true
   },
-  "package-specs": {
+  "bsc-flags": ["-bs-super-errors", "-bs-no-version-header"],
+  "package-specs": [{
     "module": "commonjs",
     "in-source": true
-  },
+  }],
   "suffix": ".bs.js",
+  "namespace": true,
   "bs-dependencies": [
+    "reason-react"
   ],
-  "warnings": {
-    "error" : "+101"
-  },
-  "reason": {
-    "react-jsx": 3
-  },
   "refmt": 3
 }
diff --git a/frontend/Login.re b/frontend/Login.re
@@ -0,0 +1 @@
+ReactDOMRe.renderToElementWithId(<LoginPage name="John" />, "login-page-app");
diff --git a/frontend/Main.re b/frontend/Main.re
diff --git a/frontend/components/loginPage/LoginPage.re b/frontend/components/loginPage/LoginPage.re
@@ -0,0 +1,3 @@
+[@react.component]
+let make = (~name) =>
+  <div> {ReasonReact.string("Hello " ++ name ++ "!")} </div>;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,17 +1,26 @@
 {
-  "name": "bs",
+  "name": "bringo",
   "version": "0.1.0",
   "scripts": {
     "webpack": "webpack",
-    "clean": "bsb -clean-world",
     "build": "bsb -make-world && webpack",
-    "watch": "bsb -make-world -w"
+    "start": "bsb -make-world -w -ws _ ",
+    "clean": "bsb -clean-world",
+    "server": "moduleserve ./ --port 8000",
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
-    "BuckleScript"
+    "BuckleScript",
+    "ReasonReact",
+    "reason-react"
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "react": "^16.8.1",
+    "react-dom": "^16.8.1",
+    "reason-react": "^0.8.0"
+  },
   "devDependencies": {
     "bs-platform": "^7.3.2",
     "webpack": "^4.43.0",

diff --git a/src/main/js/main.ml b/src/main/js/main.ml
diff --git a/src/main/resources/templates/login.mustache b/src/main/resources/templates/login.mustache
@@ -4,11 +4,7 @@
     <title>Test</title>
 </head>
 <body>
-    Login Page bitches!
-    <form action="/login" method="post">
-        <input name="uname" required />
-        <input name="pdub" type="password" required />
-        <button type="submit">Submit</button>
-    </form>
+    <section id="login-page-app"></section>
+    <script src="/dist/login.js"></script>
 </body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,9 +1,15 @@
 const path = require('path');
 
-module.exports = {
-  entry: path.resolve(__dirname, 'src/main/js/main.bs.js'),
+module.exports = [{
+  entry: path.resolve(__dirname, 'frontend/Main.bs.js'),
   output: {
     filename: 'main.js',
     path: path.resolve(__dirname, 'src/main/resources/public/dist'),
   },
-};
+}, {
+     entry: path.resolve(__dirname, 'frontend/Login.bs.js'),
+     output: {
+       filename: 'login.js',
+       path: path.resolve(__dirname, 'src/main/resources/public/dist'),
+     },
+}];
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ReactDOMRe.renderToElementWithId(<LoginPage name="John" />, "login-page-app");