Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: form-review:#2- added personal information component no css, pulled branch RB-design #15

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0467662
form-review:#2- added personal information component no css, pulled b…
nikisthaa Apr 17, 2020
c667067
form-preview:#2 - added onclick prop and declared proptypes
nikisthaa Apr 17, 2020
17d04b0
form-preview:#2 - change css style properties to camelCasing
nikisthaa Apr 17, 2020
7b41400
form-preview:#2 - added props and proptypes
nikisthaa Apr 17, 2020
2ae2a6e
form-preview:#2 - updated prop isPreview to preview
nikisthaa Apr 17, 2020
b686ca3
form-preview:#2 - added dummydata and PersonalInfo component
nikisthaa Apr 17, 2020
1f450aa
form-preview:#2 - updated icon proptypes
nikisthaa Apr 17, 2020
d82cb46
form-preview:#2 - updated proptypes
nikisthaa Apr 17, 2020
c6ae6c7
form-preview:#2 - solved merge issue with -b RB-design and added prop…
nikisthaa Apr 17, 2020
4da7b49
form-preview:#2 - added destructure in the props
nikisthaa Apr 20, 2020
d0b9ded
form-preview:#2 - removed PersonalInfoItem to separate file
nikisthaa Apr 20, 2020
bd6005b
form-preview:#2 - fixed typo
nikisthaa Apr 20, 2020
c718227
form-preview:#2 - add conditional rendering
nikisthaa Apr 20, 2020
01f19b7
form-preview:#2 - added new imports
nikisthaa Apr 20, 2020
1230655
form-preview:#2 - added new line
nikisthaa Apr 20, 2020
3cc943e
form-preview:#2 - added new line and conditional rendering
nikisthaa Apr 20, 2020
52272ff
form-preview:#2 - added destructuring in props
nikisthaa Apr 20, 2020
e7ef2f9
:form-review: #2 - pulled in branch RB-design
nikisthaa Apr 20, 2020
e241e2f
form-preview:#2 - updated dummy data
nikisthaa Apr 20, 2020
926164b
form-preview:#2 - updated component with design
nikisthaa Apr 20, 2020
cf4bf3c
form-preview:#2 - added achivement item component
nikisthaa Apr 20, 2020
9377f57
form-preview:#2 - added proptypes and achievementItem list
nikisthaa Apr 20, 2020
0a229be
form-preview:#2 - updated imports and proptypes
nikisthaa Apr 20, 2020
8d4b2dd
form-preview:#2 - updated data and props
nikisthaa Apr 20, 2020
4362c51
Merge branch 'dev' into form-preview
nikitashrestha Apr 20, 2020
61609ea
form-preview:#2 - add proptypes and fix merge conflicts
nikisthaa Apr 20, 2020
826d6f9
fix merge conflicts
nikisthaa Apr 20, 2020
d8c3625
form-review:#2 - add a line
nikisthaa Apr 20, 2020
4dc195b
form-review:#2 - implement object destructuring
nikisthaa Apr 20, 2020
65e6500
form-preview:#2 - added component for skill
nikisthaa Apr 21, 2020
9b22c3f
form-preview:#2 - add hidden style
nikisthaa Apr 21, 2020
cb4aed6
form-preview:#2 - add workexperience component
nikisthaa Apr 21, 2020
66dd1bd
form-preview:#2 - add ProjectUntertaken component
nikisthaa Apr 21, 2020
03bed8c
form-preview:#2 - add Certificate component
nikisthaa Apr 21, 2020
29b4f0a
form-preview:#2 - add contact component and update side nav
nikisthaa Apr 21, 2020
5aacf3b
form-review:#2 - added proptypes and fixed lint issue
nikisthaa Apr 21, 2020
b37d256
form-review:#2 - fixed lint issue
nikisthaa Apr 21, 2020
96c6840
form-review:#2 - add onclick event
nikisthaa Apr 21, 2020
50a80d9
form-review:#2 - fixed lint issue
nikisthaa Apr 21, 2020
610460e
form-review:#2 - update data
nikisthaa Apr 21, 2020
6838ab3
form-preview:#2 - update data
nikisthaa Apr 21, 2020
e1c86f1
form-preview:#2 - remove uppercase implementation
nikisthaa Apr 21, 2020
3e52d17
form-preview:#2 - add padding-top instead of padding-bottom
nikisthaa Apr 21, 2020
b3ed769
form-preview:#2 - update component with new data format
nikisthaa Apr 21, 2020
3f848f5
form-preview:#2 - add data to mockData file
nikisthaa Apr 21, 2020
df1ceb5
form-preview:#2 - solve merge conflicts
nikisthaa Apr 21, 2020
c5bcc90
form-preview:#2 - update props and proptypes
nikisthaa Apr 21, 2020
3e39e45
form-preview:#2 - update skill data
nikisthaa Apr 21, 2020
ffc7a50
form-preview:#2 - update proptypes
nikisthaa Apr 21, 2020
d12da81
form-preview:#2 - rename onclick to onClick
nikisthaa Apr 23, 2020
1ec6248
form-preview:#1 - remove unnecessary curly bracket
nikisthaa Apr 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const withImages = require('next-images');
const path = require('path');
const webpack = require('webpack');
module.exports = withImages({

module.exports = withImages({
nikitashrestha marked this conversation as resolved.
Show resolved Hide resolved
webpack: config => {
config.resolve.alias['~'] = path.resolve('src');
return config;
}
},
});
16 changes: 16 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion src/assets/image.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,22 @@ import ViewHidden from '~/assets/images/eye-hidden.png';
import ProfileImage from '~/assets/images/image-small.png';
import UpRightArrow from '~/assets/images/up-right-arrow.png';

export {Logo, Image, Edit, View, ProfileImage, Trash, Download, Copy, Email, Check, Delete, EditGray, Add, ViewHidden, UpRightArrow, Close, Calendar};
export {
Logo,
Image,
Edit,
View,
ProfileImage,
Trash,
Download,
Copy,
Email,
Check,
Delete,
EditGray,
Add,
ViewHidden,
UpRightArrow,
Close,
Calendar,
};
2 changes: 1 addition & 1 deletion src/assets/sass/modules/Button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
border-radius: 2px;
cursor: pointer;

@include m(cancel){
@include m(cancel) {
border: 1px solid $alto;
padding: 8px 16px;
color: $alto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.personal-info-row {
display: flex;
justify-content: space-between;
padding-bottom: 20px;
padding-top: 20px;
font: normal normal 16px/19px $font-primary;

&:last-child {
Expand Down
3 changes: 3 additions & 0 deletions src/assets/sass/modules/Skills/_skills.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
justify-content: space-between;
align-items: center;
}
@include m(hidden) {
color: $dusty-gray;
}
}

.chip-input-value {
Expand Down
4 changes: 2 additions & 2 deletions src/assets/sass/modules/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}
}

.hidden-tag{
.hidden-tag {
border-radius: 95px;
background: $nobel;
color: $white;
Expand All @@ -66,6 +66,6 @@
margin-left: 10px;
}

.close-option{
.close-option {
text-align: right;
}
18 changes: 9 additions & 9 deletions src/assets/sass/utilities/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ $font-primary: 'Inter', sans-serif;

$dusty-gray: #999999;
$mine-shaft: #333333;
$deep-koamaru: #102B7B;
$deep-koamaru: #102b7b;
$white: #ffffff;
$mercury: #E6E6E6;
$shamrock: #2ECC71;
$alto: #D2D2D2;
$dodger-blue: #29B6F6;
$gallery: #EEEEEE;
$pomegranate: #F44336;
$wild-sand: #F6F6F6;
$mercury: #e6e6e6;
$shamrock: #2ecc71;
$alto: #d2d2d2;
$dodger-blue: #29b6f6;
$gallery: #eeeeee;
$pomegranate: #f44336;
$wild-sand: #f6f6f6;
$dove-gray: #666666;
$nobel: #B3B3B3;
$nobel: #b3b3b3;
$dove-gray-light: #737373;
$black: #000000;
20 changes: 10 additions & 10 deletions src/assets/sass/utilities/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,29 @@

// Media queries -- please use this one
@mixin for-size($break) {
@if $break== "small" {
@if $break== 'small' {
@media (min-width: $small) {
// browser width >= 600px
@content;
}
} @else if $break== "medium" {
} @else if $break== 'medium' {
@media (min-width: $medium) {
// 800 px > browser width >= 600 px
@content;
}
} @else if $break== "large" {
} @else if $break== 'large' {
@media (min-width: $large) {
// browser width >= 800px
@content;
}
} @else if $break== "extra-large" {
} @else if $break== 'extra-large' {
@media (min-width: $extra-large) {
// browser width >= 800px
@content;
}
} @else {
@if (type-of($break) == "number") {
@media (min-width: $break + "px") {
@if (type-of($break) == 'number') {
@media (min-width: $break + 'px') {
// browser width >= given breakpoint in number
@content;
}
Expand All @@ -72,8 +72,8 @@

// Media queries for both min-width and min-height
@mixin for-sizes($width, $height) {
@if (type-of($width) == "number" and type-of($height) == "number") {
@media (min-width: $width + "px") and (min-height: $height + "px") {
@if (type-of($width) == 'number' and type-of($height) == 'number') {
@media (min-width: $width + 'px') and (min-height: $height + 'px') {
// browser width >= given breakpoint in number and
// browser height >= given breakpoint in number
@content;
Expand Down Expand Up @@ -109,7 +109,7 @@

//Pseudo-elements
@mixin psuedo-el($el, $el-width: null, $el-height: null) {
@if $el== ":before" or $el== "after" {
@if $el== ':before' or $el== 'after' {
&:#{$el} {
@extend %pseudos;
width: $el-width;
Expand All @@ -123,7 +123,7 @@

//Set Background
@mixin bg($img, $repeat: no-repeat, $position: 0 0, $size: cover) {
background-image: url("#{$path--rel}/#{$img}");
background-image: url('#{$path--rel}/#{$img}');
background-repeat: $repeat;
background-position: $position;
background-size: $size;
Expand Down
24 changes: 24 additions & 0 deletions src/components/achievements/AchievementItem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import ProptTypes from 'prop-types';
import EditOptions from '~/components/editoptions/EditOptions';

const AchievementItem = ({ title, date, visibility, preview }) => {
return (
<div className="achievements__row">
<div className="achievements__row-header">
<div className="sub-title">{title}</div>
{!preview && <EditOptions isHidden={!visibility} />}
</div>
<div className="achievements__year">{date}</div>
</div>
);
};

AchievementItem.propTypes = {
title: ProptTypes.string,
date: ProptTypes.string,
visibility: ProptTypes.bool,
preview: ProptTypes.bool,
};

export default AchievementItem;
44 changes: 23 additions & 21 deletions src/components/achievements/Achievements.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
import React from 'react';
import CardHeader from '~/components/cardheader/CardHeader';
import EditOptions from '~/components/editoptions/EditOptions';
import PropTypes from 'prop-types';
import { Add } from '~/assets/image';
import AchievementItem from './AchievementItem';
import CardHeader from '~/components/cardheader/CardHeader';
import CardFooter from '~/components/cardfooter/CardFooter';

const Achievements = () => {
return (
<div className="achievements-block">
<div className="card">
<CardHeader title="Achievements" />
<div className="achievements">
<div className="achievements__row">
<div className="achievements__row-header">
<div className="sub-title">Headhunt Award</div>
<EditOptions />
</div>
<div className="achievements__year">December 2012</div>
</div>
</div>
<CardFooter icon={Add} label="Add another achievement" />
</div>
</div>
)
}
const Achievements = ({ achievements, preview }) => {
const achievementsList = achievements.map(({ title, date, visibility }) => (
<AchievementItem key={title} title={title} date={date} visibility={visibility} preview={preview} />
));

return (
<div className="achievements-block">
<div className="card">
<CardHeader title="Achievements" />
{achievementsList}
<CardFooter icon={Add} label="Add another achievement" />
</div>
</div>
);
};

Achievements.propTypes = {
achievements: PropTypes.array,
preview: PropTypes.bool,
};

export default Achievements;
19 changes: 14 additions & 5 deletions src/components/button/Button.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';

const Button = ({ content, isCancel }) => {
return (
<button className={isCancel ? "btn--cancel" : "btn"}>{content}</button>
)
}
const Button = ({ content, isCancel, onClick }) => {
return (
<button className={isCancel ? 'btn--cancel' : 'btn'} onClick={e => onClick(e)}>
{content}
</button>
);
};

Button.propTypes = {
content: PropTypes.string,
isCancel: PropTypes.bool,
onClick: PropTypes.func,
};

export default Button;
26 changes: 15 additions & 11 deletions src/components/cardfooter/CardFooter.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import React from 'react';
import PropTypes from 'prop-types';

const CardFooter = ({ icon, label }) => {
return (
<div className="card__footer">
<span className="card__footer-icon">
<img src={icon} alt="Add" />
</span>
<span className="card__footer-label text-link">
{label}
</span>
</div>
)
}
return (
<div className="card__footer">
<span className="card__footer-icon">
<img src={icon} alt="Add" />
</span>
<span className="card__footer-label text-link">{label}</span>
</div>
);
};

CardFooter.propTypes = {
icon: PropTypes.string,
label: PropTypes.string,
};

export default CardFooter;
33 changes: 19 additions & 14 deletions src/components/cardheader/CardHeader.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import React from 'react';
import PropTypes from 'prop-types';

const CardHeader = ({ title, icon = null }) => {
return (
<div className="card-header">
<div className="card-header__l">
<div className="title">{title}</div>
</div>
{!icon ? ''
:
<div className="card-header__r">
<img src={icon} alt="Edit" />
</div>
}
</div>
)
}
return (
<div className="card-header">
<div className="card-header__l">
<div className="title">{title}</div>
</div>
{icon && (
<div className="card-header__r">
<img src={icon} alt="Edit" />
</div>
)}
</div>
);
};

CardHeader.propTypes = {
title: PropTypes.string,
icon: PropTypes.string,
};
nikitashrestha marked this conversation as resolved.
Show resolved Hide resolved

export default CardHeader;
Loading