diff --git a/package.json b/package.json index 7ae1fe9..e458758 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "version": "0.0.1", "private": true, "scripts": { - "dev": "astro dev --host --port 2008", - "start": "astro dev --host --port 2008", + "dev": "astro dev --host --port 2023", + "start": "astro dev --host --port 2023", "build": "astro build", "preview": "astro preview", "astro": "astro" diff --git a/public/img/barta.png b/public/img/barta.png new file mode 100644 index 0000000..e5c62ea Binary files /dev/null and b/public/img/barta.png differ diff --git a/public/img/header-img.png b/public/img/header-img.png new file mode 100644 index 0000000..2dd5dc3 Binary files /dev/null and b/public/img/header-img.png differ diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 4b6d7ce..faf5fc5 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -1,169 +1,5 @@ - \ No newline at end of file +
+
+ Powered by DWD Consultancy Services +
+
\ No newline at end of file diff --git a/src/components/MainHeader.astro b/src/components/MainHeader.astro new file mode 100644 index 0000000..02eb4c5 --- /dev/null +++ b/src/components/MainHeader.astro @@ -0,0 +1,237 @@ +
+
+ +
+
+ + \ No newline at end of file diff --git a/src/components/MainHeader.vue b/src/components/MainHeader.vue deleted file mode 100644 index 04b163e..0000000 --- a/src/components/MainHeader.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/TopHeader.astro b/src/components/TopHeader.astro new file mode 100644 index 0000000..e4dc7bb --- /dev/null +++ b/src/components/TopHeader.astro @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 3bdcb2f..ca7c597 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,4 +1,6 @@ --- +import MainHeader from '../components/MainHeader.astro'; +import TopHeader from '../components/TopHeader.astro'; export interface Props { title: string; } @@ -16,6 +18,12 @@ const { title } = Astro.props; {title} +
+ +
+ +
+
diff --git a/src/pages/[id].astro b/src/pages/[id].astro new file mode 100644 index 0000000..a178998 --- /dev/null +++ b/src/pages/[id].astro @@ -0,0 +1,34 @@ +--- +import Layout from '../layouts/Layout.astro'; +export async function getStaticPaths() { + const response = await fetch('https://api7.siliconpin.com/items/barta?filter[status][_eq]=published'); + const data = await response.json(); + const finalData = data.data.map((n: { slug: string | undefined; })=>{ + return {params: {id:n.slug}} + }) + return finalData; +} +const response = await fetch('https://api7.siliconpin.com/items/barta?filter[status][_eq]=published'); +const data = await response.json(); +const { id } = Astro.params; +const idx = data.data.findIndex((n: { slug: string | undefined; }) => n.slug ===id); +const items = data.data[idx]; +console.log(data.data[idx]) +--- + +
+
+
+

{items.heading}

+

{items.title}

+ {items.title} +

+
+
+
+ + diff --git a/src/pages/article/[id].astro b/src/pages/article/[id].astro new file mode 100644 index 0000000..5e20d7a --- /dev/null +++ b/src/pages/article/[id].astro @@ -0,0 +1,34 @@ +--- +import Layout from '../../layouts/Layout.astro'; +export async function getStaticPaths() { + const response = await fetch('https://api7.siliconpin.com/items/barta?filter[status][_eq]=published&filter[category][_eq]=article'); + const data = await response.json(); + const finalData = data.data.map((n: { slug: string | undefined; })=>{ + return {params: {id:n.slug}} + }) + return finalData; +} +const response = await fetch('https://api7.siliconpin.com/items/barta?filter[status][_eq]=published&filter[category][_eq]=article'); +const data = await response.json(); +const { id } = Astro.params; +const idx = data.data.findIndex((n: { slug: string | undefined; }) => n.slug ===id); +const items = data.data[idx]; +console.log(data.data[idx]) +--- + +
+
+
+

{items.heading}

+

{items.title}

+ {items.title} +

+
+
+
+ + diff --git a/src/pages/article/index.astro b/src/pages/article/index.astro new file mode 100644 index 0000000..2e58325 --- /dev/null +++ b/src/pages/article/index.astro @@ -0,0 +1,56 @@ +--- +import Layout from '../../layouts/Layout.astro'; +import Footer from '../../components/Footer.astro'; +const fetchData = await fetch('https://api7.siliconpin.com/items/barta?filter[status][_eq]=published&filter[category][_eq]=article'); +const dataJSON = await fetchData.json(); +const data = dataJSON.data; +// const imageData = data.image; +// const data = fetchDataJSON.data; +// console.log() +--- + + +
+
+
+ +

Latest News

+
+
+ {data.map((items: {heading: string | undefined; img: string | undefined; title : string | undefined; content : string | undefined; slug : string | undefined;}) => +
+
+ {items.heading} +

{items.title}

+ +
+

+
+
+
+ Read More +
+
+ )} +
+ +
+
+