Merge branch 'main' of https://github.com/WebmasterCamp/ywc19-hackath…

…on-e
WebmasterCamp · Jul 16, 2023 · 4b8db22 · 4b8db22
2 parents e2ec3be + 45d3534
commit 4b8db22
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/src/app.html b/src/app.html
@@ -4,6 +4,7 @@
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
 		<meta name="viewport" content="width=device-width" />
+		<link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet'>
 		%sveltekit.head%
 	</head>
 	<body data-sveltekit-preload-data="hover">

diff --git a/src/app.postcss b/src/app.postcss
@@ -1,7 +1,4 @@
 /* Write your global styles here, in PostCSS syntax */
 @tailwind base;
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
 @tailwind components;
 @tailwind utilities;
diff --git a/src/lib/components/ItemMenu.svelte b/src/lib/components/ItemMenu.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  import Icon from "@iconify/svelte";
+
+  export let name = "Default",
+    ingredient = 0,
+    timeCook = 0,
+    imgID = "/Image.svg";
+</script>
+
+<div class="w-full justify-start items-center my-1 inline-flex flex items-center">
+  <div class="w-full h-16 flex">
+    <img
+      src={imgID}
+      alt=""
+      height="1.5rem"
+      class="relative flex-col justify-start items-start flex w-16 h-16"
+    />
+    <div class="flex flex-col pl-4">
+      <h1 class="text-black text-base font-normal">{name}</h1>
+      <div class="text-black text-xs font-normal">
+        Expired in {ingredient} days
+      </div>
+      <div class="text-neutral-600 text-xs font-normal">
+        Amount : {timeCook} unit
+      </div>
+    </div>
+  </div>
+  <div>
+    <a href="/fridge">
+      <Icon icon="ic:baseline-arrow-forward-ios" />
+    </a>
+  </div>
+</div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
-    import { onMount } from 'svelte';
+  import { onMount } from 'svelte';
 	import '../app.postcss';
-
-	onMount(() => {
+	onMount(()=>{
 		Notification.requestPermission();
-	});
+	})
 </script>
 
 <slot />
diff --git a/src/routes/fridge/+page.svelte b/src/routes/fridge/+page.svelte
@@ -104,6 +104,12 @@
     <a class="text-white" href="/fridge/add">+</a>
   </div>
   <nav class="fixed bottom-0 w-screen border-t-2 border-" />
+  <button on:click={()=>{
+    new Notification("Hello", {
+      body: "Hello, world!",
+    });
+  }}>--noti--
+  </button>
 </div>
 <Drawer
   placement="bottom"

diff --git a/tailwind.config.cjs b/tailwind.config.cjs
@@ -13,7 +13,13 @@ const config = {
 		extend: {
 			boxShadow: {
 				'top': '0 -20px 60px -15px rgba(0, 0, 0, 0.3)',
-			  }
+			},
+			fontFamily: {
+				'sans': ['Montserrat'],
+				'serif': ['Montserrat'],
+				'mono': ['Montserrat'],
+
+			}
 		}
 	},