Skip to content

PUBLIC / surfer-okd

Go to a project
Commit 61e0b8e4 by Johannes Zellner
Options

Move admin ui to _admin to avoid less likely conflict

1 parent 4d9a8ee5
Inline Side-by-side
Showing with 15 additions and 12 deletions
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' }));
......
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>
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.
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!