Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PortalMEC-React
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Harbor Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PortalMEC
PortalMEC-React
Commits
ad554efa
Commit
ad554efa
authored
3 years ago
by
lfr20
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 'Develop'
# Conflicts: # src/App.js
parents
8d4de665
cf7ce0c5
No related branches found
No related tags found
2 merge requests
!104
Revert "Merge branch 'Develop_copy_to_implement_acessibility' into 'Develop'"
,
!103
Revert "Merge branch 'Develop_copy_to_implement_acessibility' into 'Develop'"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/App.js
+5
-5
5 additions, 5 deletions
src/App.js
src/env.js
+1
-1
1 addition, 1 deletion
src/env.js
with
6 additions
and
6 deletions
src/App.js
+
5
−
5
View file @
ad554efa
...
...
@@ -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
=
()
=>
{
...
...
This diff is collapsed.
Click to expand it.
src/env.js
+
1
−
1
View file @
ad554efa
...
...
@@ -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
test
.c3sl.ufpr.br
'
,
var
apiDomain
=
'
https://api.portalmec.c3sl.ufpr.br
'
,
apiVersion
=
'
v1
'
,
apiUrl
=
apiDomain
+
'
/
'
+
apiVersion
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment