Merge pull request #10 from shaniit-org/dev

update on homepage images:
shaniit-org · Nov 24, 2023 · 49ab436 · 49ab436
2 parents 46a1b63 + c3580b1
commit 49ab436
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 99 deletions.
diff --git a/src/lib/components/common/Footer.svelte b/src/lib/components/common/Footer.svelte
@@ -29,15 +29,15 @@
 				<p class="text-white text-xl mb-6">Contact Us</p>
 				<p class="text-white mb-2">Email</p>
 				<TextInput
-					placeholder="Enter your name..."
+					placeholder="Enter your name"
 					class="mb-4 bg-[#262626]  text-white"
 					type="email"
 					required
 					name="email"
 				/>
 				<p class="text-white mb-2">Message</p>
 				<TextArea
-					placeholder="Enter message..."
+					placeholder="Enter message"
 					class="mb-4 bg-[#262626] text-white"
 					name="message"
 					required

diff --git a/src/lib/components/common/HomeEventCard.svelte b/src/lib/components/common/HomeEventCard.svelte
@@ -1,14 +1,22 @@
 <script>
 	import moment from 'moment';
+	import SanityImage from '$lib/sanity/image/SanityImage.svelte';
 	/**
 	 * @type {import('../../types').News}
 	 */
 	export let data;
+	console.log(data);
 </script>
 
 <a href={`/events/${data.slug}`} class="cursor-pointer hover:bg-theme-muted bg-white flex flex-col">
-	<div class="flex flex-col justify-between p-4 flex gap-6">
-		<h3 class="text-lg text-theme-dark">
+	<SanityImage
+		maxWidth={450}
+		image={data.coverImage}
+		alt={data.title}
+		className=" aspect-video w-full object-cover"
+	/>
+	<div class="flex-col justify-between p-4 flex gap-6">
+		<h3 class="text-xl">
 			{data.title}
 		</h3>
 		<div class="flex flex-col">

diff --git a/src/lib/components/page/about/Team.svelte b/src/lib/components/page/about/Team.svelte
@@ -23,7 +23,7 @@
 							className="aspect-video object-cover w-full h-full group-hover:scale-105 transition-all duration-500 cursor-pointer"
 						/>
 					</div>
-					<h3 class="text-xl mt-4 text-center">{dat.role}</h3>
+					<h3 class="text-xl mt-2 text-center">{dat.role}</h3>
 				</div>
 			{/each}
 		</div>

diff --git a/src/lib/studio/schema/common/donator.js b/src/lib/studio/schema/common/donator.js
@@ -1,19 +1,19 @@
 import { FaPeopleCarry } from 'react-icons/fa';
 export default {
-    icon: FaPeopleCarry,
-    title: 'Donor',
-    name: 'donator',
-    type: 'document',
-    fields: [
-        {
-            title: 'Name',
-            name: 'name',
-            type: 'string'
-        },
-        {
-            title: 'Units',
-            name: 'amount',
-            type: 'number'
-        }
-    ]
+	icon: FaPeopleCarry,
+	title: 'Donor',
+	name: 'donator',
+	type: 'document',
+	fields: [
+		{
+			title: 'Name',
+			name: 'name',
+			type: 'string'
+		},
+		{
+			title: 'Units',
+			name: 'amount',
+			type: 'number'
+		}
+	]
 };
diff --git a/src/lib/studio/schema/pages/donate/document.js b/src/lib/studio/schema/pages/donate/document.js
@@ -1,26 +1,26 @@
 import { FaDollarSign } from 'react-icons/fa';
 export default {
-    icon: FaDollarSign,
-    id: 'donatePage',
-    title: 'Donate Page',
-    name: 'donatePage',
-    type: 'document',
-    fields: [
-        { title: 'SEO', name: 'seo', type: 'seo' },
-        { title: 'Title', name: 'title', type: 'string' },
-        { title: 'CoverImage', name: 'coverImage', type: 'image' },
-        { title: 'Content', name: 'content', type: 'blockContent' },
-        {
-            title: 'Payment Methods',
-            name: 'payment_methods',
-            type: 'array',
-            of: [{ type: 'payment_method' }]
-        },
-        {
-            title: 'Goal',
-            type: 'number',
-            name: 'goal'
-        }
-    ],
-    preview: { select: { title: 'seo.title', media: 'seo.ogImage' } }
+	icon: FaDollarSign,
+	id: 'donatePage',
+	title: 'Donate Page',
+	name: 'donatePage',
+	type: 'document',
+	fields: [
+		{ title: 'SEO', name: 'seo', type: 'seo' },
+		{ title: 'Title', name: 'title', type: 'string' },
+		{ title: 'CoverImage', name: 'coverImage', type: 'image' },
+		{ title: 'Content', name: 'content', type: 'blockContent' },
+		{
+			title: 'Payment Methods',
+			name: 'payment_methods',
+			type: 'array',
+			of: [{ type: 'payment_method' }]
+		},
+		{
+			title: 'Goal',
+			type: 'number',
+			name: 'goal'
+		}
+	],
+	preview: { select: { title: 'seo.title', media: 'seo.ogImage' } }
 };
diff --git a/src/lib/types/donatePage.ts b/src/lib/types/donatePage.ts
@@ -1,27 +1,27 @@
 export interface DonatePageData {
-    seo: BaseMetaData;
-    title: string;
-    description: string;
-    content: PortableText;
-    payment_methods: PaymentMethod[];
-    payment_methods_description: string;
-    coverImage: SanityImage;
-    donors: Donator[];
-    goal: number;
+	seo: BaseMetaData;
+	title: string;
+	description: string;
+	content: PortableText;
+	payment_methods: PaymentMethod[];
+	payment_methods_description: string;
+	coverImage: SanityImage;
+	donors: Donator[];
+	goal: number;
 }
 export interface Donator {
-    _id: string;
-    group: string;
-    amount: number;
+	_id: string;
+	group: string;
+	amount: number;
 }
 
 export interface PaymentMethod {
-    name: string;
-    number: string;
-    Image: SanityImage;
+	name: string;
+	number: string;
+	Image: SanityImage;
 }
 export interface DonateRoadmap {
-    title: string;
-    description: PortableText;
-    target: number;
+	title: string;
+	description: PortableText;
+	target: number;
 }
diff --git a/src/routes/+page.js b/src/routes/+page.js
@@ -25,7 +25,8 @@ const query = `{
           "slug":slug.current,
           title,
           description,
-          publishedAt
+          publishedAt,
+          coverImage ,
     },
   "news":*[_type =="news"] | order(publishedAt desc)[0...6]  {
           "slug":slug.current,
@@ -40,12 +41,12 @@ const query = `{
  * @type {import('@sveltejs/kit').Load}
  */
 export const load = async () => {
-	/**
-	 * @type {import('$lib/types/homePage').HomePageData}
-	 */
-	const data = await getPageData(query);
-	if (!data.homePage) throw error(404, 'Not Found');
-	return {
-		data
-	};
+    /**
+     * @type {import('$lib/types/homePage').HomePageData}
+     */
+    const data = await getPageData(query);
+    if (!data.homePage) throw error(404, 'Not Found');
+    return {
+        data
+    };
 };
diff --git a/src/routes/donate/+page.js b/src/routes/donate/+page.js
@@ -16,12 +16,12 @@ const query = `
  * @type {import('@sveltejs/kit').Load}
  */
 export const load = async () => {
-    /**
-     * @type {import('$lib/types/donatePage').DonatePageData}
-     */
-    const data = await getPageData(query);
-    if (!data) throw error(404, 'Not Found');
-    return {
-        data
-    };
+	/**
+	 * @type {import('$lib/types/donatePage').DonatePageData}
+	 */
+	const data = await getPageData(query);
+	if (!data) throw error(404, 'Not Found');
+	return {
+		data
+	};
 };
diff --git a/src/routes/donate/+page.svelte b/src/routes/donate/+page.svelte
@@ -83,7 +83,7 @@
 					required
 					name="units"
 				/>
-				<TextArea labelText="Message" placeholder="Enter message..." name="message" required />
+				<TextArea labelText="Message" placeholder="Enter message" name="message" required />
 				<Button type="submit" class=" mt-4 bg-[#0F62FE]" kind="primary">Send</Button>
 			</form>
 		</div>

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,22 +1,22 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-    content: ['./src/**/**/*.{html,js,svelte,ts}'],
-    theme: {
-        fontFamily: {
-            san: ['GreatHorKham Yangon', 'sans-serif']
-        },
-        extend: {
-            colors: {
-                'theme-primary': '#D0E2FF',
-                'theme-dark': '#161616',
-                'theme-muted': '#e8e8e8',
-                'theme-secondary': '#E8DAFF'
-            },
-            gridTemplateColumns: {
-                'auto-fill-100': 'repeat(auto-fill, minmax(100px, 1fr))',
-                'auto-fit-100': 'repeat(auto-fit, minmax(100px, 1fr))'
-            }
-        }
-    },
-    plugins: [require('@tailwindcss/typography')]
+	content: ['./src/**/**/*.{html,js,svelte,ts}'],
+	theme: {
+		fontFamily: {
+			san: ['GreatHorKham Yangon', 'sans-serif']
+		},
+		extend: {
+			colors: {
+				'theme-primary': '#D0E2FF',
+				'theme-dark': '#161616',
+				'theme-muted': '#e8e8e8',
+				'theme-secondary': '#E8DAFF'
+			},
+			gridTemplateColumns: {
+				'auto-fill-100': 'repeat(auto-fill, minmax(100px, 1fr))',
+				'auto-fit-100': 'repeat(auto-fit, minmax(100px, 1fr))'
+			}
+		}
+	},
+	plugins: [require('@tailwindcss/typography')]
 };