Add Favicon

simosathan9 · Oct 1, 2024 · 19b3806 · 19b3806
1 parent aeceefe
commit 19b3806
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 8 deletions.
diff --git a/bin/pre-commit b/bin/pre-commit
diff --git a/blockly_unix_database.db b/blockly_unix_database.db
diff --git a/db/blockly_unix_database.db b/db/blockly_unix_database.db
diff --git a/index.html b/index.html
@@ -128,6 +128,7 @@
     />
     <link id="light-theme" rel="stylesheet" href="css/styles.css" />
     <link id="dark-theme" rel="stylesheet" href="css/styledark.css" disabled />
+    <link rel="icon" href="/img/favicon.png" />
   </head>
   <body>
     <div id="navbar">

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "@blockly/toolbox-search": "^2.0.8",
     "dotenv": "^16.4.5",
     "passport-google-oauth20": "^2.0.0",
+    "serve-favicon": "^2.5.0",
     "sqlite3": "^5.1.7"
   }
 }
diff --git a/public/img/favicon.png b/public/img/favicon.png
diff --git a/public/js/app.js b/public/js/app.js
@@ -1,6 +1,3 @@
-Blockly.JavaScript.init(workspace);
-Blockly.JavaScript = new Blockly.Generator('JavaScript');
-var generator = javascript.javascriptGenerator;
 let workspaceChangedAfterLastExecution = false; // Flag to track if the workspace has changed after execution
 let hasExecuted = false;
 let executedWorkspace = '';

diff --git a/server.js b/server.js
@@ -16,6 +16,7 @@ const flash = require('express-flash');
 const session = require('express-session');
 const jwt = require('jsonwebtoken');
 const cookieParser = require('cookie-parser');
+const favicon = require('serve-favicon');
 const sqlite3 = require('sqlite3').verbose();
 app.use(express.json());
 const db = new sqlite3.Database('db/blockly_unix_database.db', (err) => {
@@ -68,7 +69,7 @@ app.use((req, res, next) => {
 function addAuthToken(req, res, next) {
   if (req.isAuthenticated()) {
     const token = jwt.sign({ user: req.user.id }, process.env.SECRET_KEY, {
-      expiresIn: '20m'
+      expiresIn: '30m'
     }); // Token expires in 10 seconds for testing. When in production, set to 20 minutes
     req.authToken = token;
   } else {

diff --git a/views/homePage.ejs b/views/homePage.ejs
@@ -10,6 +10,7 @@
     <!-- Link to custom CSS -->
     <link rel="stylesheet" href="/css/homePage.css">
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
+    <link rel="icon" href="/img/favicon.png">
 
     <script>
       document.addEventListener('DOMContentLoaded', () => {

diff --git a/views/login.ejs b/views/login.ejs
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-
+    <link rel="icon" href="/img/favicon.png">
 </head>
 
 <body>

diff --git a/views/register.ejs b/views/register.ejs
@@ -11,6 +11,7 @@
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
     <link rel="stylesheet" href="homePage.css">
+    <link rel="icon" href="/img/favicon.png">
     <style>
         body {
             background-color: #F2F2F2;

diff --git a/views/tutorials.ejs b/views/tutorials.ejs
@@ -10,6 +10,7 @@
     <!-- Link to custom CSS -->
     <link rel="stylesheet" href="/css/homePage.css">
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
+    <link rel="icon" href="/img/favicon.png">
 
     <script>
       document.addEventListener('DOMContentLoaded', () => {