Skip to content

Commit

Permalink
Merge pull request #14 from andela/ft-view-edit-profile-165305225
Browse files Browse the repository at this point in the history
#165305225 Users should be able to view and edit their profiles
  • Loading branch information
AnguleMathias committed Jun 7, 2019
2 parents c42e4fd + 70137e2 commit 5165046
Show file tree
Hide file tree
Showing 32 changed files with 1,487 additions and 229 deletions.
11 changes: 7 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
"plugins": ["babel", "import", "jsx-a11y", "react", "prettier"],
"rules": {
"react/prefer-stateless-function": 0,
"jsx-a11y/label-has-associated-control": [ "error", {
"required": {
"some": [ "nesting", "id" ]
"jsx-a11y/label-has-associated-control": [
"error",
{
"required": {
"some": ["nesting", "id"]
}
}
}],
],
"react/jsx-filename-extension": [
1,
{
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,28 @@
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.3.1",
"coveralls": "^3.0.3",
"css-loader": "^2.1.1",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.13.2",
"expect": "^24.8.0",
"express": "^4.17.1",
"file-loader": "^3.0.1",
"font-awesome": "^4.7.0",
"image-webpack-loader": "^4.6.0",
"moment": "^2.24.0",
"prop-types": "^15.7.2",
"css-loader": "^2.1.1",
"react": "^16.8.6",
"react-bootstrap": "^1.0.0-beta.9",
"react-dom": "^16.8.6",
"react-inline-editable-field": "^1.0.6",
"react-redux": "^7.0.3",
"react-router-dom": "^5.0.0",
"react-toastify": "^5.2.0",
"redux": "^4.0.1",
"redux-thunk": "^2.3.0",
"url-loader": "^1.1.2",
"react-toastify": "^5.2.0",
"semantic-ui-react": "^0.87.1",
"style-loader": "^0.23.1"
"style-loader": "^0.23.1",
"url-loader": "^1.1.2"
},
"devDependencies": {
"@babel/core": "^7.4.5",
Expand Down
73 changes: 73 additions & 0 deletions src/assets/styles/loader.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
@import './variables.scss';

.blue-bg {
background-color: $blue !important;
background-image: linear-gradient(90deg, $blue, $skyblue);
}

.intro-banner-vdo-play-btn {
height: 60px;
width: 60px;
position: absolute;
top: 50%;
left: 50%;
text-align: center;
margin: -35px 0 0 -35px;
border-radius: 100px;
z-index: 1;
}

.intro-banner-vdo-play-btn i {
line-height: 56px;
font-size: 30px;
}

.intro-banner-vdo-play-btn .ripple {
position: absolute;
width: 160px;
height: 160px;
z-index: -1;
left: 50%;
top: 50%;
opacity: 0;
margin: -80px 0 0 -80px;
border-radius: 100px;
-webkit-animation: ripple 1.8s infinite;
animation: ripple 1.8s infinite;
}

.intro-banner-vdo-play-btn .ripple:nth-child(2) {
animation-delay: 0.3s;
-webkit-animation-delay: 0.3s;
}

.intro-banner-vdo-play-btn .ripple:nth-child(3) {
animation-delay: 0.6s;
-webkit-animation-delay: 0.6s;
}

@-webkit-keyframes ripple {
0% {
opacity: 1;
-webkit-transform: scale(0);
transform: scale(0);
}
100% {
opacity: 0;
-webkit-transform: scale(1);
transform: scale(1);
}
}

@keyframes ripple {
0% {
opacity: 1;
-webkit-transform: scale(0);
transform: scale(0);
}
100% {
opacity: 0;
-webkit-transform: scale(1);
transform: scale(1);
}
}
253 changes: 253 additions & 0 deletions src/assets/styles/notfound.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
@import url('https://fonts.googleapis.com/css?family=Raleway:300, 700');
@import './variables.scss';

#title {
margin-top: 13em;
}

.circles:after {
content: '';
display: inline-block;
width: 100%;
height: 100px;
background: $white;
position: absolute;
top: -50px;
left: 0;
transform: skewY(-4deg);
-webkit-transform: skewY(-4deg);
}

.circles {
background: $white;
text-align: center;
position: relative;
margin-top: -60px;
}

.circles p {
font-size: 240px;
color: $white;
padding-top: 60px;
position: relative;
z-index: 9;
line-height: 100%;
}

.circles p small {
font-size: 40px;
line-height: 100%;
vertical-align: top;
}

.circles .circle.small {
width: 140px;
height: 140px;
border-radius: 50%;
background: $shadeblue;
position: absolute;
z-index: 1;
top: 80px;
left: 50%;
animation: 7s smallmove infinite cubic-bezier(1, 0.22, 0.71, 0.98);
-webkit-animation: 7s smallmove infinite cubic-bezier(1, 0.22, 0.71, 0.98);
animation-delay: 1.2s;
-webkit-animation-delay: 1.2s;
}

.circles .circle.med {
width: 200px;
height: 200px;
border-radius: 50%;
background: $shadeblue;
position: absolute;
z-index: 1;
top: 0;
left: 10%;
animation: 7s medmove infinite cubic-bezier(0.32, 0.04, 0.15, 0.75);
-webkit-animation: 7s medmove infinite cubic-bezier(0.32, 0.04, 0.15, 0.75);
animation-delay: 0.4s;
-webkit-animation-delay: 0.4s;
}

.circles .circle.big {
width: 400px;
height: 400px;
border-radius: 50%;
background: $shadeblue;
position: absolute;
z-index: 1;
top: 200px;
right: 0;
animation: 8s bigmove infinite;
-webkit-animation: 8s bigmove infinite;
animation-delay: 3s;
-webkit-animation-delay: 1s;
}

@-webkit-keyframes smallmove {
0% {
top: 10px;
left: 45%;
opacity: 1;
}
25% {
top: 300px;
left: 40%;
opacity: 0.7;
}
50% {
top: 240px;
left: 55%;
opacity: 0.4;
}
75% {
top: 100px;
left: 40%;
opacity: 0.6;
}
100% {
top: 10px;
left: 45%;
opacity: 1;
}
}

@keyframes smallmove {
0% {
top: 10px;
left: 45%;
opacity: 1;
}
25% {
top: 300px;
left: 40%;
opacity: 0.7;
}
50% {
top: 240px;
left: 55%;
opacity: 0.4;
}
75% {
top: 100px;
left: 40%;
opacity: 0.6;
}
100% {
top: 10px;
left: 45%;
opacity: 1;
}
}

@-webkit-keyframes medmove {
0% {
top: 0px;
left: 20%;
opacity: 1;
}
25% {
top: 300px;
left: 80%;
opacity: 0.7;
}
50% {
top: 240px;
left: 55%;
opacity: 0.4;
}
75% {
top: 100px;
left: 40%;
opacity: 0.6;
}
100% {
top: 0px;
left: 20%;
opacity: 1;
}
}

@keyframes medmove {
0% {
top: 0px;
left: 20%;
opacity: 1;
}
25% {
top: 300px;
left: 80%;
opacity: 0.7;
}
50% {
top: 240px;
left: 55%;
opacity: 0.4;
}
75% {
top: 100px;
left: 40%;
opacity: 0.6;
}
100% {
top: 0px;
left: 20%;
opacity: 1;
}
}

@-webkit-keyframes bigmove {
0% {
top: 0px;
right: 4%;
opacity: 0.5;
}
25% {
top: 100px;
right: 40%;
opacity: 0.4;
}
50% {
top: 240px;
right: 45%;
opacity: 0.8;
}
75% {
top: 100px;
right: 35%;
opacity: 0.6;
}
100% {
top: 0px;
right: 4%;
opacity: 0.5;
}
}
@keyframes bigmove {
0% {
top: 0px;
right: 4%;
opacity: 0.5;
}
25% {
top: 100px;
right: 40%;
opacity: 0.4;
}
50% {
top: 240px;
right: 45%;
opacity: 0.8;
}
75% {
top: 100px;
right: 35%;
opacity: 0.6;
}
100% {
top: 0px;
right: 4%;
opacity: 0.5;
}
}
Loading

0 comments on commit 5165046

Please sign in to comment.