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.

Sign up for GitHub

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

switch to fluentui #51

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

switch to fluentui #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62cbf92
switches to fluentui - wip
Aug 8, 2023
29d853f
fixes button allignment
Aug 11, 2023
0052b95
Centers Icon
Sep 1, 2023
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
353 changes: 281 additions & 72 deletions RoomieReloaded/ClientApp/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion RoomieReloaded/ClientApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fluentui/react": "^8.110.12",
"@types/history": "4.7.2",
"@types/jest": "24.0.15",
"@types/node": "12.6.2",
Expand All @@ -14,7 +15,6 @@
"@uifabric/icons": "^7.9.5",
"history": "^4.9.0",
"moment": "^2.29.4",
"office-ui-fabric-react": "7.105.3",
"react": "16.8.6",
"react-dom": "16.8.6",
"react-redux": "7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion RoomieReloaded/ClientApp/src/components/bootstrap/bootstrapView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import { Action } from 'redux';
import {MessageBar, MessageBarType, Spinner} from "office-ui-fabric-react";
import {MessageBar, MessageBarType, Spinner} from "@fluentui/react";
import { IRequestState } from "../../actions/actions";

export interface IBootstrapProps extends React.HTMLAttributes<any>, IRequestState {
Expand Down
7 changes: 6 additions & 1 deletion RoomieReloaded/ClientApp/src/components/navigation/navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@

.ms-DatePicker.timeFrameNavigation-button.date
{
width: 35px;
width: 40px;
height: 32px;
}

.ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-fieldGroup i {
right: auto;
}

.ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-fieldGroup
Expand Down
9 changes: 5 additions & 4 deletions RoomieReloaded/ClientApp/src/components/navigation/navigationView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import * as React from 'react';
import { DefaultButton, CommandBarButton } from 'office-ui-fabric-react/lib/Button';
import { Toggle } from 'office-ui-fabric-react/lib/Toggle';
import { Icon } from 'office-ui-fabric-react/lib/Icon';
import { DefaultButton, CommandBarButton } from '@fluentui/react/lib/Button';
import { Toggle } from '@fluentui/react/lib/Toggle';
import { Icon } from '@fluentui/react/lib/Icon';
import './navigation.css';
import { DatePicker, DayOfWeek } from 'office-ui-fabric-react/lib/DatePicker';
import { DatePicker } from '@fluentui/react/lib/DatePicker';
import { DayOfWeek } from '@fluentui/react';
import moment from 'moment';
import { CalendarType } from '../../reducers/calendarReducer';
import { VoidCreator, AnyValueCreator } from '../../actions/actions';
Expand Down
9 changes: 4 additions & 5 deletions RoomieReloaded/ClientApp/src/components/planner/base/item/PlannerItemComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import * as React from 'react';
import {
TooltipHost,
ITooltipProps,
getId,
DirectionalHint
} from 'office-ui-fabric-react';
import { FontIcon } from "office-ui-fabric-react/lib/Icon";
import { IPoint } from 'office-ui-fabric-react/lib/utilities/positioning';
} from '@fluentui/react';
import { ITooltipProps } from '@fluentui/react/lib/Tooltip';
import { FontIcon } from "@fluentui/react/lib/Icon";
import {
IRenderablePlannerItem,
} from '../planner';
Expand Down Expand Up @@ -162,7 +161,7 @@ class PlannerItemComponent extends React.Component<IPlannerItemComponentProps, I
return item.id !== "";
}

private getTooltipPosition = (verticalAlign:'top'|'bottom') : IPoint | undefined =>
private getTooltipPosition = (verticalAlign:'top'|'bottom') : { x: number; y: number } | undefined =>
{
const {
widthFactor,
Expand Down
2 changes: 1 addition & 1 deletion RoomieReloaded/ClientApp/src/components/planner/base/planner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {IItemRenderer, ItemRenderer} from './renderer/itemRenderer';
import {isDateTimeInRange, isItemTouchingRangeStrict} from '../utility/dateRangeHelper';
import {isWeekend} from '../../../utility/dateTimeHelper';
import {IPlannerItemParentData} from './item/PlannerItemComponent';
import {Icon, Spinner} from 'office-ui-fabric-react';
import {Icon, Spinner} from '@fluentui/react';
import {PlannerLane} from './item/PlannerLaneComponent';
import moment from 'moment';

Expand Down
2 changes: 1 addition & 1 deletion RoomieReloaded/ClientApp/src/components/toast/toast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MessageBar, MessageBarType } from 'office-ui-fabric-react';
import { MessageBar, MessageBarType } from '@fluentui/react';
import React from 'react';
import './toast.css'

Expand Down
5 changes: 2 additions & 3 deletions RoomieReloaded/ClientApp/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,14 @@ body.dark-mode .boardNavigation-button:hover.boardNavigation-button:hover {
body.dark-mode .ms-DatePicker.timeFrameNavigation-button.date {
width: auto;
}
body.dark-mode .ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-fieldGroup {
.ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-fieldGroup {
border-radius: 0;
min-width: 40px;
justify-content: center;
cursor: pointer;
}
body.dark-mode .ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-fieldGroup i {
color: rgba(255,255,255,0.87);
right: auto;
}
body.dark-mode .ms-DatePicker.timeFrameNavigation-button.date.is-open .ms-TextField-fieldGroup,
body.dark-mode .ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-fieldGroup:hover {
Expand Down Expand Up @@ -227,7 +226,7 @@ body.dark-mode .ms-DatePicker-day.ms-DatePicker-dayBackground:hover .ms-DatePick
body.dark-mode .ms-DatePicker-day.ms-DatePicker-dayBackground:active .ms-DatePicker-day-button {
color: rgba(255,255,255,0.87);
}
body.dark-mode .ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-field {
.ms-DatePicker.timeFrameNavigation-button.date .ms-TextField-field {
display: none;
}
body.dark-mode .ms-Button.timeFrameNavigation-button {
Expand Down