fede/url-short
0
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

dev #3

Closed
fede wants to merge 6 commits from dev into master
pull from: dev
merge into: fede:master
Conversation 0 Commits 6 Files Changed 6 +44 -26
6 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,2 +1,4 @@
front/node_modules
shorturls.db
front/dist
url-short

2
front/index.html
View File

@@ -10,7 +10,7 @@
href="https://fonts.googleapis.com/css2?family=Instrument+Serif:ital@0;1&display=swap"
rel="stylesheet"
/>
<title>front</title>
<title>Acortador de Urls</title>
</head>
<body>
<div id="app"></div>

12
front/src/App.svelte
View File

@@ -1,18 +1,6 @@
<script>
import { url } from "./assets/hooks/getUrl";
import AcortadorForm from "./assets/lib/AcortadorForm.svelte";
$effect(
(async () => {
if (window.location.pathname.match(/^\/short\/url\/\d+$/)) {
const numero = window.location.pathname.split("/").pop();
// console.log(numero);
const res = await fetch(`${$url}/url/${numero}`, {
method: "GET",
});
console.log(res);
}
})(),
);
</script>
<section id="center">

2
front/src/assets/hooks/getUrl.js
View File

@@ -8,6 +8,6 @@ export const url = readable(
export const redirect = readable(
typeof window !== "undefined" && window.location.hostname === "localhost"
? "http://localhost:5173/short"
? "http://localhost:8080/"
: "https://fedesrv.ddns.net/s",
);

38
front/src/assets/lib/AcortadorForm.svelte
View File

@@ -13,10 +13,10 @@
onsubmit={async (e) => {
e.preventDefault();
// console.log(e.target[0].value);
// console.log(input);
// console.log($url);
const req = { longUrl: input.value };
try {
const res = await fetch($url + "/url", {
const res = await fetch(`${$url}/url/`, {
method: "POST",
body: JSON.stringify({ ...req }),
});
@@ -30,21 +30,33 @@
}
}}
>
<button type="reset">❌</button>
<input type="text" id="acortadorinput" />
<button type="submit">↪</button>
</form>
{#if popup}
<div transition:fade class="popup-dialog">
<p>Short URL creada</p>
<button
onclick={() => {
navigator.clipboard.writeText(`${$redirect}/url/${popup}`);
popup = "";
}}
>
Copy</button
>
{#if popup == "Error"}
<p>Fallo al crear la url</p>
<button
onclick={() => {
popup = "";
}}
>
Cerrar</button
>
{:else}
<p>Short URL creada</p>
<button
onclick={() => {
navigator.clipboard.writeText(`${$redirect}/url/${popup}`);
popup = "";
}}
>
Copiar</button
>
{/if}
</div>
{/if}
@@ -82,4 +94,8 @@
.popup-dialog button:hover {
background-color: #0056b3;
}
button,
input {
padding: 0.25rem;
}
</style>

14
repository/CrearUrl.go
View File

@@ -2,6 +2,7 @@ package repository
import (
"fmt"
"math/rand/v2"
"url-short/models"
"gorm.io/gorm"
@@ -38,7 +39,18 @@ func CrearUrl(longURL string, db *gorm.DB) (string, error) {
// }
var url models.Url
result = db.Create(&models.Url{Longurl: longURL}).Scan(&url)
for {
url.Shorturl = int64(rand.Uint64())
result = db.Model(&models.Url{}).Where("shorturl = ?", url.Shorturl).Count(&counturl)
if result.Error != nil {
return "", result.Error
}
if counturl == 0 {
break
}
}
result = db.Create(&models.Url{Longurl: longURL, Shorturl: url.Shorturl}).Scan(&url)
shortURL := fmt.Sprintf("%d", url.Shorturl)
if result.Error != nil {