Skip to content

Commit

Permalink
Merge pull request #8 from openobserve/fix/bugs
Browse files Browse the repository at this point in the history
Fix/bugs
  • Loading branch information
ktx-krupa authored Feb 1, 2025
2 parents d05aaeb + 387e92e commit dd2a2ac
Show file tree
Hide file tree
Showing 8 changed files with 624 additions and 32 deletions.
Binary file added public/Homepage/Screenity-video-Jan 31-2025.mp4
Binary file not shown.
478 changes: 478 additions & 0 deletions public/solution-hero.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions src/components/forms/BaseForm.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<script setup>
import { defineProps, defineEmits, ref, watch } from "vue";
const props = defineProps({
formFields: {
type: Array,
required: true,
},
buttonText: {
type: String,
required: true,
},
buttonVariant: {
type: String,
default: "primary",
},
});
const formData = ref({});
// Initialize form data
onMounted(() => {
props.formFields.forEach((field) => {
formData.value[field.name] = field.type === "checkbox" ? false : "";
});
});
const onSubmit = () => {
console.log("Form submitted with data:", formData.value);
};
</script>
<template>
<form @submit.prevent="onSubmit" class="space-y-6">
<div
v-for="(field, index) in formFields"
:key="index"
class="flex flex-col"
>
<label :for="field.name" class="text-white font-medium mb-1">
{{ field.label }}
</label>
<input
v-if="field.type === 'text'"
:type="field.type"
:id="field.name"
:placeholder="field.placeholder"
v-model="formData[field.name]"
class="bg-[#23282C] border border-[#373a3d] rounded-lg p-3 focus:outline-none focus:ring-2 focus:ring-blue-500"
/>
<select
v-else-if="field.type === 'select'"
:id="field.name"
v-model="formData[field.name]"
class="bg-[#23282C] text-white border border-[#43484C] rounded-lg p-3 focus:outline-none focus:ring-2 focus:ring-blue-500"
>
<option v-for="option in field.options" :key="option" :value="option">
{{ option }}
</option>
</select>
<textarea
v-else-if="field.type === 'textarea'"
:id="field.name"
:placeholder="field.placeholder"
v-model="formData[field.name]"
class="bg-[#23282C] border border-[#43484C] rounded-lg p-3 focus:outline-none focus:ring-2 focus:ring-blue-500"
></textarea>
</div>

<!-- Checkbox -->
<div class="flex items-start gap-3">
<input type="checkbox" id="terms" v-model="formData.terms" class="mt-1" />
<label for="terms" class="text-gray-600">
I confirm I have read and agree to the
<a href="#" class="text-blue-500 underline">Terms and Conditions</a>.
</label>
</div>

<!-- Submit Button -->
<div>
<CustomButton :variant="buttonVariant" type="submit">
{{ buttonText }}
</CustomButton>
</div>
</form>
</template>
6 changes: 4 additions & 2 deletions src/components/heroSections/FeatureHeroSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ defineProps({

<template>
<section
class="relative flex flex-col items-center text-center bg-no-repeat bg-[50%_40vh] md:bg-[50%_20vh] bg-cover px-4"
class="relative flex flex-col items-center text-center bg-no-repeat bg-[50%_20vh] md:bg-[50%_20vh] bg-cover px-4 pt-[5vh] md:pt-[20vh]"
:style="{
backgroundImage: `url(${backgroundImage})`,
}"
Expand All @@ -48,7 +48,9 @@ defineProps({
<h1 class="text-3xl sm:text-4xl md:text-5xl font-bold mb-6">
{{ title }}
</h1>
<p class="text-lg sm:text-xl md:text-2xl font-medium text-[#E2E3E5]">{{ subtitle }}</p>
<p class="text-lg sm:text-xl md:text-2xl font-medium text-[#E2E3E5]">
{{ subtitle }}
</p>
</div>

<!-- Hero Section with Background -->
Expand Down
21 changes: 16 additions & 5 deletions src/components/heroSections/HomeHeroSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,26 @@ defineProps({

<template>
<section
class="relative flex justify-center items-center lg:justify-start h-[calc(100vh-100px)] text-center lg:text-left bg-cover bg-center bg-no-repeat px-4 sm:px-8 lg:px-16"
:style="{ backgroundImage: `url(${background})` }"

class="relative flex justify-center lg:justify-start min-h-screen lg:text-left px-4 sm:px-8 lg:px-16"
>
<video
class="absolute top-0 left-0 w-full h-full object-cover"
autoplay
muted
loop
playsinline
>
<source
src="/Homepage/Screenity-video-Jan 31-2025.mp4"
type="video/mp4"
/>
Your browser does not support the video tag.
</video>
<!-- Content Section -->
<div class="relative z-10 text-white max-w-4xl">
<div class="relative pt-10 md:pt10 md:pl-10 lg:pt-20 lg:pl-20 text-white max-w-4xl">
<!-- Title -->
<TextWithGradient
class="text-3xl sm:text-4xl md:text-5xl lg:text-6xl font-bold mb-4 text-center sm:text-left"
class="text-3xl sm:text-4xl md:text-5xl lg:text-6xl font-bold mb-4 sm:text-left"
:title="title"
textGradientColor="gradient-color"
align="left"
Expand Down
29 changes: 13 additions & 16 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ import ComponentCollectionMapper from "../components/ComponentCollectionMapper.v
import BlogWrapper from "../components/wrapper/BlogWrapper.vue";
import HomeFeatureWrapper from "../components/wrapper/HomeFeatureWrapper.vue";
import HomeWhyO2Wrapper from "../components/wrapper/HomeWhyO2Wrapper.vue";
import fetchApi from '../utils/strapi';
import fetchApi from "../utils/strapi";
const PageData = await fetchApi({
endpoint: "pages",
query: { path: "/", pLevel: "10" },
endpoint: "api/homepage",
query: { pLevel: "10", status: "draft" },
});
console.log(PageData.data[0].body,"datatatata");
const cards = [
{
image: "public/blogColor-1.png",
Expand Down Expand Up @@ -389,16 +388,15 @@ const tabsData = [
image: "/Homepage/UI-14.svg",
},
];
// const pageData = [
// {
// __component: "section.herosection",
// title: "Open Source Observability",
// subtitle:
// "Fast, Scalable, and Cost-effective Monitoring for Modern Applications",
// background: "/Coding BG.svg",
// },
// ];
const pageData = [
{
__component: "section.herosection",
title: "Open Source Observability",
subtitle:
"Fast, Scalable, and Cost-effective Monitoring for Modern Applications",
background: "/Coding BG.svg",
},
];
const trustedCompanies = {
title: "Trusted by leading companies",
Expand All @@ -424,7 +422,7 @@ const trustedCompanies = {

<Layout>
<!-- <CustomAnnouncement AnnouncementBanner={announcementBanner} /> -->
<ComponentCollectionMapper data={PageData.data[0].body} client:load />
<ComponentCollectionMapper data={pageData} client:load />
<FeatureCardWithIconWrapper cardData={cardDataforsection2} />
<UsecaseCardWithIconWrapper cardData={cardDataforsection3} />
<TopCompaniesWrapper
Expand Down Expand Up @@ -470,4 +468,3 @@ const trustedCompanies = {
]}
/>
</Layout>

20 changes: 20 additions & 0 deletions src/pages/platform/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import TabsWrapper from "../../components/wrapper/TabsWrapper.vue";
import GetDemoWrapper from "../../components/wrapper/GetDemoWrapper.vue";
import CaseStudyWrapper from "../../components/wrapper/CaseStudyWrapper.vue";
import BannerWrapper from "../../components/wrapper/BannerWrapper.vue";
import BaseForm from "../../components/forms/BaseForm.vue";
import { ref } from "vue";
const cardData = [
{
icon: "/Performance.svg",
Expand Down Expand Up @@ -375,6 +377,18 @@ const bannerData = {
},
],
};
// Define form structure
const formFields = ref([
{ name: "username", label: "Username", type: "text" },
{ name: "acceptTerms", label: "Accept Terms & Conditions", type: "checkbox" },
]);
const formData = ref({ username: "", acceptTerms: false });
const handleSubmit = (data: any) => {
console.log("Submitted Data:", data);
};
---

<Layout>
Expand Down Expand Up @@ -407,4 +421,10 @@ const bannerData = {
client:load
/>
<BannerWrapper items={bannerData} client:load />
<!-- <BaseForm
v-model={formData}
:fields={formFields}
submitText="Register"
@submit={handleSubmit}
/> -->
</Layout>
17 changes: 8 additions & 9 deletions src/pages/solution/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ const visitSandboxData = {
title: "Visit the Sandbox",
description:
"Experience OpenObserve's capabilities firsthand in a sandbox environment. Test features, explore integrations, and see how our solutions can benefit your organization.",
};
---

Expand All @@ -187,17 +186,17 @@ const visitSandboxData = {
{ label: "REQUEST ENTERPRISE DEMO", variant: "secondary" },
]}
backgroundImage="/EclipseSolution.svg"
footerImage="/SolutionPageSS.svg"
footerImage="/solution-hero.svg"
/>
<TabsWithImageWrapper items={tabsData} client:load />

<VisitSandbox
title={visitSandboxData.title}
description={visitSandboxData.description}
buttons={[{ label: "LAUNCH SANDBOX", variant: "secondary" }]}
backgroundImage="/sandboxBG.svg"
client:load
/>
title={visitSandboxData.title}
description={visitSandboxData.description}
buttons={[{ label: "LAUNCH SANDBOX", variant: "secondary" }]}
backgroundImage="/sandboxBG.svg"
client:load
/>

<CustomCardWrapper
title="Empowering Teams with Tailored Solutions"
Expand All @@ -215,6 +214,6 @@ const visitSandboxData = {
/>

<CustomSeprater />

<BannerWrapper items={bannerData} client:load />
</Layout>

0 comments on commit dd2a2ac

Please sign in to comment.