Skip to content

Commit 8770d41

Browse files
committed
Feat: Merge source master and fix conflicts
2 parents db8125b + 95be235 commit 8770d41

File tree

114 files changed

+4111
-1471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+4111
-1471
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@
66

77
</div>
88

9+
---
10+
911
**Homepage**
10-
![image](https://user-images.githubusercontent.com/42484705/197355352-1becb11c-3e03-426c-b20c-5c14db6ac9ee.png)
12+
![image](https://user-images.githubusercontent.com/42484705/197696692-560c05b1-5207-41c7-adc9-d10fe403ece2.png)
1113

1214
**Components selection page**
13-
![image](https://user-images.githubusercontent.com/42484705/197355398-e36d1cb5-15aa-4c47-b5dc-e56c5f7f630b.png)
15+
![image](https://user-images.githubusercontent.com/42484705/197696771-9aaf4f6d-1928-4d66-9d2b-01ad479d289a.png)
1416

1517
**Codepen page**
16-
![image](https://user-images.githubusercontent.com/42484705/197355431-718855e6-66ab-4229-b5bb-db3fda5956ff.png)
18+
![image](https://user-images.githubusercontent.com/42484705/197697009-132c44c8-29b3-40f7-98d0-c54f0aa8a33b.png)
1719

20+
---
1821

1922
# Motivation
2023

@@ -53,7 +56,7 @@ Buy us coffee or tea or even a book at [buymeacoffee 🍵](https://www.buymeacof
5356
`git commit -m "commit message"`
5457
8. Push the changes to origin
5558
`git push origin <branch_name>`
56-
9. After that create new Pull Request in your GitHub account. (It should appeared after commits were pushed)
59+
9. After that create new Pull Request in your GitHub account. (It should appear after commits were pushed)
5760

5861
# Contributors 🎉
5962

components/aboutUs.js

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable @next/next/no-img-element */
22
import {useState, useEffect} from "react";
33
import {BallTriangle} from "react-loader-spinner";
4-
import Link from "next/link";
4+
import {SiBuymeacoffee} from "react-icons/si";
55

66
const AboutUs = () => {
77
const [loading, setloading] = useState(true);
@@ -42,32 +42,61 @@ const AboutUs = () => {
4242
) : (
4343
<div className="banner">
4444
<div>
45-
<div className="w-full flex justify-evenly flex-wrap">
46-
<div className="w-5/12 my-5 p-2 m border-white border-2 rounded">
47-
<p className="w-full text-xl text-white">
48-
Our website motivation
45+
<div className="flex flex-col justify-center items-center flex-wrap">
46+
<div className="my-5 mx-3 p-6 md:w-4/5 md:mx-0 flex flex-col justify-center items-center border-white border-2 rounded-lg bg-sky-300">
47+
<p className="text-xl font-bold underline underline-offset-4 text-blue-700 mb-4">
48+
Our motivation
4949
</p>
5050
<hr className="bg-white" />
51-
<p className="w-full text-white">
51+
<p className="w-full text-center text-blue-900 font-semibold">
5252
We do know tailwind css is an emerging CSS framework which
5353
makes our website/ app unique without styling compared to
5454
other market bootstraps.
5555
</p>
5656
</div>
57-
<div className="w-5/12 my-5 p-2 m border-white border-2 rounded">
58-
<p className="w-full text-xl text-white">
59-
Solution we are providing
57+
<div className="my-5 mx-3 p-6 md:w-4/5 md:mx-0 flex flex-col justify-center items-center border-white border-2 rounded-lg bg-sky-300">
58+
<p className="text-xl font-bold underline underline-offset-4 text-blue-700 mb-4">
59+
Solution we are providing 🧑‍💻
6060
</p>
6161
<hr className="bg-white" />
62-
<p className="w-full text-white">
62+
<p className="w-full text-center text-blue-900 font-semibold">
6363
You can get almost all layouts and components built under
6464
Tailwind CSS, and the best part is we can play around with
6565
them in inbuilt code editor and copy the codebase too for your
6666
projects.
6767
</p>
6868
</div>
69+
<div className="my-5 mx-3 p-6 md:w-4/5 md:mx-0 flex flex-col justify-center items-center border-white border-2 rounded-lg bg-sky-300">
70+
<p className="text-xl font-bold underline underline-offset-4 text-blue-700 mb-4">
71+
Like our Product 😎
72+
</p>
73+
<hr className="bg-white" />
74+
<p className="w-full text-center text-blue-900 font-semibold flex flex-col md:flex-row justify-center items-center">
75+
This contribution is not forced but welcomed, as this will
76+
help us run this software for long time, Buy us coffee or tea
77+
or even a book at{" "}
78+
<a
79+
href="https://www.buymeacoffee.com/jsvigneshkanna"
80+
target="_blank"
81+
rel="noreferrer"
82+
className="ml-4 bg-rose-500 p-2 rounded-3xl text-2xl text-white">
83+
<SiBuymeacoffee />
84+
</a>
85+
</p>
86+
</div>
87+
</div>
88+
<div>
89+
<div className="flex flex-col justify-center items-center flex-wrap">
90+
<div className=" my-5 mx-3 p-6 flex flex-col justify-center items-center md:w-4/5 md:mx-0p-6 px-5 overflow-auto border-blue-700 border-2 rounded-lg">
91+
<p className=" mt-8 mb-8 text-xl text-white underline underline-offset-4">
92+
Our Contributers 🥂
93+
</p>
94+
<div
95+
id="contributors"
96+
className="overflow-auto whitespace-nowrap w-auto flex flex-wrap justify-evenly gap-1 md:gap-8"></div>
97+
</div>
98+
</div>
6999
</div>
70-
<div></div>
71100
</div>
72101
</div>
73102
)}

components/document.js

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/* eslint-disable @next/next/no-img-element */
2+
import Link from "next/link";
3+
4+
const Document = () => {
5+
return (
6+
<div className=" bg-slate-300 text-black min-h-screen pt-32 md:pt-40 px-4 md:px-40 font-sans">
7+
<h1 className="text-2xl border-b-2 border-teal-700 font-black">
8+
Documentation 📝
9+
</h1>
10+
<div className="py-8 flex flex-col justify-center items-start">
11+
<h3 className="text-center pb-8 font-bold text-xl text-red-900 underline underline-offset-4">
12+
1. Feature video 📺
13+
</h3>
14+
<video
15+
className="w-auto rounded-3xl h-auto border-2 border-rose-500 shadow-xl shadow-blue-300"
16+
controls>
17+
<source src="/tailwind_bootstrap_docs.mkv" type="video/mp4"></source>
18+
</video>
19+
</div>
20+
21+
<div className="py-8 flex flex-col justify-center items-start">
22+
<h3 className="text-left pb-6 font-bold text-xl text-red-900 underline underline-offset-4">
23+
2. Type of components 💾
24+
</h3>
25+
<p className="text-left font-medium">
26+
Currently we have around 10 different types of components
27+
</p>
28+
<p className="pt-4 font-medium">
29+
Please check
30+
<Link href="/components">
31+
<span className="bg-sky-300 text-rose-700 px-3 py-2 rounded-lg ml-2 font-semibold">
32+
here
33+
</span>
34+
</Link>
35+
</p>
36+
</div>
37+
38+
<div className="py-8 flex flex-col justify-center items-start pb-20">
39+
<h3 className="text-left pb-6 font-bold text-xl text-red-900 underline underline-offset-4">
40+
3. How to use this website ⚡
41+
</h3>
42+
<div className="text-left font-medium">
43+
<p className="pb-3">
44+
- You can search some of the required components like &apos;Buttons,
45+
Forms, Navbars, Alerts&apos; from the components page.
46+
</p>
47+
<p className="pb-3">
48+
- Go to the required component page and try different UI code from
49+
embeded codepen.
50+
</p>
51+
<p className="pb-3">
52+
- For specific components like &apos;Navbars&apos; you can open/
53+
close the HTML tab to simulate the mobile responsiveness
54+
</p>
55+
<p className="pb-3">
56+
- In addition to that, we can open the specific codepen in a new tab
57+
by clicking &apos;EDIT ON CODEPEN&apos;
58+
</p>
59+
<p className="bg-rose-500 rounded-lg mt-4 py-2 px-4 text-white font-bold">
60+
🚀 NOTE: It may take 2-3 seconds for the codepen page to load due to
61+
the page is heavy in size. Any contributors who can solve this issue
62+
can connect by Github
63+
</p>
64+
</div>
65+
</div>
66+
</div>
67+
);
68+
};
69+
70+
export default Document;

components/faqs.js

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/* eslint-disable @next/next/no-img-element */
2+
import {useEffect} from "react";
3+
import Link from "next/link";
4+
5+
const FAQs = () => {
6+
useEffect(() => {
7+
setTimeout(() => {
8+
const data = {
9+
q1: {
10+
qus: "What is Tailwind Bootstrap",
11+
ans: "Tailwind css is an emerging CSS framework which makes our website/ app unique without styling compared to other market bootstraps.",
12+
},
13+
q2: {
14+
qus: "Who drives this website",
15+
ans: 'Our Contributers Drive the website (around 50+ open source contributors - and growing in 🚀 pace), for more visit <a href="/aboutUs" target="_blank" rel="noreferrer" class="text-blue-700">Here</a>',
16+
},
17+
q3: {
18+
qus: "What all components are there in this website",
19+
ans: 'There are a lot of components on this website, you can access them from <a href="/components" target="_blank" rel="noreferrer" class="text-blue-700">Here</a>',
20+
},
21+
q4: {
22+
qus: "Can we play around with tailwindcss codes",
23+
ans: "Yes,You can. We actually have embeded codepen in each component section. You can modify the code/ styles and rerun the codepen to get required design ⚡",
24+
},
25+
q5: {
26+
qus: "Is there any pricing or subscription",
27+
ans: 'Nooooo 🙅,It is free of cost. We will atmost thrive to keep this website open sourced and free of cost to users. If you like our product very much and wish to contribute us some money which we use to enhance further, you can reach us at <a href="https://www.buymeacoffee.com/jsvigneshkanna" target="_blank" rel="noreferrer" class="text-blue-700">Here</a>',
28+
},
29+
q6: {
30+
qus: "How can we use these UI components and where can we find documents",
31+
ans: 'You can actually play around with existing component codes in each component section, copy them and use them in your codebase. For more information check <a href="/documentation" target="_blank" rel="noreferrer" class="text-blue-700">Docs</a>',
32+
},
33+
q7: {
34+
qus: "I would like to contribute to this website, how can I proceed?",
35+
ans: 'Hurray 🕺💃, You can contribute from <a href="https://github.com/jsvigneshkanna/tailwind_ui_components" class="text-blue-700">Here</a>. We are so happy, that you checked our product and like to contribute !',
36+
},
37+
};
38+
if (document.getElementById("faqs").innerHTML == "") {
39+
for (const q in data) {
40+
document.getElementById(
41+
"faqs",
42+
).innerHTML += `<div class="border-b font-medium border-black my-2 overflow-hidden">
43+
<div class="flex justify-between p-3 items-center ">
44+
<p>${data[q].qus}</p>
45+
<p class="ml-2 border border-black rounded-full answer_btn"><svg xmlns="http://www.w3.org/2000/svg" fill="none"
46+
viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
47+
<path stroke-linecap="round" stroke-linejoin="round"
48+
d="M19.5 8.25l-7.5 7.5-7.5-7.5" />
49+
</svg></p>
50+
</div>
51+
<hr>
52+
<p class="hidden p-3">${data[q].ans}</p>
53+
</div>`;
54+
}
55+
}
56+
Array.from(document.getElementsByClassName("answer_btn")).forEach((e) => {
57+
e.addEventListener("click", (ee) => {
58+
let ele = e.parentElement.parentElement.children[2];
59+
let ele1 = e.parentElement.children[0];
60+
let flag = false;
61+
Array.from(ele.classList).forEach((classes) => {
62+
if (classes == "hidden") flag = true;
63+
});
64+
if (flag) {
65+
ele.classList.remove("hidden");
66+
e.classList.add("origin-center");
67+
e.classList.add("rotate-180");
68+
e.classList.add("bg-blue-500");
69+
e.classList.remove("border");
70+
e.classList.add("text-white");
71+
ele1.classList.add("text-blue-500");
72+
} else {
73+
ele.classList.add("hidden");
74+
e.classList.remove("origin-center");
75+
e.classList.remove("rotate-180");
76+
e.classList.remove("bg-blue-500");
77+
e.classList.add("border");
78+
e.classList.remove("text-white");
79+
ele1.classList.remove("text-blue-500");
80+
}
81+
});
82+
});
83+
}, 100);
84+
}, []);
85+
86+
return (
87+
<div>
88+
<div className="banner">
89+
<div class="pb-6 text-white">
90+
<h1 class="p-3 text-center font-semibold text-lg md:text-2xl underline underline-offset-8">
91+
Frequently Asked Questions
92+
</h1>
93+
<div
94+
id="faqs"
95+
class="text-black bg-stone-300 border m-auto mt-9 mx-4 md:mx-40 px-3 md:px-8 py-12 rounded-2xl border-black"></div>
96+
</div>
97+
</div>
98+
</div>
99+
);
100+
};
101+
102+
export default FAQs;

components/footer.js

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
/* eslint-disable @next/next/no-img-element */
22
/* eslint-disable @next/next/no-html-link-for-pages */
33

4-
import React from "react";
4+
import Link from "next/link";
55

66
const Footer = () => {
77
return (
88
<div>
9-
<footer className=" p-6 sm:p-6 bg-gradient-to-bl from-[#2a003c] to-[#010142]">
10-
<div className="md:flex md:flex-row flex-col md:justify-between md:px-40 pt-0 md:pt-8">
11-
<div className="mb-6 md:mb-0 mt-6 md:mt-0">
9+
<footer className=" p-6 sm:p-6 bg-gradient-to-b from-[#310046] to-[#000057]">
10+
<div className="md:flex md:flex-row flex-col md:justify-between md:px-40 pt-0 md:pt-4">
11+
<div className="mb-4 md:mb-0 mt-4 md:mt-0">
1212
<a
1313
href="https://tailwindcsscomponents.vercel.app/"
1414
className="flex items-center justify-center">
1515
<img
16-
src="/favi-tailwind.png"
17-
className="md:mr-3 h-10 mr-1"
16+
src="/favicon/favicon.png"
17+
className="md:mr-3 h-10 mr-1 rounded-3xl"
1818
alt="FlowBite Logo"></img>
19-
<span className="self-center text-xl md:text-2xl font-semibold whitespace-nowrap dark:text-white">
19+
<span className="text-white self-center text-xl md:text-2xl font-semibold whitespace-nowrap dark:text-white">
2020
tailwind
2121
</span>
22-
<span className="self-center text-xl md:text-2xl font-semibold whitespace-nowrap dark:text-blue-500 ml-2">
22+
<span className="text-white self-center text-xl md:text-2xl font-semibold whitespace-nowrap dark:text-blue-500 ml-2">
2323
BOOTSRAP
2424
</span>
2525
</a>
2626
</div>
27-
<div className="grid grid-cols-2 gap-8 md:gap-36 place-items-center">
27+
<div className="grid grid-cols-2 gap-20 md:gap-32 place-items-center">
2828
<div>
2929
<h2 className="mb-4 text-xs md:text-lg font-semibold uppercase text-white underline underline-offset-2">
3030
Follow us
3131
</h2>
32-
<ul className="text-gray-200 text-xs md:text-lg">
32+
<ul className="text-gray-200 text-xs md:text-base">
3333
<li className="mb-4">
3434
<a
3535
href="https://github.com/jsvigneshkanna/tailwind_ui_components"
@@ -54,24 +54,26 @@ const Footer = () => {
5454
<h2 className="mb-4 text-xs md:text-lg font-semibold uppercase text-white underline underline-offset-2">
5555
Legal
5656
</h2>
57-
<ul className="text-gray-200 text-xs md:text-lg">
57+
<ul className="text-gray-200 text-xs md:text-base">
5858
<li className="mb-4">
59-
<a href="" className="hover:underline hover:text-blue-300">
59+
<Link
60+
href="/legal/privacypolicy"
61+
className="hover:underline hover:text-blue-300">
6062
Privacy Policy
61-
</a>
63+
</Link>
6264
</li>
6365
<li>
64-
<a
66+
<Link
6567
href="/legal/license"
6668
className="hover:underline hover:text-blue-300">
6769
License
68-
</a>
70+
</Link>
6971
</li>
7072
</ul>
7173
</div>
7274
</div>
7375
</div>
74-
<hr className="my-6 sm:mx-auto border-gray-400 lg:my-8" />
76+
<hr className="my-6 sm:mx-auto border-gray-400 lg:my-4" />
7577
<div className="sm:flex sm:items-center sm:justify-between md:px-40 text-center">
7678
<span className="text-sm text-white sm:text-center">
7779
© 2022{" "}

0 commit comments

Comments
 (0)