diff --git a/next.config.js b/next.config.js index a27a344..dc580ea 100644 --- a/next.config.js +++ b/next.config.js @@ -1,4 +1,5 @@ const plugins = require('next-compose-plugins') +const withImages = require('next-images'); // const withOptimizedImages = require('next-optimized-images'); const withBundleAnalyzer = require('@next/bundle-analyzer')({ enabled: process.env.ANALYZE === 'true', @@ -46,6 +47,22 @@ if (process.env.EXPORT !== 'true') { defaultLocale: 'en-US', } } +// module.exports = withImages({ +// images: { +// loader: "custom", +// path: "/public/", +// imageSizes: [16, 32, 48, 64, 96, 128, 256, 384], +// deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840], +// nextImageExportOptimizer: { +// imageFolderPath: "public", +// exportFolderPath: "out", +// quality: 75, +// }, +// }, +// env: { +// storePicturesInWEBP: true, +// }, +// }) module.exports = plugins( [ @@ -79,7 +96,7 @@ module.exports = plugins( }, }, ], - // withOptimizedImages, + // withImages, withBundleAnalyzer, ], nextConfig diff --git a/package.json b/package.json index 2e8e35f..98153dd 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "prettier": "prettier -l \"./src/**/*.{js,jsx,md}\"", "dev": "next dev", "build": "next build", - "export": "EXPORT=true next build && EXPORT=true next export", + "export": "EXPORT=true next build && EXPORT=true next export && EXPORT=true next-image-export-optimizer", "analyze": "ANALYZE=true next build", "start": "next start", "fleek:deploy": "EXPORT=true next build && EXPORT=true next export && fleek site:deploy" @@ -33,6 +33,7 @@ "@react-three/postprocessing": "^2.3.2", "@widgetbot/react-embed": "^1.4.0", "babel-plugin-glsl": "^1.0.0", + "cloudinary-build-url": "^0.2.4", "framer-motion": "4.1.17", "global": "^4.4.0", "glsl-random": "^0.0.5", @@ -43,6 +44,8 @@ "leva": "^0.9.23", "lil-gui": "^0.11.0", "next": "^12.1.4", + "next-image-export-optimizer": "^0.9.5", + "next-images": "^1.8.4", "next-optimized-images": "^2.6.2", "next-seo": "^5.4.0", "react": "^18.0.0", diff --git a/public/assets/img/icons/welcometometagame.svg b/public/assets/img/icons/welcometometagame.svg index 8593b40..9087fbc 100644 --- a/public/assets/img/icons/welcometometagame.svg +++ b/public/assets/img/icons/welcometometagame.svg @@ -74,74 +74,74 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + diff --git a/public/assets/models/musashi/ilb.glb b/public/assets/models/musashi/ilb.glb new file mode 100644 index 0000000..b8a7966 Binary files /dev/null and b/public/assets/models/musashi/ilb.glb differ diff --git a/public/assets/models/musashi/moloch-pet-1.glb b/public/assets/models/musashi/moloch-pet-1.glb new file mode 100644 index 0000000..2d5bc39 Binary files /dev/null and b/public/assets/models/musashi/moloch-pet-1.glb differ diff --git a/public/assets/models/musashi/robe.glb b/public/assets/models/musashi/robe.glb new file mode 100644 index 0000000..b5b4759 Binary files /dev/null and b/public/assets/models/musashi/robe.glb differ diff --git a/public/assets/models/musashi/robe2.glb b/public/assets/models/musashi/robe2.glb new file mode 100644 index 0000000..e4d1c30 Binary files /dev/null and b/public/assets/models/musashi/robe2.glb differ diff --git a/public/favicon.ico b/public/favicon.ico index 718d6fe..dc6f2ea 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/social.png b/public/social.png index e153f54..1be8ac4 100644 Binary files a/public/social.png and b/public/social.png differ diff --git a/src/components/canvas/BabyEarth.jsx b/src/components/canvas/BabyEarth.jsx index af6e765..664805d 100644 --- a/src/components/canvas/BabyEarth.jsx +++ b/src/components/canvas/BabyEarth.jsx @@ -30,23 +30,22 @@ export default function BabyEarthVox(props) { return ( - + router.push(route)} // onPointerOver={(e) => setHover(true)} // onPointerOut={(e) => setHover(false)} /> diff --git a/src/components/canvas/EasterEgg.jsx b/src/components/canvas/EasterEgg.jsx index eac2071..6d3f661 100644 --- a/src/components/canvas/EasterEgg.jsx +++ b/src/components/canvas/EasterEgg.jsx @@ -39,11 +39,6 @@ const OctoEasterEgg = (props) => { const deltaTime = elapsedTime - previousTime; previousTime = elapsedTime; - if (mesh.current && animate) { - mesh.current.position.x = -3.5 + Math.sin(elapsedTime * 0.9) * Math.PI * 0.05; - mesh.current.position.y = -1.5 - Math.cos(elapsedTime * 0.1) * Math.PI * 0.5; - mesh.current.rotation.z = -elapsedTime * 0.06; - } }) if (material.current) { material.current.map = mapTexture; diff --git a/src/components/canvas/Galaxy.jsx b/src/components/canvas/Galaxy.jsx index d0fb31f..99f071e 100644 --- a/src/components/canvas/Galaxy.jsx +++ b/src/components/canvas/Galaxy.jsx @@ -54,12 +54,15 @@ const Galaxy = ({ dof, parameters, nucleus, helper, effects, ...props }) => { particles.current.position.y = -scrollY * 0.0005; // galaxy1.rotation.y += (parallaxX - cameraGroup.position.x) * 2 * deltaTime particles.current.rotation.z = scrollY * 0.0004; - particles.current.rotation.x = -elapsedTime * 0.006; + particles.current.rotation.y = -elapsedTime * 0.006; } else if (parameters.type === 2) { particles.current.rotation.y = -elapsedTime * 0.007; } else if (parameters.type == 3) { particles.current.position.y = scrollY * 0.0004; particles.current.rotation.y = Math.cos(elapsedTime * 0.03) * Math.PI * 0.05; + } else if (parameters.type == 4) { + particles.current.position.z = -scrollY * 0.0004; + particles.current.rotation.y = Math.cos(elapsedTime * 0.03) * Math.PI * 0.05; } } @@ -156,7 +159,7 @@ const Galaxy = ({ dof, parameters, nucleus, helper, effects, ...props }) => { positions[i3 + 2] = Math.sin(branchAngle + spinAngle) * radius + randomZ const mixedColor = colorInside.clone() - mixedColor.lerp(colorOutside, radius / parameters.radius * 1.05) + mixedColor.lerp(colorOutside, radius / parameters.radius * 2) colors[i3 + 0] = mixedColor.r colors[i3 + 1] = mixedColor.g @@ -228,7 +231,7 @@ const Galaxy = ({ dof, parameters, nucleus, helper, effects, ...props }) => { particles.current.geometry.setAttribute('position', new THREE.BufferAttribute(positions, 3)) particles.current.geometry.setAttribute('color', new THREE.BufferAttribute(colors, 3)) - if (parameters.type === 5) { + if (parameters.type === 3) { material.current.map = planeColorTexture material.current.alphaMap = planeAlphaTexture @@ -237,6 +240,12 @@ const Galaxy = ({ dof, parameters, nucleus, helper, effects, ...props }) => { material.current.opacity = parameters.opacity } + // if (parameters.type === 3) { + // material.current.transparent = true + // material.current.sizeAttenuation = true + // material.current.opacity = parameters.opacity + + // } } return ( @@ -312,17 +321,6 @@ export function Nucleus({ size }) { // eslint-disable-next-line react/display-name export const Effects = forwardRef((props, ref) => { - const bokehScale = { - min: 0, - max: 10, - value: 1, - }; - - return ( - - - - ) }) diff --git a/src/components/canvas/Household.jsx b/src/components/canvas/Household.jsx index d52df51..76dfb58 100644 --- a/src/components/canvas/Household.jsx +++ b/src/components/canvas/Household.jsx @@ -25,7 +25,7 @@ export default function HouseholdVox(props) { } }) return ( - + + s.router) + const [originalPos, setOriginalPos] = useState(null) const group = useRef(); const [hovered, setHover] = useState(false) const { nodes, materials } = useGLTF("/assets/models/jetsetter-vox.glb"); @@ -14,38 +15,49 @@ export default function JetsetterVox(props) { const clock = new THREE.Clock(); let previousTime = 0; + + const storeOriginalPos = useCallback((pos) => { + + if (originalPos !== null) return; + setOriginalPos(pos) + }, [originalPos, setOriginalPos]) + useFrame((state, delta) => { const elapsedTime = clock.getElapsedTime(); const deltaTime = elapsedTime - previousTime; previousTime = elapsedTime; - - if (group.current && animate && !route) { - // group.current.position.x = -3.5 + Math.sin(elapsedTime * 0.9) * Math.PI * 1; - // group.current.position.y = -1.5 - Math.cos(elapsedTime * 0.1) * Math.PI * 0.5; - // group.current.position.z = -1.5 - Math.cos(elapsedTime * 0.1) * Math.PI * 3; - group.current.rotation.y = elapsedTime * 0.3; + if (group.current && animate) { + group.current.rotation.y = (Math.PI * 0.4) + elapsedTime * 0.03 } }) +// useEffect(() => { +// let z = null; +// if (group.current) { +// storeOriginalPos(group.current.position) + +// if (hovered) { +// console.log('origpos', originalPos.z); +// gsap.to(group.current.position, { +// duration: 1.5, +// ease: "power2.inOut", +// z: 1 +// }) +// } +// console.log(originalPos); +// gsap.to(group.current.position, { +// duration: 1.5, +// ease: "power2.inOut", +// z: 0 +// }) + +// } + +// }, [group, hovered, originalPos, storeOriginalPos]); // gsap - if (group.current && animate === false) { - if (hovered) { - gsap.to(group.current.position, { - duration: 1.5, - ease: "power2.inOut", - z: 1 - }) - } else { - gsap.to(group.current.position, { - duration: 1.5, - ease: "power2.inOut", - z: 0 - }) - } - } return ( - + { + const { dom } = useStore(); const group = useRef(null); + const loadingBar = useRef(null); + const { active, progress, errors, item, loaded, total } = useProgress(); + let ratioLoaded = loaded / total + + useEffect(() => { + if (ratioLoaded < 1) { + console.log(ratioLoaded); + if (loadingBar.current) { + console.log(loadingBar.current); + // loadingBar.current.style.transform = `scaleX(${ratioLoaded})` + + } + } else { + // loadingBar.current.style.transform = '' + } + + }, [ratioLoaded]); return ( - - Loading... - + + + + + {progress.toFixed()}% loaded + + + {item} / {total} + + + + ); }; \ No newline at end of file diff --git a/src/components/canvas/Lux.jsx b/src/components/canvas/Lux.jsx index 741a5ff..b242b4b 100644 --- a/src/components/canvas/Lux.jsx +++ b/src/components/canvas/Lux.jsx @@ -28,7 +28,7 @@ export default function LuxVox(props) { } }) return ( - + { - const elapsedTime = clock.getElapsedTime(); - const deltaTime = elapsedTime - previousTime; - previousTime = elapsedTime; - if (group.current && animate) { - group.current.position.y = -1 - Math.cos(elapsedTime * 0.1) * Math.PI * 0.05; + const { route } = props + useEffect(() => { + if (group.current.children) { + console.log(group.current.children); + // group.current.children[0].geometry.computeFaceNormals(); + // group.current.children[0].geometry.computeVertextNormals(); + // group.current.children[0].geometry.normalsNeedUpdate = true; - // group.current.rotation.y = elapsedTime * 0.03; - group.current.rotation.z = -0.05 - Math.sin(elapsedTime * 0.3) * Math.PI * 0.03; } - }) - + }, []); return ( - - - - + router.push(route)} - onPointerOver={(e) => setHover(true)} - onPointerOut={(e) => setHover(false)} - // scale={hovered ? 1.1 : 1} /> {/* */} diff --git a/src/components/canvas/OctoPet.jsx b/src/components/canvas/OctoPet.jsx index fa2c705..9a7e4d9 100644 --- a/src/components/canvas/OctoPet.jsx +++ b/src/components/canvas/OctoPet.jsx @@ -23,17 +23,18 @@ export default function OctoPetVox(props) { group.current.position.y = 4 - Math.cos(elapsedTime * 0.1) * Math.PI * 0.5; group.current.position.z = -2.5 - Math.cos(elapsedTime * 0.1) * Math.PI * 0.3; group.current.rotation.y = elapsedTime * 0.005; - group.current.rotation.z = -elapsedTime * 0.05; + // group.current.rotation.z = -elapsedTime * 0.05; } }) return ( - + router.push(route)} // onPointerOver={(e) => setHover(true)} // onPointerOut={(e) => setHover(false)} diff --git a/src/components/canvas/galaxies.jsx b/src/components/canvas/galaxies.jsx index 427888d..6e8ccc6 100644 --- a/src/components/canvas/galaxies.jsx +++ b/src/components/canvas/galaxies.jsx @@ -16,7 +16,7 @@ export const galaxyColors = { outside: '#FF61E6' } export const galaxy2Colors = { - inside: '#462080', + inside: '#FF61E6', outside: '#7C56FF' } export const galaxy3Colors = { @@ -25,18 +25,18 @@ export const galaxy3Colors = { } export const galaxy4Colors = { inside: '#462080', - outside: '#7C56FF' + outside: '#FF61E6' } export const galaxy5Colors = { - inside: '#7C56FF', - outside: '#462080' + inside: '#ffffff', + outside: '#FF61E6' } /** * Galaxy */ export const galaxy1Params = { count: 100000, - size: 0.033, + size: 0.03, radius: 4.86, branches: 8, spin: 8, @@ -61,7 +61,7 @@ export const galaxy2Params = { branches: 8, spin: 8, randomness: 9, - randomnessPower: 1, + randomnessPower: 10, insideColor: galaxy2Colors.inside, outsideColor: galaxy2Colors.outside, type: 2, @@ -99,16 +99,16 @@ export const galaxy3Params = { export const galaxy4Params = { count: 100000, - size: 0.005, - radius: 1, + size: 0.01, + radius: 8, branches: 8, spin: 5, - randomness: 4, - randomnessPower: 20, + randomness: 1.5, + randomnessPower: 1, insideColor: galaxy4Colors.inside, outsideColor: galaxy4Colors.outside, type: 4, - opacity: 1, + opacity: 0.5, focusDistance: 0.05, focalLength: 0.05, width: 480, @@ -119,17 +119,17 @@ export const galaxy4Params = { } export const galaxy5Params = { - count: 75000, - size: 0.03, + count: 100000, + size: 0.05, radius: 35, branches: 8, spin: 5, - randomness: 1.7, + randomness: 2.5, randomnessPower: 10, insideColor: galaxy5Colors.inside, outsideColor: galaxy5Colors.outside, type: 3, - opacity: 0.1, + opacity: 0.5, focusDistance: 0.05, focalLength: 0.05, width: 480, @@ -232,7 +232,7 @@ export const generateGalaxy = (params) => { positions[i3 + 2] = Math.sin(branchAngle + spinAngle) * radius + randomZ const mixedColor = colorInside.clone() - mixedColor.lerp(colorOutside, radius / params.radius * 1.05) + mixedColor.lerp(colorOutside, radius / params.radius * 2) colors[i3 + 0] = mixedColor.r colors[i3 + 1] = mixedColor.g diff --git a/src/components/canvas/musashi/Ilb.jsx b/src/components/canvas/musashi/Ilb.jsx new file mode 100644 index 0000000..0c8e0c1 --- /dev/null +++ b/src/components/canvas/musashi/Ilb.jsx @@ -0,0 +1,65 @@ +import React, { useRef, useState } from "react"; +import { useFrame } from '@react-three/fiber' +import { useGLTF } from "@react-three/drei"; +import * as THREE from "three"; +import gsap from "gsap"; +import useStore from '@/helpers/store' + +export default function ILBVox(props) { + const router = useStore((s) => s.router) + const group = useRef(); + const material = useRef(); + const [hovered, setHover] = useState(false) + const { nodes, materials } = useGLTF("/assets/models/musashi/ilb.glb"); + const { route } = props + const clock = new THREE.Clock(); + let previousTime = 0; + + + useFrame(() => { + const elapsedTime = clock.getElapsedTime(); + const deltaTime = elapsedTime - previousTime; + previousTime = elapsedTime; + + }) + + // if (hovered) { + // gsap.to(group.current.position, { + // x: 2, + // y: 0, + // z: 0 + // }) + // } else { + // gsap.to(group.current.position, { + // x: 0, + // y: 0, + // z: 0 + // }) + // } + + return ( + + router.push(route)} + onPointerOver={(e) => setHover(true)} + onPointerOut={(e) => setHover(false)} + /> + + + + ); +} + +useGLTF.preload("/assets/models/musashi/ilb.glb"); \ No newline at end of file diff --git a/src/components/canvas/musashi/MolochPet1.jsx b/src/components/canvas/musashi/MolochPet1.jsx new file mode 100644 index 0000000..6fc914e --- /dev/null +++ b/src/components/canvas/musashi/MolochPet1.jsx @@ -0,0 +1,73 @@ +import React, { useRef, useState } from "react"; +import { useFrame } from '@react-three/fiber' +import { useGLTF } from "@react-three/drei"; +import * as THREE from "three"; +import gsap from "gsap"; +import useStore from '@/helpers/store' + +export default function ILBVox(props) { + const router = useStore((s) => s.router) + const group = useRef(); + const material = useRef(); + const [hovered, setHover] = useState(false) + const { nodes, materials } = useGLTF("/assets/models/musashi/moloch-pet-1.glb"); + const { route, animate } = props + const clock = new THREE.Clock(); + let previousTime = 0; + + + useFrame(() => { + const elapsedTime = clock.getElapsedTime(); + const deltaTime = elapsedTime - previousTime; + previousTime = elapsedTime; + + if (group.current && animate) { + group.current.position.x = 1 + Math.sin(elapsedTime * 0.6) * Math.PI * 0.03; + group.current.position.y = -1 - Math.cos(elapsedTime * 0.07) * Math.PI * 0.5; + // group.current.position.z = -0.25 - Math.cos(elapsedTime * 0.1) * Math.PI * 0.3; + + group.current.rotation.z = -0.05 - Math.sin(elapsedTime * 0.3) * Math.PI * 0.03; + group.current.rotation.y = elapsedTime * 0.03; + } + }) + + // if (hovered) { + // gsap.to(group.current.position, { + // x: 2, + // y: 0, + // z: 0 + // }) + // } else { + // gsap.to(group.current.position, { + // x: 0, + // y: 0, + // z: 0 + // }) + // } + + return ( + + router.push(route)} + onPointerOver={(e) => setHover(true)} + onPointerOut={(e) => setHover(false)} + /> + + + + ); +} + +useGLTF.preload("/assets/models/musashi/moloch-pet-1.glb"); \ No newline at end of file diff --git a/src/components/canvas/musashi/Robe.jsx b/src/components/canvas/musashi/Robe.jsx new file mode 100644 index 0000000..bd675e1 --- /dev/null +++ b/src/components/canvas/musashi/Robe.jsx @@ -0,0 +1,53 @@ +import React, { useRef, useState } from "react"; +import { useFrame } from '@react-three/fiber' +import { useGLTF } from "@react-three/drei"; +import * as THREE from "three"; +import gsap from "gsap"; +import useStore from '@/helpers/store' + +export default function RobeVox(props) { + const router = useStore((s) => s.router) + const group = useRef(); + const material = useRef(); + const [hovered, setHover] = useState(false) + const { nodes, materials } = useGLTF("/assets/models/musashi/robe.glb"); + const { route, animate } = props + const clock = new THREE.Clock(); + let previousTime = 0; + + useFrame(() => { + const elapsedTime = clock.getElapsedTime(); + const deltaTime = elapsedTime - previousTime; + previousTime = elapsedTime; + + if (group.current && animate) { + + } + }) + + + return ( + + router.push(route)} + // onPointerOver={(e) => setHover(true)} + // onPointerOut={(e) => setHover(false)} + /> + + + + ); +} + +useGLTF.preload("/assets/models/musashi/robe.glb"); \ No newline at end of file diff --git a/src/components/canvas/musashi/Robe2.jsx b/src/components/canvas/musashi/Robe2.jsx new file mode 100644 index 0000000..76dffd4 --- /dev/null +++ b/src/components/canvas/musashi/Robe2.jsx @@ -0,0 +1,66 @@ +import React, { useRef, useState } from "react"; +import { useFrame } from '@react-three/fiber' +import { useGLTF } from "@react-three/drei"; +import * as THREE from "three"; +import gsap from "gsap"; +import useStore from '@/helpers/store' + +export default function Robe2Vox(props) { + const router = useStore((s) => s.router) + const group = useRef(); + const material = useRef(); + const [hovered, setHover] = useState(false) + const { nodes, materials } = useGLTF("/assets/models/musashi/robe2.glb"); + const { route, animate } = props + const clock = new THREE.Clock(); + let previousTime = 0; + + + useFrame(() => { + const elapsedTime = clock.getElapsedTime(); + const deltaTime = elapsedTime - previousTime; + previousTime = elapsedTime; + + if (group.current && animate) { + } + }) + + // if (hovered) { + // gsap.to(group.current.position, { + // x: 2, + // y: 0, + // z: 0 + // }) + // } else { + // gsap.to(group.current.position, { + // x: 0, + // y: 0, + // z: 0 + // }) + // } + + return ( + + router.push(route)} + onPointerOver={(e) => setHover(true)} + onPointerOut={(e) => setHover(false)} + /> + + + + ); +} + +useGLTF.preload("/assets/models/musashi/robe2.glb"); \ No newline at end of file diff --git a/src/components/dom/AlphaNotice.jsx b/src/components/dom/AlphaNotice.jsx index e22ebf3..c38b116 100644 --- a/src/components/dom/AlphaNotice.jsx +++ b/src/components/dom/AlphaNotice.jsx @@ -51,9 +51,9 @@ export function AlphaNotice() { 👀 {" "} - We're still working on content, there's no Web3 connectivity and there + We're still working on content, there's no Web3 connectivity (or is there...?) and there are some bugs.
We're working to get it - all ship shape for June! + all ship shape ASAP! {/* */} ( > -); \ No newline at end of file +); + diff --git a/src/components/dom/EasterEgg.jsx b/src/components/dom/EasterEgg.jsx index 687401f..39f08a0 100644 --- a/src/components/dom/EasterEgg.jsx +++ b/src/components/dom/EasterEgg.jsx @@ -125,7 +125,7 @@ export const EasterEgg = () => { - + { - + ); diff --git a/src/components/dom/Header.jsx b/src/components/dom/Header.jsx index 52b7fad..2f99834 100644 --- a/src/components/dom/Header.jsx +++ b/src/components/dom/Header.jsx @@ -11,7 +11,7 @@ import { useDisclosure, Stack, } from "@chakra-ui/react"; -import { BiWalletAlt } from 'react-icons/bi' +import { BiWalletAlt, BiJoystick } from 'react-icons/bi' import { BoxedNextImage } from "@/components/dom/BoxedNextImage"; import { useDisabledGeneralNotify, useOnScreen } from "@/utils/hooks"; @@ -36,7 +36,7 @@ const Links = [ href: "#speakers", }, { - name: "MetaFest-a-verse", + name: "MetaFest-a-Verse", href: "#metafest-verse", }, { @@ -203,29 +203,45 @@ export function SiteHeader() { {screenSize !== 'base' ? ( - + Join MetaGame + ) : ( + } - aria-label="Connect Web3 wallet" + icon={} + aria-label="Join MetaGame" flex={0} fontSize={{base: '12vmin', lg: "2vmax"}} colorScheme="ghost" color="#927CFF" - onClick={disabledGenNotify} alignSelf="center" // filter="drop-shadow(0 0 15px #FF61E6)" /> + + )} diff --git a/src/components/dom/cv-artists/Luxumbra.jsx b/src/components/dom/cv-artists/Luxumbra.jsx index 84c5770..5cd8576 100644 --- a/src/components/dom/cv-artists/Luxumbra.jsx +++ b/src/components/dom/cv-artists/Luxumbra.jsx @@ -28,7 +28,7 @@ export const ArtistLuxumbra = () => { > luxumbra - + Some Voxels by lux. diff --git a/src/components/dom/cv-artists/Musashi.jsx b/src/components/dom/cv-artists/Musashi.jsx index c2a6fdc..690a246 100644 --- a/src/components/dom/cv-artists/Musashi.jsx +++ b/src/components/dom/cv-artists/Musashi.jsx @@ -13,7 +13,7 @@ export const ArtistMusashi = ({artist}) => { return ( { > {name} - + {strapline} diff --git a/src/components/dom/integrations/AirtableInstance.jsx b/src/components/dom/integrations/AirtableInstance.jsx index 3df111d..a1a7133 100644 --- a/src/components/dom/integrations/AirtableInstance.jsx +++ b/src/components/dom/integrations/AirtableInstance.jsx @@ -31,11 +31,10 @@ export function AirtablePerformerInstance () { ) } -export function AirtableSponsorInstance () { +export function AirtableFairInstance () { return ( }> - - + ) } diff --git a/src/components/dom/integrations/CalendarInstance.jsx b/src/components/dom/integrations/CalendarInstance.jsx index 528e503..e9c11bb 100644 --- a/src/components/dom/integrations/CalendarInstance.jsx +++ b/src/components/dom/integrations/CalendarInstance.jsx @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import { Box } from "@chakra-ui/react"; +import { Box, Text } from "@chakra-ui/react"; // import TimezonePicker from 'react-timezone' import styled from '@emotion/styled' @@ -15,6 +15,8 @@ const InstanceContainer = styled.div` function CalendarInstance () { const [timezone, changeTimezone] = useState('Europe/London') + const [viewTip, setViewTip] = useState(false) + return ( <>