Skip to content

Commit 560ec81

Browse files
authored
Merge branch 'main' into tomain
2 parents 2252b49 + 45df3c1 commit 560ec81

File tree

12 files changed

+89
-49
lines changed

12 files changed

+89
-49
lines changed

drizzle.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ export default {
1616
ssl: false
1717
}
1818
} satisfies Config;
19+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-- Current sql file was generated after introspecting the database
2+
-- If you want to run this migration please uncomment this code before executing migrations
3+
/*
4+
CREATE TABLE "test_table" (
5+
"id" serial PRIMARY KEY NOT NULL,
6+
"name" text NOT NULL
7+
);
8+
9+
*/

drizzle/meta/0000_snapshot.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"tables": {
77
"public.Category": {
88
"name": "Category",
9+
910
"schema": "",
1011
"columns": {
1112
"id": {
@@ -466,6 +467,7 @@
466467
"uniqueConstraints": {},
467468
"policies": {},
468469
"checkConstraints": {},
470+
469471
"isRLSEnabled": false
470472
}
471473
},
@@ -478,6 +480,7 @@
478480
"_meta": {
479481
"columns": {},
480482
"schemas": {},
483+
481484
"tables": {}
482485
}
483486
}

drizzle/relations.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ export const hotelRelations = relations(hotel, ({one}) => ({
1010

1111
export const categoriesRelations = relations(categories, ({many}) => ({
1212
hotels: many(hotel),
13-
}));
13+
}));
14+

drizzle/schema.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ export const hotel = pgTable("hotel", {
8181
name: "hotel_type_fk"
8282
}),
8383
]);
84+

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"svelte": "^5.0.0",
3939
"svelte-check": "^4.0.0",
4040
"tailwindcss": "^4.0.0",
41+
"tsx": "^4.19.4",
4142
"typescript": "^5.0.0",
4243
"vite": "^6.2.6"
4344
},

phruk/home.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
box-sizing: border-box;
1313
}
1414

15-
body {
15+
#navbody {
1616
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
1717
background: linear-gradient(135deg, #1a1a1a 0%, #2d2d2d 100%);
1818
color: white;
@@ -214,7 +214,7 @@
214214
</style>
215215
</head>
216216

217-
<body>
217+
<div id="navbody">
218218
<nav class="navbar">
219219
<div class="logo">
220220
<div class="logo-circle">ไลท์</div>
@@ -245,6 +245,6 @@
245245

246246
<button class="cta-button">ปุ่มไปฟังก์ชันแนบ</button>
247247
</main>
248-
</body>
248+
</div>
249249

250250
</html>

pnpm-lock.yaml

Lines changed: 49 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
--color-secondary-700: #0369a1;
2727
--color-secondary-800: #075985;
2828
--color-secondary-900: #0c4a6e;
29+
--color-teamblue: #4E9EE3;
2930
}
3031

3132
@source "../node_modules/flowbite-svelte/dist";
@@ -36,4 +37,4 @@
3637
input[type="search"]::-webkit-search-cancel-button {
3738
display: none;
3839
}
39-
}
40+
}

src/routes/+page.svelte

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
});
4242
});
4343
44+
function handleSearch() {
4445
46+
}
4547
4648
const cards = [
4749
{
@@ -97,7 +99,7 @@
9799
<div class="relative text-center z-10">
98100
<h1 class="text-4xl md:text-5xl font-bold mb-2">คำพูดเซียบชวนมากดูปุ่ม</h1>
99101
<h2 class="text-4xl md:text-5xl font-bold mb-8">คำพูดเซียบชวนมากดูปุ่ม</h2>
100-
<button class="bg-blue-600 hover:bg-blue-700 px-6 py-3 rounded-lg font-medium transition-colors">
102+
<button class="bg-teamblue hover:bg-teamblue/80 px-6 py-3 rounded-lg font-medium transition-colors">
101103
ปุ่มไปพิงค์ขันแนบ
102104
</button>
103105
</div>
@@ -106,20 +108,20 @@
106108
<!-- Search Section -->
107109
<section class="px-6 py-8">
108110
<div class="max-w-md mx-auto relative">
109-
<!-- <form onsubmit={handleSearch}>
111+
<form onsubmit={handleSearch}>
110112
<div class="relative">
111-
<Search class="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-5 h-5" />
113+
<div class="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-5 h-5" />
112114
<input
113115
type="text"
114116
placeholder="ค้นหา"
115117
bind:value={searchQuery}
116118
class="w-full pl-10 pr-4 py-3 bg-white text-gray-900 rounded-full border-0 focus:ring-2 focus:ring-blue-500 focus:outline-none"
117119
/>
118120
</div>
119-
</form> -->
121+
</form>
120122
</div>
121123

122-
<div class="flex justify-center space-x-8 mt-6">
124+
<div class="mt-56 flex justify-center space-x-8 mt-6">
123125
<a href="/top-rated" class="text-blue-400 hover:text-blue-300 text-sm">สถานที่ดูดาวที่ดีที่สุด</a>
124126
<a href="/family-friendly" class="text-blue-400 hover:text-blue-300 text-sm">สถานที่ดูดาวและน่าสำหรับครอบครัว</a>
125127
</div>
@@ -129,22 +131,18 @@
129131
<section class="px-6 pb-12">
130132
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6 max-w-6xl mx-auto">
131133
{#each cards as card}
132-
<div class="bg-gray-800 rounded-lg overflow-hidden">
133-
<div class="relative h-48 bg-gray-600">
134-
<img
135-
src="/placeholder.svg?height=200&width=300"
136-
alt="สถานที่ดูดาว"
137-
class="w-full h-full object-cover"
138-
/>
139-
</div>
140-
<div class="p-4">
141-
<h3 class="text-lg font-semibold mb-2">{card.title}</h3>
142-
<p class="text-gray-400 text-sm mb-4">{card.description}</p>
143-
<button class="bg-blue-600 hover:bg-blue-700 px-4 py-2 rounded-lg text-sm font-medium transition-colors">
144-
อ่านเพิ่มเติม
145-
</button>
134+
<div class="space-y-4">
135+
<Card img="image.png" class="bg-[#000]">
136+
<div class="m-6">
137+
<h5 class="mb-2 text-2xl font-bold tracking-tight text-white">Noteworthy technology acquisitions 2021</h5>
138+
<p class="mb-3 leading-tight font-normal text-white">Here are the biggest enterprise technology acquisitions of 2021 so far, in reverse chronological order.</p>
139+
<Button class="w-40">
140+
Read more <ArrowRightOutline class="ms-2 h-6 w-6 text-white" />
141+
</Button>
146142
</div>
147-
</div>
143+
</Card>
144+
</div>
145+
148146
{/each}
149147
</div>
150148
</section>

0 commit comments

Comments
 (0)