Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💚 Fix broken CI Pipelines #693

Merged
merged 2 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: "18"
cache: "yarn"
node-version: 'lts/*'
cache: 'yarn'

- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand All @@ -40,8 +40,8 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: "18"
cache: "yarn"
node-version: 'lts/*'
cache: 'yarn'

- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
import { FC } from 'react'
import { BrowserRouter, Route, Routes } from 'react-router-dom'
import { BrowserRouter, Route, Routes } from 'react-router'
import '../leaflet.config.js'
import Notification from './components/Notification.js'
import ProtectedRoute from './components/ProtectedRoute'
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/NavItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box, Button, colors } from '@mui/material'
import { FC } from 'react'
import { Link } from 'react-router-dom'
import { Link } from 'react-router'

interface Props {
active: boolean
Expand Down
2 changes: 1 addition & 1 deletion src/components/ticker/TickerList.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Table, TableCell, TableContainer, TableHead, TableRow, TableSortLabel } from '@mui/material'
import { FC, useEffect, useState } from 'react'
import { useSearchParams } from 'react-router-dom'
import { useSearchParams } from 'react-router'
import { GetTickersQueryParams } from '../../api/Ticker'
import useDebounce from '../../hooks/useDebounce'
import TickerListFilter from './TickerListFilter'
Expand Down
8 changes: 4 additions & 4 deletions src/contexts/AuthContext.test.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { describe, it, expect, beforeEach, vi } from 'vitest'
import { render, screen } from '@testing-library/react'
import { AuthProvider } from './AuthContext'
import { MemoryRouter } from 'react-router-dom'
import sign from 'jwt-encode'
import { MemoryRouter } from 'react-router-dom'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { AuthProvider } from './AuthContext'

// Mock of useNavigate, useLocation (react-router-dom)
// Mock of useNavigate, useLocation (react-router)
vi.mock('react-router', () => ({
...vi.importActual('react-router'), // This ensures any other exports remain intact
useNavigate: vi.fn(() => vi.fn()), // A function that returns another function
Expand Down
3 changes: 1 addition & 2 deletions src/views/HomeView.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { FC } from 'react'
import { Navigate } from 'react-router'
import { useSearchParams } from 'react-router-dom'
import { Navigate, useSearchParams } from 'react-router'
import Loader from '../components/Loader'
import useAuth from '../contexts/useAuth'
import useTickersQuery from '../queries/useTickersQuery'
Expand Down
8 changes: 4 additions & 4 deletions src/views/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { FC } from 'react'
import { faGaugeHigh, faGears, faUsers } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { Box, Container } from '@mui/material'
import { FC } from 'react'
import { useLocation } from 'react-router'
import Nav from '../components/navigation/Nav'
import NavItem from '../components/navigation/NavItem'
import UserDropdown from '../components/navigation/UserDropdown'
import useAuth from '../contexts/useAuth'
import { useLocation } from 'react-router-dom'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faGaugeHigh, faGears, faUsers } from '@fortawesome/free-solid-svg-icons'

interface Props {
children: React.ReactNode
Expand Down
2 changes: 1 addition & 1 deletion src/views/TickerView.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC } from 'react'
import { useParams } from 'react-router-dom'
import { useParams } from 'react-router'
import Ticker from '../components/ticker/Ticker'
import useAuth from '../contexts/useAuth'
import useTickerQuery from '../queries/useTickerQuery'
Expand Down
Loading