add register page and api login

damianham · Apr 4, 2020 · 56f4916 · 56f4916
1 parent 4faa333
commit 56f4916
Show file tree

Hide file tree

Showing 9 changed files with 567 additions and 122 deletions.
diff --git a/app/.amber.yml.lqd b/app/.amber.yml.lqd
@@ -38,4 +38,4 @@ watch:
     build_commands:
       - echo watching assets
     run_commands:
-      - yarn watch
+      - npm run watch
diff --git a/app/config/routes.cr b/app/config/routes.cr
@@ -1,5 +1,5 @@
 Amber::Server.configure do |app|
-  pipeline :web, :auth do
+  pipeline :web do
     # Plug is the method to use connect a pipe (middleware)
     # A plug accepts an instance of HTTP::Handler
     # plug Amber::Pipe::PoweredByAmber.new
@@ -23,6 +23,8 @@ Amber::Server.configure do |app|
     plug Amber::Pipe::Logger.new
     plug Amber::Pipe::Session.new
     plug Amber::Pipe::CORS.new
+    # enable this pipe for JWT support
+    # plug AuthenticateJWT.new
   end
 
   # All static content will run these transformations
@@ -33,15 +35,16 @@ Amber::Server.configure do |app|
   end
 
   routes :web do
-    get "/authenticateWithToken", HomeController, :authenticate_jwt
-    get "/me", HomeController, :me
-    websocket "/model", ModelSocket
-    websocket "/signal", SignalSocket
     get "/", HomeController, :index
-    post "/", HomeController, :token_sign_in_helper
   end
 
   routes :api do
+    get "/authenticateWithToken", HomeController, :authenticate_jwt
+    post "/api/auth/signin", HomeController, :signin
+    get "/me", HomeController, :me 
+    post "/", HomeController, :token_sign_in_helper
+    websocket "/model", ModelSocket
+    websocket "/signal", SignalSocket
   end
 
   routes :static do

diff --git a/app/src/assets/javascripts/app.js.lqd b/app/src/assets/javascripts/app.js.lqd
@@ -36,6 +36,12 @@ import HeaderLinks from 'components/Header/HeaderLinks.jsx'
 import Auth from '../../lib/js/auth'
 import routes from '../../modules/js/routes'
 
+import Components from 'views/Components/Components.jsx'
+import LandingPage from 'views/LandingPage/LandingPage.jsx'
+import ProfilePage from 'views/ProfilePage/ProfilePage.jsx'
+import LoginPage from 'views/LoginPage/LoginPage.jsx'
+import RegisterPage from 'views/RegisterPage/RegisterPage.jsx'
+
 const dashboardRoutes = []
 
 // define a mapping from a text name used as the icon ID in routes in
@@ -116,6 +122,43 @@ const styles = (theme) => ({
   }
 })
 
+const static_routes = [ {
+  path: '/components',
+  exact: true,
+  type: 'index',
+  name: 'Components',
+  main: Components,
+  icon: 'View'
+}, {
+  path: '/landing-page',
+  exact: true,
+  type: 'index',
+  name: 'Landing Example',
+  main: LandingPage,
+  icon: 'Info'
+}, {
+  path: '/profile-page',
+  exact: true,
+  type: 'index',
+  name: 'Profile Example',
+  main: ProfilePage,
+  icon: 'Face'
+}, {
+  path: '/login-page',
+  exact: true,
+  type: 'index',
+  name: 'Login',
+  main: LoginPage,
+  icon: 'Login'
+}, {
+  path: '/signup',
+  exact: true,
+  type: 'index',
+  name: 'Signup',
+  main: RegisterPage,
+  icon: 'Signup'
+}]
+
 class ListItemLink extends React.Component {
   constructor (props, state) {
     super(props, state)
@@ -335,14 +378,7 @@ class App extends React.Component {
             { this.isAuthenticated() ? (
               <ListItemLink exact key='/profile-page' to='/profile-page' primary='Profile' icon={<PersonIcon />} />
             ) : (
-              <li>
-                <a href='/signup'>
-                  <ListItem button >
-                    <ListItemIcon>{<PersonAddIcon />}</ListItemIcon>
-                    <ListItemText primary="Sign Up" />
-                  </ListItem>
-                </a>
-              </li>
+              <ListItemLink exact key='/register-page' to='/signup' primary='Register' icon={<PersonAddIcon />} />
             )
             }
           </List>
@@ -357,6 +393,15 @@ class App extends React.Component {
               component={route.main}
             />
           ))}
+          {static_routes.map((route, index) => (
+            <Route
+              key={index}
+              path={route.path}
+              exact={route.exact}
+              component={route.main}
+            />
+          ))
+          }
         </Switch>
       </div>
     )