Add some basic bootstrap stuff

Johannes Zellner
Commit 0fd8904c authored Mar 01, 2016 by Johannes Zellner
Showing with 43 additions and 4 deletions
app.js
app/css/bootstrap.css
app/css/bootstrap.css.map
app/css/bootstrap.min.css
app/css/bootstrap.min.css.map
app/fonts/glyphicons-halflings-regular.eot
app/fonts/glyphicons-halflings-regular.svg
app/fonts/glyphicons-halflings-regular.ttf
app/fonts/glyphicons-halflings-regular.woff
app/fonts/glyphicons-halflings-regular.woff2
app/index.html
app/js/bootstrap.js
app/js/bootstrap.min.js
app/js/jquery-1.12.1.min.js
app/js/npm.js
app/welcome.html
--- a/app.js
+++ b/app.js
@@ -35,7 +35,7 @@ router.get('/', function (req, res) { res.status(200).send(ejs.render(fs.readFil

 app.use(morgan('dev'));
 app.use(compression());
-app.use('/settings', express.static(__dirname + '/app'));
+app.use('/admin', express.static(__dirname + '/app'));
 app.use(express.static(path.resolve(__dirname, process.argv[2] || 'files')));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false, limit: '100mb' }));

--- a/app/css/bootstrap.css
+++ b/app/css/bootstrap.css
--- a/app/css/bootstrap.css.map
+++ b/app/css/bootstrap.css.map
--- a/app/css/bootstrap.min.css
+++ b/app/css/bootstrap.min.css
--- a/app/css/bootstrap.min.css.map
+++ b/app/css/bootstrap.min.css.map
--- a/app/fonts/glyphicons-halflings-regular.eot
+++ b/app/fonts/glyphicons-halflings-regular.eot
--- a/app/fonts/glyphicons-halflings-regular.svg
+++ b/app/fonts/glyphicons-halflings-regular.svg
--- a/app/fonts/glyphicons-halflings-regular.ttf
+++ b/app/fonts/glyphicons-halflings-regular.ttf
--- a/app/fonts/glyphicons-halflings-regular.woff
+++ b/app/fonts/glyphicons-halflings-regular.woff
--- a/app/fonts/glyphicons-halflings-regular.woff2
+++ b/app/fonts/glyphicons-halflings-regular.woff2
--- a/app/index.html
+++ b/app/index.html
+<html>
+<head>
+    <title> Cloudron Surfer </title>
+
+    <link rel="stylesheet" href="/admin/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/admin/css/style.css">
+
+    <script src="/admin/js/jquery-1.12.1.min.js"></script>
+    <script src="/admin/js/bootstrap.min.js"></script>
+
+</head>
+<body>
+
+<div class="wrapper">
+    <div class="content">
+        <h1> Surfer Admin </h1>
+        <p>
+            Upload some files using the commandline tool.
+            <button class="btn btn-primary">Foobar</button>
+        </p>
+    </div>
+</div>
+
+</body>
+</html>
--- a/app/js/bootstrap.js
+++ b/app/js/bootstrap.js
--- a/app/js/bootstrap.min.js
+++ b/app/js/bootstrap.min.js
--- a/app/js/jquery-1.12.1.min.js
+++ b/app/js/jquery-1.12.1.min.js
--- a/app/js/npm.js
+++ b/app/js/npm.js
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+require('../../js/transition.js')
+require('../../js/alert.js')
+require('../../js/button.js')
+require('../../js/carousel.js')
+require('../../js/collapse.js')
+require('../../js/dropdown.js')
+require('../../js/modal.js')
+require('../../js/tooltip.js')
+require('../../js/popover.js')
+require('../../js/scrollspy.js')
+require('../../js/tab.js')
+require('../../js/affix.js')
\ No newline at end of file
--- a/app/welcome.html
+++ b/app/welcome.html
@@ -2,15 +2,15 @@
 <head>
    <title> Cloudron Surfer </title>

-    <link rel="stylesheet" href="/settings/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/settings/css/style.css">
+    <link rel="stylesheet" href="/admin/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/admin/css/style.css">

 </head>
 <body>

 <div class="wrapper">
    <div class="content">
-        <img src="/settings/img/logo.png"/>
+        <img src="/admin/img/logo.png"/>
        <h1> Cloudron Surfer </h1>
        <p>
            Upload some files using the commandline tool.