Merge branch 'master' of https://github.com/iampavangandhi/TradeByte …

…into fix/iampavangandhi#46
fabcodingzest · Aug 20, 2020 · 1f0df7d · 1f0df7d
2 parents 86a53f8 + e87ac41
commit 1f0df7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app.js b/app.js
@@ -82,7 +82,7 @@ app.use(function (req, res, next) {
 });
 
 // Static folder
-app.use(express.static(path.join(__dirname, "public")));
+app.use(express.static(path.join(__dirname, "/public")));
 
 // Routes
 app.use("/", require("./routes/api/index"));

diff --git a/views/layouts/app.ejs b/views/layouts/app.ejs
@@ -9,20 +9,21 @@
       integrity="sha256-46r060N2LrChLLb5zowXQ72/iKKNiw/lAmygmHExk/o="
       crossorigin="anonymous"
     />
-    <link
-      href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css"
-      rel="stylesheet"
-    />
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/Chart.min.js"></script>
 
-    <link rel="stylesheet" href="css/style.css" />
+    <link type="text/css" rel="stylesheet" href="./css/style.css" />
+    <link type="text/css" rel="stylesheet" href="../css/style.css" />
     <title>TradeByte</title>
   </head>
 
   <body>
     <div class="md:flex flex-col bg-gray-300 md:flex-row min-h-screen w-full">
       <%- include('../partials/_nav.ejs') %> <%- body %>
     </div>
-    <script type="application/javascript" src="javascript/script.js"></script>
+    <script type="application/javascript" src="./javascript/script.js"></script>
+    <script
+      type="application/javascript"
+      src="../javascript/script.js"
+    ></script>
   </body>
 </html>