feat: splitting

schibsted · Feb 1, 2024 · 8fe836f · 8fe836f
1 parent e59da75
commit 8fe836f
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 446 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
         "express": "^4.17.3",
         "express-handlebars": "^7.1.2",
         "express-session": "^1.17.3",
+        "flowbite": "^2.2.1",
         "getenv": "^1.0.0",
         "hbs": "^4.2.0",
         "helmet": "^3.23.3",

diff --git a/public/tailwind.js b/public/tailwind.js
@@ -1 +1,2 @@
 import './styles/main.scss'
+import 'flowbite';
diff --git a/server/app.js b/server/app.js
@@ -17,7 +17,6 @@ const { engine } =require('express-handlebars');
 
 const app = express();
 
-
 app.engine('.hbs', engine({
     extname: '.hbs',
     helpers: {
@@ -29,6 +28,7 @@ app.engine('.hbs', engine({
         }
     }
 }));
+
 app.set('view engine', '.hbs');
 app.set('views', `${__dirname}/views`);
 
@@ -52,7 +52,24 @@ oauth.initialize(app);
 
 
 app.get('/tailwind', asyncMW(async (req, res) => {
-    res.render('tailwind');
+    const data = { pkgJson, config };
+    if (req.isAuthenticated()) {
+        if (!req.user.userinfo) {
+            // We came from a purchase flow, and our token doesn't have the 'openid' scope. Let's
+            // try to redirect to /oauth to "quickly fetch" a token
+            return res.redirect('/oauth');
+        }
+        data.userInfo = req.user.userinfo;
+    }
+
+    res.render('tailwind',{
+        loginProperties:[
+            "Popup",
+            "One step login",
+            "New Flow"
+        ],
+        ...data
+    });
 }));
 
 app.get('/', asyncMW(async (req, res) => {

diff --git a/server/views/layouts/main.hbs b/server/views/layouts/main.hbs
@@ -36,8 +36,12 @@
 <body class="text-blueGray-700 antialiased">
 <noscript>You need to enable JavaScript to run this app.</noscript>
 <div id="root">
-    {{> header }}
-    {{{body}}}
+    {{> nav }}
+    <div class="md:ml-64 bg-blueGray-50">
+        <div class="bg-pink-600 p-4 md:px-8 ">
+            {{{body}}}
+        </div>
+    </div>
     {{> footer }}
 </div>
 <script type="text/javascript">

diff --git a/server/views/partials/header.hbs → server/views/partials/nav.hbs b/server/views/partials/header.hbs → server/views/partials/nav.hbs