Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
weilueluo committed May 18, 2024
1 parent 1aeaacd commit bf32b41
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 20 deletions.
34 changes: 30 additions & 4 deletions build.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,33 @@
# use by deploy script
#!/usr/bin/zsh

set -xoe pipefail
# Enable error checking and pipefail
set -o pipefail

# Load nvm
export NVM_DIR="$HOME/.nvm"
{
set +x # Disable command tracing
if [ -s "$NVM_DIR/nvm.sh" ]; then
. "$NVM_DIR/nvm.sh"
# Source bash_completion to ensure nvm functions are available
[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" > /dev/null 2>&1
else
echo "nvm.sh not found"
exit 1
fi
} 2>/dev/null

# Re-enable error checking and pipefail without tracing
set -o pipefail

# Check if nvm command is available
if ! command -v nvm &> /dev/null; then
echo "nvm cli not found"
exit 1
fi

nvm use
nvm ci
npm run build

# Run npm commands
npm ci
npm run build
16 changes: 4 additions & 12 deletions components/home/navPanel/NavigationPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,13 @@ type NavItem = {

const navItems: NavItem[] = [
{
name: 'CV',
link: '/cv'
name: 'Older Site',
link: 'https://v1.wll.dev'
},
{
name: 'RSS',
link: '/rss'
},
{
name: 'About',
link: '/about'
name: 'Newer Site',
link: 'https://v2.wll.dev'
},
{
name: 'Anime',
link: '/anime'
}
]

export default function NavigationPanel() {
Expand Down
2 changes: 1 addition & 1 deletion components/home/threejs/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import ThreeJsLights from './Lights';
import { ThreeJsPostEffects } from './PostEffects';
import GradientBackground from './gradientBackground/GradientBackground';
import Lines from './lines/Lines';
import MainBall from './mainBall//MainBall';
import MainBall from './mainBall/MainBall';
import Moon from './moon/Moon';
import ThreeRotateText from './rotateText/ThreeRotateText';
import ThreeJsStats from './stats/Stats';
Expand Down
4 changes: 2 additions & 2 deletions components/legacy/scene/Ball.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import { getMainBallRadius } from './global';
import sphere_fs from './shaders/sphere_fs.glsl';
import sphere_vs from './shaders/sphere_vs.glsl';

import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
import { lightPositionContext } from '../../common/contexts';

import { LineAnimator } from '../../animation/LineAnimator';
Expand Down
2 changes: 1 addition & 1 deletion components/playground/posteffects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useFrame, useThree } from '@react-three/fiber';
import { useEffect } from 'react';
import { BloomPass } from 'three/examples/jsm/postprocessing/BloomPass';
import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer';
import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass';

export function usePostEffects() {
const { gl, scene, camera } = useThree();
Expand Down

0 comments on commit bf32b41

Please sign in to comment.