Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
personal_website
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
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
cs242-fa18-jyu65
personal_website
Commits
af8fa554
Commit
af8fa554
authored
6 years ago
by
JINGXUAN_YU
Browse files
Options
Downloads
Patches
Plain Diff
add_description
parent
28c9a71a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!3
Week4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/data/data.json
+16
-12
16 additions, 12 deletions
src/data/data.json
src/pages/Portfolio.jsx
+7
-2
7 additions, 2 deletions
src/pages/Portfolio.jsx
src/styles/Portfolio.scss
+5
-1
5 additions, 1 deletion
src/styles/Portfolio.scss
with
28 additions
and
15 deletions
src/data/data.json
+
16
−
12
View file @
af8fa554
...
...
@@ -4,84 +4,88 @@
"image"
:
[
"../../public/assets/images/1-1.JPG"
,
"../../public/assets/images/1-2.JPG"
],
"name"
:
"Blessing"
,
"time"
:
"2018-8-30"
,
"description"
:
"Feature flowers: Wax flower, Yew, Basil, Minicarn"
"description"
:
[
"Feature flowers: Wax flower, Yew, Basil, Minicarn"
]
},
{
"id"
:
2
,
"image"
:
[
"../../public/assets/images/2-1.JPG"
,
"../../public/assets/images/2-2.JPG"
],
"name"
:
"Corsage of Joy"
,
"time"
:
"2018-9-6"
,
"description"
:
"Cushion mum, Minicarn, Waxflower"
"description"
:
[
"Cushion mum, Minicarn, Waxflower"
]
},
{
"id"
:
3
,
"image"
:
[
"../../public/assets/images/3-1.JPG"
,
"../../public/assets/images/3-2.JPG"
],
"name"
:
"Embrace"
,
"time"
:
"2018-9-13"
,
"description"
:
"Feature flowers: Zinnia, Plumed celosia, Garlic chives"
"description"
:
[
"Feature flowers: Zinnia, Plumed celosia, Garlic chives"
]
},
{
"id"
:
4
,
"image"
:
[
"../../public/assets/images/4-1.JPG"
,
"../../public/assets/images/4-2.JPG"
],
"name"
:
"Blossom"
,
"time"
:
"2018-9-20"
,
"description"
:
"Feature flowers: Artemisia, Sedum, Zinnia
\n
Foliage: Smokebush, Bayberry, Leather leaf"
"description"
:
[
"Feature flowers: Artemisia, Sedum, Zinnia"
,
"Foliage: Smokebush, Bayberry, Leather leaf"
]
},
{
"id"
:
5
,
"image"
:
[
"../../public/assets/images/5-1.JPG"
,
"../../public/assets/images/5-2.JPG"
],
"name"
:
"Moonlight over the Lotus Pond"
,
"time"
:
"2018-9-20"
,
"description"
:
"Feature flowers: Cushion chrysanthemum, Button chrysanthemum, Mini carnation
\n
Foliage: Smokebush"
"description"
:
[
"Feature flowers: Cushion chrysanthemum, Button chrysanthemum, Mini carnation"
,
"Foliage: Smokebush"
]
},
{
"id"
:
6
,
"image"
:
[
"../../public/assets/images/6-1.JPG"
,
"../../public/assets/images/6-2.JPG"
,
"../../public/assets/images/6-3.JPG"
,
"../../public/assets/images/6-4.JPG"
],
"name"
:
"Tranquil"
,
"time"
:
"2018-9-27"
,
"description"
:
"Feature flowers: Cosmo, Gomphrena
\n
Foliage: Bear grass, Smokebush, Leather leaf, Bayberry"
"description"
:
[
"Feature flowers: Cosmo, Gomphrena"
,
"Foliage: Bear grass, Smokebush, Leather leaf, Bayberry"
]
},
{
"id"
:
7
,
"image"
:
[
"../../public/assets/images/7-1.JPG"
,
"../../public/assets/images/7-2.JPG"
],
"name"
:
"Passion"
,
"time"
:
"2018-10-4"
,
"description"
:
"Feature flowers: Gladiolus, Mini carnations, Dasiy, Solidago, Plumed celosia"
"description"
:
[
"Feature flowers: Gladiolus, Mini carnations, Dasiy, Solidago, Plumed celosia"
]
},
{
"id"
:
8
,
"image"
:
[
"../../public/assets/images/8-1.JPG"
,
"../../public/assets/images/8-2.JPG"
],
"name"
:
"Greetings from A Summer Morning"
,
"time"
:
"2018-10-12"
,
"description"
:
"Feature flowers: Larkspur, Spidermum, Mini carnations, Gomphrena"
"description"
:
[
"Feature flowers: Larkspur, Spidermum, Mini carnations, Gomphrena"
]
},
{
"id"
:
9
,
"image"
:
[
"../../public/assets/images/9-1.JPG"
,
"../../public/assets/images/9-2.JPG"
],
"name"
:
"Violet Rythm"
,
"time"
:
"2018-10-20"
,
"description"
:
"Feature flowers: Iris, Alstroemeria"
"description"
:
[
"Feature flowers: Iris, Alstroemeria"
]
},
{
"id"
:
10
,
"image"
:
[
"../../public/assets/images/10-1.JPG"
,
"../../public/assets/images/10-2.JPG"
,
"../../public/assets/images/10-3.JPG"
],
"name"
:
"Vitality"
,
"time"
:
"2018-10-25"
,
"description"
:
"Feature flowers: Spidermum, Hypericum berry, Spray rose, Sea Lavender"
"description"
:
[
"Feature flowers: Spidermum, Hypericum berry, Spray rose, Sea Lavender"
]
},
{
"id"
:
11
,
"image"
:
[
"../../public/assets/images/11-1.JPG"
,
"../../public/assets/images/11-2.JPG"
,
"../../public/assets/images/11-3.JPG"
],
"name"
:
"Affection"
,
"time"
:
"2018-11-9"
,
"description"
:
"Feature flowers: Tulip, Solidago, Button mum, Safflower, Hypericum berries
\n
Foliage: Tree fern, Variegated mini pittosporum"
"description"
:
[
"Feature flowers: Tulip, Solidago, Button mum, Safflower, Hypericum berries"
,
"Foliage: Tree fern, Variegated mini pittosporum"
]
},
{
"id"
:
12
,
"image"
:
[
"../../public/assets/images/12-1.JPG"
,
"../../public/assets/images/12-2.JPG"
],
"name"
:
"Gay"
,
"time"
:
"2018-11-15"
,
"description"
:
"Feature flowers: Statice"
"description"
:
[
"Feature flowers: Statice"
]
}
]
This diff is collapsed.
Click to expand it.
src/pages/Portfolio.jsx
+
7
−
2
View file @
af8fa554
...
...
@@ -14,7 +14,7 @@ class Portfolio extends React.Component {
activeItem
:
'
Portfolio
'
,
modalName
:
''
,
modalId
:
[],
modalDescription
:
''
,
modalDescription
:
[]
,
open
:
false
,
}
...
...
@@ -26,7 +26,7 @@ class Portfolio extends React.Component {
render
()
{
const
{
activeItem
,
open
,
modalName
,
modalId
,
activeItem
,
open
,
modalName
,
modalId
,
modalDescription
}
=
this
.
state
;
return
(
...
...
@@ -54,6 +54,11 @@ class Portfolio extends React.Component {
<
ModalHeader
toggle
=
{
this
.
handleCloseCard
}
>
{
modalName
}
</
ModalHeader
>
<
ModalBody
>
<
CardCarousel
idx
=
{
modalId
}
/>
<
div
id
=
"description"
>
{
modalDescription
.
map
((
line
,
key
)
=>
(
<
h5
key
=
{
key
}
>
{
line
}
</
h5
>
))
}
</
div
>
</
ModalBody
>
<
ModalFooter
>
<
Button
basic
color
=
"black"
onClick
=
{
this
.
handleCloseCard
}
>
Close
</
Button
>
...
...
This diff is collapsed.
Click to expand it.
src/styles/Portfolio.scss
+
5
−
1
View file @
af8fa554
...
...
@@ -31,4 +31,8 @@
#card-group
{
display
:
flex
;
justify-content
:
center
;
}
\ No newline at end of file
}
#description
{
margin-top
:
2%
;
}
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