Skip to content

Commit

Permalink
footer
Browse files Browse the repository at this point in the history
  • Loading branch information
Ellen010 committed Nov 28, 2024
1 parent f590c25 commit 45ef93e
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 9 deletions.
Binary file added public/models/Winnie_assis_miel v29.glb
Binary file not shown.
7 changes: 5 additions & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import Navbar from "./components/Navbar";
import Canon from "./components/Canon";
import Highlights from "./components/Highlights";
import Model from "./components/Model";
import Features from "./components/Features";
import Footer from "./components/Footer";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import * as Sentry from "@sentry/react";
import Features from "./components/Features";


function App () {

Expand All @@ -16,9 +18,10 @@ import Features from "./components/Features";
<Highlights/>
<Model/>
<Features />
<Footer />
{/*
<HowItWorks />
<Footer /> */}
*/}

</main>
)
Expand Down
8 changes: 4 additions & 4 deletions src/components/Features.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,19 @@ const Features = () => {
<div className="feature-text-container">
<div className="flex-1 flex-center">
<p className="feature-text g_text">
Ideal Mario is
Ideal Mario is {' '}
<span className="text-white">
modifiable and made of several colors
</span>,
using precise parts to perfectly fitting.
using precise parts for perfect fitting.
</p>
</div>

<div className="flex-1 flex-center">
<p className="feature-text g_text">
Unique recycable materials that are safe for enviroment and weight
Unique recycable materials are safe for enviroment and lightweight{' '}
<span className="text-white">
and it is one of the lighest concepts.
and the aseembly is extremely easy. {' '}
</span>
You'll notice the unique features of this model once you print it!
</p>
Expand Down
45 changes: 45 additions & 0 deletions src/components/Footer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React from 'react'
import { footerLinks } from '../constants'

const Footer = () => {
return (
<footer className="py-5 sm:px-10 px-5">
<div className="screen-max-width">
<div>
<p className="font-semibold text-gray text-xs">
More ways to shop: {' '}
<span className="underline text-blue">
Find my models {' '}
</span>
on https://cults3d.com/en/users/3Dregrees/3d-models {' '}
<span className="underline text-blue">
or https://thangs.com/designer/3Degrees?srsltid=AfmBOoqqd54qKk-v0arWkAeAeCnGFt5MS4IjZrVmzf_sQyUS7COSaP6x
</span>{' '}
.
</p>
<p className="font-semibold text-gray text-xs">

</p>
</div>

<div className="bg-neutral-700 my-5 h-[1px] w-full" />

<div className="flex md:flex-row flex-col md:items-center justify-between">
<p className="font-semibold text-gray text-xs">Copright @ 2024 3Degrees Inc. All rights reserved.</p>
<div className="flex">
{footerLinks.map((link, i) => (
<p key={link} className="font-semibold text-gray text-xs">
{link}{' '}
{i !== footerLinks.length - 1 && (
<span className="mx-2"> | </span>
)}
</p>
))}
</div>
</div>
</div>
</footer>
)
}

export default Footer
2 changes: 1 addition & 1 deletion src/components/ModelView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ModelView = ({ index, groupRef, gsapType, controlRef, setRotationState, si
<group ref={groupRef} name={`${index === 1} ? 'small' : 'large`} position={[0, 0 ,0]}>
<Suspense fallback={<Loader />}>
<Tube
scale={index === 1 ? [0.009, 0.009, 0.009] : [0.01, 0.01, 0.01]}
scale={index === 1 ? [0.009, 0.009, 0.009] : [0.012, 0.012, 0.012]}
item={item}
size={size}
/>
Expand Down
5 changes: 3 additions & 2 deletions src/components/Tube.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useGLTF, useTexture } from "@react-three/drei";


function Model(props) {
const { nodes, materials } = useGLTF('/models/Pot_12cm.glb');
const { nodes, materials } = useGLTF('/models/Winnie_assis_miel v29.glb');
const texture = useTexture(props.item.img);

useEffect(() => {
Expand Down Expand Up @@ -37,5 +37,6 @@ function Model(props) {

export default Model;

useGLTF.preload('/models/Pot_12cm.glb');
// useGLTF.preload('/models/Pot_12cm.glb');

useGLTF.preload('/Winnie_assis_miel v29.glb');

0 comments on commit 45ef93e

Please sign in to comment.