working on frontend stuff

shawn-mcginty · Jun 19, 2020 · 4468035 · 4468035
1 parent 9cb10b7
commit 4468035
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,5 +37,10 @@ task installJs(type: Exec) {
     commandLine "npm", "install"
 }
 
+task cleanJs(type: Exec) {
+    commandLine "npm", "run", "clean"
+}
+
 compileJs.dependsOn installJs
-compileJava.dependsOn compileJs
+compileJava.dependsOn compileJs
+clean.dependsOn cleanJs
diff --git a/frontend/components/mainPage/MainPage.re b/frontend/components/mainPage/MainPage.re
@@ -8,11 +8,94 @@ let make = () =>
           <NavBar classes />
           <main>
             <Container maxWidth=`Md>
-              <Paper className=classes##mainPaper>
+              <Paper className=classes##mainPaper elevation={`Int(3)}>
                 {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
+                {React.string("test")}
+                <br />
+                <br />
               </Paper>
             </Container>
           </main>
+          <footer className=classes##footer>
+            <Container maxWidth=`Md>
+              <Typography variant=`Caption gutterBottom=true>
+                {React.string(
+                   "This is a footer, maybe some licensing info or copywrite or privacy info.",
+                 )}
+              </Typography>
+            </Container>
+          </footer>
         </>
       )
     }

diff --git a/frontend/components/navBar/NavBar.re b/frontend/components/navBar/NavBar.re
@@ -1,7 +1,7 @@
 [@react.component]
 let make = (~classes) => {
   MaterialUi.(
-    <AppBar position=`Static>
+    <AppBar position=`Fixed>
       <Toolbar>
         <IconButton edge=`Start className=classes##navIcon>
           <Icons.MenuFilled />

diff --git a/frontend/styles/SharedClasses.re b/frontend/styles/SharedClasses.re
@@ -17,4 +17,14 @@ let classes: list(MaterialUi_WithStyles.style) = [
     styles: ReactDOMRe.Style.make(~color="#ffffff", ~marginRight="10px", ()),
   },
   {name: "mainPaper", styles: ReactDOMRe.Style.make(~paddingTop="76px", ())},
+  {
+    name: "footer",
+    styles:
+      ReactDOMRe.Style.make(
+        ~paddingTop="76px",
+        ~paddingBottom="12px",
+        ~color="rgba(0, 0, 0, 0.54)",
+        (),
+      ),
+  },
 ];