Skip to content
Snippets Groups Projects
Commit ad554efa authored by lfr20's avatar lfr20
Browse files

Merge branch 'master' into 'Develop'

# Conflicts:
#   src/App.js
parents 8d4de665 cf7ce0c5
No related branches found
No related tags found
2 merge requests!104Revert "Merge branch 'Develop_copy_to_implement_acessibility' into 'Develop'",!103Revert "Merge branch 'Develop_copy_to_implement_acessibility' into 'Develop'"
......@@ -103,20 +103,20 @@ const BlockedUser = React.lazy(() => import("./Admin/Pages/Pages/SubPages/Blocke
async function supportsWebp() {
if (!createImageBitmap) return false;
const webpData = 'data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=';
const blob = await fetch(webpData).then(r => r.blob());
return createImageBitmap(blob).then(() => true, () => false);
}
const LoadingScreen = () => (
const LoadingScreen = () => (
<div style={{
position: "absolute",
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)"
}}>
<LoadingSpinner/>
<LoadingSpinner />
</div>
);
......@@ -133,7 +133,7 @@ export default function App() {
const customHistory = createBrowserHistory()
async function testWebpSupport() {
if(await supportsWebp()) {
if (await supportsWebp()) {
localStorage.setItem('webpSupport', 'True');
} else {
localStorage.setItem('webpSupport', 'False');
......@@ -158,7 +158,7 @@ export default function App() {
useEffect(() => {
state.contrast === "" ? document.body.style.backgroundColor = "white" : document.body.style.backgroundColor = "black"
}, [ state.contrast ]);
}, [state.contrast]);
useEffect(() => {
const setWindowSize = () => {
......
......@@ -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.portalmectest.c3sl.ufpr.br',
var apiDomain = 'https://api.portalmec.c3sl.ufpr.br',
apiVersion = 'v1',
apiUrl = apiDomain + '/' + apiVersion;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment