h3n3/cadhub
1
0
Fork 0
Code Issues 35 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:Irev-Dev/cadhub into main

Browse Source
This commit is contained in:
Jeremy Wright
2021-10-10 00:01:09 -04:00
parent 95877f6dc7 9f769d6a61
commit 0b704b8adf
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/web/src/components/EditorMenu/helpers.ts
View File

@@ -54,7 +54,9 @@ export const makeStlDownloadHandler =
extensions: ['.stl'], extensions: ['.stl'],
}) })
} }
toast("CadHub is a work in process and We're still working out kinks with the STL download.") toast(
"CadHub is a work in process and We're still working out kinks with the STL download."
)
if (geometry) { if (geometry) {
if ( if (
type === 'geometry' && type === 'geometry' &&

4
app/web/src/components/FatalErrorBoundary/FatalErrorBoundary.tsx
View File

@@ -15,6 +15,10 @@ class FatalErrorBoundary extends FatalErrorBoundaryBase {
``` ```
$ git clone https://github.com/netlify/prerender.git $ git clone https://github.com/netlify/prerender.git
$ cd prerender $ cd prerender
```
comment out the lines `server.use(require("./lib/plugins/basicAuth"));` and `server.use(require("./lib/plugins/s3HtmlCache"));` in `server.js`
then
```
$ npm install $ npm install
$ npm start $ npm start
``` ```

2
app/web/src/components/Hero/AssetWithGooey.tsx
View File

@@ -4,7 +4,7 @@ import { useLoader, useThree, useFrame } from '@react-three/fiber'
import { STLLoader } from 'three/examples/jsm/loaders/STLLoader' import { STLLoader } from 'three/examples/jsm/loaders/STLLoader'
import { useEdgeSplit } from 'src/helpers/hooks/useEdgeSplit' import { useEdgeSplit } from 'src/helpers/hooks/useEdgeSplit'
import texture from 'src/components/IdeViewer/dullFrontLitMetal.png' import texture from 'src/components/IdeViewer/dullFrontLitMetal.png'
import { Glitch, EffectComposer } from "@react-three/postprocessing"; import { Glitch, EffectComposer } from '@react-three/postprocessing'
import { MeshDistortMaterial, Sphere, useTexture } from '@react-three/drei' import { MeshDistortMaterial, Sphere, useTexture } from '@react-three/drei'
const thresholdAngle = 10 const thresholdAngle = 10

12
app/web/src/components/Hero/Hero.tsx
View File

@@ -281,7 +281,13 @@ function ModelSection({
const { ref, inView } = useInView() const { ref, inView } = useInView()
return ( return (
<div className="relative h-full"> <div className="relative h-full">
<FatalErrorBoundary page={() => <div className="bg-gray-800 p-8 rounded-md text-ch-gray-300">something seams to have gone wrong here</div>}> <FatalErrorBoundary
page={() => (
<div className="bg-gray-800 p-8 rounded-md text-ch-gray-300">
something seams to have gone wrong here
</div>
)}
>
<div className="absolute inset-0" ref={ref}> <div className="absolute inset-0" ref={ref}>
<Canvas <Canvas
linear linear
@@ -299,7 +305,9 @@ function ModelSection({
<pointLight position={[2, 1.5, 0]} color="#FF0000" intensity={2} /> <pointLight position={[2, 1.5, 0]} color="#FF0000" intensity={2} />
<Suspense <Suspense
fallback={<Html center className="loading" children="Loading..." />} fallback={
<Html center className="loading" children="Loading..." />
}
> >
<AssetWithGooey assetUrl={assetUrl} scale={scale} /> <AssetWithGooey assetUrl={assetUrl} scale={scale} />
</Suspense> </Suspense>