diff --git a/client/Dockerfile b/client/Dockerfile index a46874f..fa80839 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -12,14 +12,14 @@ RUN npm run build FROM node:18-alpine AS production -LABEL "website.name"="short1url" -LABEL "maintainer"="thuongtruong1009" +LABEL "website.name"="onelink" +LABEL "maintainer"="thuongtruong109" LABEL "org.opencontainers.image.authors"="Tran Nguyen Thuong Truong " LABEL "org.opencontainers.image.version"="1.0" LABEL "org.opencontainers.image.description"="Ship your link in an easier way" LABEL "org.opencontainers.image.licenses"="MIT" -LABEL "org.opencontainers.image.source"="https://github.com/thuongtruong1009/short1url/api" -LABEL "org.opencontainers.image.documentation"="https://github.com/thuongtruong1009/short1url/blob/main/README.md" +LABEL "org.opencontainers.image.source"="https://github.com/thuongtruong109/onelink/api" +LABEL "org.opencontainers.image.documentation"="https://github.com/thuongtruong109/onelink/blob/main/README.md" WORKDIR /app diff --git a/client/app.vue b/client/app.vue index 443e664..e4ac6a0 100644 --- a/client/app.vue +++ b/client/app.vue @@ -24,27 +24,33 @@ const onClearInput = () => { toolOption.value = EBUTTON_OPTION.SHORTEN; }; -onMounted(() => { - getAllShorted(); -}); - -const getAllShorted = async () => { - const ipData = await FetchMethod(config.public.ipSource); - const allData = await FetchMethod( - `${config.public.apiBase}/all?ip=${ipData?.ip}`, - { - method: "POST", - } - ); - - shortedUrl.value = allData; -}; +// onMounted(() => { +// getAllShorted(); +// }); + +// const getAllShorted = async () => { +// const ipData = await FetchMethod(config.public.ipSource, +// { +// method: "GET", +// mode: 'no-cors', +// } +// ); +// const allData = await FetchMethod( +// `${config.public.apiBase}/own?ip=${ipData?.ip}`, +// { +// method: "POST", +// mode: 'no-cors', +// } +// ); + +// shortedUrl.value = allData; +// }; const onShorten = async () => { if (!url.value) return; toolOption.value = EBUTTON_OPTION.SHORTEN; - const shortenData = await FetchMethod(`${config.public.apiBase}`, { + const shortenData = await FetchMethod(`${config.public.apiBase}/`, { method: "POST", body: JSON.stringify({ url: url.value }), }); @@ -95,7 +101,7 @@ const onClickOptionBtn = (option: EBUTTON_OPTION) => { @click="onClickOptionBtn(EBUTTON_OPTION.QRCODE)" > - QR Code + QR @@ -108,7 +114,7 @@ const onClickOptionBtn = (option: EBUTTON_OPTION) => { @click="onClickOptionBtn(EBUTTON_OPTION.BARCODE)" > - Bar Code + Bar @@ -136,10 +142,11 @@ main { align-items: center; min-height: 100vh; overflow: hidden; - background-image: url("/landing.png"); + background-image: url("/landing.jpg"); background-repeat: no-repeat; background-size: cover; background-position: 100% 100%; + background-attachment: fixed; section { border-radius: 0.5rem; @@ -148,12 +155,8 @@ main { .form { display: flex; - flex-direction: column; align-items: center; justify-content: space-between; - margin: 1rem; - padding: 2rem 1rem; - background: rgba(247, 247, 247, 0.3); border-radius: 0.5rem; width: 100%; @@ -167,21 +170,23 @@ main { ul { @include flex-center; - width: 100%; - margin-top: 1rem; + width: fit-content; list-style: none; li { .bar_btn { @include button($blue); + padding: 1.1rem 0.8rem; } .qr_btn { @include button($purple); + padding: 1.1rem 0.8rem; } .short_btn { @include button($red); + padding: 1.1rem 0.8rem; } } } diff --git a/client/assets/_base.scss b/client/assets/_base.scss index 8e2ae5d..ad24b84 100644 --- a/client/assets/_base.scss +++ b/client/assets/_base.scss @@ -30,3 +30,7 @@ a { text-decoration: none; color: inherit; } + +a:hover { + text-decoration: underline; +} diff --git a/client/components/Footer.vue b/client/components/Footer.vue index aedfe08..90def83 100644 --- a/client/components/Footer.vue +++ b/client/components/Footer.vue @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@ footer { position: absolute; bottom: 0; - color: white; + color: gray; text-align: center; padding: 1rem; font-size: 0.75rem; diff --git a/client/components/Header.vue b/client/components/Header.vue index 35312e5..57d8428 100644 --- a/client/components/Header.vue +++ b/client/components/Header.vue @@ -2,7 +2,7 @@
logo -

Short1url

+

Onelink

Ship your link in an easier way
@@ -10,19 +10,20 @@