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
c13028b3
Commit
c13028b3
authored
Aug 05, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-dev(pc)' into 'master'
push lagi See merge request
!3
parents
bdd4bf67
8a7de15a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
15 deletions
+66
-15
Index.js
src/Utils/Index.js
+1
-2
Images.js
src/assets/Images.js
+1
-0
dropdown-black.svg
src/assets/dropdown-black.svg
+6
-0
dropdown-white.svg
src/assets/dropdown-white.svg
+1
-1
search.png
src/assets/search.png
+0
-0
Beranda.js
src/container/Beranda.js
+42
-0
Home.js
src/container/Home.js
+15
-12
No files found.
src/Utils/Index.js
View file @
c13028b3
...
...
@@ -74,13 +74,12 @@ function FadeMenu() {
}
const
footerStyle
=
{
backgroundColor
:
"
purple
"
,
backgroundColor
:
"
#0d2846
"
,
fontSize
:
"20px"
,
color
:
"white"
,
borderTop
:
"1px solid #E7E7E7"
,
textAlign
:
"center"
,
padding
:
"20px"
,
position
:
"fixed"
,
left
:
"0"
,
bottom
:
"0"
,
height
:
"60px"
,
...
...
src/assets/Images.js
View file @
c13028b3
const
Images
=
{
dropdownWhite
:
require
(
'./dropdown-white.svg'
),
dropdownBlack
:
require
(
'./dropdown-black.svg'
),
flagEnglish
:
require
(
'./english.svg'
),
search
:
require
(
'./search.png'
),
logout
:
require
(
'./setting.png'
),
...
...
src/assets/dropdown-black.svg
0 → 100644
View file @
c13028b3
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"8"
height=
"6"
viewBox=
"0 0 8 6"
>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<path
d=
"M0 0H23.977V24H0z"
transform=
"rotate(90 13.5 2.5)"
/>
<path
fill=
"#4B4B4B"
d=
"M8.998 10.02L15.002 8.998 13.975 14.998z"
transform=
"rotate(90 13.5 2.5) rotate(45 12 11.998)"
/>
</g>
</svg>
src/assets/dropdown-white.svg
View file @
c13028b3
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"8"
height=
"6"
viewBox=
"0 0 8 6"
>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<path
d=
"M0 0H23.977V24H0z"
transform=
"rotate(90 13.5 2.5)"
/>
<path
fill=
"#
4B4B4B
"
d=
"M8.998 10.02L15.002 8.998 13.975 14.998z"
transform=
"rotate(90 13.5 2.5) rotate(45 12 11.998)"
/>
<path
fill=
"#
FFF
"
d=
"M8.998 10.02L15.002 8.998 13.975 14.998z"
transform=
"rotate(90 13.5 2.5) rotate(45 12 11.998)"
/>
</g>
</svg>
src/assets/search.png
View replaced file @
bdd4bf67
View file @
c13028b3
1.21 KB
|
W:
|
H:
809 Bytes
|
W:
|
H:
2-up
Swipe
Onion skin
src/container/Beranda.js
0 → 100644
View file @
c13028b3
import
React
,
{
Component
}
from
'react'
;
import
{
Typography
}
from
'@material-ui/core'
;
export
default
class
Beranda
extends
Component
{
render
()
{
return
(
<
div
style
=
{{
flex
:
1
}}
>
<
div
style
=
{{
height
:
150
,
width
:
'100%'
,
backgroundColor
:
'#354960'
,
padding
:
20
}}
>
<
Typography
style
=
{{
fontSize
:
'24px'
,
color
:
'white'
}}
>
Selamat
Datang
,
John
!<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'12px'
,
color
:
'white'
,
marginTop
:
50
}}
>
Task
Yang
Harus
Dikerjakan
<
/Typography
>
<
/div
>
<
div
style
=
{{
flex
:
1
,
padding
:
20
,
width
:
'100%'
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
color
:
'#7e8085'
,
fontSize
:
'11px'
,
textDecorationLine
:
'underline'
,
marginRight
:
48
}}
>
Budget
-
2021
(
0
/
7
)
<
/Typography
>
<
Typography
style
=
{{
color
:
'#7e8085'
,
fontSize
:
'11px'
,
textDecorationLine
:
'underline'
,
marginRight
:
48
}}
>
Laporan
Bulanan
-
Oct
2020
(
1
/
7
)
<
/Typography
>
<
Typography
style
=
{{
color
:
'#51c6ea'
,
fontSize
:
'11px'
,
textDecorationLine
:
'underline'
,
marginRight
:
48
}}
>
Rolling
Outlook
-
Oct
2020
(
0
/
5
)
<
/Typography
>
<
Typography
style
=
{{
color
:
'#7e8085'
,
fontSize
:
'11px'
,
textDecorationLine
:
'underline'
}}
>
Lainnya
<
/Typography
>
<
/div
>
<
/div
>
<
div
style
=
{{
flex
:
1
,
padding
:
20
,
width
:
'100%'
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
div
style
=
{{
height
:
283
,
width
:
398
,
borderRadius
:
6
,
backgroundColor
:
'#fff'
,
border
:
'1px solid #c4c4c4'
,
marginRight
:
25
,
padding
:
16
}}
>
<
Typography
style
=
{{
color
:
'#4b4b4b'
,
fontSize
:
'16px'
,
fontWeight
:
'bold'
}}
>
BALANCE
SHEET
<
/Typography
>
<
/div
>
<
div
style
=
{{
height
:
283
,
width
:
398
,
borderRadius
:
6
,
backgroundColor
:
'#fff'
,
border
:
'1px solid #c4c4c4'
}}
>
<
/div
>
<
/div
>
<
div
style
=
{{
display
:
'flex'
,
marginTop
:
25
}}
>
<
div
style
=
{{
height
:
283
,
width
:
398
,
borderRadius
:
6
,
backgroundColor
:
'#fff'
,
border
:
'1px solid #c4c4c4'
,
marginRight
:
25
}}
>
<
/div
>
<
div
style
=
{{
height
:
283
,
width
:
398
,
borderRadius
:
6
,
backgroundColor
:
'#fff'
,
border
:
'1px solid #c4c4c4'
}}
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
);
}
}
src/container/Home.js
View file @
c13028b3
...
...
@@ -28,6 +28,7 @@ import {
}
from
"react-router-dom"
;
import
Images
from
'../assets/Images'
;
import
{
FadeMenu
,
Footer
}
from
'../Utils/Index'
;
import
Beranda
from
'./Beranda'
;
const
drawerWidth
=
240
;
...
...
@@ -117,9 +118,9 @@ export default function MiniDrawer() {
[
classes
.
appBarShift
]:
open
,
})}
>
<
Toolbar
style
=
{{
flex
:
1
,
backgroundColor
:
'
white
'
}}
>
<
Toolbar
style
=
{{
flex
:
1
,
backgroundColor
:
'
#51c6ea
'
}}
>
<
IconButton
color
=
"
defaul
t"
color
=
"
inheri
t"
aria
-
label
=
"open drawer"
onClick
=
{
handleDrawerOpen
}
edge
=
"start"
...
...
@@ -129,19 +130,19 @@ export default function MiniDrawer() {
>
<
MenuIcon
/>
<
/IconButton
>
<
div
style
=
{{
backgroundColor
:
'
white
'
,
height
:
'70px'
,
display
:
'flex'
,
flex
:
1
,
placeContent
:
'flex-end'
}}
>
<
div
style
=
{{
backgroundColor
:
'
#51c6ea
'
,
height
:
'70px'
,
display
:
'flex'
,
flex
:
1
,
placeContent
:
'flex-end'
}}
>
<
div
style
=
{{
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
paddingRight
:
20
,
paddingLeft
:
20
}}
>
<
div
style
=
{{
width
:
44
,
height
:
44
,
backgroundColor
:
'#354960'
,
borderRadius
:
30
,
marginRight
:
10
}}
/
>
<
Typography
style
=
{{
color
:
'
black
'
}}
>
Tommy
<
/Typography
>
<
Typography
style
=
{{
color
:
'
white
'
}}
>
Tommy
<
/Typography
>
{
/* <img src={require('./assets/dropdown-white.svg')} alt="React Logo" style={{ marginLeft: 15 }} /> */
}
<
FadeMenu
/>
<
/div
>
<
div
style
=
{{
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
paddingRight
:
10
,
paddingLeft
:
1
0
,
borderLeftColor
:
'#c2c2c2'
,
borderLeftWidth
:
.
2
,
borderLeftStyle
:
'solid'
}}
>
<
div
style
=
{{
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
paddingRight
:
20
,
paddingLeft
:
2
0
,
borderLeftColor
:
'#c2c2c2'
,
borderLeftWidth
:
.
2
,
borderLeftStyle
:
'solid'
}}
>
<
img
src
=
{
Images
.
search
}
alt
=
"React Logo"
style
=
{{
height
:
18
,
width
:
18
}}
/
>
<
/div
>
<
div
style
=
{{
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
paddingRight
:
20
,
paddingLeft
:
20
,
borderLeftColor
:
'#c2c2c2'
,
borderLeftWidth
:
.
2
,
borderLeftStyle
:
'solid'
}}
>
<
img
src
=
{
Images
.
flagEnglish
}
alt
=
"React Logo"
style
=
{{
height
:
32
,
width
:
32
}}
/
>
<
Typography
style
=
{{
color
:
'
black
'
}}
>
EN
<
/Typography
>
<
Typography
style
=
{{
color
:
'
white
'
}}
>
EN
<
/Typography
>
<
/div
>
<
/div
>
<
/Toolbar
>
...
...
@@ -183,21 +184,23 @@ export default function MiniDrawer() {
))}
</List>
</Drawer>
<div className={classes.content} style={{ height: '100vh', justifyContent: 'space-between' }}>
<div className={classes.content} style={{ height: '100vh', justifyContent: 'space-between'
, padding: 0, backgroundColor: '#f8f8f8'
}}>
<div>
<div className={classes.toolbar} />
<Switch>
{/*
<Switch>
<Route exact path={path}>
<h3>Please select a topic.</h3>
</Route>
<Route path={`
$
{
path
}
/:topicId`}
>
<
Topic
/>
<
/Route
>
<
/Switch
>
<
/Switch> */
}
<
Beranda
/>
<
Footer
>
<
Typography
style
=
{{
fontSize
:
'12px'
}}
>
©
EKSAD
Technology
.
All
rights
reserved
.
<
/Typography
>
<
/Footer
>
<
/div
>
<
Footer
>
<
span
>
footer
content
<
/span
>
<
/Footer
>
<
/div
>
<
/div
>
);
...
...
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