Merge pull request #65 from NeuroJSON/dev-fan

Bug fixes for reset previous rendering and show spinner before loading new preview

Author: elainefan331

.github/workflows/build-deploy-neurojsonio.yml

@@ -0,0 +1,38 @@
+# name: Deploy to Production
+
+# on:
+#   push:
+#     branches:
+#       - staging
+
+# jobs:
+#   deploy:
+#     runs-on: ubuntu-22.04
+#     env:
+#       CI: false
+
+#     steps:
+#       - name: Check out the repository
+#         uses: actions/checkout@v3
+
+#       - name: Install dependencies
+#         run: yarn install --frozen-lockfile
+
+#       - name: Build React App for production
+#         run: |
+#           echo "Building for production at root /"
+#           PUBLIC_URL="/" yarn build
+
+#       - name: Copy JS libraries
+#         run: |
+#           mkdir -p build/js
+#           cp -r public/js/* build/js/
+
+#       - name: Deploy to neurojson.io
+#         uses: NeuroJSON/[email protected]
+#         with:
+#           server: ${{ secrets.NEUROJ_IO_SERVER }}
+#           username: ${{ secrets.NEUROJ_SERVER_USER }}
+#           ssh_private_key: ${{ secrets.NEUROJ_SERVER_SSH_KEY }}
+#           local_path: "./build/*"
+#           remote_path: "${{ secrets.NEUROJ_CI_PATH }}"

.github/workflows/build-deploy-zodiac.yml

@@ -26,11 +26,16 @@ jobs:
         id: get_branch
         run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
 
+      - name: Print GitHub Runner Public IP
+        run: |
+          echo "GitHub runner public IP:"
+          curl https://api.ipify.org
+
       - name: Build React App with Dynamic PUBLIC_URL
         run: |
           echo "Building for /dev/${{ env.BRANCH_NAME }}/"
           PUBLIC_URL="/dev/${{ env.BRANCH_NAME }}/" yarn build
-      
+
       - name: Copy JS libraries (jdata, bjdata etc.)
         run: |
           mkdir -p build/js

public/img/3cards_vertical.png public/img/section3_cards.pngpublic/img/3cards_vertical.png renamed to public/img/section3_cards.png

@@ -1,5 +1,5 @@
 import ArrowCircleDownIcon from "@mui/icons-material/ArrowCircleDown";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
+// import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import SearchIcon from "@mui/icons-material/Search";
 import {
   Typography,
@@ -94,8 +94,7 @@ const Section1: React.FC<Section1Props> = ({ scrollToNext }) => {
                 },
               }}
             >
-              Efficiently manage and explore your databases and datasets with
-              ease.
+              Search Findable, Accessible, Interoperable, and Reusable datasets
             </Typography>
           </Box>
         </Grid>
@@ -128,6 +127,7 @@ const Section1: React.FC<Section1Props> = ({ scrollToNext }) => {
                 "& label.Mui-focused": {
                   color: Colors.darkGreen, // label color when focused
                   fontWeight: "bold",
+                  transform: "translate(12px, -22px) scale(0.75)", // translate(x, y) move label further up
                   padding: "5px",
                   borderRadius: "5px",
                 },

src/components/HomePageComponents/Section1.tsx

@@ -89,10 +89,10 @@ const Section3: React.FC<Section3Props> = ({ scrollToNext }) => {
         onClick={handleOpen}
       >
         <img
-          src={`${process.env.PUBLIC_URL}/img/3cards_vertical.png`}
+          src={`${process.env.PUBLIC_URL}/img/section3_cards.png`}
           alt="rendering feature info cards"
           style={{
-            width: "100%",
+            width: "70%",
             height: "auto",
           }}
         ></img>
@@ -115,10 +115,11 @@ const Section3: React.FC<Section3Props> = ({ scrollToNext }) => {
           </IconButton>
 
           <video controls style={{ width: "100%", borderRadius: "4px" }}>
-            <source
+            {/* <source
               src="https://neurojson.org/tutorials/overview/neurojsonio_volume_render_short.mp4"
               type="video/mp4"
-            />
+            /> */}
+            <source src="/video/preview_video.mp4" type="video/mp4" />
             Your browser does not support the video tag.
           </video>
         </Box>

src/components/HomePageComponents/Section3.tsx

@@ -87,7 +87,8 @@ const NavItems: React.FC = () => {
             sx={{ mb: { xs: 1 } }}
           >
             {[
-              { text: "ABOUT", url: "https://neurojson.org/Doc/Start" },
+              // { text: "ABOUT", url: "https://neurojson.org/Doc/Start" },
+              { text: "ABOUT", url: RoutesEnum.ABOUT },
               { text: "WIKI", url: "https://neurojson.org/Wiki" },
               { text: "SEARCH", url: RoutesEnum.SEARCH },
               { text: "DATABASES", url: RoutesEnum.DATABASES },