Skip to content

Commit c871631

Browse files
authored
chore: merge develop with master (#49)
* chore: version bump * refactor: major changes Rename file/dirs move common files to library tsconfig path config config file update changed ink -> drop removed unused files created index files for dirs created notfound page moved dump components to elements section * refactor: sync feature changes Add connected user detail Add Gist last sync data Add app version Add loadash utility * style: settings page style changes * refactor: moved service calls to state add new rxjs operator to find child remove unnecessary methods utilize ngxs selector decorator * refactor: linting, build * refactor: unhandled promise check * fix: response data mismatch * refactor: rename, reorder, and saperated actions by state and database * refactor: update components with newely created actions * refactor: wip * refactor: add local/remote setting actions * feat(sync): Fine tune Gist sync option in settings (#5) * chore: version bump * refactor: major changes Rename file/dirs move common files to library tsconfig path config config file update changed ink -> drop removed unused files created index files for dirs created notfound page moved dump components to elements section * refactor: sync feature changes Add connected user detail Add Gist last sync data Add app version Add loadash utility * style: settings page style changes * refactor: moved service calls to state add new rxjs operator to find child remove unnecessary methods utilize ngxs selector decorator * refactor: linting, build * refactor: unhandled promise check * fix: response data mismatch * refactor: rename, reorder, and saperated actions by state and database * refactor: update components with newely created actions * refactor: wip * refactor: add local/remote setting actions * build: version bump * feat: replace chrome color picker with sketch * feat: release/v1beta3 (#7) * build: version bump * chore: ignore vscode settings file * chore: include vscode settings file in repo * build: add travis setup * build: add release-it script * Release 1.0.0-beta.3 * Release 1.0.0-beta.4 * feat: add empty state for buckets * feat: add empty state for buckets (#8) * feat: add tiny circle view * fix: settigs not saved in db * style: update tiny circle view * feat: circle view * feat: add tiny circle view * fix: settigs not saved in db * style: update tiny circle view * style: change background colors * feat: sort buckets and drops properly (#14) * fix: buckets and drops are re-ordered on reload * fix: set created/updated timestamp as optional in ts * test: change test runner from jasmine to jest (#15) * Add renovate.json (#17) * chore(deps): pin dependencies (#18) * fix(deps): update dependency a-color-picker to v1.0.6 (#35) * fix(deps): update dependency @ngxs/store to v3.1.4 (#34) * fix(deps): update dependency @angular/pwa to v0.6.8 (#32) * fix(deps): update angularmaterial monorepo to v6.2.1 (#31) * chore(deps): update dependency typescript to v2.9.2 (#30) * chore(deps): update dependency stylelint-scss to v3.1.3 (#28) * chore(deps): update dependency stylelint to v9.3.0 (#27) * chore(deps): update dependency pouchdb-server to v4.0.1 (#26) * chore(deps): update dependency github-release-notes to v0.16.0 (#25) * chore(deps): update dependency codelyzer to v4.3.0 (#24) * chore(deps): update dependency @types/node to v8.10.20 (#23) * chore(deps): update dependency @types/jasmine to v2.8.8 (#22) * chore(deps): update dependency @angular/cli to v6.0.8 (#21) * fix(deps): update dependency fuse.js to v3.2.1 (#37) * fix(deps): update dependency core-js to v2.5.7 (#36) * fix(deps): update dependency @ngxs/devtools-plugin to v3.1.4 (#33) * chore(deps): update dependency tslint to v5.10.0 (#29) * chore(deps): update dependency @angular-devkit/build-angular to v0.6.8 (#20) * chore(deps): update angular monorepo to v6.0.5 (#19) * fix(deps): update dependency ngx-smart-modal to v6.0.3 (#41) * fix(deps): update dependency ngx-clipboard to v11.1.1 (#39) * fix(deps): update dependency gun to v0.9.9991 (#38) * fix(deps): update dependency ngx-color to v1.5.2 (#40) * build: sematic renovate setup (#16) * test: change test runner from jasmine to jest * build: add config for travis, sematic release, renovate * fix: add dummy secrets file to fix missing file issue * chore: add missing dep * chore: set npm verison in package json * chore: update node version in travis * chore: add install command in travis * chore(deps): pin dependency validate-npm-package-name to v3.0.0 * chore: sematic renovate setup (#45) * test: change test runner from jasmine to jest * build: add config for travis, sematic release, renovate * fix: add dummy secrets file to fix missing file issue * chore: add missing dep * chore: set npm verison in package json * chore: update node version in travis * chore: add install command in travis * chore: add missing dep * chore(deps): update npm to v5.10.0 (#46) * chore(deps): pin dependency travis-deploy-once to v5.0.0 (#47) * fix(deps): update dependency ngx-toastr to v8.8.0 (#48)
1 parent c1924f2 commit c871631

37 files changed

+5725
-2950
lines changed

.babelrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"env": {
3+
"test": {
4+
"plugins": ["transform-es2015-modules-commonjs"]
5+
}
6+
}
7+
}

.releaserc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"prepare": [
3+
"@semantic-release/npm",
4+
"@semantic-release/changelog",
5+
{
6+
"path": "@semantic-release/exec",
7+
"cmd": "chmod a+x ./bin/version.sh && ./bin/version.sh ${nextRelease.version}"
8+
},
9+
{
10+
"path": "@semantic-release/git",
11+
"assets": ["package.json", "package-lock.json", "CHANGELOG.md", "src/environments/version.ts"],
12+
"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
13+
}
14+
],
15+
"publish": ["@semantic-release/github"]
16+
}

.stage

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit bfc2d9a51bdb2e58c9016a5e104495e6efb43416

.travis.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
language: node_js
2-
node_js:
3-
- "9"
4-
branches:
5-
only:
6-
- master
7-
before_script:
8-
- npm i conventional-changelog --global
9-
after_success:
10-
- test $TRAVIS_BRANCH = "master" && test $TRAVIS_PULL_REQUEST = "false" && npm run release-it
11-
script:
12-
- echo "skipping..."
132
cache:
143
directories:
4+
- ~/.npm
155
- "node_modules"
6+
notifications:
7+
email: false
8+
node_js:
9+
- '9.3.0'
10+
install:
11+
- "npm install"
12+
script:
13+
- "npm run create:secret"
14+
- "npm run test"
15+
after_success:
16+
- npm run travis-deploy-once "npm run semantic-release"
17+
before_deploy:
18+
- "npm run webpack"
1619
deploy:
1720
provider: pages
18-
skip-cleanup: true
19-
github-token: $GITHUB_TOKEN
20-
keep-history: true
21-
local-dir: "dist"
21+
skip_cleanup: true
22+
local_dir: dist/
23+
github_token: $GITHUB_TOKEN
2224
on:
2325
branch: master
26+
branches:
27+
except:
28+
- /^v\d+\.\d+\.\d+$/

.vscode/settings.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44
{
55
"name": "feature/refactor",
66
"base": "develop"
7+
},
8+
{
9+
"name": "feature/sorting",
10+
"base": "develop"
11+
},
12+
{
13+
"name": "feature/test-setup",
14+
"base": "develop"
15+
},
16+
{
17+
"name": "feature/travis-sematic-renovate-setup",
18+
"base": "develop"
19+
}
20+
],
21+
"gitflow4code.releases": [
22+
{
23+
"name": "release/v1beta3",
24+
"base": "develop"
25+
},
26+
{
27+
"name": "feature/redesign",
28+
"base": "develop"
729
}
830
],
931
"gitflow4code.releases": [

bin/version.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
echo "The version would be: $1"
3+
echo "export const INKAPP_VERSION='$1'" > ./src/environments/version.ts
4+
echo "Version file updated!"

config/create-secret.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const writeFile = require('write');
2+
3+
const fileContent = ` /* secret!! */
4+
export const githubClientSecret = '';
5+
export const githubClientID = '';
6+
`;
7+
writeFile('./src/environments/secrets.ts', fileContent, err => {
8+
if (err) console.log('Error while creating secrets file.', err);
9+
});

jest.config.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
module.exports = {
2+
preset: 'jest-preset-angular',
3+
roots: ['src'],
4+
setupTestFrameworkScriptFile: './src/setup-jest.ts',
5+
globals: {
6+
'ts-jest': {
7+
tsConfigFile: 'src/tsconfig.spec.json'
8+
},
9+
__TRANSFORM_HTML__: true
10+
},
11+
transform: {
12+
'^.+\\.jsx?$': 'babel-jest',
13+
'^.+\\.(ts|js|html)$': '<rootDir>/node_modules/jest-preset-angular/preprocessor.js'
14+
},
15+
testMatch: ['**/__tests__/**/*.+(ts|js)?(x)', '**/+(*.)+(spec|test).+(ts|js)?(x)'],
16+
moduleFileExtensions: ['ts', 'js', 'html', 'json'],
17+
moduleNameMapper: {
18+
'@services/(.*)': '<rootDir>/src/app/library/services/$1',
19+
'@elements/(.*)': '<rootDir>/src/app/library/elements/$1',
20+
'@components/(.*)': '<rootDir>/src/app/library/components/$1',
21+
'@store/(.*)': '<rootDir>/src/app/library/store/$1',
22+
'@lib/(.*)': '<rootDir>/src/app/library/$1',
23+
'@root/(.*)': '<rootDir>/src/app/$1'
24+
},
25+
modulePaths: ['<rootDir>/src', '<rootDir>/node_modules'],
26+
transformIgnorePatterns: ['<rootDir>/node_modules/(?!lodash-es)'],
27+
snapshotSerializers: [
28+
'<rootDir>/node_modules/jest-preset-angular/AngularSnapshotSerializer.js',
29+
'<rootDir>/node_modules/jest-preset-angular/HTMLCommentSerializer.js'
30+
]
31+
};

0 commit comments

Comments
 (0)