Flummi/fpaste
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

user

Browse Source
This commit is contained in:
Flummi 2018-02-20 07:04:36 +01:00
parent 26be5bf757
commit 86995cab67
7 changed files with 175 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
public/css/user.css Normal file
View File

@ -0,0 +1,35 @@
form p.label {
display: inline-block;
width: 150px;
margin-top: 5px;
margin-bottom: 5px;
}
form p.checkbox {
display: inline-block;
margin-top: 5px;
margin-bottom: 5px;
margin-left: 5px;
}
#settings-form input[type=submit],
#settings-form input[type=reset] {
margin: 20px 20px 5px 0;
display: inline-block;
}
#user-activated-links a,
#logout-links a {
background-color: #777;
color: white;
border: 1px solid #666;
font-family: 'Ubuntu', sans-serif;
font-weight: bold;
padding: 10px;
margin: 5px 0 5px;
border-radius: 3px;
display: inline-block;
box-shadow: 3px 3px 10px #666;
cursor: pointer;
margin-right: 20px;
}

1
src/fpaste.mjs
View File

@ -23,6 +23,7 @@ app
.use("/", router.index) .use("/", router.index)
.use("/v", router.view) .use("/v", router.view)
.use("/a", router.about) .use("/a", router.about)
.use("/u", router.user)
.get("/:uuid", (req, res) => res.redirect(`/v/${req.params.uuid}/`)) .get("/:uuid", (req, res) => res.redirect(`/v/${req.params.uuid}/`))

4
src/routes/index.mjs
View File

@ -1,10 +1,12 @@
import index from "./r/index"; import index from "./r/index";
import view from "./r/view"; import view from "./r/view";
import about from "./r/about"; import about from "./r/about";
import user from "./r/user";
export default { export default {
index: index, index: index,
view: view, view: view,
about: about about: about,
user: user
}; };

6
src/routes/r/index.mjs
View File

@ -3,7 +3,7 @@ import express from "express";
import db from "../../lib/sql"; import db from "../../lib/sql";
const queries = { const queries = {
getlangs: "select * from `languages`", getlangs: "select * from `languages` order by `name` asc",
add: "insert into `pastes` (`uuid`,`lang`,`desc`,`paste`,`hidden`,`reply`) " add: "insert into `pastes` (`uuid`,`lang`,`desc`,`paste`,`hidden`,`reply`) "
+ "values (LEFT(UUID(), 8), ?, ?, ?, ?, ?)", + "values (LEFT(UUID(), 8), ?, ?, ?, ?, ?)",
getuuid: "select `uuid` from `pastes` where `id` = ? limit 1" getuuid: "select `uuid` from `pastes` where `id` = ? limit 1"
@ -20,7 +20,7 @@ export default express.Router()
desc: req.body.desc || "", desc: req.body.desc || "",
content: req.body.content || false, content: req.body.content || false,
lang: languages.getKey(req.body.lang) || 1, lang: languages.getKey(req.body.lang) || 1,
hidden: req.body.hidden || 0, hidden: req.body.hidden === "on" || false,
reply: req.body.reply || 0 reply: req.body.reply || 0
}; };
if(!data.content) if(!data.content)
@ -38,6 +38,8 @@ export default express.Router()
}); });
Map.prototype.getKey = function(val) { Map.prototype.getKey = function(val) {
if(!val)
return 1;
for(let [key, value] of this) for(let [key, value] of this)
if(value.toLowerCase() === val.toLowerCase()) if(value.toLowerCase() === val.toLowerCase())
return key; return key;

14
src/routes/r/user.mjs Normal file
View File

@ -0,0 +1,14 @@
import express from "express";
import db from "../../lib/sql";
export default express.Router()
.get("/", (req, res) => {
res.render("login");
})
.get("/register", (req, res) => {
res.send("WIP");
})
.get("/lost-password", (req, res) => {
res.send("WIP");
});

109
views/layouts/main.handlebars
View File

@ -2,12 +2,14 @@
<html> <html>
<head> <head>
<title>fpaste</title> <title>fpaste</title>
<link rel="stylesheet" type="text/css" href="/css/jquery-ui.min.css" />
<link rel="stylesheet" type="text/css" href="/css/main.css" /> <link rel="stylesheet" type="text/css" href="/css/main.css" />
<link rel="stylesheet" type="text/css" href="/css/notifications.css" /> <link rel="stylesheet" type="text/css" href="/css/notifications.css" />
<link rel="stylesheet" type="text/css" href="/css/code.css" /> <link rel="stylesheet" type="text/css" href="/css/code.css" />
<link rel="stylesheet" type="text/css" href="/css/view.css" /> <link rel="stylesheet" type="text/css" href="/css/view.css" />
<link rel="stylesheet" type="text/css" href="/css/index.css" /> <link rel="stylesheet" type="text/css" href="/css/index.css" />
<link rel="stylesheet" type="text/css" href="/css/fonts.css" /> <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
<link rel="stylesheet" type="text/css" href="/css/user.css" />
</head> </head>
<body> <body>
<header> <header>
@ -35,6 +37,7 @@
<script type="text/javascript" src="/js/jquery-3.1.0.min.js"></script> <script type="text/javascript" src="/js/jquery-3.1.0.min.js"></script>
<script type="text/javascript" src="/js/jquery.timeago.js"></script> <script type="text/javascript" src="/js/jquery.timeago.js"></script>
<script type="text/javascript" src="/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/js/main.js"></script> <script type="text/javascript" src="/js/main.js"></script>
<script> <script>
$(document).ready(() => { $(document).ready(() => {
@ -52,6 +55,112 @@
str.year = "1 year"; str.year = "1 year";
str.suffixFromNow = null; str.suffixFromNow = null;
$("time.timeago").timeago(); $("time.timeago").timeago();
$.widget("custom.combobox", {
_create: function() {
this.wrapper = $("<span>")
.addClass("custom-combobox")
.insertAfter(this.element);
this.element.hide();
this._createAutocomplete();
this._createShowAllButton();
},
_createAutocomplete: function() {
var selected = this.element.children(":selected"),
value = selected.val() ? selected.text() : "";
this.input = $("<input>")
.appendTo(this.wrapper)
.val(value)
.attr("title", "")
.addClass("custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-left")
.autocomplete({
delay: 0,
minLength: 0,
source: $.proxy(this, "_source")
})
.tooltip({
classes: {
"ui-tooltip": "ui-state-highlight"
}
});
this._on(this.input, {
autocompleteselect: function(event, ui) {
ui.item.option.selected = true;
this._trigger("select", event, {
item: ui.item.option
});
},
autocompletechange: "_removeIfInvalid"
});
},
_createShowAllButton: function() {
var input = this.input,
wasOpen = false;
$("<a>")
.attr("tabIndex", -1)
.attr("title", "Show All Items")
.tooltip()
.appendTo(this.wrapper)
.button({
icons: {
primary: "ui-icon-triangle-1-s"
},
text: false
})
.removeClass("ui-corner-all")
.addClass("custom-combobox-toggle ui-corner-right")
.on("mousedown", function() {
wasOpen = input.autocomplete("widget").is(":visible");
})
.on("click", function() {
input.trigger("focus");
if (wasOpen) return;
input.autocomplete("search", "");
});
},
_source: function(request, response) {
var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
response(this.element.children("option").map(function() {
var text = $(this).text();
if (this.value && (!request.term || matcher.test(text)))
return {
label: text,
value: text,
option: this
};
}));
},
_removeIfInvalid: function(event, ui) {
if (ui.item) return;
var value = this.input.val(),
valueLowerCase = value.toLowerCase(),
valid = false;
this.element.children("option").each(function() {
if ($(this).text().toLowerCase() === valueLowerCase) {
this.selected = valid = true;
return false;
}
});
if (valid) return;
this.input
.val("")
.attr("title", value + " didn't match any item")
.tooltip("open");
this.element.val("");
this._delay(function() {
this.input.tooltip("close").attr("title", "");
}, 2500);
this.input.autocomplete("instance").term = "";
},
_destroy: function() {
this.wrapper.remove();
this.element.show();
}
});
$("#lang").combobox();
$("#toggle").on("click", function() {
$("#lang").toggle();
});
}); });
</script> </script>
</body> </body>

7
views/login.handlebars Normal file
View File

@ -0,0 +1,7 @@
<h1>User login</h1>
<form action="/u" method="post" id="login-form">
<p class="label">Email:</p><input type="text" name="email" value=""><br>
<p class="label">Password:</p><input type="password" name="password"><br>
<input type="submit" value="Login">
</form>
<p>No user account yet? <a href="/u/register">Register</a> now for free. Forgot your password? <a href="/u/lost-password">Get a new one.</a></p>