mirror of
https://github.com/Sosokker/SOS12.git
synced 2025-12-19 20:54:06 +01:00
Merge branch 'main' of https://github.com/Sosokker/SOS12
This commit is contained in:
commit
7b051f1d1c
@ -1,6 +1,6 @@
|
|||||||
import { BrowserRouter } from "react-router-dom";
|
import { BrowserRouter } from "react-router-dom";
|
||||||
import { Routes, Route } from 'react-router-dom';
|
import { Routes, Route } from 'react-router-dom';
|
||||||
import { Menu, Guide, Navbar, Contacts, StarsCanvas, Problems, Faq } from "./components";
|
import { Menu, Navbar, Contacts, StarsCanvas, Problems, Faq } from "./components";
|
||||||
import "./index.css"
|
import "./index.css"
|
||||||
import "./components/Problems.css"
|
import "./components/Problems.css"
|
||||||
|
|
||||||
@ -13,13 +13,11 @@ const App = () => {
|
|||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<Menu />} />
|
<Route path="/" element={<Menu />} />
|
||||||
<Route path="/problems" element={<Problems />} />
|
<Route path="/problems" element={<Problems />} />
|
||||||
<Route path="/guide" element={<Guide />} />
|
|
||||||
<Route path="/contacts" element={<Contacts />} />
|
<Route path="/contacts" element={<Contacts />} />
|
||||||
<Route path="/contact" element={<Contacts />} />
|
<Route path="/contact" element={<Contacts />} />
|
||||||
<Route path="/faq" element={<Faq />} />
|
<Route path="/faq" element={<Faq />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</div>
|
</div>
|
||||||
{/*<StarsCanvas />*/}
|
|
||||||
</div>
|
</div>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -36,9 +36,9 @@ const Contact = () => {
|
|||||||
import.meta.env.VITE_APP_EMAILJS_TEMPLATE_ID,
|
import.meta.env.VITE_APP_EMAILJS_TEMPLATE_ID,
|
||||||
{
|
{
|
||||||
from_name: form.name,
|
from_name: form.name,
|
||||||
to_name: "JavaScript Mastery",
|
to_name: "JJ",
|
||||||
from_email: form.email,
|
from_email: form.email,
|
||||||
to_email: "sujata@jsmastery.pro",
|
to_email: "Jwizzed@outlook.com",
|
||||||
message: form.message,
|
message: form.message,
|
||||||
},
|
},
|
||||||
import.meta.env.VITE_APP_EMAILJS_PUBLIC_KEY
|
import.meta.env.VITE_APP_EMAILJS_PUBLIC_KEY
|
||||||
|
|||||||
@ -5,7 +5,6 @@ import SocialMedia from "./SocialMedia.jsx";
|
|||||||
import {styles} from "../styles.js";
|
import {styles} from "../styles.js";
|
||||||
import { StarsCanvas } from "./canvas";
|
import { StarsCanvas } from "./canvas";
|
||||||
|
|
||||||
|
|
||||||
const Contacts = () => {
|
const Contacts = () => {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { SectionWrapper } from "../hoc";
|
|
||||||
|
|
||||||
|
|
||||||
const Guide = () => {
|
|
||||||
return (
|
|
||||||
<div></div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default SectionWrapper(Guide, "work");
|
|
||||||
@ -1,7 +1,6 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import Tilt from "react-tilt";
|
import Tilt from "react-tilt";
|
||||||
import { motion } from "framer-motion";
|
import { motion } from "framer-motion";
|
||||||
|
|
||||||
import { styles } from "../styles";
|
import { styles } from "../styles";
|
||||||
import { menu } from "../constants";
|
import { menu } from "../constants";
|
||||||
import { SectionWrapper } from "../hoc";
|
import { SectionWrapper } from "../hoc";
|
||||||
@ -9,7 +8,7 @@ import { fadeIn, textVariant } from "../utils/motion";
|
|||||||
import { StarsCanvas } from "./canvas";
|
import { StarsCanvas } from "./canvas";
|
||||||
|
|
||||||
const ServiceCard = ({ index, title, icon, url }) => (
|
const ServiceCard = ({ index, title, icon, url }) => (
|
||||||
<Tilt className='xs:w-[250px] w-full'>
|
<Tilt className='xs:w-[350px] w-full'>
|
||||||
<motion.div
|
<motion.div
|
||||||
variants={fadeIn("right", "spring", index * 0.5, 0.75)}
|
variants={fadeIn("right", "spring", index * 0.5, 0.75)}
|
||||||
className='w-full green-pink-gradient p-[1px] rounded-[20px] shadow-card'
|
className='w-full green-pink-gradient p-[1px] rounded-[20px] shadow-card'
|
||||||
@ -26,10 +25,10 @@ const ServiceCard = ({ index, title, icon, url }) => (
|
|||||||
<img
|
<img
|
||||||
src={icon}
|
src={icon}
|
||||||
alt='web-development'
|
alt='web-development'
|
||||||
className='w-16 h-16 object-contain'
|
className='w-20 h-20 object-contain'
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<h3 className='text-white text-[20px] font-bold text-center'>
|
<h3 className='text-white text-[30px] font-bold text-center'>
|
||||||
{title}
|
{title}
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
import { StarsCanvas, EarthCanvas } from './canvas';
|
import { StarsCanvas, EarthCanvas } from './canvas';
|
||||||
import Navbar from "./Navbar";
|
import Navbar from "./Navbar";
|
||||||
import Menu from "./Menu";
|
import Menu from "./Menu";
|
||||||
import Guide from "./Guide";
|
|
||||||
import Contacts from "./Contacts";
|
import Contacts from "./Contacts";
|
||||||
import CanvasLoader from "./Loader";
|
import CanvasLoader from "./Loader";
|
||||||
import Faq from './Faq';
|
import Faq from './Faq';
|
||||||
@ -12,7 +11,6 @@ import SocialMedia from './Socialmedia';
|
|||||||
export {
|
export {
|
||||||
Navbar,
|
Navbar,
|
||||||
Menu,
|
Menu,
|
||||||
Guide,
|
|
||||||
Contacts,
|
Contacts,
|
||||||
CanvasLoader,
|
CanvasLoader,
|
||||||
StarsCanvas,
|
StarsCanvas,
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
import {
|
import {
|
||||||
guide,
|
|
||||||
contacts_pic,
|
contacts_pic,
|
||||||
faq_pic,
|
faq_pic,
|
||||||
problems,
|
problems,
|
||||||
@ -13,10 +12,6 @@ export const navLinks = [
|
|||||||
id: "problems",
|
id: "problems",
|
||||||
title: "Problems",
|
title: "Problems",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
id: "guide",
|
|
||||||
title: "Guide",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
id: "faq",
|
id: "faq",
|
||||||
title: "FAQ",
|
title: "FAQ",
|
||||||
@ -32,10 +27,6 @@ const menu = [
|
|||||||
title: "Problems",
|
title: "Problems",
|
||||||
icon: problems,
|
icon: problems,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: "Guide",
|
|
||||||
icon: guide,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: "FAQ",
|
title: "FAQ",
|
||||||
icon: faq_pic,
|
icon: faq_pic,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user