Skip to content

Commit 85c09f8

Browse files
corentin703corentin703
committed
Fix + Docker based dev environment
1 parent 75ee1c0 commit 85c09f8

21 files changed

Lines changed: 174 additions & 69 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,7 @@ lib-cov
5555

5656
.idea
5757
.vercel
58+
59+
dev/.db-migrated
60+
dev/data/db
61+
dev/data/pg4admin

‎app/components/dashboard/articles/ExportArticles.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { useQuery } from 'blitz'
2-
import { Button } from '@mui/material'
31
import xlsx from 'xlsx'
2+
import { useQuery } from 'blitz'
3+
import Button from '@mui/material/Button'
44

55
import TableChartIcon from '@mui/icons-material/TableChart'
66

77
import getArticlesWithStats from 'app/entities/articles/queries/getArticlesWithStats'
88

99
export default function ExportArticles() {
10-
const [{ articles }] = useQuery<any>(getArticlesWithStats, {})
10+
const [{ articles }] = useQuery(getArticlesWithStats, {})
1111

1212
const exportToExcel = () => {
13-
const date = new Date(Date.now())
13+
const date = new Date()
1414

1515
const workBook = xlsx.utils.book_new()
1616

@@ -29,10 +29,10 @@ export default function ExportArticles() {
2929
'Prix cotisants',
3030
'Visible',
3131
'Ajouté le',
32-
'Nombre vente dernière semaine',
33-
'Nombre vente dernier mois',
34-
'Nombre vente dernière année',
35-
'Nombre vente total',
32+
'Total ventes (semaine)',
33+
'Total ventes (mois)',
34+
'Total ventes (année)',
35+
'Total ventes',
3636
],
3737
...articles.map((article) => [
3838
article.name,
@@ -61,7 +61,7 @@ export default function ExportArticles() {
6161
}
6262

6363
return (
64-
<Button endIcon={<TableChartIcon />} variant={'contained'} onClick={exportToExcel}>
64+
<Button endIcon={<TableChartIcon />} variant="contained" onClick={exportToExcel}>
6565
Exporter vers Excel
6666
</Button>
6767
)

‎app/components/dashboard/promotions/ExportPromotions.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { useQuery } from 'blitz'
2-
import { Button } from '@mui/material'
31
import xlsx from 'xlsx'
2+
import { useQuery } from 'blitz'
3+
import Button from '@mui/material/Button'
44

55
import TableChartIcon from '@mui/icons-material/TableChart'
66

77
import getPromotions from 'app/entities/promotions/queries/getPromotions'
88

99
export default function ExportPromotions() {
10-
const [{ promotions }] = useQuery<any>(getPromotions, {
10+
const [{ promotions }] = useQuery(getPromotions, {
1111
include: {
1212
_count: {
1313
select: {
@@ -21,7 +21,7 @@ export default function ExportPromotions() {
2121
})
2222

2323
const exportToExcel = () => {
24-
const date = new Date(Date.now())
24+
const date = new Date()
2525

2626
const workBook = xlsx.utils.book_new()
2727

‎app/components/dashboard/users/ExportUsers.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { useQuery } from 'blitz'
2-
import { Button } from '@mui/material'
31
import xlsx from 'xlsx'
2+
import { useQuery } from 'blitz'
3+
import Button from '@mui/material/Button'
44

55
import TableChartIcon from '@mui/icons-material/TableChart'
66

77
import getUsers from 'app/entities/users/queries/getUsers'
88

99
export default function ExportUsers() {
10-
const [{ users }] = useQuery<any>(getUsers, {
10+
const [{ users }] = useQuery(getUsers, {
1111
include: {
1212
promotion: {
1313
select: {

‎app/components/hub/average/AverageModule.tsx‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
import React, { createContext, useContext, useEffect, useState } from 'react'
2-
import { InputLabel, MenuItem, Select } from '@mui/material'
1+
import { createContext, useEffect, useState } from 'react'
32
import FormControl from '@mui/material/FormControl'
3+
import InputLabel from '@mui/material/InputLabel'
44
import Typography from '@mui/material/Typography'
5+
import MenuItem from '@mui/material/MenuItem'
6+
import Select from '@mui/material/Select'
57

8+
import { YearData, AverageStoredData } from 'constants/modules/average/types'
69
import AverageData from 'constants/modules/average/AverageData'
7-
import { YearData } from 'constants/modules/average/types'
8-
import Year from './Year'
9-
10-
const importData = (): { averageData: YearData[]; currentYear: number; currentSector?: number } => {
11-
let data: any = localStorage.getItem('average_data')
12-
if (data === null) {
13-
data = {
14-
averageData: AverageData,
15-
currentYear: 0,
16-
currentSector: undefined,
17-
}
18-
} else {
19-
data = JSON.parse(data)
10+
import Year from 'app/components/hub/average/Year'
11+
12+
const importData = (): AverageStoredData => {
13+
const storedData: string | null = localStorage.getItem('average_data')
14+
15+
if (storedData !== null) {
16+
return JSON.parse(storedData)
2017
}
2118

22-
return data
19+
return {
20+
averageData: AverageData,
21+
currentYear: 0,
22+
currentSector: undefined,
23+
}
2324
}
2425

2526
const saveData = (averageData: YearData[], currentYear: number, currentSector?: number) => {

‎app/components/hub/average/SectorTable.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React, { useEffect, useState } from 'react'
2-
import Paper from '@mui/material/Paper'
3-
import Table from '@mui/material/Table'
1+
import TableContainer from '@mui/material/TableContainer'
2+
import Typography from '@mui/material/Typography'
43
import TableBody from '@mui/material/TableBody'
54
import TableCell from '@mui/material/TableCell'
6-
import TableContainer from '@mui/material/TableContainer'
75
import TableHead from '@mui/material/TableHead'
86
import TableRow from '@mui/material/TableRow'
9-
import Typography from '@mui/material/Typography'
7+
import { useEffect, useState } from 'react'
8+
import Paper from '@mui/material/Paper'
9+
import Table from '@mui/material/Table'
1010

1111
import { SectorData, UEData } from 'constants/modules/average/types'
1212
import UeTable from './UeTable'

‎app/components/hub/average/Semester.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useContext, useEffect, useState } from 'react'
1+
import { useContext, useEffect, useState } from 'react'
22
import Typography from '@mui/material/Typography'
33

44
import { SectorData, SemesterData } from 'constants/modules/average/types'

‎app/components/hub/average/Subject.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React, { useEffect, useState } from 'react'
1+
import { useEffect, useState } from 'react'
22

3-
import { TextField } from '@mui/material'
43
import InputAdornment from '@mui/material/InputAdornment'
54
import TableRow from '@mui/material/TableRow'
65
import TableCell from '@mui/material/TableCell'
6+
import { TextField } from '@mui/material'
77

88
import { SubjectData } from 'constants/modules/average/types'
99

‎app/components/hub/average/UeTable.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import React, { useEffect, useState } from 'react'
2-
import Box from '@mui/material/Box'
3-
import Collapse from '@mui/material/Collapse'
4-
import Table from '@mui/material/Table'
51
import TableBody from '@mui/material/TableBody'
62
import TableCell from '@mui/material/TableCell'
73
import TableHead from '@mui/material/TableHead'
4+
import Collapse from '@mui/material/Collapse'
85
import TableRow from '@mui/material/TableRow'
6+
import { useEffect, useState } from 'react'
7+
import Table from '@mui/material/Table'
8+
import Box from '@mui/material/Box'
99

10-
import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
1110
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
11+
import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
1212
import IconButton from '@mui/material/IconButton'
1313

14-
import Subject from './Subject'
1514
import { SubjectData, UEData } from 'constants/modules/average/types'
15+
import Subject from './Subject'
1616

1717
interface UeTablePropsType {
1818
ueData: UEData
@@ -23,7 +23,7 @@ const UeTable = ({ ueData, setUeData }: UeTablePropsType) => {
2323
const [ueState, setUeState] = useState(ueData)
2424
const [averageState, setAverageState] = useState(ueState.average)
2525

26-
const [open, setOpen] = React.useState(false)
26+
const [open, setOpen] = useState(false)
2727

2828
useEffect(() => {
2929
setUeData({

‎app/components/hub/average/Year.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react'
1+
import { useEffect, useState } from 'react'
22

33
import { YearData } from 'constants/modules/average/types'
44
import Semester from './Semester'

0 commit comments

Comments
 (0)