From c98bd6921aec22767f2b0ae77f7b39942a8780e8 Mon Sep 17 00:00:00 2001 From: Neha Gupta Date: Thu, 4 Apr 2019 18:07:08 -0700 Subject: [PATCH] Updating usage of Link fabric component --- ServerlessLibraryAPI/ClientApp/src/App.js | 8 ++++---- .../ClientApp/src/components/Login/Login.js | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ServerlessLibraryAPI/ClientApp/src/App.js b/ServerlessLibraryAPI/ClientApp/src/App.js index f23f05b..32417ba 100644 --- a/ServerlessLibraryAPI/ClientApp/src/App.js +++ b/ServerlessLibraryAPI/ClientApp/src/App.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { Switch, Route } from 'react-router-dom'; -import { Link } from 'office-ui-fabric-react'; +import { Switch, Route, Link } from 'react-router-dom'; +import { Link as FabricLink } from 'office-ui-fabric-react'; import './App.css'; import { PrivateRoute } from './components/PrivateRoute'; @@ -31,11 +31,11 @@ getCurrentSample(id) return (
maincontent - Contributions + Contributions
); }} - /> + /> diff --git a/ServerlessLibraryAPI/ClientApp/src/components/Login/Login.js b/ServerlessLibraryAPI/ClientApp/src/components/Login/Login.js index 25563c2..b264efa 100644 --- a/ServerlessLibraryAPI/ClientApp/src/components/Login/Login.js +++ b/ServerlessLibraryAPI/ClientApp/src/components/Login/Login.js @@ -1,7 +1,6 @@ import React, { Component } from 'react'; import { Redirect } from 'react-router-dom'; - -import { Link } from 'office-ui-fabric-react'; +import { Link as FabricLink } from 'office-ui-fabric-react'; class Login extends Component { constructor(props) { @@ -29,11 +28,11 @@ class Login extends Component { return (

You must log in to view the page at {from.pathname}

- Sign in using Fabric Link + Sign in using Fabric Link
- Sign out + Sign out
- +
) }