From 629a1fba25f0a0fb37275722e8acf16a805abd3d Mon Sep 17 00:00:00 2001 From: dev sp Date: Fri, 9 Feb 2024 05:59:06 +0000 Subject: [PATCH 01/12] chamge --- src/components/EditNews.vue | 19 ++++++++++--------- src/pages/editor/ad-file.astro | 2 +- src/pages/editor/add-news.astro | 4 ++-- src/pages/editor/gen-news.astro | 2 +- src/pages/{ => editor}/multi-lang.astro | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) rename src/pages/{ => editor}/multi-lang.astro (98%) diff --git a/src/components/EditNews.vue b/src/components/EditNews.vue index fe4e000..cd71703 100644 --- a/src/components/EditNews.vue +++ b/src/components/EditNews.vue @@ -2,11 +2,12 @@

Edit News

@@ -39,7 +40,7 @@
- +
@@ -47,19 +48,19 @@
- +
- +
- +
- +
diff --git a/src/pages/editor/ad-file.astro b/src/pages/editor/ad-file.astro index ad58f0a..f94312d 100644 --- a/src/pages/editor/ad-file.astro +++ b/src/pages/editor/ad-file.astro @@ -1,5 +1,5 @@ --- -import Layout from "../layouts/Layout.astro"; +import Layout from "../../layouts/Layout.astro"; ---
diff --git a/src/pages/editor/add-news.astro b/src/pages/editor/add-news.astro index 3d7e9a1..67b99df 100644 --- a/src/pages/editor/add-news.astro +++ b/src/pages/editor/add-news.astro @@ -1,6 +1,6 @@ --- -import Layout from "../layouts/Layout.astro"; -import ImageUpload from "../components/ImageUpload.vue"; +import Layout from "../../layouts/Layout.astro"; +// import ImageUpload from "../../components/ImageUpload.vue"; --- diff --git a/src/pages/editor/gen-news.astro b/src/pages/editor/gen-news.astro index cad6e6b..b76f971 100644 --- a/src/pages/editor/gen-news.astro +++ b/src/pages/editor/gen-news.astro @@ -1,5 +1,5 @@ --- -import Layout from "../layouts/Layout.astro"; +import Layout from "../../layouts/Layout.astro"; ---
diff --git a/src/pages/multi-lang.astro b/src/pages/editor/multi-lang.astro similarity index 98% rename from src/pages/multi-lang.astro rename to src/pages/editor/multi-lang.astro index 286392b..cf86387 100644 --- a/src/pages/multi-lang.astro +++ b/src/pages/editor/multi-lang.astro @@ -1,6 +1,6 @@ --- -import Layout from "../layouts/Layout.astro"; -import ImageUpload from "../components/ImageUpload.vue"; +import Layout from "../../layouts/Layout.astro"; +import ImageUpload from "../../components/ImageUpload.vue"; --- From d920cba44992df84ebbdd01188e1ce9210074b8d Mon Sep 17 00:00:00 2001 From: dev sp Date: Fri, 9 Feb 2024 11:21:41 +0000 Subject: [PATCH 02/12] resolve chors issue in production server --- src/components/EditNews.vue | 2 +- src/pages/editor/add-news.astro | 166 ++++--------------- src/pages/editor/multi-lang.astro | 158 ------------------ src/pages/editor/single-gen.astro | 267 ++++++++++++++++++++++++++++++ 4 files changed, 300 insertions(+), 293 deletions(-) delete mode 100644 src/pages/editor/multi-lang.astro create mode 100644 src/pages/editor/single-gen.astro diff --git a/src/components/EditNews.vue b/src/components/EditNews.vue index cd71703..b865104 100644 --- a/src/components/EditNews.vue +++ b/src/components/EditNews.vue @@ -100,7 +100,7 @@ let currentUrl = window.location.href; let langValue = currentUrl.split("/")[4].split("lang=")[1]; let spliturl = currentUrl.split("/")[4].split("edit=")[1].split(`lang=${langValue}`)[0].split(`&`)[0]; - console.log(spliturl); + console.log(spliturl, langValue); let formData = new FormData(); formData.append('slug', spliturl); fetch(`https://apisp.dev2.cicdhosting.com/_dedicated/dwd/edit-news/?action=news_${langValue}`, { diff --git a/src/pages/editor/add-news.astro b/src/pages/editor/add-news.astro index 67b99df..6e095e1 100644 --- a/src/pages/editor/add-news.astro +++ b/src/pages/editor/add-news.astro @@ -1,6 +1,6 @@ --- import Layout from "../../layouts/Layout.astro"; -// import ImageUpload from "../../components/ImageUpload.vue"; +import ImageUpload from "../../components/ImageUpload.vue"; --- @@ -8,13 +8,14 @@ import Layout from "../../layouts/Layout.astro";

Genarate New News

+ - +
+
- +
- - +
- -
@@ -135,25 +53,12 @@ import Layout from "../../layouts/Layout.astro"; - \ No newline at end of file diff --git a/src/pages/editor/single-gen.astro b/src/pages/editor/single-gen.astro new file mode 100644 index 0000000..67b99df --- /dev/null +++ b/src/pages/editor/single-gen.astro @@ -0,0 +1,267 @@ +--- +import Layout from "../../layouts/Layout.astro"; +// import ImageUpload from "../../components/ImageUpload.vue"; +--- + + +
+
+
+

Genarate New News

+
+ + +
+ + +
+
+ + +
+
+ +
+
+ + +
+ +
+
+ + + +
+
+
+ + + \ No newline at end of file From 5d2a3f552e862bbd530560cd147a2a46ae60ba37 Mon Sep 17 00:00:00 2001 From: dev sp Date: Fri, 9 Feb 2024 15:22:02 +0000 Subject: [PATCH 03/12] b5 --- src/components/EditNews.vue | 2 +- src/pages/editor/ad-file.astro | 57 --------------------------------- src/pages/editor/add-file.astro | 47 +++++++++++++++++++++++++++ src/pages/editor/add-news.astro | 6 ++-- 4 files changed, 52 insertions(+), 60 deletions(-) delete mode 100644 src/pages/editor/ad-file.astro create mode 100644 src/pages/editor/add-file.astro diff --git a/src/components/EditNews.vue b/src/components/EditNews.vue index b865104..be35132 100644 --- a/src/components/EditNews.vue +++ b/src/components/EditNews.vue @@ -31,6 +31,7 @@
-
- - -
-
-
- diff --git a/src/pages/editor/add-file.astro b/src/pages/editor/add-file.astro new file mode 100644 index 0000000..6f8f199 --- /dev/null +++ b/src/pages/editor/add-file.astro @@ -0,0 +1,47 @@ +--- +import Layout from "../../layouts/Layout.astro"; +--- + +
+
+

Upload File

+
+ + + + +
+ +
+
+
+
+ diff --git a/src/pages/editor/add-news.astro b/src/pages/editor/add-news.astro index 6e095e1..3da3163 100644 --- a/src/pages/editor/add-news.astro +++ b/src/pages/editor/add-news.astro @@ -34,6 +34,9 @@ import ImageUpload from "../../components/ImageUpload.vue";
+
+ +
@@ -63,12 +66,11 @@ import ImageUpload from "../../components/ImageUpload.vue"; function submitNewsPara(event) { event.preventDefault(); - let genButton = document.getElementById('genButton'); - let langInput = document.getElementById('language'); let loadSection = document.getElementById('loadingSection'); let newsData = document.getElementById('newsPara'); let formData = new FormData(newsData); loadSection.style.display = 'block'; + fetch(`https://apisp.dev2.cicdhosting.com/_dedicated/dwd/multi-lang/`, { method: 'POST', body: formData, From ae8f0c0b7759488dc295b65b675eecf5c42c194a Mon Sep 17 00:00:00 2001 From: dev sp Date: Mon, 12 Feb 2024 12:00:22 +0000 Subject: [PATCH 04/12] add file upload --- src/pages/editor/add-file.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/editor/add-file.astro b/src/pages/editor/add-file.astro index 6f8f199..3531aa2 100644 --- a/src/pages/editor/add-file.astro +++ b/src/pages/editor/add-file.astro @@ -21,7 +21,7 @@ import Layout from "../../layouts/Layout.astro"; event.preventDefault(); let formID = document.getElementById('formID'); let formData = new FormData(formID); - fetch(`https://apisp.dev2.cicdhosting.com/upload/`,{ + fetch(`https://apisp.dev2.cicdhosting.com/file_upload/v2/`,{ method: 'POST', body: formData, }) @@ -38,7 +38,7 @@ import Layout from "../../layouts/Layout.astro"; document.getElementById('errorMessage').style.display = 'none'; } - // console.log(data) + console.log(data) }) .catch(error => { console.error(error); From 74973dfc1e3ba235b7d8ce72262e6c7a48d676ce Mon Sep 17 00:00:00 2001 From: dev sp Date: Tue, 13 Feb 2024 16:11:16 +0000 Subject: [PATCH 05/12] change file upload --- public/img/camera.svg | 1 + src/components/AdminHeader.astro | 17 +++++++++ src/components/EditNews.vue | 5 +++ src/components/GetData.vue | 64 ++++++++++++++++++++++++++++++++ src/pages/editor/add-file.astro | 19 +++++++--- src/pages/editor/add-news.astro | 63 ++++++++++++++++++++++++++++++- src/pages/editor/edit-news.astro | 8 ++-- src/pages/editor/index.astro | 2 + src/pages/en/index.astro | 25 +++++++++++++ src/pages/news.astro | 49 ++++++++++++++++++++++++ 10 files changed, 243 insertions(+), 10 deletions(-) create mode 100644 public/img/camera.svg create mode 100644 src/components/AdminHeader.astro create mode 100644 src/components/GetData.vue create mode 100644 src/pages/en/index.astro create mode 100644 src/pages/news.astro diff --git a/public/img/camera.svg b/public/img/camera.svg new file mode 100644 index 0000000..3e283f7 --- /dev/null +++ b/public/img/camera.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/AdminHeader.astro b/src/components/AdminHeader.astro new file mode 100644 index 0000000..236fb41 --- /dev/null +++ b/src/components/AdminHeader.astro @@ -0,0 +1,17 @@ +
+
+
+
+ + +
+
+
+
+ \ No newline at end of file diff --git a/src/components/EditNews.vue b/src/components/EditNews.vue index be35132..a421feb 100644 --- a/src/components/EditNews.vue +++ b/src/components/EditNews.vue @@ -76,6 +76,11 @@
+ +
+
+
+ diff --git a/src/components/GetData.vue b/src/components/GetData.vue new file mode 100644 index 0000000..8ec7667 --- /dev/null +++ b/src/components/GetData.vue @@ -0,0 +1,64 @@ + + \ No newline at end of file diff --git a/src/pages/editor/add-file.astro b/src/pages/editor/add-file.astro index 3531aa2..b61d0c4 100644 --- a/src/pages/editor/add-file.astro +++ b/src/pages/editor/add-file.astro @@ -4,24 +4,33 @@ import Layout from "../../layouts/Layout.astro";
+
+ Select image to upload: + + +

Upload File

-
+ +
- --> diff --git a/src/pages/editor/add-news.astro b/src/pages/editor/add-news.astro index 3da3163..2599d94 100644 --- a/src/pages/editor/add-news.astro +++ b/src/pages/editor/add-news.astro @@ -1,9 +1,11 @@ --- import Layout from "../../layouts/Layout.astro"; import ImageUpload from "../../components/ImageUpload.vue"; +import AdminHeader from "../../components/AdminHeader.astro"; --- +
@@ -34,8 +36,13 @@ import ImageUpload from "../../components/ImageUpload.vue";
-
- +
+ + + +
+
@@ -43,6 +50,7 @@ import ImageUpload from "../../components/ImageUpload.vue";
+