hot fixes

src/App.js

@@ -155,27 +155,27 @@ export default function App() {
   const AdminTemplate = (props) => {
     if (CheckUserPermission())
       return (
-          <div style={{ backgroundColor: "	#D3D3D3" }}>
-            <AppBarAdmin />
-            <div style={{ padding: "2em" }}>
-              {props.inner}
-            </div>
+        <div style={{ backgroundColor: "	#D3D3D3" }}>
+          <AppBarAdmin />
+          <div style={{ padding: "2em" }}>
+            {props.inner}
           </div>
-        )
+        </div>
+      )
     else
       return (
         <div style={{ backgroundColor: "	#D3D3D3" }}>
-            <div style={{ padding: "2em" }}>
-              <Unauthorized />
-            </div>
+          <div style={{ padding: "2em" }}>
+            <Unauthorized />
           </div>
+        </div>
       )
   }
 
   return (
     // add piwik later
-    // history={piwik.connectToHistory(customHistory)}
-    <BrowserRouter>
+
+    <BrowserRouter history={piwik.connectToHistory(customHistory)}>
       <Header />
       <div
         style={{
@@ -224,234 +224,234 @@ export default function App() {
         <Route path="/topico" component={FormationMaterialPage} />
         <Route path="/iframe-colecao" component={FormationMaterialIframe} />
         <Route path="/material-formacao" component={MaterialPage} />
-        
-        <Route 
-          path="/admin/home" 
-          exact={true} 
+
+        <Route
+          path="/admin/home"
+          exact={true}
           render={() => {
-            return <AdminTemplate inner={<Inframe/>}/>
-          }} 
+            return <AdminTemplate inner={<Inframe />} />
+          }}
         />
-        <Route 
-          path="/admin/institutions" 
+        <Route
+          path="/admin/institutions"
           render={() => {
-            return <AdminTemplate inner={<Institution />}/>
-          }} 
+            return <AdminTemplate inner={<Institution />} />
+          }}
         />
-        <Route 
-          path="/admin/institution" 
+        <Route
+          path="/admin/institution"
           render={() => {
-            return <AdminTemplate inner={<InstitutionCard />}/>
-          }} 
+            return <AdminTemplate inner={<InstitutionCard />} />
+          }}
         />
         <Route
           path="/admin/institutionEdit"
           render={() => {
-            return <AdminTemplate inner={<InstitutionsInput />}/>
+            return <AdminTemplate inner={<InstitutionsInput />} />
           }}
         />
         <Route
           path="/admin/InstitutionCreate"
           render={() => {
-            return <AdminTemplate inner={<CreateInstitution />}/>
+            return <AdminTemplate inner={<CreateInstitution />} />
           }}
         />
-        <Route 
-          path="/admin/noteVars" 
+        <Route
+          path="/admin/noteVars"
           render={() => {
-            return <AdminTemplate inner={<NoteVariables />}/>
-          }} 
+            return <AdminTemplate inner={<NoteVariables />} />
+          }}
         />
-        <Route 
-          path="/admin/noteVar" 
+        <Route
+          path="/admin/noteVar"
           render={() => {
-            return <AdminTemplate inner={<NoteVarCard />}/>
-          }} 
+            return <AdminTemplate inner={<NoteVarCard />} />
+          }}
         />
-        <Route 
-          path="/admin/noteVarEdit" 
+        <Route
+          path="/admin/noteVarEdit"
           render={() => {
-            return <AdminTemplate inner={<NoteVarInputs />}/>
-          }} 
+            return <AdminTemplate inner={<NoteVarInputs />} />
+          }}
         />
-        <Route 
-          path="/admin/languages" 
+        <Route
+          path="/admin/languages"
           render={() => {
-            return <AdminTemplate inner={<Languages />}/>
-          }} 
+            return <AdminTemplate inner={<Languages />} />
+          }}
         />
-        <Route 
-          path="/admin/languageEdit" 
+        <Route
+          path="/admin/languageEdit"
           render={() => {
-            return <AdminTemplate inner={<EditLanguage />}/>
-          }} 
+            return <AdminTemplate inner={<EditLanguage />} />
+          }}
         />
-        <Route 
-          path="/admin/languageCreate" 
+        <Route
+          path="/admin/languageCreate"
           render={() => {
-            return <AdminTemplate inner={<CreateLanguage />}/>
-          }} 
+            return <AdminTemplate inner={<CreateLanguage />} />
+          }}
         />
         <Route
           path="/admin/CommunityQuestions"
           render={() => {
-            return <AdminTemplate inner={<CommunityQuestions />}/>
+            return <AdminTemplate inner={<CommunityQuestions />} />
           }}
         />
         <Route
           path="/admin/CommunityQuestion"
           render={() => {
-            return <AdminTemplate inner={<CommunityCard />}/>
+            return <AdminTemplate inner={<CommunityCard />} />
           }}
         />
-        <Route 
-          path="/admin/Collections" 
+        <Route
+          path="/admin/Collections"
           render={() => {
-            return <AdminTemplate inner={<Collections />}/>
-          }} 
+            return <AdminTemplate inner={<Collections />} />
+          }}
         />
-        <Route 
-          path="/admin/Collection" 
+        <Route
+          path="/admin/Collection"
           render={() => {
-            return <AdminTemplate inner={<CollectionCard />}/>
-          }} 
+            return <AdminTemplate inner={<CollectionCard />} />
+          }}
         />
         <Route
           path="/admin/EditCollection"
           render={() => {
-            return <AdminTemplate inner={<EditCollection />}/>
+            return <AdminTemplate inner={<EditCollection />} />
           }}
         />
-        <Route 
-          path="/admin/Ratings" 
+        <Route
+          path="/admin/Ratings"
           render={() => {
-            return <AdminTemplate inner={<Ratings />}/>
-          }} 
+            return <AdminTemplate inner={<Ratings />} />
+          }}
         />
-        <Route 
-          path="/admin/Rating" 
+        <Route
+          path="/admin/Rating"
           render={() => {
-            return <AdminTemplate inner={<RatingCard />}/>
-          }} 
+            return <AdminTemplate inner={<RatingCard />} />
+          }}
         />
-        <Route 
-          path="/admin/EditRating" 
+        <Route
+          path="/admin/EditRating"
           render={() => {
-            return <AdminTemplate inner={<EditRating />}/>
-          }} 
+            return <AdminTemplate inner={<EditRating />} />
+          }}
         />
-        <Route 
-          path="/admin/CreateRating" 
+        <Route
+          path="/admin/CreateRating"
           render={() => {
-            return <AdminTemplate inner={<CreateRating />}/>
-          }} 
+            return <AdminTemplate inner={<CreateRating />} />
+          }}
         />
-        <Route 
-          path="/admin/Questions" 
+        <Route
+          path="/admin/Questions"
           render={() => {
-            return <AdminTemplate inner={<Questions />}/>
-          }} 
+            return <AdminTemplate inner={<Questions />} />
+          }}
         />
-        <Route 
-          path="/admin/CreateQuestion" 
+        <Route
+          path="/admin/CreateQuestion"
           render={() => {
-            return <AdminTemplate inner={<CreateQuestions />}/>
-          }} 
+            return <AdminTemplate inner={<CreateQuestions />} />
+          }}
         />
-        <Route 
-          path="/admin/activities" 
+        <Route
+          path="/admin/activities"
           render={() => {
-            return <AdminTemplate inner={<Activity />}/>
-          }} 
+            return <AdminTemplate inner={<Activity />} />
+          }}
         />
-        <Route 
-          path="/admin/activity" 
+        <Route
+          path="/admin/activity"
           render={() => {
-            return <AdminTemplate inner={<ActivityCard />}/>
-          }} 
+            return <AdminTemplate inner={<ActivityCard />} />
+          }}
         />
         <Route
           path="/admin/learningObjects"
           render={() => {
-            return <AdminTemplate inner={<EducationalObject />}/>
-          }} 
+            return <AdminTemplate inner={<EducationalObject />} />
+          }}
         />
         <Route
           path="/admin/learningObject"
           render={() => {
-            return <AdminTemplate inner={<EducationalObjectCard />}/>
-          }} 
+            return <AdminTemplate inner={<EducationalObjectCard />} />
+          }}
         />
         <Route
           path="/admin/learningObjectEdit"
           render={() => {
-            return <AdminTemplate inner={<EducationalObjectEdit />}/>
-          }} 
+            return <AdminTemplate inner={<EducationalObjectEdit />} />
+          }}
         />
-        <Route 
-          path="/admin/complaints" 
+        <Route
+          path="/admin/complaints"
           render={() => {
-            return <AdminTemplate inner={<Complaints />}/>
-          }} 
+            return <AdminTemplate inner={<Complaints />} />
+          }}
         />
-        <Route 
-          path="/admin/complaint" 
+        <Route
+          path="/admin/complaint"
           render={() => {
-            return <AdminTemplate inner={<ComplaintCard />}/>
-          }} 
+            return <AdminTemplate inner={<ComplaintCard />} />
+          }}
         />
         <Route
           path="/admin/users/teacher_requests"
           render={() => {
-            return <AdminTemplate inner={<AproveTeacher />}/> 
+            return <AdminTemplate inner={<AproveTeacher />} />
           }} />
-        <Route 
-          path="/admin/usersList" 
+        <Route
+          path="/admin/usersList"
           render={() => {
-            return <AdminTemplate inner={<UserList />}/>
-          }} 
+            return <AdminTemplate inner={<UserList />} />
+          }}
         />
-        <Route 
-          path="/admin/user" 
+        <Route
+          path="/admin/user"
           render={() => {
-            return <AdminTemplate inner={<UserCard />}/>
-          }} 
+            return <AdminTemplate inner={<UserCard />} />
+          }}
         />
-        <Route 
-          path="/admin/EditUser" 
+        <Route
+          path="/admin/EditUser"
           render={() => {
-            return <AdminTemplate inner={<EditUser />}/>
-          }} 
+            return <AdminTemplate inner={<EditUser />} />
+          }}
         />
-        <Route 
-          path="/admin/permissions" 
+        <Route
+          path="/admin/permissions"
           render={() => {
-            return <AdminTemplate inner={<UserPermissions />}/>
-          }} 
+            return <AdminTemplate inner={<UserPermissions />} />
+          }}
         />
-        <Route 
-          path="/admin/EditPermissions" 
+        <Route
+          path="/admin/EditPermissions"
           render={() => {
-            return <AdminTemplate inner={<EditRole />}/>
-          }} 
+            return <AdminTemplate inner={<EditRole />} />
+          }}
         />
-        <Route 
-          path="/admin/CreateRole" 
+        <Route
+          path="/admin/CreateRole"
           render={() => {
-            return <AdminTemplate inner={<CreateRole />}/>
-          }} 
+            return <AdminTemplate inner={<CreateRole />} />
+          }}
         />
-        <Route 
-          path="/admin/BlockedUsers" 
+        <Route
+          path="/admin/BlockedUsers"
           render={() => {
-            return <AdminTemplate inner={<BlockedUser />}/>
-          }} 
+            return <AdminTemplate inner={<BlockedUser />} />
+          }}
         />
-        <Route 
-          path="/admin/sendEmail" 
+        <Route
+          path="/admin/sendEmail"
           render={() => {
-            return <AdminTemplate inner={<SendEmail />}/>
-          }} 
+            return <AdminTemplate inner={<SendEmail />} />
+          }}
         />
 
         <Route path='*' component={PageNotFound} />