Skip to content
Draft
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
34,338 changes: 3 additions & 34,335 deletions front/package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fluentui/react": "^7.155.2",
"@fluentui/react": "^8.0.0",
"@fluentui/react-cards": "^0.200.0",
"@fluentui/react-hooks": "^8.0.0",
"@reduxjs/toolkit": "^1.5.0",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
Expand All @@ -12,7 +14,6 @@
"@types/node": "^14.14.14",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@uifabric/react-cards": "^0.115.2",
"axios": "^0.21.1",
"leaflet": "^1.7.1",
"react": "^17.0.1",
Expand Down
2 changes: 1 addition & 1 deletion front/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import './App.css';
import 'office-ui-fabric-react/dist/css/fabric.css';
import '@fluentui/react/dist/css/fabric.css';
import Map from './components/map/MinecraftMap';
import React, { useState } from "react";
import { initializeIcons, IStackStyles, Stack } from '@fluentui/react';
Expand Down
8 changes: 4 additions & 4 deletions front/src/components/DeleteButton.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { IIconProps, ActionButton } from 'office-ui-fabric-react';
import { IIconProps, ActionButton } from '@fluentui/react';
import * as React from 'react';
import { Dialog, DialogType, DialogFooter } from 'office-ui-fabric-react/lib/Dialog';
import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button';
import { useId, useBoolean } from '@uifabric/react-hooks';
import { Dialog, DialogType, DialogFooter } from '@fluentui/react/lib/Dialog';
import { PrimaryButton, DefaultButton } from '@fluentui/react/lib/Button';
import { useId, useBoolean } from '@fluentui/react-hooks';

interface IDeleteButtonProps
{
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/EditButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IIconProps, ActionButton } from 'office-ui-fabric-react';
import { IIconProps, ActionButton } from '@fluentui/react';

interface IEditButtonProps
{
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/Location/AddLocation.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { PrimaryButton, TextField, Stack, IStackItemStyles, Separator, IStackTokens } from 'office-ui-fabric-react';
import { PrimaryButton, TextField, Stack, IStackItemStyles, Separator, IStackTokens } from '@fluentui/react';
import React, { useEffect, useState } from "react";
import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { Checkbox } from '@fluentui/react/lib/Checkbox';
import { CoordinateControl } from "./CoordinateControl";
import { Panel } from 'office-ui-fabric-react/lib/Panel';
import { Panel } from '@fluentui/react/lib/Panel';
import { Categories } from "./Categories";
import { useLocations } from '../../contexts/LocationsContext';

Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Location/Categories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
import { Dropdown, IDropdownOption } from '@fluentui/react/lib/Dropdown';
import { useLocationTypes } from "../../contexts/LocationTypesContext";

interface ICategoriesProps
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Location/CoordinateControl.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IStackTokens, TextField, Stack } from 'office-ui-fabric-react';
import { IStackTokens, TextField, Stack } from '@fluentui/react';
import { useState } from 'react';

interface ICoordinatesProps {
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/Location/EditLocation.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { PrimaryButton, TextField, Stack, IStackItemStyles, Separator, IStackTokens } from 'office-ui-fabric-react';
import { PrimaryButton, TextField, Stack, IStackItemStyles, Separator, IStackTokens } from '@fluentui/react';
import React, { useState } from "react";
import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { Checkbox } from '@fluentui/react/lib/Checkbox';
import { CoordinateControl } from "./CoordinateControl";
import { Panel } from 'office-ui-fabric-react/lib/Panel';
import { Panel } from '@fluentui/react/lib/Panel';
import { Categories } from "./Categories";
import { LocationModel, CoordinateModel } from "../../api/client";
import { useLocations } from "../../contexts/LocationsContext";
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/LocationList/CoordinateLabel.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Text } from 'office-ui-fabric-react';
import { Text } from '@fluentui/react';
import { CoordinateModel } from "../../api/client";

interface ICoordinateLabelProps {
Expand Down
4 changes: 2 additions & 2 deletions front/src/components/LocationList/LocationFilter.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { Stack, IStackTokens, IStackItemStyles, Text, PrimaryButton, DefaultButton } from 'office-ui-fabric-react';
import { Checkbox } from '@fluentui/react/lib/Checkbox';
import { Stack, IStackTokens, IStackItemStyles, Text, PrimaryButton, DefaultButton } from '@fluentui/react';
import { Categories } from "../Location/Categories";
import Guid from "../../api/guid";

Expand Down
8 changes: 4 additions & 4 deletions front/src/components/LocationList/LocationListItem.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Text, Stack, IStackTokens } from 'office-ui-fabric-react';
import { useBoolean } from '@uifabric/react-hooks';
import { Card, ICardTokens, ICardStyles, ICardItemStyles, ICardItemTokens, ICardSectionStyles } from '@uifabric/react-cards';
import { Text, Stack, IStackTokens } from '@fluentui/react';
import { useBoolean } from '@fluentui/react-hooks';
import { Card, ICardTokens, ICardStyles, ICardItemStyles, ICardItemTokens, ICardSectionStyles } from '@fluentui/react-cards';
import { DeleteButton } from "../DeleteButton";
import { EditButton } from "../EditButton";
import { CoordinateLabel } from "./CoordinateLabel";
import { Customizer } from 'office-ui-fabric-react/lib/Utilities';
import { Customizer } from '@fluentui/react/lib/Utilities';
import { EditLocation } from "../Location/EditLocation";
import { LocationModel } from "../../api/client";
import { OptionsDisplay } from "./OptionsDisplay";
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/LocationList/LocationsList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Stack, IStackTokens, IStackItemStyles, Text, IStackStyles } from 'office-ui-fabric-react';
import { Stack, IStackTokens, IStackItemStyles, Text, IStackStyles } from '@fluentui/react';
import { ListItem } from "./LocationListItem";
import { LocationModel } from "../../api/client";
import { LocationsFilter } from "./LocationFilter";
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/LocationList/OptionsDisplay.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import { LocationModel } from "../../api/client";
import { Stack } from 'office-ui-fabric-react';
import { FontIcon } from 'office-ui-fabric-react/lib/Icon';
import { mergeStyles, mergeStyleSets } from 'office-ui-fabric-react/lib/Styling';
import { Stack } from '@fluentui/react';
import { FontIcon } from '@fluentui/react/lib/Icon';
import { mergeStyles, mergeStyleSets } from '@fluentui/react/lib/Styling';

interface IOptionsDisplayProps
{
Expand Down
14 changes: 7 additions & 7 deletions front/src/components/MenuBar.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import React from 'react';
import { useBoolean } from '@uifabric/react-hooks';
import { CommandBar, ICommandBarItemProps } from 'office-ui-fabric-react/lib/CommandBar';
import { Customizer } from 'office-ui-fabric-react/lib/Utilities';
import { useBoolean } from '@fluentui/react-hooks';
import { CommandBar, ICommandBarItemProps } from '@fluentui/react/lib/CommandBar';
import { Customizer } from '@fluentui/react/lib/Utilities';
import { AddLocation } from "../components/Location/AddLocation";
import { ZoomToCoordinate } from '../components/ZoomToCoordinate';
import { RealmSelectorPanel } from './Realm/RealmSelectorPanel';
import { CoordinateModel } from "../api/client";
import { Text, Stack } from 'office-ui-fabric-react';
import { Image } from 'office-ui-fabric-react/lib/Image';
import { Text, Stack } from '@fluentui/react';
import { Image } from '@fluentui/react/lib/Image';
import gridImage from "../images/samplegrid.png";
import { useId } from '@uifabric/react-hooks';
import { useId } from '@fluentui/react-hooks';
import {
getTheme,
mergeStyleSets,
FontWeights,
Modal,
} from 'office-ui-fabric-react';
} from '@fluentui/react';
import { useRealms } from "../contexts/RealmsContext";

interface IMenuBarProps
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/Realm/RealmSelectorPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Stack, Text } from 'office-ui-fabric-react';
import { Stack, Text } from '@fluentui/react';
import React from "react";
import { Realms } from './Realms';
import { Panel } from 'office-ui-fabric-react/lib/Panel';
import { Panel } from '@fluentui/react/lib/Panel';
import { useRealms } from '../../contexts/RealmsContext';
import {
getTheme,
mergeStyleSets
} from 'office-ui-fabric-react';
} from '@fluentui/react';

interface IRealmSelectorPanel {
dismissPanel: (() => void);
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Realm/Realms.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
import { Dropdown, IDropdownOption } from '@fluentui/react/lib/Dropdown';
import { useRealms } from "../../contexts/RealmsContext";

interface IRealmsProps
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/ZoomToCoordinate.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CoordinateModel } from "../api/client";
import { IStackItemStyles } from 'office-ui-fabric-react';
import { IStackItemStyles } from '@fluentui/react';
import React, { useEffect, useState } from "react";
import { Panel } from 'office-ui-fabric-react/lib/Panel';
import { PrimaryButton, Stack } from 'office-ui-fabric-react';
import { Panel } from '@fluentui/react/lib/Panel';
import { PrimaryButton, Stack } from '@fluentui/react';
import { CoordinateControl } from "./Location/CoordinateControl";

interface IZoomToCoordinate
Expand Down
10 changes: 5 additions & 5 deletions front/src/components/map/LocationTypeMarker.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useEffect, useState } from "react";
import { Marker, Popup } from 'react-leaflet';
import { useBoolean } from '@uifabric/react-hooks';
import { Text, Separator, Stack } from 'office-ui-fabric-react';
import { mergeStyles, mergeStyleSets } from 'office-ui-fabric-react/lib/Styling';
import { Customizer } from 'office-ui-fabric-react/lib/Utilities';
import { FontIcon } from 'office-ui-fabric-react/lib/Icon';
import { useBoolean } from '@fluentui/react-hooks';
import { Text, Separator, Stack } from '@fluentui/react';
import { mergeStyles, mergeStyleSets } from '@fluentui/react/lib/Styling';
import { Customizer } from '@fluentui/react/lib/Utilities';
import { FontIcon } from '@fluentui/react/lib/Icon';
import { EditButton } from "../EditButton";
import L from "leaflet";
import { useLocationTypes } from "../../contexts/LocationTypesContext";
Expand Down
Loading