development/91b18844-c148-4ae0-9a69-cc57582d450b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
development merged 9 commits from version_1 into main 2026-01-20 15:24:00 +00:00
Conversation 0 Commits 9 Files Changed 9 +9 -6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 219f90b8f4 - Show all commits

15
src/App.tsx
View File

@@ -1,16 +1,19 @@
import React from 'react'; import React from 'react';
import { ThemeProvider } from './components/ui/ThemeProvider';
import NavbarStyleApple from './components/navbar/NavbarStyleApple/NavbarStyleApple'; import NavbarStyleApple from './components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroBillboard from './components/sections/hero/HeroBillboard'; import HeroBillboard from './components/sections/hero/HeroBillboard';
import FeatureCardOne from './components/sections/feature/FeatureCardOne'; import FeatureCardOne from './components/sections/feature/FeatureCardOne';
function App() { function App() {
return ( return (
<div className="App"> <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
<NavbarStyleApple /> <div className="App">
<HeroBillboard /> <NavbarStyleApple />
<FeatureCardOne /> <HeroBillboard />
</div> <FeatureCardOne />
</div>
</ThemeProvider>
); );
} }
export default App; export default App;