Skip to content

Commit

Permalink
fix: removed suspense, use yarn and brought back mui-rff
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrien Lenoir committed Jan 31, 2022
1 parent 00a0ab3 commit 75ee1c0
Show file tree
Hide file tree
Showing 27 changed files with 13,046 additions and 19,251 deletions.
2 changes: 1 addition & 1 deletion app/components/auth/LoginForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from 'react'
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import Typography from '@mui/material/Typography'
import { useMutation, AuthenticationError } from 'blitz'

Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/articles/ArticleForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Image } from 'blitz'
import { TextField, Switches } from 'bde-isima-mui-rff'
import { TextField, Switches } from 'mui-rff'
import IconButton from '@mui/material/IconButton'
import InputAdornment from '@mui/material/InputAdornment'

Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/cashing/SearchUser.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Autocomplete } from 'bde-isima-mui-rff'
import { Autocomplete } from 'mui-rff'
import TextField from '@mui/material/TextField'
import { useQuery, useAuthenticatedSession } from 'blitz'
import { useState, Dispatch, SetStateAction } from 'react'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'

import { Form, FORM_ERROR } from 'app/components/forms/Form'
import EnhancedTextField from 'app/components/forms/EnhancedTextfield'
Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/clubs/ClubForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Image } from 'blitz'
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import Divider from '@mui/material/Divider'
import IconButton from '@mui/material/IconButton'
import InputAdornment from '@mui/material/InputAdornment'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import Tab from '@mui/material/Tab'
import TabList from '@mui/lab/TabList'
import { Field } from 'react-final-form'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useForm } from 'react-final-form'
import { TextField, Select } from 'bde-isima-mui-rff'
import { TextField, Select } from 'mui-rff'
import Divider from '@mui/material/Divider'
import MenuItem from '@mui/material/MenuItem'
import FormGroup from '@mui/material/FormGroup'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import { useForm } from 'react-final-form'
import FormGroup from '@mui/material/FormGroup'
import { FieldArray } from 'react-final-form-arrays'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import { useForm } from 'react-final-form'
import Divider from '@mui/material/Divider'
import FormGroup from '@mui/material/FormGroup'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Select } from 'bde-isima-mui-rff'
import { Select } from 'mui-rff'
import MuiCard from '@mui/material/Card'
import Button from '@mui/material/Button'
import { useForm } from 'react-final-form'
Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/elections/CandidatesForm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import { useForm } from 'react-final-form'
import Divider from '@mui/material/Divider'
import FormGroup from '@mui/material/FormGroup'
Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/partners/PartnerForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Image } from 'blitz'
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import IconButton from '@mui/material/IconButton'
import InputAdornment from '@mui/material/InputAdornment'

Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/promotions/PromotionForm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'

import { Promotion } from 'db'
import { Form, FORM_ERROR } from 'app/components/forms/Form'
Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/users/PromotionsForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useQuery } from 'blitz'
import { Select } from 'bde-isima-mui-rff'
import { Select } from 'mui-rff'
import MenuItem from '@mui/material/MenuItem'

import getPromotions from 'app/entities/promotions/queries/getPromotions'
Expand Down
2 changes: 1 addition & 1 deletion app/components/dashboard/users/UserForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useMemo, useState } from 'react'
import AppBar from '@mui/material/AppBar'
import Divider from '@mui/material/Divider'
import TabContext from '@mui/lab/TabContext'
import { TextField, Switches } from 'bde-isima-mui-rff'
import { TextField, Switches } from 'mui-rff'
import IconButton from '@mui/material/IconButton'
import InputAdornment from '@mui/material/InputAdornment'
import CircularProgress from '@mui/material/CircularProgress'
Expand Down
2 changes: 1 addition & 1 deletion app/components/forms/EnhancedTextfield.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useField, FieldProps } from 'react-final-form'
import { ShowErrorFunc, showErrorOnChange } from 'bde-isima-mui-rff'
import { ShowErrorFunc, showErrorOnChange } from 'mui-rff'
import { TextField as MuiTextField, TextFieldProps as MuiTextFieldProps } from '@mui/material'

export type EnhancedTextFieldProps = Partial<Omit<MuiTextFieldProps, 'type' | 'onChange'>> & {
Expand Down
2 changes: 1 addition & 1 deletion app/components/hub/elections/Vote/VoteForm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField, Checkboxes } from 'bde-isima-mui-rff'
import { TextField, Checkboxes } from 'mui-rff'
import Typography from '@mui/material/Typography'

import { Candidate } from 'db'
Expand Down
2 changes: 1 addition & 1 deletion app/components/hub/feedback/FeedbackForm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField, Select } from 'bde-isima-mui-rff'
import { TextField, Select } from 'mui-rff'
import MenuItem from '@mui/material/MenuItem'

import { Form, FORM_ERROR } from 'app/components/forms/Form'
Expand Down
2 changes: 1 addition & 1 deletion app/components/hub/settings/SettingsForm.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Image } from 'blitz'
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import Divider from '@mui/material/Divider'
import Typography from '@mui/material/Typography'
import IconButton from '@mui/material/IconButton'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Image } from 'blitz'
import Button from '@mui/material/Button'
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import Typography from '@mui/material/Typography'

import { PaymentMethod } from './TopUp'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from 'react'
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'
import Divider from '@mui/material/Divider'

import { Form, FORM_ERROR } from 'app/components/forms/Form'
Expand Down
2 changes: 1 addition & 1 deletion app/components/public/contact/ContactForm.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TextField } from 'bde-isima-mui-rff'
import { TextField } from 'mui-rff'

import { Form, FORM_ERROR } from 'app/components/forms/Form'
import { ContactInput, ContactInputType } from 'app/components/forms/validations'
Expand Down
6 changes: 3 additions & 3 deletions app/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'react-multi-carousel/lib/styles.css'

import type { BlitzPage } from 'blitz'
import { Suspense, SuspenseList, lazy } from 'react'
import { Suspense, lazy } from 'react'

import Landing from 'app/components/public/Landing'
import getPublicNav from 'app/components/nav/public/getPublicNav'
Expand All @@ -15,7 +15,7 @@ const MessengerChat = lazy(() => import('app/components/public/MessengerChat'))

const Index: BlitzPage = () => {
return (
<SuspenseList revealOrder="forwards">
<>
<Landing />
<Suspense fallback={null}>
<School />
Expand All @@ -35,7 +35,7 @@ const Index: BlitzPage = () => {
<Suspense fallback={null}>
<MessengerChat />
</Suspense>
</SuspenseList>
</>
)
}

Expand Down
1 change: 0 additions & 1 deletion blitz.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as path from 'path'
import withPWA from 'next-pwa'
import { BlitzConfig, sessionMiddleware, simpleRolesIsAuthorized } from 'blitz'

Expand Down
Loading

0 comments on commit 75ee1c0

Please sign in to comment.