Merge branch 'alpha-mirana' into Mirana

mini-mirana · May 22, 2022 · b0b22ed · b0b22ed
2 parents 54771e9 + cf06b45
commit b0b22ed
Show file tree

Hide file tree

Showing 27 changed files with 1,563 additions and 113 deletions.
diff --git a/.pipeline/alpha.yml b/.pipeline/alpha.yml
@@ -12,6 +12,7 @@ pipeline:
     image: node:16-alpine
     commands:
       - apk add git
+      - git fetch --tags --force
       - git checkout $CI_COMMIT_BRANCH
       - yarn ci
     secrets: [ GH_TOKEN ]

diff --git a/.pipeline/release.yml b/.pipeline/release.yml
@@ -12,6 +12,7 @@ pipeline:
     image: node:16-alpine
     commands:
       - apk add git
+      - git fetch --tags --force
       - git checkout $CI_COMMIT_BRANCH
       - yarn ci
     secrets: [ GH_TOKEN ]
@@ -35,4 +36,4 @@ pipeline:
     when:
       branch:
         exclude: master
-branches: [ master, Mirana ]
+branches: [ master, Mirana, sarme ]
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
diff --git a/docs/master/CHANGELOG.md b/docs/master/CHANGELOG.md
@@ -1,3 +1,44 @@
+## [3.1.1](https://github.com/mini-mirana/personal-website/compare/v3.1.0...v3.1.1) (2022-05-08)
+
+# [3.1.0](https://github.com/mini-mirana/personal-website/compare/v3.0.0...v3.1.0) (2022-05-08)
+
+### Bug Fixes
+
+- Fix lag while navigation ([de1c3ba](https://github.com/mini-mirana/personal-website/commit/de1c3bab19924287c21544427dee7103b44d94dc))
+
+# [3.0.0](https://github.com/mini-mirana/personal-website/compare/v2.0.2...v3.0.0) (2022-05-08)
+
+### Bug Fixes
+
+- **components:** Fix credits mouse hover ([43191e4](https://github.com/mini-mirana/personal-website/commit/43191e4a55a3704337cc5c1cbc46dc025c31e7e0))
+- Improve camera fov and lighting ([fc102bc](https://github.com/mini-mirana/personal-website/commit/fc102bc91adfb817d9f602762cc4102300437999))
+
+### Features
+
+- **website:** Override default cursor ([1d956bb](https://github.com/mini-mirana/personal-website/commit/1d956bb47e54053a396a66b92fee6036b115e147))
+
+## [2.0.2](https://github.com/mini-mirana/personal-website/compare/v2.0.1...v2.0.2) (2022-05-04)
+
+## [2.0.1](https://github.com/mini-mirana/personal-website/compare/v2.0.0...v2.0.1) (2022-05-04)
+
+# [2.0.0](https://github.com/mini-mirana/personal-website/compare/v1.2.0...v2.0.0) (2022-05-04)
+
+### Features
+
+- **components:** Add reverse functionality to TextMesh ([ea7b27c](https://github.com/mini-mirana/personal-website/commit/ea7b27c05c175790437d12a0a955d0c8030e5dc9))
+
+# [1.2.0](https://github.com/mini-mirana/personal-website/compare/v1.1.3...v1.2.0) (2022-04-12)
+
+### Bug Fixes
+
+- Fix tags where not fetch during ci ([6f468ed](https://github.com/mini-mirana/personal-website/commit/6f468ed5c12127352687ee4ebf246b9e4361fb49))
+
+## [1.1.3](https://github.com/mini-mirana/personal-website/compare/v1.1.2...v1.1.3) (2022-04-11)
+
+## [1.1.2](https://github.com/mini-mirana/personal-website/compare/v1.1.1...v1.1.2) (2022-04-11)
+
+## [1.1.1](https://github.com/mini-mirana/personal-website/compare/v1.1.0...v1.1.1) (2022-04-11)
+
 # [1.1.0](https://github.com/mini-mirana/personal-website/compare/v1.0.3...v1.1.0) (2022-04-10)
 
 ### Bug Fixes

diff --git a/docs/mirana/CHANGELOG.md b/docs/mirana/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -136,11 +136,20 @@
         "name": "Mirana",
         "channel": "mirana"
       },
+      {
+        "name": "sarme",
+        "channel": "sarme"
+      },
       {
         "name": "alpha-mirana",
         "channel": "alpha-mirana",
         "prerelease": true
       },
+      {
+        "name": "alpha-sarme",
+        "channel": "alpha-sarme",
+        "prerelease": true
+      },
       {
         "name": "alpha",
         "prerelease": true
@@ -197,7 +206,7 @@
       [
         "@semantic-release/exec",
         {
-          "successCmd": "echo -n ${nextRelease.version} > .tags"
+          "successCmd": "echo -n ${nextRelease.gitTag} > .tags"
         }
       ]
     ]

diff --git a/public/fonts/NotoSansMerged-Regular.ttf b/public/fonts/NotoSansMerged-Regular.ttf
diff --git a/public/images/boards-g92417fa21_1920.jpg b/public/images/boards-g92417fa21_1920.jpg
diff --git a/public/images/photo-manipulation-gfff20f04a_1920.jpg b/public/images/photo-manipulation-gfff20f04a_1920.jpg
diff --git a/public/images/vi-room.ir__Pixel_5.png b/public/images/vi-room.ir__Pixel_5.png
diff --git a/public/pdfs/Abdolrahman_Ghaedi_Resume.pdf b/public/pdfs/Abdolrahman_Ghaedi_Resume.pdf
diff --git a/public/videos/SampleVideo_1280x720_30mb.mp4 b/public/videos/SampleVideo_1280x720_30mb.mp4
diff --git a/public/videos/jurassic-farm.mp4 b/public/videos/jurassic-farm.mp4
diff --git a/public/videos/medical.mp4 b/public/videos/medical.mp4
diff --git a/public/videos/school.mp4 b/public/videos/school.mp4
diff --git a/public/videos/timewarp.mp4 b/public/videos/timewarp.mp4
diff --git a/public/videos/vampire.mp4 b/public/videos/vampire.mp4
diff --git a/public/videos/vpn.mp4 b/public/videos/vpn.mp4
diff --git a/src/components/Cursor/index.jsx b/src/components/Cursor/index.jsx
@@ -216,10 +216,12 @@ export function Cursor({
               <button
                 type='button'
                 className='z-20 font-mono text-base text-zinc-500 hover:text-white'
-                onMouseEnter={() => {
-                  hover(true)
+                onClick={() => {
                   setCopyRightHovered(true)
                 }}
+                onPointerOver={() => {
+                  hover(true)
+                }}
                 onMouseLeave={() => {
                   hover(false)
                 }}>

diff --git a/src/components/Loader/index.jsx b/src/components/Loader/index.jsx
@@ -95,7 +95,11 @@ export function Loader({
               <AnimatorGeneralProvider animator={{ duration: { enter: 2500, exit: 100 } }}>
                 <Animator animator={{ animation: true, manager: 'stagger' }}>
                   <ArwesText className='ml-[1%] text-center'>
-                    Tap anywhere to start <br /> Pro tip: pinch to move through channel
+                    Tap anywhere to start <br />{' '}
+                    <span className='text-xs font-semibold inline-block py-1 px-2 uppercase rounded-full text-blue-600 bg-blue-200 uppercase last:mr-0 mr-1'>
+                      PRO TIP
+                    </span>{' '}
+                    Pinch or pan to move through channel
                   </ArwesText>
                 </Animator>
               </AnimatorGeneralProvider>

diff --git a/src/components/Stack/index.jsx b/src/components/Stack/index.jsx
@@ -81,10 +81,7 @@ export function Stack({
                 </mesh>
                 <AnimatedText
                   maxWidth={width - 0.6}
-                  font={
-                    c?.titleFont ||
-                    'https://res.cloudinary.com/mirana/raw/upload/v1648124858/personal-website/NotoSansMerged-Regular_my0irf.ttf'
-                  }
+                  font={c?.titleFont || './fonts/NotoSansMerged-Regular.ttf'}
                   fontSize={c?.titleFontSize || 0.1}
                   letterSpacing={0.1}
                   textAlign='center'
@@ -102,10 +99,7 @@ export function Stack({
                   <meshStandardMaterial color='white' />
                 </AnimatedText>
                 <Text
-                  font={
-                    c?.descriptionFont ||
-                    'https://res.cloudinary.com/mirana/raw/upload/v1648124858/personal-website/NotoSansMerged-Regular_my0irf.ttf'
-                  }
+                  font={c?.descriptionFont || './fonts/NotoSansMerged-Regular.ttf'}
                   fontSize={c?.descriptionFontSize || 0.09}
                   maxWidth={width - 0.6}
                   letterSpacing={0.1}
@@ -128,10 +122,7 @@ export function Stack({
                   </mesh>
                   <AnimatedText
                     maxWidth={width - 0.6}
-                    font={
-                      c?.titleFont ||
-                      'https://res.cloudinary.com/mirana/raw/upload/v1648124858/personal-website/NotoSansMerged-Regular_my0irf.ttf'
-                    }
+                    font={c?.titleFont || './fonts/NotoSansMerged-Regular.ttf'}
                     fontSize={c?.titleFontSize || 0.1}
                     letterSpacing={0.1}
                     textAlign='center'
@@ -214,10 +205,7 @@ export function Stack({
                 </mesh>
                 <AnimatedText
                   maxWidth={width / 2}
-                  font={
-                    c?.titleFont ||
-                    'https://res.cloudinary.com/mirana/raw/upload/v1648124858/personal-website/NotoSansMerged-Regular_my0irf.ttf'
-                  }
+                  font={c?.titleFont || './fonts/NotoSansMerged-Regular.ttf'}
                   fontSize={c?.titleFontSize || 0.1}
                   letterSpacing={0.1}
                   textAlign='center'
@@ -252,10 +240,7 @@ export function Stack({
                   <meshBasicMaterial attach='material' map={c.source} toneMapped={false} />
                 </mesh>
                 <Text
-                  font={
-                    c?.descriptionFont ||
-                    'https://res.cloudinary.com/mirana/raw/upload/v1648124858/personal-website/NotoSansMerged-Regular_my0irf.ttf'
-                  }
+                  font={c?.descriptionFont || './fonts/NotoSansMerged-Regular.ttf'}
                   fontSize={c?.descriptionFontSize || 0.09}
                   maxWidth={0.5 * width - 0.5}
                   letterSpacing={0.1}
@@ -345,9 +330,9 @@ export function Stack({
                   onPointerOver={() => {
                     if (!('ontouchstart' in window)) {
                       addGlow(i)
-                      const newHovered = Array(content.length).fill(false)
-                      newHovered[i] = true
-                      setHovered(newHovered)
+                      //                       const newHovered = Array(content.length).fill(false)
+                      //                       newHovered[i] = true
+                      //                       setHovered(newHovered)
                     }
                   }}
                   onPointerLeave={() => {
@@ -356,10 +341,7 @@ export function Stack({
                     }
                   }}
                   maxWidth={width - 0.6}
-                  font={
-                    c?.titleFont ||
-                    'https://res.cloudinary.com/mirana/raw/upload/v1648124858/personal-website/NotoSansMerged-Regular_my0irf.ttf'
-                  }
+                  font={c?.titleFont || './fonts/NotoSansMerged-Regular.ttf'}
                   fontSize={c?.titleFontSize || 0.1}
                   letterSpacing={0.1}
                   textAlign='center'

diff --git a/src/components/TextMesh/index.jsx b/src/components/TextMesh/index.jsx
@@ -9,6 +9,7 @@ extend({ TextGeometry })
 export function TextMesh({
   children,
   fontUrl,
+  reverse = false,
   fontConfig = {
     size: 100,
     height: 0.1,
@@ -44,7 +45,7 @@ export function TextMesh({
   }, [children])
 
   return (
-    <group scale={[0.01 * size, 0.01 * size, 0.1]} {...props}>
+    <group scale={[0.01 * size, 0.01 * size, 0.1]} {...props} rotation={reverse ? [0, 0, Math.PI] : [0, 0, 0]}>
       <mesh ref={mesh}>
         <textGeometry
           args={[children, { font, ...fontConfig }]}

diff --git a/src/pages/_document.js b/src/pages/_document.js
@@ -22,6 +22,7 @@ export default class MyDocument extends Document {
           <link rel='apple-touch-icon' sizes='180x180' href='/icons/apple-touch-icon.png' />
           <link rel='icon' type='image/png' sizes='32x32' href='/icons/favicon-32x32.png' />
           <link rel='icon' type='image/png' sizes='16x16' href='/icons/favicon-16x16.png' />
+          <script src='https://hammerjs.github.io/dist/hammer.js' />
           <link rel='manifest' href='/manifest.json' />
           <link rel='icon' href='/favicon.ico' />
         </Head>