Merge branch 'master' of github.com:neurostuff/neurostore into enh/adv_search

Author: jdkent

.github/workflows/workflow.yml

@@ -332,9 +332,9 @@ jobs:
         AUTH0_BASE_URL: ${{ secrets.AUTH0_BASE_URL }}
         AUTH0_ACCESS_TOKEN_URL: ${{ secrets.AUTH0_ACCESS_TOKEN_URL }}
         AUTH0_AUTH_URL: ${{ secrets.AUTH0_AUTH_URL }}
-        REACT_APP_AUTH0_CLIENT_ID: ${{ secrets.REACT_APP_AUTH0_CLIENT_ID }}
-        REACT_APP_AUTH0_DOMAIN: ${{ secrets.REACT_APP_AUTH0_DOMAIN }}
-        REACT_APP_AUTH0_CLIENT_SECRET: ${{ secrets.REACT_APP_AUTH0_CLIENT_SECRET }}
+        VITE_APP_AUTH0_CLIENT_ID: ${{ secrets.VITE_APP_AUTH0_CLIENT_ID }}
+        VITE_APP_AUTH0_DOMAIN: ${{ secrets.VITE_APP_AUTH0_DOMAIN }}
+        VITE_APP_AUTH0_CLIENT_SECRET: ${{ secrets.VITE_APP_AUTH0_CLIENT_SECRET }}
       run: |
         cp neurosynth-frontend/.env.example neurosynth-frontend/.env.dev && \
         docker compose run \
@@ -344,14 +344,14 @@ jobs:
           -e "AUTH0_BASE_URL=${AUTH0_BASE_URL}" \
           -e "AUTH0_ACCESS_TOKEN_URL=${AUTH0_ACCESS_TOKEN_URL}" \
           -e "AUTH0_AUTH_URL=${AUTH0_AUTH_URL}" \
-          -e "REACT_APP_AUTH0_DOMAIN=${REACT_APP_AUTH0_DOMAIN}" \
-          -e "REACT_APP_AUTH0_CLIENT_ID=${REACT_APP_AUTH0_CLIENT_ID}" \
-          -e "REACT_APP_AUTH0_AUDIENCE=localhost" \
-          -e "REACT_APP_AUTH0_CLIENT_SECRET=${REACT_APP_AUTH0_CLIENT_SECRET}" \
-          -e "REACT_APP_ENV=DEV" \
-          -e "REACT_APP_NEUROSTORE_API_DOMAIN=http://localhost/api" \
+          -e "VITE_APP_AUTH0_DOMAIN=${VITE_APP_AUTH0_DOMAIN}" \
+          -e "VITE_APP_AUTH0_CLIENT_ID=${VITE_APP_AUTH0_CLIENT_ID}" \
+          -e "VITE_APP_AUTH0_AUDIENCE=https://neurostore.xyz/api/" \
+          -e "VITE_APP_AUTH0_CLIENT_SECRET=${VITE_APP_AUTH0_CLIENT_SECRET}" \
+          -e "VITE_APP_ENV=STAGING" \
+          -e "VITE_APP_NEUROSTORE_API_DOMAIN=http://localhost/api" \
           -e "CI=true" \
-          -e "REACT_APP_NEUROSYNTH_API_DOMAIN=http://localhost:81/api" \
+          -e "VITE_APP_NEUROSYNTH_API_DOMAIN=http://localhost:81/api" \
           --rm -w /compose/neurosynth-frontend \
           compose \
           bash -c "cd /compose/neurosynth-frontend && \
@@ -475,20 +475,22 @@ jobs:
       name: Frontend Cypress E2E Tests
       uses: cypress-io/github-action@v6
       env:
-        CYPRESS_auth0ClientId: ${{ secrets.REACT_APP_AUTH0_CLIENT_ID }}
-        CYPRESS_auth0ClientSecret: ${{ secrets.REACT_APP_AUTH0_CLIENT_SECRET }}
-        CYPRESS_auth0Domain: ${{ secrets.REACT_APP_AUTH0_DOMAIN }}
-        CYPRESS_auth0Audience: localhost
-        REACT_APP_AUTH0_AUDIENCE: localhost
-        REACT_APP_AUTH0_CLIENT_ID: ${{ secrets.REACT_APP_AUTH0_CLIENT_ID }}
-        REACT_APP_AUTH0_DOMAIN: ${{ secrets.REACT_APP_AUTH0_DOMAIN }}
-        REACT_APP_AUTH0_CLIENT_SECRET: ${{ secrets.REACT_APP_AUTH0_CLIENT_SECRET }}
-        REACT_APP_ENV: DEV
-        REACT_APP_NEUROSTORE_API_DOMAIN: ${{ secrets.REACT_APP_NEUROSTORE_API_DOMAIN }}
-        REACT_APP_NEUROSYNTH_API_DOMAIN: ${{ secrets.REACT_APP_NEUROSYNTH_API_DOMAIN }}
+        CYPRESS_auth0ClientId: ${{ secrets.VITE_APP_AUTH0_CLIENT_ID }}
+        CYPRESS_auth0ClientSecret: ${{ secrets.VITE_APP_AUTH0_CLIENT_SECRET }}
+        CYPRESS_: ${{ secrets.VITE_APP_AUTH0_DOMAIN }}
+        CYPRESS_auth0Audience: https://neurostore.xyz/api/
+        CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+        VITE_APP_AUTH0_AUDIENCE: https://neurostore.xyz/api/
+        VITE_APP_AUTH0_CLIENT_ID: ${{ secrets.VITE_APP_AUTH0_CLIENT_ID }}
+        VITE_APP_AUTH0_DOMAIN: ${{ secrets.VITE_APP_AUTH0_DOMAIN }}
+        VITE_APP_AUTH0_CLIENT_SECRET: ${{ secrets.VITE_APP_AUTH0_CLIENT_SECRET }}
+        VITE_APP_ENV: STAGING
+        VITE_APP_NEUROSTORE_API_DOMAIN: ${{ secrets.VITE_APP_NEUROSTORE_API_DOMAIN }}
+        VITE_APP_NEUROSYNTH_API_DOMAIN: ${{ secrets.VITE_APP_NEUROSYNTH_API_DOMAIN }}
       with:
-        build: npm run build:dev
-        start: npm run start-ci:dev
+        build: npm run build:staging
+        record: true
+        start: npm run serve-build
         browser: chrome
         wait-on: http://localhost:3000
         working-directory: /home/runner/work/neurostore/neurostore/compose/neurosynth-frontend

.gitignore

@@ -102,7 +102,6 @@ ENV/
 
 # Spyder project settings
 .spyderproject
-.vscode
 
 # Rope project settings
 .ropeproject

compose/neurosynth-frontend/.babelrc

@@ -1,8 +1,8 @@
-REACT_APP_AUTH0_DOMAIN=dev-mui7zm42.us.auth0.com
-REACT_APP_AUTH0_CLIENT_ID=YOUR_NEUROSTORE_API_AUTH0_CLIENT_ID
-REACT_APP_AUTH0_CLIENT_SECRET=YOUR_AUTH0_CLIENT_SECRET
-REACT_APP_AUTH0_AUDIENCE=localhost
-REACT_APP_NEUROSTORE_API_DOMAIN=http://localhost/api
-REACT_APP_NEUROSYNTH_API_DOMAIN=http://localhost:81/api
-REACT_APP_ENV=DEV
-REACT_APP_PUBMED_API_KEY=YOUR_PUBMED_KEY
+VITE_APP_AUTH0_DOMAIN=dev-mui7zm42.us.auth0.com
+VITE_APP_AUTH0_CLIENT_ID=YOUR_NEUROSTORE_API_AUTH0_CLIENT_ID
+VITE_APP_AUTH0_CLIENT_SECRET=YOUR_AUTH0_CLIENT_SECRET
+VITE_APP_AUTH0_AUDIENCE=localhost
+VITE_APP_NEUROSTORE_API_DOMAIN=http://localhost/api
+VITE_APP_NEUROSYNTH_API_DOMAIN=http://localhost:81/api
+VITE_APP_ENV=DEV
+VITE_APP_PUBMED_API_KEY=YOUR_PUBMED_KEY

compose/neurosynth-frontend/.env.example

@@ -0,0 +1,8 @@
+{
+    "singleQuote": true,
+    "semi": true,
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "tabs": false,
+    "printWidth": 120
+}

compose/neurosynth-frontend/.eslintrc

@@ -0,0 +1,16 @@
+import { vi } from 'vitest';
+
+const useAuth0 = vi.fn().mockReturnValue({
+    getAccessTokenSilently: vi.fn().mockImplementation(() => {
+        return Promise.resolve('test-token');
+    }),
+    loginWithPopup: vi.fn(),
+    logout: vi.fn(),
+    isAuthenticated: false,
+    isLoading: false,
+    user: {
+        sub: 'some-github-user',
+    },
+});
+
+export { useAuth0 };

compose/neurosynth-frontend/.prettierrc.json

@@ -0,0 +1,7 @@
+import { vi } from 'vitest';
+
+const useSnackbar = vi.fn().mockReturnValue({
+    enqueueSnackbar: vi.fn(),
+});
+
+export { useSnackbar };

compose/neurosynth-frontend/__mocks__/@auth0/auth0-react.ts

@@ -0,0 +1,13 @@
+import { vi } from 'vitest';
+
+const useQueryClient = vi.fn().mockReturnValue({
+    invalidateQueries: vi.fn(),
+});
+
+const useQuery = vi.fn().mockReturnValue({
+    data: null,
+    isLoading: false,
+    isError: false,
+});
+
+export { useQueryClient, useQuery };

compose/neurosynth-frontend/__mocks__/notistack.ts

@@ -1,12 +1,13 @@
+import { vi } from 'vitest';
 import { NavigateProps } from 'react-router-dom';
 
-const useParams = jest.fn().mockReturnValue({
+const useParams = vi.fn().mockReturnValue({
     projectId: 'test-project-id',
 });
 
-const useNavigate = jest.fn().mockReturnValue(jest.fn());
+const useNavigate = vi.fn().mockReturnValue(vi.fn());
 
-const useLocation = jest.fn().mockReturnValue({
+const useLocation = vi.fn().mockReturnValue({
     location: {
         search: '',
     },