Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
f5525d3e
Commit
f5525d3e
authored
Aug 09, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
update See merge request
!21
parents
d1abb4c9
0be5cc85
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
96 additions
and
6 deletions
+96
-6
package-lock.json
package-lock.json
+79
-0
Images.js
src/assets/Images.js
+5
-3
Home.js
src/container/Home.js
+2
-2
User.js
src/container/Otorisasi/User.js
+9
-0
UserRole.js
src/container/Otorisasi/UserRole.js
+0
-0
homeRoutes.js
src/router/homeRoutes.js
+1
-1
No files found.
package-lock.json
View file @
f5525d3e
...
...
@@ -4426,6 +4426,65 @@
"type"
:
"^1.0.1"
}
},
"d3-color"
:
{
"version"
:
"1.4.1"
,
"resolved"
:
"https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz"
,
"integrity"
:
"sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q=="
},
"d3-dispatch"
:
{
"version"
:
"1.0.6"
,
"resolved"
:
"https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz"
,
"integrity"
:
"sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
},
"d3-ease"
:
{
"version"
:
"1.0.6"
,
"resolved"
:
"https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz"
,
"integrity"
:
"sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
},
"d3-interpolate"
:
{
"version"
:
"1.4.0"
,
"resolved"
:
"https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz"
,
"integrity"
:
"sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA=="
,
"requires"
:
{
"d3-color"
:
"1"
}
},
"d3-path"
:
{
"version"
:
"1.0.9"
,
"resolved"
:
"https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz"
,
"integrity"
:
"sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
},
"d3-selection"
:
{
"version"
:
"1.4.2"
,
"resolved"
:
"https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz"
,
"integrity"
:
"sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
},
"d3-shape"
:
{
"version"
:
"1.3.7"
,
"resolved"
:
"https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz"
,
"integrity"
:
"sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="
,
"requires"
:
{
"d3-path"
:
"1"
}
},
"d3-timer"
:
{
"version"
:
"1.0.10"
,
"resolved"
:
"https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz"
,
"integrity"
:
"sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
},
"d3-transition"
:
{
"version"
:
"1.3.2"
,
"resolved"
:
"https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz"
,
"integrity"
:
"sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA=="
,
"requires"
:
{
"d3-color"
:
"1"
,
"d3-dispatch"
:
"1"
,
"d3-ease"
:
"1"
,
"d3-interpolate"
:
"1"
,
"d3-selection"
:
"^1.1.0"
,
"d3-timer"
:
"1"
}
},
"damerau-levenshtein"
:
{
"version"
:
"1.0.6"
,
"resolved"
:
"https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"
,
...
...
@@ -10869,6 +10928,18 @@
"whatwg-fetch"
:
"^3.0.0"
}
},
"react-d3-donut"
:
{
"version"
:
"1.1.2"
,
"resolved"
:
"https://registry.npmjs.org/react-d3-donut/-/react-d3-donut-1.1.2.tgz"
,
"integrity"
:
"sha512-NN6uFPiSYfh+859QNBa5UfGUZlORGJF4r8RPS1HJmF3MserVrpU8YLC1MkRIENJLmIrnhk7v0sNmhBE1DNnEZg=="
,
"requires"
:
{
"d3-interpolate"
:
"^1.3.2"
,
"d3-selection"
:
"^1.3.2"
,
"d3-shape"
:
"^1.2.2"
,
"d3-transition"
:
"^1.1.3"
,
"prop-types"
:
"^15.6.2"
}
},
"react-dev-utils"
:
{
"version"
:
"10.2.1"
,
"resolved"
:
"https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz"
,
...
...
@@ -11120,6 +11191,14 @@
"resolved"
:
"https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"
,
"integrity"
:
"sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-number-format"
:
{
"version"
:
"4.4.1"
,
"resolved"
:
"https://registry.npmjs.org/react-number-format/-/react-number-format-4.4.1.tgz"
,
"integrity"
:
"sha512-ZGFMXZ0U7DcmQ3bSZY3FULOA1mfqreT9NIMYZNoa/ouiSgiTQiYA95Uj2KN8ge6BRr+ghA5vraozqWqsHZQw3Q=="
,
"requires"
:
{
"prop-types"
:
"^15.7.2"
}
},
"react-router"
:
{
"version"
:
"5.2.0"
,
"resolved"
:
"https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz"
,
...
...
src/assets/Images.js
View file @
f5525d3e
const
Images
=
{
//Vector
dropdownWhite
:
require
(
'./dropdown-white.svg'
),
dropdownBlack
:
require
(
'./dropdown-black.svg'
),
flagEnglish
:
require
(
'./english.svg'
),
search
:
require
(
'./search.png'
),
logout
:
require
(
'./setting.png'
),
setting
:
require
(
'./logout.png'
),
Home
:
require
(
'./home.svg'
),
budgetTahunan
:
require
(
'./masterbudget.svg'
),
manajemenDokumen
:
require
(
'./docmanagement.svg'
),
...
...
@@ -29,6 +27,10 @@ const Images = {
//Image
triputra
:
require
(
'./triputra.png'
),
ceklis
:
require
(
'./ceklis.png'
),
search
:
require
(
'./search.png'
),
logout
:
require
(
'./setting.png'
),
setting
:
require
(
'./logout.png'
),
}
...
...
src/container/Home.js
View file @
f5525d3e
...
...
@@ -225,7 +225,7 @@ export default function MiniDrawer() {
<
ListItemIcon
>
{
index
%
2
===
0
?
<
InboxIcon
style
=
{{
color
:
"white"
}}
/> : <MailIcon style={{color:"white"}}/
>
}
<
/ListItemIcon
>
<
Typography
style
=
{{
color
:
'white'
,
fontSize
:
12
}}
>
{
item
.
label
}
<
/Typography
>
<
/ListItem
>
{
item
.
subItem
!=
null
?
(
index
===
selectedIndex
?
<
Expand
More
style
=
{{
color
:
"white"
,
marginLeft
:
50
,
alignSelf
:
'center'
}}
/> : <ExpandLess
style={{color:"white", marginLeft: 50, alignSelf:'center'}}/
>
)
:
null
}
{
item
.
subItem
!=
null
?
(
index
===
selectedIndex
?
<
Expand
Less
style
=
{{
color
:
"white"
,
marginLeft
:
50
,
alignSelf
:
'center'
}}
/> : <ExpandMore
style={{color:"white", marginLeft: 50, alignSelf:'center'}}/
>
)
:
null
}
<
/div
>
:
<
Link
to
=
{
`
${
url
}
/
${
item
.
path
}
`
}
>
...
...
@@ -242,7 +242,7 @@ export default function MiniDrawer() {
{
item
.
subItem
.
map
((
sub
,
index
)
=>
{
return
(
<
Link
to
=
{
`
${
url
}
/
${
sub
.
path
}
`
}
>
<
ListItem
style
=
{{
paddingLeft
:
7
0
}}
>
<
ListItem
style
=
{{
paddingLeft
:
7
2
}}
>
<
Typography
style
=
{{
color
:
'white'
,
fontSize
:
12
}}
>
{
sub
.
label
}
<
/Typography
>
<
/ListItem
>
<
/Link
>
...
...
src/container/Otorisasi/User.js
0 → 100644
View file @
f5525d3e
import
React
,
{
Component
}
from
'react'
;
export
default
class
componentName
extends
Component
{
render
()
{
return
(
<
div
>
textInComponent
<
/div
>
);
}
}
src/container/UserRole.js
→
src/container/
Otorisasi/
UserRole.js
View file @
f5525d3e
File moved
src/router/homeRoutes.js
View file @
f5525d3e
import
screen404
from
'../container/Screen404'
import
Beranda
from
'../container/Beranda'
import
UserRole
from
'../container/UserRole'
import
UserRole
from
'../container/
Otorisasi/
UserRole'
import
ApprovalMatrix
from
'../container/ApprovalMatrix'
import
BudgetTahunan
from
'../container/BudgetTahunan'
;
import
HomePage
from
'../container/HomePage'
;
...
...
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