diff --git a/.vscode/settings.json b/.vscode/settings.json index 6f3a291..250032a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,6 @@ { - "liveServer.settings.port": 5501 + "liveServer.settings.port": 5501, + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 462a6b9..43b85cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "ionicons": "^7.4.0", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router-dom": "^6.26.1", + "react-router-dom": "^6.26.2", "react-scripts": "^5.0.1", "react-typing-effect": "^2.0.5", "web-vitals": "^2.1.4" @@ -18502,7 +18502,6 @@ "version": "6.26.2", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.2.tgz", "integrity": "sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==", - "license": "MIT", "dependencies": { "@remix-run/router": "1.19.2", "react-router": "6.26.2" diff --git a/package.json b/package.json index 392acb7..4f40661 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "ionicons": "^7.4.0", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router-dom": "^6.26.1", + "react-router-dom": "^6.26.2", "react-scripts": "^5.0.1", "react-typing-effect": "^2.0.5", "web-vitals": "^2.1.4" diff --git a/src/App.js b/src/App.js index eaf1cec..c7329a6 100644 --- a/src/App.js +++ b/src/App.js @@ -1,20 +1,24 @@ +import React from 'react'; +import { BrowserRouter as Router, Route, Routes } from "react-router-dom"; +import Navbar from "./Navbar"; import Home from './Home'; import ScrollIndicator from './ScrollIndicator'; -import PreloaderContainer from './PreloaderContainer.js'; // For Preloader +import PreloaderContainer from './PreloaderContainer'; // For Preloader import './style.css'; -import './script.js'; -import './preloader.js'; -import './TopBar.js'; - function App() { return ( -
- - - - -
+ +
+ + + + + } /> + + +
+
); } diff --git a/src/Home.js b/src/Home.js index 8448c07..b9348ee 100644 --- a/src/Home.js +++ b/src/Home.js @@ -1,15 +1,23 @@ import React from "react"; import ReactTypingEffect from "react-typing-effect"; import Navbar from "./Navbar"; + const Home = () => { return (
-
+
-
+
-

+

Recent Updates

@@ -387,10 +422,14 @@ const Home = () => {

-

+

Main Office

-

+

The Main Office is the Place Which has to be designed to its best.

@@ -420,10 +459,14 @@ const Home = () => {
-

+

Main Cabinete

-

+

Cabinait is the place for best productive work.

@@ -452,10 +495,14 @@ const Home = () => {
-

+

Main Centre

-

+

Main Center is the place for best productive work.

@@ -465,7 +512,10 @@ const Home = () => { Check Out BOQ - @@ -514,7 +564,10 @@ const Home = () => { > booking@grilli.com - + Booking Request : +88-123-123456

Open : 09:00 am - 01:00 pm

@@ -538,9 +591,15 @@ const Home = () => { className="input-field" /> - @@ -548,54 +607,84 @@ const Home = () => {