]> git.immae.eu Git - perso/Immae/Projets/Nodejs/Surfer.git/commitdiff
projects / perso / Immae / Projets / Nodejs / Surfer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 4d9a8ee)
Move admin ui to _admin to avoid less likely conflict
authorJohannes Zellner <johannes@nebulon.de>
Tue, 1 Mar 2016 15:12:55 +0000 (16:12 +0100)
committerJohannes Zellner <johannes@nebulon.de>
Tue, 1 Mar 2016 15:12:55 +0000 (16:12 +0100)
app.js patch | blob | blame | history
app/index.html patch | blob | blame | history
app/welcome.html patch | blob | blame | history

diff --git a/app.js b/app.js
index 6e602c7927dce4b1df9103b30ad2f2012a32cfcd..f7a05eea028f88a575ff095ca05ffe3c38344e00 100755 (executable)
--- 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('/admin', 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' }));
diff --git a/app/index.html b/app/index.html
index ab892f7c7365ae59d7cbc05d98bcf07e2e9f4b3f..cf1f399f1462d1c9e7785d56883a5fbaf3a70ecd 100644 (file)
--- a/app/index.html
+++ b/app/index.html
@@ -2,9 +2,9 @@
 <head>
     <title> Cloudron Surfer </title>
 
-    <link rel="stylesheet" href="/admin/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/admin/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/admin/css/style.css">
+    <link rel="stylesheet" href="/_admin/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/_admin/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/_admin/css/style.css">
 
 </head>
 <body id="app">
@@ -125,14 +125,17 @@
                     </tbody>
                 </table>
             </div>
+            <div class="col-lg-12" style="text-align: right;">
+                <button class="btn btn-default btn-sm" v-on:click="">Create Directory</button>
+            </div>
         </div>
     </div>
 
-    <script src="/admin/js/jquery-1.12.1.min.js"></script>
-    <script src="/admin/js/bootstrap.min.js"></script>
-    <script src="/admin/js/vue.min.js"></script>
-    <script src="/admin/js/superagent.js"></script>
-    <script src="/admin/js/app.js"></script>
+    <script src="/_admin/js/jquery-1.12.1.min.js"></script>
+    <script src="/_admin/js/bootstrap.min.js"></script>
+    <script src="/_admin/js/vue.min.js"></script>
+    <script src="/_admin/js/superagent.js"></script>
+    <script src="/_admin/js/app.js"></script>
 
 </body>
 </html>
diff --git a/app/welcome.html b/app/welcome.html
index b21fbbbd9fe83219c6cdf3e096aecff7dae13d5c..d85c2a0d5b2562900f15ffabd0d4e5765d34b5de 100644 (file)
--- a/app/welcome.html
+++ b/app/welcome.html
@@ -2,15 +2,15 @@
 <head>
     <title> Cloudron Surfer </title>
 
-    <link rel="stylesheet" href="/admin/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/admin/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="/admin/img/logo.png"/>
+        <img src="/_admin/img/logo.png"/>
         <h1> Cloudron Surfer </h1>
         <p>
             Upload some files using the commandline tool.
Surfer is a Simple static file server