Skip to content

Commit

Permalink
Merge pull request #10 from Oreoz/feature/update-ember
Browse files Browse the repository at this point in the history
Updates to Ember 3.4 and Updates dependencies
  • Loading branch information
Oreoz authored Sep 20, 2018
2 parents cdf87dc + c070059 commit d093182
Show file tree
Hide file tree
Showing 31 changed files with 7,641 additions and 4,341 deletions.
18 changes: 18 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
42 changes: 40 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,48 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
}
},
overrides: [
// node files
{
files: [
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
}
]
};
22 changes: 11 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
42 changes: 27 additions & 15 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.eslintignore
/.eslintrc.js
/.gitignore
/.watchmanconfig
/.travis.yml
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/ember-cli-build.js
/testem.js
/tests/
/yarn.lock
.gitkeep

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
10 changes: 10 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'use strict';

module.exports = {
extends: 'recommended',

rules: {
'attribute-indentation': false,
'block-indentation': false
}
};
41 changes: 30 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: node_js

node_js:
- '6'
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "6"

sudo: false
dist: trusty
Expand All @@ -14,25 +16,42 @@ cache:
- $HOME/.npm

env:
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default

matrix:
fast_finish: true
global:
# See https://git.io/vdao3 for details.
- JOBS=1

jobs:
fail_fast: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
script:
- npm run lint:hbs
- npm run lint:js
- npm test

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.16
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery

before_install:
- npm config set spin false
- npm install -g npm@4
- npm --version

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

notifications:
email: false
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017
Copyright (c) 2018

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
6 changes: 5 additions & 1 deletion addon/components/timeline/timeline-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ export default Component.extend(InViewportMixin, {
classNames: 'timeline-content',
classNameBindings: ['viewportEntered:bounce-in:is-hidden', 'animate'],

animate: true
animate: true,

didEnterViewport() {
this.set('viewportEntered', true);
},
});
6 changes: 5 additions & 1 deletion addon/components/timeline/timeline-image.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ export default Component.extend(InViewportMixin, {
classNames: 'timeline-image',
classNameBindings: ['viewportEntered:bounce-in:is-hidden', 'animate'],

animate: true
animate: true,

didEnterViewport() {
this.set('viewportEntered', true);
}
});
4 changes: 2 additions & 2 deletions addon/templates/components/timeline/timeline-block.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{yield (hash
image=(component 'timeline/timeline-image' animate=animate)
content=(component 'timeline/timeline-content' animate=animate)
image=(component "timeline/timeline-image" animate=animate)
content=(component "timeline/timeline-content" animate=animate)
)}}
2 changes: 1 addition & 1 deletion addon/templates/components/timeline/timeline-content.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{yield (hash
date=(component 'timeline/timeline-date')
date=(component "timeline/timeline-date")
)}}
2 changes: 1 addition & 1 deletion addon/templates/components/vertical-timeline.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{{yield (hash
block=(component 'timeline/timeline-block' animate=animate)
block=(component "timeline/timeline-block" animate=animate)
)}}
53 changes: 27 additions & 26 deletions app/styles/ember-vertical-timeline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ $output-bourbon-deprecation-warnings: false;
@import 'partials/layout';

*, *:after, *:before {
@include box-sizing(border-box);
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

/* Modules - reusable parts of our design */
Expand Down Expand Up @@ -117,26 +118,26 @@ $output-bourbon-deprecation-warnings: false;
}

&.bounce-in.animate {
visibility: visible;
@include animation(cd-bounce-1 .6s);
visibility: visible;
animation: cd-bounce-1 0.6s;
}
}
}

@include keyframes(cd-bounce-1) {
0% {
opacity: 0;
@include transform(scale(.5));
}
@keyframes cd-bounce-1 {
0% {
opacity: 0;
transform: scale(0.5);
}

60% {
opacity: 1;
@include transform(scale(1.2));
}
60% {
opacity: 1;
transform: scale(1.2);
}

100% {
@include transform(scale(1));
}
100% {
transform: scale(1);
}
}

.timeline-content {
Expand Down Expand Up @@ -259,47 +260,47 @@ $output-bourbon-deprecation-warnings: false;
}

&.bounce-in.animate {
visibility: visible;
@include animation(cd-bounce-2 .6s);
visibility: visible;
animation: cd-bounce-2 .6s;
}
}
}

@include MQ(L) {
/* inverse bounce effect on even content blocks */
.timeline-block:nth-child(even) .timeline-content.bounce-in.animate {
@include animation(cd-bounce-2-inverse .6s);
animation: cd-bounce-2-inverse .6s;
}
}

@include keyframes(cd-bounce-2) {
@keyframes cd-bounce-2 {
0% {
opacity: 0;
@include transform(translateX(-100px));
transform: translateX(-100px);
}

60% {
opacity: 1;
@include transform(translateX(20px));
transform: translateX(20px);
}

100% {
@include transform(translateX(0));
transform: translateX(0);
}
}

@include keyframes(cd-bounce-2-inverse) {
@keyframes cd-bounce-2-inverse {
0% {
opacity: 0;
@include transform(translateX(100px));
transform: translateX(100px);
}

60% {
opacity: 1;
@include transform(translateX(-20px));
transform: translateX(-20px);
}

100% {
@include transform(translateX(0));
transform: translateX(0);
}
}
Loading

0 comments on commit d093182

Please sign in to comment.