Skip to content

Commit

Permalink
Merge pull request #5 from DGclasher/master
Browse files Browse the repository at this point in the history
Fix type errors, add portfolio page
  • Loading branch information
Ne0sky authored Apr 28, 2024
2 parents 32984a3 + 180f4c6 commit 340ed98
Show file tree
Hide file tree
Showing 12 changed files with 788 additions and 231 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/build-push-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Build and Push Docker Image

on:
push:
branches:
- 'master'

jobs:
docker:
runs-on: ubuntu-latest
steps:
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
-
name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v5
with:
push: true
tags: dgclasher/infinite-edits
113 changes: 34 additions & 79 deletions app/contact/page.tsx
Original file line number Diff line number Diff line change
@@ -1,60 +1,41 @@
"use client";

import { useState } from "react";

import { zodResolver } from "@hookform/resolvers/zod";

import { useForm } from "react-hook-form";

import * as z from "zod";

import { Checkbox } from "@/components/ui/checkbox";

import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";

import { Button } from "@/components/ui/button";

import {
Form,
FormControl,
FormDescription,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@/components/ui/form";

import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Input } from "@/components/ui/input";

import { useToast } from "@/components/ui/use-toast";

import { Button } from "@/components/ui/button";
import { Textarea } from "@/components/ui/textarea";
import { PiCheckLight, PiSmiley } from "react-icons/pi";
import { useToast } from "@/components/ui/use-toast";

const FormSchema = z.object({
first_name: z.string(),
last_name: z.string(),
email: z.string().email(),
job_title: z.string(),
company_name: z.string(),
help: z.enum([
"Evaluate Bird for my company",
"Learn More",
"Get a Quote",
"Other",
]),
help: z.enum(["Learn More", "Get a Quote", "Other"]), // Ensure enum matches here
services: z.enum([
"Mobile App Develoment",
"Social Media Marketing",
"UI/UX Design",
"Branding",
"Website Development",
"Short video edits",
"Thumbnail creation",
"Graphic design",
"Long form video edits",
]),
info: z.string(),
});
Expand All @@ -65,17 +46,14 @@ type FormValues = {
email: string;
job_title: string;
company_name: string;
help: "Evaluate Bird for my company" | "Learn More" | "Get a Quote" | "Other";
help: "Learn More" | "Get a Quote" | "Other";
services:
| "Mobile App Develoment"
| "Social Media Marketing"
| "UI/UX Design"
| "Branding"
| "Website Development";
| "Short video edits"
| "Thumbnail creation"
| "Graphic design"
| "Long form video edits";
info: string;
terms: boolean;
};

export default function ContactForm() {
const [loading, setLoading] = useState(false);
const [submitted, setSubmitted] = useState(false);
Expand All @@ -90,7 +68,7 @@ export default function ContactForm() {
job_title: "",
company_name: "",
help: "Learn More",
services: "Mobile App Develoment",
services: "Short video edits",
info: "",
},
});
Expand Down Expand Up @@ -131,7 +109,7 @@ export default function ContactForm() {
<div className="md:flex items-start justify-center md:py-40 px-6">
<div className="">
<div className="text-5xl font-medium w-full md:w-2/3 pb-5 md:text-7xl bg-clip-text text-transparent bg-gradient-to-b from-neutral-50 to-neutral-400 bg-opacity-50">
Contact our sales team
Contact our team
</div>
<div
className="
Expand All @@ -140,14 +118,13 @@ export default function ContactForm() {
text-gray-300
"
>
Let&apos;s talk about how Bird can help your team work better.
<iframe
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3805.9440107860064!2d78.3500691746846!3d17.462393700640927!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3bcb93b3f0000001%3A0x57dd07d512be374b!2sRaudra%20EduServices%20Pvt.Limited!5e0!3m2!1sen!2sin!4v1710615238946!5m2!1sen!2sin"
className="rounded-xl"
style={{
border: "0",
width: "100%",
height: "300px",
height: "500px",
maxWidth: "80%",
}}
allowFullScreen
Expand Down Expand Up @@ -251,26 +228,26 @@ export default function ContactForm() {
<SelectContent className="bg-zinc-900 text-white">
<div className="flex gap-4">
<SelectItem
value="Mobile App Development"
value="Graphic design"
className="text-white"
>
Mobile App Development
Graphic design
</SelectItem>
</div>
<SelectItem
value="Social Media Marketing"
value="Short video edits"
className="text-white"
>
Social Media Marketing
Short video edits
</SelectItem>
<SelectItem value="51-200" className="text-white">
51-200
</SelectItem>
<SelectItem value="501-1000" className="text-white">
501-1000
<SelectItem
value="Thumbnail creation"
className="text-white"
>
Thumbnail creation
</SelectItem>
<SelectItem value="1000+" className="text-white">
1000+
<SelectItem value="Graphic Design" className="text-white">
Graphic Design
</SelectItem>
</SelectContent>
</Select>
Expand Down Expand Up @@ -299,12 +276,6 @@ export default function ContactForm() {
</SelectTrigger>
</FormControl>
<SelectContent className="bg-zinc-900 text-white">
<SelectItem
value="Evaluate Bird for my company"
className="text-white"
>
Evaluate Bird for my company
</SelectItem>
<SelectItem value="Learn More" className="text-white">
Learn More
</SelectItem>
Expand Down Expand Up @@ -339,23 +310,7 @@ export default function ContactForm() {
)}
/>

<div className="flex gap-4 items-center">
<div>
<Checkbox
className="
outline
border-2
text-sm
font-light
bg-clip-text text-transparent bg-gradient-to-b from-neutral-50 to-neutral-400
"
/>
</div>
<div className="text-xs font-light md:w-3/4 mb-1 bg-clip-text text-transparent bg-gradient-to-b from-neutral-50 to-neutral-400">
I agree to Bird&apos; sending marketing communications related
to bird
</div>
</div>
<div className="flex gap-4 items-center"></div>

<div className="flex items-center gap-4">
<Button
Expand Down
4 changes: 2 additions & 2 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function Home() {
</span>
<br />{" "}
<span className="text-6xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-rose-400 to bg-indigo-800 ">
Infinity Edits
Infinite Edits
</span>{" "}
<br />
<span className="text-2xl bg-clip-text text-transparent bg-gradient-to-b from-neutral-50 to bg-neutral-500 mt-2 block">
Expand Down Expand Up @@ -63,7 +63,7 @@ export default function Home() {
</Link>
</div>
</div>
<div className="w-[100%]">
<div className="w-[100%] hidden md:flex">
<HeroScroll />
</div>
</div>
Expand Down
Loading

0 comments on commit 340ed98

Please sign in to comment.