Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2022-066
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
2022-066
2022-066
Commits
480c74be
Commit
480c74be
authored
May 08, 2022
by
Navodya Pasqual
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed ui issues
parent
ca2f608a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
8 deletions
+30
-8
frontend/package-lock.json
frontend/package-lock.json
+28
-5
frontend/src/components/navBar/navbar.js
frontend/src/components/navBar/navbar.js
+2
-2
frontend/src/routes/pageRoutes.js
frontend/src/routes/pageRoutes.js
+0
-1
No files found.
frontend/package-lock.json
View file @
480c74be
...
@@ -2597,6 +2597,14 @@
...
@@ -2597,6 +2597,14 @@
"resolved"
:
"https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz"
,
"integrity"
:
"sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
"integrity"
:
"sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
},
},
"@types/http-proxy"
:
{
"version"
:
"1.17.9"
,
"resolved"
:
"https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"
,
"integrity"
:
"sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="
,
"requires"
:
{
"@types/node"
:
"*"
}
},
"@types/istanbul-lib-coverage"
:
{
"@types/istanbul-lib-coverage"
:
{
"version"
:
"2.0.4"
,
"version"
:
"2.0.4"
,
"resolved"
:
"https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"
,
"resolved"
:
"https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"
,
...
@@ -5755,8 +5763,7 @@
...
@@ -5755,8 +5763,7 @@
"eventemitter3"
:
{
"eventemitter3"
:
{
"version"
:
"4.0.7"
,
"version"
:
"4.0.7"
,
"resolved"
:
"https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
,
"resolved"
:
"https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
,
"integrity"
:
"sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
,
"integrity"
:
"sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
"dev"
:
true
},
},
"eventlistener"
:
{
"eventlistener"
:
{
"version"
:
"0.0.1"
,
"version"
:
"0.0.1"
,
...
@@ -6778,7 +6785,6 @@
...
@@ -6778,7 +6785,6 @@
"version"
:
"1.18.1"
,
"version"
:
"1.18.1"
,
"resolved"
:
"https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
,
"integrity"
:
"sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="
,
"integrity"
:
"sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="
,
"dev"
:
true
,
"requires"
:
{
"requires"
:
{
"eventemitter3"
:
"^4.0.0"
,
"eventemitter3"
:
"^4.0.0"
,
"follow-redirects"
:
"^1.0.0"
,
"follow-redirects"
:
"^1.0.0"
,
...
@@ -7251,6 +7257,11 @@
...
@@ -7251,6 +7257,11 @@
"resolved"
:
"https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
,
"resolved"
:
"https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
,
"integrity"
:
"sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
"integrity"
:
"sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
},
},
"is-plain-obj"
:
{
"version"
:
"3.0.0"
,
"resolved"
:
"https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
,
"integrity"
:
"sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
},
"is-plain-object"
:
{
"is-plain-object"
:
{
"version"
:
"2.0.4"
,
"version"
:
"2.0.4"
,
"resolved"
:
"https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
,
"resolved"
:
"https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
,
...
@@ -12189,8 +12200,7 @@
...
@@ -12189,8 +12200,7 @@
"requires-port"
:
{
"requires-port"
:
{
"version"
:
"1.0.0"
,
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
,
"integrity"
:
"sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
,
"integrity"
:
"sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
"dev"
:
true
},
},
"resize-observer-polyfill"
:
{
"resize-observer-polyfill"
:
{
"version"
:
"1.5.1"
,
"version"
:
"1.5.1"
,
...
@@ -14000,6 +14010,7 @@
...
@@ -14000,6 +14010,7 @@
"express"
:
"^4.17.1"
,
"express"
:
"^4.17.1"
,
"graceful-fs"
:
"^4.2.6"
,
"graceful-fs"
:
"^4.2.6"
,
"html-entities"
:
"^2.3.2"
,
"html-entities"
:
"^2.3.2"
,
"http-proxy-middleware"
:
"^2.0.0"
,
"ipaddr.js"
:
"^2.0.1"
,
"ipaddr.js"
:
"^2.0.1"
,
"open"
:
"^8.0.9"
,
"open"
:
"^8.0.9"
,
"p-retry"
:
"^4.5.0"
,
"p-retry"
:
"^4.5.0"
,
...
@@ -14038,6 +14049,18 @@
...
@@ -14038,6 +14049,18 @@
"resolved"
:
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"
,
"integrity"
:
"sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
"integrity"
:
"sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
},
},
"http-proxy-middleware"
:
{
"version"
:
"2.0.6"
,
"resolved"
:
"https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"
,
"integrity"
:
"sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw=="
,
"requires"
:
{
"@types/http-proxy"
:
"^1.17.8"
,
"http-proxy"
:
"^1.18.1"
,
"is-glob"
:
"^4.0.1"
,
"is-plain-obj"
:
"^3.0.0"
,
"micromatch"
:
"^4.0.2"
}
},
"json-schema-traverse"
:
{
"json-schema-traverse"
:
{
"version"
:
"1.0.0"
,
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
,
...
...
frontend/src/components/navBar/navbar.js
View file @
480c74be
...
@@ -27,7 +27,7 @@ const Navbar = () => {
...
@@ -27,7 +27,7 @@ const Navbar = () => {
<
div
className
=
"
navbar-links_container
"
>
<
div
className
=
"
navbar-links_container
"
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/
'
)}
to
=
"
/
"
>
Home
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/
'
)}
to
=
"
/
"
>
Home
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
#
'
)}
to
=
"
#
"
>
Video
summarizer
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
#
'
)}
to
=
"
#
"
>
Video
summarizer
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
#
'
)}
to
=
"
#
"
>
Digital
human
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/digital-human
'
)}
to
=
"
/digital-human
"
>
Digital
human
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/about-us
'
)}
to
=
"
/about-us
"
>
About
us
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/about-us
'
)}
to
=
"
/about-us
"
>
About
us
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/contact-us
'
)}
to
=
"
/contact-us
"
>
Contact
us
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/contact-us
'
)}
to
=
"
/contact-us
"
>
Contact
us
<
/Link></
p
>
<
/div
>
<
/div
>
...
@@ -47,7 +47,7 @@ const Navbar = () => {
...
@@ -47,7 +47,7 @@ const Navbar = () => {
<
div
className
=
"
navbar-menu_container-links
"
>
<
div
className
=
"
navbar-menu_container-links
"
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/
'
)}
to
=
"
/
"
>
Home
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/
'
)}
to
=
"
/
"
>
Home
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
#
'
)}
to
=
"
#
"
>
Video
summarizer
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
#
'
)}
to
=
"
#
"
>
Video
summarizer
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
#
'
)}
to
=
"
#
"
>
Digital
human
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/digital-human
'
)}
to
=
"
/digital-human
"
>
Digital
human
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/about-us
'
)}
to
=
"
/about-us
"
>
About
us
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/about-us
'
)}
to
=
"
/about-us
"
>
About
us
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/contact-us
'
)}
to
=
"
/contact-us
"
>
Contact
us
<
/Link></
p
>
<
p
><
Link
style
=
{
isActive
(
history
,
'
/contact-us
'
)}
to
=
"
/contact-us
"
>
Contact
us
<
/Link></
p
>
<
/div
>
<
/div
>
...
...
frontend/src/routes/pageRoutes.js
View file @
480c74be
...
@@ -2,7 +2,6 @@ import React from 'react';
...
@@ -2,7 +2,6 @@ import React from 'react';
import
{
BrowserRouter
as
Router
,
Route
,
Switch
}
from
'
react-router-dom
'
;
import
{
BrowserRouter
as
Router
,
Route
,
Switch
}
from
'
react-router-dom
'
;
//import pages
//import pages
import
Home
from
"
../main/home
"
;
import
DigitalHuman
from
'
../digitalHuman/digitalHuman
'
;
import
DigitalHuman
from
'
../digitalHuman/digitalHuman
'
;
import
Home
from
"
../main/Home/home
"
;
import
Home
from
"
../main/Home/home
"
;
import
Navbar
from
'
../components/navBar/navbar
'
;
import
Navbar
from
'
../components/navBar/navbar
'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment