SinTan1729/chhoto-url
SinTan1729/chhoto-url
1
0
Fork 0
mirror of https://github.com/SinTan1729/chhoto-url synced 2024-12-26 07:38:36 -06:00
Code Issues Releases Activity

Reorganize files, keep table from moving on alert

Browse source
This commit is contained in:
Sayantan Santra 2023-04-10 11:31:34 -05:00
parent 2f48b1e58c
commit e18a71a73c
6 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actix/resources/index.html
View file

@ -15,10 +15,10 @@
<link rel="icon" type="image/png" href="assets/favicon-32.png" sizes="32x32">
<link rel="icon" type="image/png" href="assets/favicon-196.png" sizes="196x196">
<script src="script.js"></script>
<script src="static/script.js"></script>
<link rel="stylesheet" href="https://unpkg.com/purecss@1.0.1/build/pure-min.css"
integrity="sha384-oAOxQR6DkCoMliIh8yFnu25d7Eq/PHS21PClpwjOTeU2jRSq11vu66rf90/cZr47" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" rel="noopener" target="_blank" href="styles.css">
<link rel="stylesheet" type="text/css" target="_blank" href="static/styles.css">
</head>
<body>
@ -40,6 +40,7 @@
</div>
<div class="pure-controls">
<button class="pure-button pure-button-primary">Shorten!</button>
<p id="alert-box">&nbsp;</p>
</div>
</fieldset>
</form>
@ -49,7 +50,7 @@
<br>
<thead>
<tr>
<td id="short-url-header">Short URL (click to copy)</td>
<td id="short-url-header">Short URL<br>(click to copy)</td>
<td>Long URL</td>
<td>Hits</td>
<td name="deleteBtn">&times;</td>

0
actix/resources/404.html → actix/resources/static/404.html
View file

9
actix/resources/script.js → actix/resources/static/script.js
View file

@ -48,7 +48,7 @@ const displayData = async (data) => {
const table = document.querySelector("#url-table");
if (!window.isSecureContext) {
const shortUrlHeader = document.getElementById("short-url-header");
shortUrlHeader.innerHTML = "Short URL (right click and copy)";
shortUrlHeader.innerHTML = "Short URL<br>(right click and copy)";
}
table_box.style.visibility = "visible";
table.innerHTML = ''; // Clear
@ -57,10 +57,10 @@ const displayData = async (data) => {
};
const showAlert = async (text, col) => {
document.getElementById("alertBox")?.remove();
document.getElementById("alert-box")?.remove();
const controls = document.querySelector(".pure-controls");
const alertBox = document.createElement("p");
alertBox.setAttribute("id", "alertBox");
alertBox.setAttribute("id", "alert-box");
alertBox.setAttribute("style", `color:${col}`);
alertBox.innerHTML = text;
controls.appendChild(alertBox);
@ -121,7 +121,8 @@ const deleteButton = (shortUrl) => {
btn.onclick = e => {
e.preventDefault();
if (confirm("Do you want to delete the entry " + shortUrl + "?")) {
document.getElementById("alertBox")?.remove();
document.getElementById("alert-box")?.remove();
showAlert("&nbsp;", "black");
fetch(`/api/del/${shortUrl}`, {
method: "DELETE"
}).then(_ => refreshData());

0
actix/resources/styles.css → actix/resources/static/styles.css
View file

4
actix/src/auth.rs
View file

@ -32,7 +32,7 @@ fn check(token: Option<String>) -> bool {
.duration_since(SystemTime::UNIX_EPOCH)
.expect("Time went backwards!")
.as_secs();
if token_text == "valid-session-token" && time_now < token_time + 1209600 {
if token_text == "session-token" && time_now < token_time + 1209600 {
// There are 1209600 seconds in 14 days
true
} else {
@ -43,7 +43,7 @@ fn check(token: Option<String>) -> bool {
}
pub fn gen_token() -> String {
let token_text = "valid-session-token".to_string();
let token_text = "session-token".to_string();
let time = SystemTime::now()
.duration_since(SystemTime::UNIX_EPOCH)
.expect("Time went backwards!")

2
actix/src/main.rs
View file

@ -59,7 +59,7 @@ async fn siteurl(session: Session) -> HttpResponse {
// 404 error page
#[get("/err/404")]
async fn error404() -> impl Responder {
NamedFile::open_async("./resources/404.html").await
NamedFile::open_async("./resources/static/404.html").await
}
// Handle a given shortlink