summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfahimkhan2016-09-20 17:33:40 +0530
committerfahimkhan2016-09-20 17:33:40 +0530
commit36aaf4cdc8f978920db073aba03b136fc8a7a432 (patch)
tree67590cba46977f86e2ae0f59308735eec7b84cc3
parent54cf9ef1c1fd193bc8cb6c9fdc4cd67b6f35753f (diff)
downloadOnline-NgSpice-Simulator-36aaf4cdc8f978920db073aba03b136fc8a7a432.tar.gz
Online-NgSpice-Simulator-36aaf4cdc8f978920db073aba03b136fc8a7a432.tar.bz2
Online-NgSpice-Simulator-36aaf4cdc8f978920db073aba03b136fc8a7a432.zip
Subject: Added layout
Description: Added layput to About and Contact page.
Diffstat
-rw-r--r--public/css/customstylesheet.css5
-rw-r--r--routes/routes.js5
-rw-r--r--views/about.html9
-rw-r--r--views/base.html0
-rw-r--r--views/contact.html13
-rw-r--r--views/footer.html8
-rw-r--r--views/head.html21
-rw-r--r--views/header.html24
-rw-r--r--views/index.html69
-rw-r--r--views/indexes.html313
10 files changed, 404 insertions, 63 deletions
diff --git a/public/css/customstylesheet.css b/public/css/customstylesheet.css
index 26ae4b7..35fe451 100644
--- a/public/css/customstylesheet.css
+++ b/public/css/customstylesheet.css
@@ -11,4 +11,9 @@ body {
.footer{
background: #222222;
+ position: fixed;
+ height: 50px;
+ bottom: 0;
+ width: 100%;
+
}
diff --git a/routes/routes.js b/routes/routes.js
index e20ae07..6889f74 100644
--- a/routes/routes.js
+++ b/routes/routes.js
@@ -10,6 +10,11 @@ module.exports = function(express,app,fs,os,io,PythonShell,scriptPath){
});
+ router.get('/index',function(req,res,next){
+ res.render('index',{host:app.get('host'),title:'Ngspice Simulator'});
+
+ });
+
/*About Page*/
router.get('/about',function(req,res,next){
res.render('about',{title:'Ngspice Simulator'});
diff --git a/views/about.html b/views/about.html
index c43a799..2ba0e0f 100644
--- a/views/about.html
+++ b/views/about.html
@@ -1,9 +1,12 @@
<!DOCTYPE html>
<html>
<head>
- <title><%= title %></title>
+ <% include head.html %>
</head>
<body>
+ <header>
+ <% include header.html %>
+ </header>
<h1>About</h1>
<section>
<p>
@@ -13,6 +16,10 @@
The FOSSEE project is part of the National Mission on Education through Information and Communication Technology (ICT), Ministry of Human Resources and Development, Government of India.
</p>
</section>
+
+ <footer class="footer">
+ <% include footer.html %>
+ </footer>
</body>
</html> \ No newline at end of file
diff --git a/views/base.html b/views/base.html
deleted file mode 100644
index e69de29..0000000
--- a/views/base.html
+++ /dev/null
diff --git a/views/contact.html b/views/contact.html
index 946da42..4775e4c 100644
--- a/views/contact.html
+++ b/views/contact.html
@@ -1,11 +1,18 @@
<!DOCTYPE html>
<html>
<head>
- <title><%= title %></title>
+ <% include head.html %>
</head>
<body>
- <h2>Welcome to contact Page</h2>
-
+ <header>
+ <% include header.html %>
+ </header>
+ <h1>Contact</h1>
+
+ <footer class="footer">
+ <% include footer.html %>
+ </footer>
+
</body>
</html>
diff --git a/views/footer.html b/views/footer.html
new file mode 100644
index 0000000..dae8b59
--- /dev/null
+++ b/views/footer.html
@@ -0,0 +1,8 @@
+<div class="container">
+ <!-- <div> -->
+ <p style="text-align:center;">This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License.</a><br><a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank"><img src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png"></a>
+ </p>
+
+ <!-- <p>&copy; 2016 FOSSEE, IIT Bombay</p> -->
+ <!-- </div> -->
+</div>
diff --git a/views/head.html b/views/head.html
new file mode 100644
index 0000000..04a091c
--- /dev/null
+++ b/views/head.html
@@ -0,0 +1,21 @@
+
+<meta charset="UTF-8">
+<title><%= title %></title>
+<!-- Bootstrap core CSS -->
+<link rel="stylesheet" href="../css/bootstrap.min-3.3.6.css">
+
+<!-- Custom styles for this template -->
+<link href="../css/customstylesheet.css" rel="stylesheet">
+
+<!--Favicon-->
+<link rel="shortcut icon" href="../images/favicon.ico" />
+
+<script src="/socket.io/socket.io.js"></script>
+<script src="../js/plotly-latest.min.js"></script>
+
+
+<!-- Bootstrap JQuery -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+<script>window.jQuery || document.write('<script src="../js/jquery.min.js"><\/script>')</script>
+<!-- Bootstrap core JS -->
+<script src="../js/bootstrap.min-3.3.6.js"></script> \ No newline at end of file
diff --git a/views/header.html b/views/header.html
new file mode 100644
index 0000000..7a9f64e
--- /dev/null
+++ b/views/header.html
@@ -0,0 +1,24 @@
+<nav class="navbar navbar-inverse navbar-fixed-top">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/index">Online Simulator</a>
+ </div>
+ <div class="collapse navbar-collapse" id="navbar">
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="/index">Home</a></li>
+ <li><a href="/about">About</a></li>
+ <li><a href="/contact">Contact</a></li>
+ </ul>
+ <!-- <ul class="nav navbar-nav navbar-right">
+ <li><a href="#"><span class="glyphicon glyphicon-user"></span> Sign Up</a></li>
+ <li><a href="#"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+ </ul> -->
+ </div>
+ </div>
+ </nav> \ No newline at end of file
diff --git a/views/index.html b/views/index.html
index 69fc532..185f305 100644
--- a/views/index.html
+++ b/views/index.html
@@ -1,55 +1,12 @@
<!doctype html>
<html lang="en">
<head>
- <meta charset="UTF-8">
- <title><%= title %></title>
- <!-- Bootstrap core CSS -->
- <link rel="stylesheet" href="../css/bootstrap.min-3.3.6.css">
-
- <!-- Custom styles for this template -->
- <link href="../css/customstylesheet.css" rel="stylesheet">
-
- <!--Favicon-->
- <link rel="shortcut icon" href="../images/favicon.ico" />
-
- <script src="/socket.io/socket.io.js"></script>
- <script src="../js/plotly-latest.min.js"></script>
-
-
- <!-- Bootstrap JQuery -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
- <script>window.jQuery || document.write('<script src="../js/jquery.min.js"><\/script>')</script>
- <!-- Bootstrap core JS -->
- <script src="../js/bootstrap.min-3.3.6.js"></script>
-
+ <% include head.html %>
</head>
<body>
- <nav class="navbar navbar-inverse navbar-fixed-top">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">Online Simulator</a>
- </div>
- <div class="collapse navbar-collapse" id="navbar">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="/about">About</a></li>
- <li><a href="/contact">Contact</a></li>
- </ul>
- <!-- <ul class="nav navbar-nav navbar-right">
- <li><a href="#"><span class="glyphicon glyphicon-user"></span> Sign Up</a></li>
- <li><a href="#"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
- </ul> -->
- </div>
- </div>
- </nav>
-
-
+ <header>
+ <% include header.html %>
+ </header>
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="descNgspice">
@@ -116,18 +73,12 @@ v(in) v(out)
</div>
-
</div>
+ <div>
<footer class="footer">
- <div class="container">
- <!-- <div> -->
- <p style="text-align:center;">This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License.</a><br><a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank"><img src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png"></a>
- </p>
-
- <!-- <p>&copy; 2016 FOSSEE, IIT Bombay</p> -->
- <!-- </div> -->
- </div>
- </footer>
+ <% include footer.html %>
+ </footer>
+ </div>
<script>
@@ -289,7 +240,7 @@ v(in) v(out)
title: "Voltage(Volts) / Current(Amp)",
titlefont: {
family: 'Courier New, monospace',
- size: 15,
+ size: 12,
color: '#7f7f7f'
}
},
@@ -298,7 +249,7 @@ v(in) v(out)
showgrid: true, // remove the x-axis grid lines
titlefont: {
family: 'Courier New, monospace',
- size: 15,
+ size: 12,
color: '#7f7f7f'
}
}
diff --git a/views/indexes.html b/views/indexes.html
new file mode 100644
index 0000000..69fc532
--- /dev/null
+++ b/views/indexes.html
@@ -0,0 +1,313 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title><%= title %></title>
+ <!-- Bootstrap core CSS -->
+ <link rel="stylesheet" href="../css/bootstrap.min-3.3.6.css">
+
+ <!-- Custom styles for this template -->
+ <link href="../css/customstylesheet.css" rel="stylesheet">
+
+ <!--Favicon-->
+ <link rel="shortcut icon" href="../images/favicon.ico" />
+
+ <script src="/socket.io/socket.io.js"></script>
+ <script src="../js/plotly-latest.min.js"></script>
+
+
+ <!-- Bootstrap JQuery -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+ <script>window.jQuery || document.write('<script src="../js/jquery.min.js"><\/script>')</script>
+ <!-- Bootstrap core JS -->
+ <script src="../js/bootstrap.min-3.3.6.js"></script>
+
+</head>
+<body>
+ <nav class="navbar navbar-inverse navbar-fixed-top">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#">Online Simulator</a>
+ </div>
+ <div class="collapse navbar-collapse" id="navbar">
+ <ul class="nav navbar-nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="/about">About</a></li>
+ <li><a href="/contact">Contact</a></li>
+ </ul>
+ <!-- <ul class="nav navbar-nav navbar-right">
+ <li><a href="#"><span class="glyphicon glyphicon-user"></span> Sign Up</a></li>
+ <li><a href="#"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+ </ul> -->
+ </div>
+ </div>
+ </nav>
+
+
+
+ <!-- Main jumbotron for a primary marketing message or call to action -->
+ <div class="descNgspice">
+ <div class="container">
+ <h2>Ngspice</h2>
+ <p3>SPICE (Simulation Program with Integrated Circuit Emphasis) is a widely used tool for simulating electrical circuits. The original version was developed at the Electronics Research Laboratory of the University of California, Berkeley. Dozens of variations of SPICE exist, with both free and commercial versions available.
+
+ This site allows you to run ngspice simulations from a web browser environment. Whether you are using a Windows, Linux, or Mac computer, a smart phone, or a tablet, you always should be able to run a SPICE simulation.
+ </p3>
+ </div>
+ </div>
+
+
+ <div class="container">
+ <h2>Editor</h2>
+ <p>Please write your ngspice netlist in the below editor.</p>
+ <form role="form">
+ <div class="form-group editorArea">
+
+ <textarea class="form-control" id="netlist" rows="20">
+* Author: FOSSEE
+* Date:
+
+*Netlist Connection Information
+r1 in out 1k
+c1 out gnd 10u
+v1 in gnd pwl(0m 0 0.5m 5 50m 5 50.5m 0 100m 0)
+
+*Analysis information
+.tran 10e-03 100e-03 0e-03
+
+*Please do not remove this line
+.control
+ run
+.endc
+.end
+ </textarea>
+ <h3>Plots:</h3>
+ <textarea class="form-control" id="plotOption" rows="3">
+v(in) v(out)
+ </textarea>
+ </div>
+ </form>
+ <div class="buttonArea">
+ <button id="doSubmit" class="btn btn-success">Submit</button>
+ <button id="doSaveNetlist" class="btn btn-success">Save Netlist</button>
+ <button id="doClear" class="btn btn-danger">Clear Plots</button>
+ </div>
+
+ <hr>
+
+ <div id="messages">
+ <p class="fromServer">Server acknowledgement goes here</p>
+ </div>
+
+ <div class="container" id="plot" style="display:none;">
+ <div class="row">
+ <div id="graph" style="width:600px;height:400px;" class="col-lg-6">
+
+
+ </div>
+
+ </div>
+
+ </div>
+
+
+ </div>
+ <footer class="footer">
+ <div class="container">
+ <!-- <div> -->
+ <p style="text-align:center;">This work is licensed under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License.</a><br><a href="http://creativecommons.org/licenses/by-sa/4.0/" rel="license" target="_blank"><img src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png"></a>
+ </p>
+
+ <!-- <p>&copy; 2016 FOSSEE, IIT Bombay</p> -->
+ <!-- </div> -->
+ </div>
+ </footer>
+
+
+ <script>
+ console.log("Client Started!!!");
+ //var socket = io.connect('http://localhost:3000');
+ var socket = io.connect();
+ console.log("Socket Created!!!");
+ socket.on('loadingPage', function (data) {
+ console.log('Client : '+data);
+ socket.emit('user',{socketID:socket.id});
+ });
+
+ var editorContent = document.getElementById("netlist");
+ var submitButton = document.getElementById("doSubmit");
+ var saveButton = document.getElementById("doSaveNetlist");
+ var clearButton = document.getElementById("doClear");
+ var messages = document.getElementById("messages");
+ var plotArea = document.getElementById("plotArea");
+ var plotVariable = document.getElementById("plotOption");
+
+ submitButton.addEventListener("click", function() {
+ var netlist = editorContent.value;
+ var plotDetails = plotVariable.value.split("\n");
+ // var plotDetails = plotOption.split("\n");
+ var plotList = [];
+ for(var i = 0;i < plotDetails.length;i++){
+ if (plotDetails[i].trim()==""){
+ continue
+ }
+ else{
+ plotList.push(plotDetails[i].trim());
+ }
+
+ }
+
+ console.log("Netlist :"+editorContent.value);
+ messages.innerHTML = "";
+ socket.emit("netlist",{"netlist":netlist,"plotList":plotList});
+ document.getElementById('plot').style.display = 'block';
+ });
+
+ clearButton.addEventListener("click",function(){
+ document.getElementById('plot').style.display = 'none';
+ messages.innerHTML = "";
+
+ });
+
+ saveButton.addEventListener("click",function(){
+ var netlist = editorContent.value;
+ // create a new Blob (html5 magic) that conatins the data from your form feild
+ var textFileAsBlob = new Blob([netlist], {type:'text/plain'});
+
+ var netListFileName = prompt('Enter name of netlist file to be saved');
+ if(!netListFileName){
+ alert("Please give the proper name");
+ }
+
+ // console.log(textFileAsBlob);
+
+ // create a link for our script to 'click'
+ var downloadLink = document.createElement("a");
+
+ downloadLink.download = netListFileName+'.cir.out';
+
+ // Link Name
+ downloadLink.innerHTML = "Netlist Download Link";
+
+ // allow our code to work in webkit & Gecko based browsers
+ // without the need for a if / else block.
+ window.URL = window.URL || window.webkitURL;
+
+ // Create the link Object.
+ downloadLink.href = window.URL.createObjectURL(textFileAsBlob);
+ // when link is clicked call a function to remove it from
+ // the DOM in case user wants to save a second file.
+ downloadLink.onclick = destroyClickedElement;
+ // make sure the link is hidden.
+ downloadLink.style.display = "none";
+ // add the link to the DOM
+ document.body.appendChild(downloadLink);
+
+ // click the new link
+ downloadLink.click();
+
+
+ });
+
+ socket.on("serverMessage", function(message) {
+ // console.log("RECEIVED : " + message);
+ messages.innerHTML = "<br>" + message.stdout + "<br>"+message.stderr;
+
+ });
+
+ socket.on("clearPlot",function(){
+ document.getElementById('plot').style.display = 'none';
+ messages.innerHTML = "";
+ });
+
+ socket.on("plotData",function(data){
+ var outData = data['outData'];
+ plotList = data['plotList'];
+ console.log("PlotList---->"+plotList);
+ var keys = Object.keys(outData);
+
+ nonStackPlot(keys,outData,plotList);
+
+ });
+
+ function destroyClickedElement(event)
+ {
+ // remove the link from the DOM
+ document.body.removeChild(event.target);
+ }
+
+ function nonStackPlot(keys,outData,PlotList)
+ {
+ traces = getTraces(keys,outData);
+
+ var layout = getLayout(keys,plotList);
+
+ Plotly.newPlot(document.getElementById('graph'), traces, layout);
+
+ }
+
+ function getTraces(keys,outData)
+ {
+ var traceObj = {};
+ var traces = [];
+ //Dynamically creating traces
+ for(var i=0; i<keys.length; i++){
+ if(keys[i]=='x-axis'){
+ continue;
+ }
+ else{
+ var trace = {
+ x: outData['x-axis'],
+ y: outData[keys[i]],
+ name:keys[i],
+ type: 'scatter'
+ };
+ traceObj[keys[i]] = trace;
+ }
+ }
+
+ var traceKey = Object.keys(traceObj);
+ for (var i=0;i<traceKey.length;i++) {
+ var value = traceObj[traceKey[i]];
+ traces.push(value);
+ }
+ return traces;
+ }
+
+ function getLayout(keys,PlotList)
+ {
+ var layout = {
+
+ 'title':'Simulation Output',
+ yaxis: {
+ title: "Voltage(Volts) / Current(Amp)",
+ titlefont: {
+ family: 'Courier New, monospace',
+ size: 15,
+ color: '#7f7f7f'
+ }
+ },
+ xaxis: {
+ title:"time(Sec) / Frequency(Hz)",
+ showgrid: true, // remove the x-axis grid lines
+ titlefont: {
+ family: 'Courier New, monospace',
+ size: 15,
+ color: '#7f7f7f'
+ }
+ }
+ };
+
+ return layout;
+
+ }
+
+ </script>
+</body>
+</html>
generated by cgit (git 2.34.1) at 2024-12-19 07:10:59 +0000