Migrate to bootstrap 4 and fontawesome 5
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
3acde1749b
commit
1aa968299a
5 changed files with 438 additions and 183 deletions
3
Makefile
3
Makefile
|
@ -1,5 +1,6 @@
|
|||
generate: l10n
|
||||
coffee -c frontend/application.coffee
|
||||
docker run --rm -ti -v $(CURDIR):$(CURDIR) -w $(CURDIR) node \
|
||||
bash -c "npm install -g coffeescript && coffee -c frontend/application.coffee && chown -R $(shell id -u) frontend"
|
||||
go generate
|
||||
|
||||
l10n:
|
||||
|
|
424
assets.go
424
assets.go
File diff suppressed because one or more lines are too long
|
@ -29,11 +29,11 @@ hashLoad = () ->
|
|||
if hash.length == 0
|
||||
return
|
||||
|
||||
$('#panelNewSecret').hide()
|
||||
$('#panelSecretURL').hide()
|
||||
$('#cardNewSecret').hide()
|
||||
$('#cardSecretURL').hide()
|
||||
$('#notfound').hide()
|
||||
$('#somethingwrong').hide()
|
||||
$('#panelReadSecretPre').show()
|
||||
$('#cardReadSecretPre').show()
|
||||
|
||||
requestSecret = () ->
|
||||
hash = window.location.hash
|
||||
|
@ -67,12 +67,12 @@ secretCreated = (data) ->
|
|||
secretHash = "#{secretHash}|#{securePassword}"
|
||||
url = "#{location.href.split('#')[0]}##{secretHash}"
|
||||
|
||||
$('#panelNewSecret').hide()
|
||||
$('#panelReadSecretPre').hide()
|
||||
$('#panelSecretURL').show()
|
||||
$('#panelSecretURL').find('input').val url
|
||||
$('#panelSecretURL').find('input').focus()
|
||||
$('#panelSecretURL').find('input').select()
|
||||
$('#cardNewSecret').hide()
|
||||
$('#cardReadSecretPre').hide()
|
||||
$('#cardSecretURL').show()
|
||||
$('#cardSecretURL').find('input').val url
|
||||
$('#cardSecretURL').find('input').focus()
|
||||
$('#cardSecretURL').find('input').select()
|
||||
|
||||
securePassword = null
|
||||
|
||||
|
@ -81,13 +81,13 @@ showData = (data) ->
|
|||
if securePassword != null
|
||||
secret = GibberishAES.dec(secret, securePassword)
|
||||
|
||||
$('#panelNewSecret').hide()
|
||||
$('#panelSecretURL').hide()
|
||||
$('#cardNewSecret').hide()
|
||||
$('#cardSecretURL').hide()
|
||||
$('#notfound').hide()
|
||||
$('#somethingwrong').hide()
|
||||
$('#panelReadSecretPre').hide()
|
||||
$('#panelReadSecret').show()
|
||||
$('#panelReadSecret').find('textarea').val secret
|
||||
$('#cardReadSecretPre').hide()
|
||||
$('#cardReadSecret').show()
|
||||
$('#cardReadSecret').find('textarea').val secret
|
||||
|
||||
somethingWrong = () ->
|
||||
$('#somethingwrong').show()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Generated by CoffeeScript 1.12.4
|
||||
// Generated by CoffeeScript 2.3.0
|
||||
(function() {
|
||||
var createSecret, dataNotFound, hashLoad, initBinds, newSecret, requestSecret, secretCreated, securePassword, showData, somethingWrong;
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
|||
400: somethingWrong,
|
||||
500: somethingWrong,
|
||||
404: function() {
|
||||
// Mock for interface testing
|
||||
return secretCreated({
|
||||
secret_id: 'foobar'
|
||||
});
|
||||
|
@ -38,11 +39,11 @@
|
|||
if (hash.length === 0) {
|
||||
return;
|
||||
}
|
||||
$('#panelNewSecret').hide();
|
||||
$('#panelSecretURL').hide();
|
||||
$('#cardNewSecret').hide();
|
||||
$('#cardSecretURL').hide();
|
||||
$('#notfound').hide();
|
||||
$('#somethingwrong').hide();
|
||||
return $('#panelReadSecretPre').show();
|
||||
return $('#cardReadSecretPre').show();
|
||||
};
|
||||
|
||||
requestSecret = function() {
|
||||
|
@ -55,7 +56,7 @@
|
|||
securePassword = parts[1];
|
||||
}
|
||||
id = hash.substring(1);
|
||||
return $.ajax("api/get/" + id, {
|
||||
return $.ajax(`api/get/${id}`, {
|
||||
dataType: "json",
|
||||
statusCode: {
|
||||
404: dataNotFound,
|
||||
|
@ -80,15 +81,15 @@
|
|||
var secretHash, url;
|
||||
secretHash = data.secret_id;
|
||||
if (securePassword !== null) {
|
||||
secretHash = secretHash + "|" + securePassword;
|
||||
secretHash = `${secretHash}|${securePassword}`;
|
||||
}
|
||||
url = (location.href.split('#')[0]) + "#" + secretHash;
|
||||
$('#panelNewSecret').hide();
|
||||
$('#panelReadSecretPre').hide();
|
||||
$('#panelSecretURL').show();
|
||||
$('#panelSecretURL').find('input').val(url);
|
||||
$('#panelSecretURL').find('input').focus();
|
||||
$('#panelSecretURL').find('input').select();
|
||||
url = `${(location.href.split('#')[0])}#${secretHash}`;
|
||||
$('#cardNewSecret').hide();
|
||||
$('#cardReadSecretPre').hide();
|
||||
$('#cardSecretURL').show();
|
||||
$('#cardSecretURL').find('input').val(url);
|
||||
$('#cardSecretURL').find('input').focus();
|
||||
$('#cardSecretURL').find('input').select();
|
||||
return securePassword = null;
|
||||
};
|
||||
|
||||
|
@ -98,13 +99,13 @@
|
|||
if (securePassword !== null) {
|
||||
secret = GibberishAES.dec(secret, securePassword);
|
||||
}
|
||||
$('#panelNewSecret').hide();
|
||||
$('#panelSecretURL').hide();
|
||||
$('#cardNewSecret').hide();
|
||||
$('#cardSecretURL').hide();
|
||||
$('#notfound').hide();
|
||||
$('#somethingwrong').hide();
|
||||
$('#panelReadSecretPre').hide();
|
||||
$('#panelReadSecret').show();
|
||||
return $('#panelReadSecret').find('textarea').val(secret);
|
||||
$('#cardReadSecretPre').hide();
|
||||
$('#cardReadSecret').show();
|
||||
return $('#cardReadSecret').find('textarea').val(secret);
|
||||
};
|
||||
|
||||
somethingWrong = function() {
|
||||
|
|
|
@ -1,70 +1,52 @@
|
|||
<!DOCTYPE html>
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<!-- Required meta tags -->
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
|
||||
<title>OTS - One Time Secrets</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
||||
<!-- Bootstrap -->
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/flatly/bootstrap.min.css"
|
||||
integrity="sha256-r1WijW/SNMgOwk5LDk7QRHr6oVYYbYWMw/1kOXfYJfg=" crossorigin="anonymous" />
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
|
||||
integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/css/bootstrap.min.css"
|
||||
integrity="sha256-LA89z+k9fjgMKQ/kq4OO2Mrf8VltYml/VES+Rg0fh20=" crossorigin="anonymous" />
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/4.1.1/flatly/bootstrap.min.css"
|
||||
integrity="sha256-Aq7aBPqZwiUM2fHchlRaVD7RFsEBto+K77fvREGjnHU=" crossorigin="anonymous" />
|
||||
|
||||
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
|
||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"
|
||||
integrity="sha256-3Jy/GbSLrg0o9y5Z5n1uw0qxZECH7C6OQpVBgNFYa0g=" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"
|
||||
integrity="sha256-g6iAfvZp+nDQ2TdTR/VVKJf3bGro4ub5fvWSWVRi2NE=" crossorigin="anonymous"></script>
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.12/css/all.css"
|
||||
integrity="sha384-G0fIWCsCzJIMAVNQPfjH08cyYaUtMwjJwqiRKxxE/rx96Uroj1BtIQ6MLJuheaO9" crossorigin="anonymous">
|
||||
|
||||
<title>OTS - One Time Secrets</title>
|
||||
|
||||
<style>
|
||||
#somethingwrong, #notfound, #panelReadSecret, #panelSecretURL, #panelReadSecretPre {
|
||||
display: none;
|
||||
}
|
||||
.footer {
|
||||
font-size: 0.9em;
|
||||
text-align: center;
|
||||
color: #2f2f2f;
|
||||
}
|
||||
#somethingwrong, #notfound, #cardReadSecret, #cardSecretURL, #cardReadSecretPre { display: none; }
|
||||
.footer { color: #2f2f2f; font-size: 0.9em; text-align: center; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-default">
|
||||
<div class="container-fluid">
|
||||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
||||
<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="#">OTS - One Time Secrets</a>
|
||||
</div>
|
||||
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="#" id="newSecret"><i class="fa fa-plus"></i> {{T "btn-new-secret"}}</a></li>
|
||||
</ul>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
</div><!-- /.container-fluid -->
|
||||
</nav>
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
|
||||
<a class="navbar-brand" href="#"><i class="fas fa-user-secret"></i> OTS - One Time Secrets</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-push-2">
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<li class="nav-item"></li>
|
||||
<li class="nav-item"><a href="#" id="newSecret"><i class="fas fa-plus"></i> {{T "btn-new-secret"}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container mt-4">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8">
|
||||
<div class="alert alert-danger" role="alert" id="notfound">
|
||||
<i class="fa fa-question-circle" aria-hidden="true"></i>
|
||||
<i class="fas fa-question-circle" aria-hidden="true"></i>
|
||||
{{T "alert-secret-not-found"}}
|
||||
</div>
|
||||
<div class="alert alert-danger" role="alert" id="somethingwrong">
|
||||
<i class="fa fa-question-circle" aria-hidden="true"></i>
|
||||
<i class="fas fa-question-circle" aria-hidden="true"></i>
|
||||
{{T "alert-something-went-wrong"}}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -73,11 +55,11 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="panel panel-primary" id="panelNewSecret">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{T "title-new-secret"}}</h3>
|
||||
<div class="card border-primary" id="cardNewSecret">
|
||||
<div class="card-header bg-primary text-white">
|
||||
{{T "title-new-secret"}}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="card-body">
|
||||
<form id="formCreateSecret">
|
||||
<div class="form-group">
|
||||
<label for="secret">{{T "label-secret-data"}}</label>
|
||||
|
@ -88,11 +70,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-success" id="panelSecretURL">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{T "title-secret-created"}}</h3>
|
||||
<div class="card border-success" id="cardSecretURL">
|
||||
<div class="card-header bg-success text-white">
|
||||
{{T "title-secret-created"}}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="card-body">
|
||||
<p>
|
||||
{{T "text-pre-url"}}
|
||||
</p>
|
||||
|
@ -105,11 +87,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-primary" id="panelReadSecretPre">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{T "title-reading-secret"}}</h3>
|
||||
<div class="card border-primary" id="cardReadSecretPre">
|
||||
<div class="card-header bg-primary text-white">
|
||||
{{T "title-reading-secret"}}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="card-body">
|
||||
<p>
|
||||
{{T "text-pre-reveal-hint"}}
|
||||
</p>
|
||||
|
@ -120,11 +102,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-primary" id="panelReadSecret">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">{{T "title-reading-secret"}}</h3>
|
||||
<div class="card border-primary" id="cardReadSecret">
|
||||
<div class="card-header bg-primary text-white">
|
||||
{{T "title-reading-secret"}}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="card-body">
|
||||
<div class="form-group">
|
||||
<textarea class="form-control" rows="5" readonly></textarea>
|
||||
</div>
|
||||
|
@ -138,19 +120,20 @@
|
|||
</div> <!-- /.col-md-12 -->
|
||||
</div> <!-- /.row -->
|
||||
|
||||
<div class="row">
|
||||
<div class="row mt-5">
|
||||
<div class="col-md-12 footer">
|
||||
{{T "text-powered-by"}} <a href="https://github.com/Luzifer/ots"><i class="fa fa-github"></i> Luzifer/OTS</a> {{.version}}
|
||||
{{T "text-powered-by"}} <a href="https://github.com/Luzifer/ots"><i class="fab fa-github"></i> Luzifer/OTS</a> {{.version}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.12.4/jquery.min.js"
|
||||
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
|
||||
<!-- Include all compiled plugins (below), or include individual files as needed -->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"
|
||||
integrity="sha256-U5ZEeKfGNOja007MMD3YBI0A3OSZOQbeG6z2f2Y0hu8=" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"
|
||||
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.1/popper.min.js"
|
||||
integrity="sha256-ST2MecrXrJaAsqmfpk9XRQITlDoyMmUtgKBEndDisSc=" crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0/js/bootstrap.min.js"
|
||||
integrity="sha256-5+02zu5UULQkO7w1GIr6vftCgMfFdZcAHeDtFnKZsBs=" crossorigin="anonymous"></script>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/gibberish-aes/1.0.0/gibberish-aes.min.js"
|
||||
integrity="sha256-H9B/XRDijNiF3agVjtiz1ILVi3csEdGz9YBg5TjWouM=" crossorigin="anonymous"></script>
|
||||
|
||||
|
|
Loading…
Reference in a new issue