diff --git a/README.md b/README.md index fc2b5cfcdd748ecdebe7be6c597409879eea76e3..f768e33fc946e6074d6bd3ce5d454853adb3615e 100644 --- a/README.md +++ b/README.md @@ -1,98 +1,3 @@ -<<<<<<< HEAD -# ompoi_landing page - - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://git.selfmade.ninja/mubamuzeen09876/ompoi_landing-page.git -git branch -M master -git push -uf origin master -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://git.selfmade.ninja/mubamuzeen09876/ompoi_landing-page/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README - -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. -======= # React + Vite This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules. @@ -101,4 +6,3 @@ Currently, two official plugins are available: - [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh - [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh ->>>>>>> 259253b (my First commit) diff --git a/landing_page b/landing_page deleted file mode 160000 index b7a03c1c31d36448c957a35eba845b37b2de7e07..0000000000000000000000000000000000000000 --- a/landing_page +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b7a03c1c31d36448c957a35eba845b37b2de7e07 diff --git a/src/component/Frame 20.png b/src/assets/bento/Frame 20.png similarity index 100% rename from src/component/Frame 20.png rename to src/assets/bento/Frame 20.png diff --git a/src/component/Frame 21.png b/src/assets/bento/Frame 21.png similarity index 100% rename from src/component/Frame 21.png rename to src/assets/bento/Frame 21.png diff --git a/src/component/Frame22.png b/src/assets/bento/Frame22.png similarity index 100% rename from src/component/Frame22.png rename to src/assets/bento/Frame22.png diff --git a/src/component/Elsa_Mills.svg b/src/assets/conact/Elsa_Mills.svg similarity index 100% rename from src/component/Elsa_Mills.svg rename to src/assets/conact/Elsa_Mills.svg diff --git a/src/component/Ema_Grey.svg b/src/assets/conact/Ema_Grey.svg similarity index 100% rename from src/component/Ema_Grey.svg rename to src/assets/conact/Ema_Grey.svg diff --git a/src/component/Gopal.svg b/src/assets/conact/Gopal.svg similarity index 100% rename from src/component/Gopal.svg rename to src/assets/conact/Gopal.svg diff --git a/src/component/Gopal_Women.svg b/src/assets/conact/Gopal_Women.svg similarity index 100% rename from src/component/Gopal_Women.svg rename to src/assets/conact/Gopal_Women.svg diff --git a/src/component/Jessi.svg b/src/assets/conact/Jessi.svg similarity index 100% rename from src/component/Jessi.svg rename to src/assets/conact/Jessi.svg diff --git a/src/component/Rectangle 9.png b/src/assets/conact/Rectangle 9.png similarity index 100% rename from src/component/Rectangle 9.png rename to src/assets/conact/Rectangle 9.png diff --git a/src/component/phone-call.png b/src/assets/conact/phone-call.png similarity index 100% rename from src/component/phone-call.png rename to src/assets/conact/phone-call.png diff --git a/src/component/telephone.png b/src/assets/conact/telephone.png similarity index 100% rename from src/component/telephone.png rename to src/assets/conact/telephone.png diff --git a/src/component/enqure122.png b/src/assets/enqurey/enqure122.png similarity index 100% rename from src/component/enqure122.png rename to src/assets/enqurey/enqure122.png diff --git a/src/component/call.png b/src/assets/footer/call.png similarity index 100% rename from src/component/call.png rename to src/assets/footer/call.png diff --git a/src/component/instagram.png b/src/assets/footer/instagram.png similarity index 100% rename from src/component/instagram.png rename to src/assets/footer/instagram.png diff --git a/src/component/whatsapp.png b/src/assets/footer/whatsapp.png similarity index 100% rename from src/component/whatsapp.png rename to src/assets/footer/whatsapp.png diff --git a/src/component/world.png b/src/assets/footer/world.png similarity index 100% rename from src/component/world.png rename to src/assets/footer/world.png diff --git a/src/component/world1.png b/src/assets/footer/world1.png similarity index 100% rename from src/component/world1.png rename to src/assets/footer/world1.png diff --git a/src/component/hero_section.png b/src/assets/hero/hero_section.png similarity index 100% rename from src/component/hero_section.png rename to src/assets/hero/hero_section.png diff --git a/src/component/men_women.png b/src/assets/hero/men_women.png similarity index 100% rename from src/component/men_women.png rename to src/assets/hero/men_women.png diff --git a/src/component/vendor_boy_girl.png b/src/assets/hero/vendor_boy_girl.png similarity index 100% rename from src/component/vendor_boy_girl.png rename to src/assets/hero/vendor_boy_girl.png diff --git a/src/assets/shopbg.png b/src/assets/shopbg.png deleted file mode 100644 index a206c78cfaeca75ea9df8fb15472cc28cd0db885..0000000000000000000000000000000000000000 Binary files a/src/assets/shopbg.png and /dev/null differ diff --git a/src/component/bentobox.jsx b/src/component/bentobox.jsx index 9cfd89720456a8e7de4afed7c664810fa914c58f..3d9740821eb8a67582924a457529a21f29e4a083 100644 --- a/src/component/bentobox.jsx +++ b/src/component/bentobox.jsx @@ -1,7 +1,7 @@ import React from "react"; -import first from "./Frame 20.png"; -import second from "./Frame22.png"; -import third from "./Frame 21.png"; +import first from "../assets/bento/Frame 20.png"; +import second from "../assets/bento/Frame22.png"; +import third from "../assets/bento/Frame 21.png"; function Bento() { return ( <> diff --git a/src/component/contact.jsx b/src/component/contact.jsx index 7fa924ff751b0b63207d3e9f0c335cc3c34a64dd..258eca83a2c5df6c356484430335a27dd9cd1b85 100644 --- a/src/component/contact.jsx +++ b/src/component/contact.jsx @@ -1,10 +1,10 @@ import React from "react"; -import copai from "./Gopal_Women.svg"; -import jassi from "./Jessi.svg"; -import ema from "./Ema_Grey.svg"; -import emacity from "./Elsa_Mills.svg"; -import gopal from "./Gopal.svg"; -import phone from "./phone-call.png"; +import copai from "../assets/conact/Gopal_Women.svg"; +import jassi from "../assets/conact/Jessi.svg"; +import ema from "../assets/conact/Ema_Grey.svg"; +import emacity from "../assets/conact/Elsa_Mills.svg"; +import gopal from "../assets/conact/Gopal.svg"; +import phone from "../assets/conact/phone-call.png"; const team=[ { name: "Gopal", role: "Payment Support", image: copai}, { name: "Jessi", role: "Customer Support", image: jassi }, diff --git a/src/component/enquire.jsx b/src/component/enquire.jsx index d4ee3e16758159a18584caf00f5492bda889e290..0ed41cbca6f218a7537e374de5f13dee368a3a88 100644 --- a/src/component/enquire.jsx +++ b/src/component/enquire.jsx @@ -1,5 +1,5 @@ import React from "react"; -import enquire from "./enqure122.png"; +import enquire from "../assets/enqurey/enqure122.png"; function Enquire() { return ( diff --git a/src/component/footer.jsx b/src/component/footer.jsx index e43fbe4e233f310efe660fb1c1b1cfe22c64989a..270492d578a285897fbf0df466347605d1e935a8 100644 --- a/src/component/footer.jsx +++ b/src/component/footer.jsx @@ -1,9 +1,9 @@ import React from "react"; import "./Footer.css"; // Import the CSS file -import call from "./call.png"; -import Whatsapp from "./whatsapp.png"; -import insta from "./instagram.png"; -import world from "./world1.png"; +import call from "../assets/footer/call.png"; +import Whatsapp from "../assets/footer/whatsapp.png"; +import insta from "../assets/footer/instagram.png"; +import world from "../assets/footer/world1.png"; //className="m-h-screen bg-[#28409C] md:bg-[url('world.png')] md:object-right-top md:bg-cover " { diff --git a/src/component/navbar.jsx b/src/component/navbar.jsx index af25a9ce252d20d9b898355911a64cdcd8cd312c..85119c1dd3e3c44ec7db68b5fc178e84f9d4e7f9 100644 --- a/src/component/navbar.jsx +++ b/src/component/navbar.jsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { FaBars, FaTimes } from "react-icons/fa"; -import backgd from "./hero_section.png"; -import boy from "./vendor_boy_girl.png"; +import backgd from "../assets/hero/hero_section.png"; +import boy from "../assets/hero/vendor_boy_girl.png"; function Navbar() { const [menuOpen, setMenuOpen] = useState(false);