From 8f5a65e993d5ed58e7abb724c3b98a695074bbbd Mon Sep 17 00:00:00 2001
From: Lucas Schoenfelder <les17@inf.ufpr.br>
Date: Wed, 29 Jul 2020 10:51:50 -0300
Subject: [PATCH] mectest
---
public/index.html | 29 +------------------
src/Components/LoginContainerFunction.js | 12 ++++----
.../FineUploaderDropzone.js | 5 ++++
src/env.js | 2 +-
4 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/public/index.html b/public/index.html
index 2e5c176d..a990c797 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,30 +1,3 @@
-<!-- Copyright (C) 2019 Centro de Computacao Cientifica e Software Livre
-Departamento de Informatica - Universidade Federal do Parana
-This file is part of Plataforma Integrada MEC.
-Plataforma Integrada MEC is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Plataforma Integrada MEC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>. -->
-
-<!DOCTYPE html>
-<html lang="pt-br">
- <head>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Portal MEC</title>
- </head>
- <body >
- <noscript>You need to enable JavaScript to run this app.</noscript>
- <div id="root"/>
- </body>
-</html>
+<!-- Copyright (C) 2019 Centro de Computacao Cientifica e Software Livre Departamento de Informatica - Universidade Federal do Parana This file is part of Plataforma Integrada MEC. Plataforma Integrada MEC is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Plataforma Integrada MEC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>. --> <!DOCTYPE html> <html lang="pt-br"> <head> <meta charset="utf-8" /> <!-- google sign-in --> <meta name="google-signin-client_id" content="288460085642-k4veg4fo8kddvjer8b055n9da5qtgha7.apps.googleusercontent.com"> <script src="https://apis.google.com/js/platform.js" async defer></script> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Portal MEC</title> </head> <body > <noscript>You need to enable JavaScript to run this app.</noscript> <div id="root"/> </body> </html>
diff --git a/src/Components/LoginContainerFunction.js b/src/Components/LoginContainerFunction.js
index b3c63046..a6532b50 100644
--- a/src/Components/LoginContainerFunction.js
+++ b/src/Components/LoginContainerFunction.js
@@ -95,7 +95,7 @@ export default function LoginContainer (props) {
}
//arrumar isso
- const responseGoogle = (response) => {
+ const = (response) => {
console.log(response);
}
@@ -112,16 +112,16 @@ export default function LoginContainer (props) {
</DialogHeaderStyled>
<DialogContentDiv>
- {/*<SocialConnectDiv>
+ <SocialConnectDiv>
<StyledGoogleLoginButton
- clientId="658977310896-knrl3gka66fldh83dao2rhgbblmd4un9.apps.googleusercontent.com"
- onSuccess={responseGoogle}
- onFailure={responseGoogle}
+ clientId="288460085642-k4veg4fo8kddvjer8b055n9da5qtgha7.apps.googleusercontent.com"
+ onSuccess={ }
+ onFailure={ }
cookiePolicy={'single_host_origin'}
>
<span style={{textTransform:"none", fontSize:"13px", color : "#666"}}>Usando o Google</span>
</StyledGoogleLoginButton>
- </SocialConnectDiv>*/}
+ </SocialConnectDiv>
<H3Div>
<H3Styled>
diff --git a/src/Components/UploadPageComponents/FineUploaderDropzone.js b/src/Components/UploadPageComponents/FineUploaderDropzone.js
index 33f1f06d..a00b1bb0 100644
--- a/src/Components/UploadPageComponents/FineUploaderDropzone.js
+++ b/src/Components/UploadPageComponents/FineUploaderDropzone.js
@@ -17,6 +17,11 @@ export default function FineUploaderDropzone (props) {
deleteFile : {
enabled : true,
endpoint: `${apiUrl}/learning_objects/` + props.draftID + '/chunk'
+ },
+ callbacks : {
+ onUploadChunk : function(id, name, chunkData) {
+
+ }
}
}
})
diff --git a/src/env.js b/src/env.js
index 1f221ee7..2450da0f 100644
--- a/src/env.js
+++ b/src/env.js
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
-var apiDomain = 'https://api.portalmec.c3sl.ufpr.br',
+var apiDomain = 'https://api.portalmectest.c3sl.ufpr.br',
apiVersion = 'v1',
apiUrl = apiDomain + '/' + apiVersion;
--
GitLab