Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Commit

Permalink
Update Angular 6 (#328)
Browse files Browse the repository at this point in the history
- Rename repository to ngx-materialize
- Update Angular 6
- Update Rxjs 6
- Update README.md repository name, paths, angular.json, etc
- Bump to version 6
- Replace `mdi` library in demo for `@mdi/font` and update README.md icon installation instructions
- Explicitly use `index` when using barrel import/export
- Update CircleCI
- Update AppVeyor
- Update Heroku
  • Loading branch information
jfcere authored Jun 3, 2018
1 parent 875bac0 commit 3b60ea2
Show file tree
Hide file tree
Showing 651 changed files with 5,054 additions and 10,686 deletions.
55 changes: 0 additions & 55 deletions .angular-cli.json

This file was deleted.

40 changes: 20 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ jobs:
steps:
# Checkout the code from the branch into the working_directory
- checkout
# Restore lib dependencies from cache
# Restore dependencies from cache
- restore_cache:
key: lib-dependency-cache-{{ checksum "yarn.lock" }}
# Install lib dependencies
key: dependency-cache-{{ checksum "yarn.lock" }}
# Install dependencies
- run:
name: Install lib dependencies
name: Install dependencies
command: yarn install --frozen-lockfile --no-progress
# Cache lib dependencies if they don't exist
# Cache dependencies if they don't exist
- save_cache:
key: lib-dependency-cache-{{ checksum "yarn.lock" }}
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- ./node_modules
# Test the source code
- run:
name: Test
command: yarn test --single-run --code-coverage --no-progress --browser=ChromeNoSandbox
command: yarn test --watch=false --code-coverage --no-progress
- store_artifacts:
path: test-results.xml
prefix: tests
Expand All @@ -32,41 +32,41 @@ jobs:
# Lint the source code
- run:
name: Lint
command: yarn lint --formatters-dir ./tslint-formatters --format junit -o tslint.xml
command: yarn lint:ci
- store_artifacts:
path: tslint.xml
prefix: lint
# Build the source code
- run:
name: Build
command: yarn build
command: yarn build:lib
deploy:
docker:
- image: circleci/node:8-browsers
steps:
# Checkout the code from the branch into the working_directory
- checkout
# Restore demo-app dependencies from cache
# Restore dependencies from cache
- restore_cache:
key: demo-dependency-cache-{{ checksum "./demo-app/yarn.lock" }}
# Install demo-app dependencies
key: dependency-cache-{{ checksum "yarn.lock" }}
# Install dependencies
- run:
name: Install demo-app dependencies
command: cd demo-app && yarn install --frozen-lockfile --no-progress
name: Install dependencies
command: yarn install --frozen-lockfile --no-progress
# Cache local dependencies if they don't exist
- save_cache:
key: demo-dependency-cache-{{ checksum "./demo-app/yarn.lock" }}
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- ./demo-app/node_modules
# Build demo-app
- ./node_modules
# Build demo
- run:
name: Build
command: cd demo-app && yarn gh-pages:build
# Deploy demo-app to Github Pages
command: yarn gh-pages:build
# Deploy demo to Github Pages
- run:
name: Deploy to gh-pages
command: cd demo-app && yarn gh-pages:deploy
command: yarn gh-pages:deploy

workflows:
version: 2
Expand Down
3 changes: 1 addition & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ root = true
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = 0
max_line_length = off
trim_trailing_whitespace = false
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ When asking general "how to" questions:
- Please do not open an issue here!
- Instead, ask for help on [StackOverflow](https://stackoverflow.com/) with Materialize and Angular tags.

- Read the [CONTRIBUTING document](https://github.com/sherweb/ng2-materialize/blob/master/CONTRIBUTING.md) Any issues that are violating the contributing guidelines, will be closed!
- [Search for duplicate or closed issues](https://github.com/sherweb/ng2-materialize/issues?utf8=%E2%9C%93&q=is%3Aissue) and make sure that is not an issue related to Materialize or other library.
- Read the [CONTRIBUTING document](https://github.com/sherweb/ngx-materialize/blob/master/CONTRIBUTING.md) Any issues that are violating the contributing guidelines, will be closed!
- [Search for duplicate or closed issues](https://github.com/sherweb/ngx-materialize/issues?utf8=%E2%9C%93&q=is%3Aissue) and make sure that is not an issue related to Materialize or other library.
- Prepare a [reduced test case](https://css-tricks.com/reduced-test-cases/) for any bugs.
- Provide a [StackBlitz](https://stackblitz.com/edit/ngx-materialize) that reproduce your issue.

Expand Down
25 changes: 4 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,19 @@
# compiled output
/dist
/documentation
/package
/tmp
/out-tsc
/out
/package

# transpiled output
/inline-template
/src/inline-template
*.ngsummary.json
*.ngfactory.ts
*.ngstyle.ts

# dependencies
/node_modules
/src/node_modules
**/node_modules

# IDEs and editors
/.idea
*.iml
.project
.classpath
.c9/
.settings/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
Expand All @@ -42,20 +30,15 @@
/connect.lock
/coverage
/libpeerconnection.log
/package
/typings
npm-debug.log
package-lock.json
test-results.xml
testem.log
tslint.xml
*.log
*.tar
*.tgz

# e2e
/e2e/*.js
/e2e/*.map

#System Files
# System Files
.DS_Store
Thumbs.db
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"url": "http://localhost:4200/",
"sourceMaps": true,
"webRoot": "${workspaceRoot}",
"diagnosticLogging": true,
"trace": true,
"sourceMapPathOverrides": {
"webpack:///../*": "${webRoot}/*"
},
Expand All @@ -25,7 +25,7 @@
"port": 9222,
"sourceMaps": true,
"webRoot": "${workspaceRoot}",
"diagnosticLogging": true,
"trace": true,
"sourceMapPathOverrides": {
"webpack:///../*": "${webRoot}/*"
}
Expand Down
10 changes: 5 additions & 5 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# ng2-materialize Community Code of Conduct
# ngx-materialize Community Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as the ng2-materialize team pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
In the interest of fostering an open and welcoming environment, we as the ngx-materialize team pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Expand All @@ -24,13 +24,13 @@ Examples of unacceptable behavior by participants include:

## Our Responsibilities

The ng2-materialize team is responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
The ngx-materialize team is responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

The ng2-materialize team has the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
The ngx-materialize team has the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing ng-materialize or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by the ng2-materialize team.
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing ng-materialize or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by the ngx-materialize team.

## Enforcement

Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

## Code of Conduct

Please read and follow our [Code of Conduct](https://github.com/sherweb/ng2-materialize/blob/master/CODE_OF_CONDUCT.md).
Please read and follow our [Code of Conduct](https://github.com/sherweb/ngx-materialize/blob/master/CODE_OF_CONDUCT.md).

## Reporting Bugs
A bug is a demonstrable problem that is caused by the code in the repository. Good bug reports are extremely helpful! Unclear issues with little explanations will be closed.
Expand All @@ -31,7 +31,7 @@ We (at SherWeb) are currently wrapping the components as we need them, and unfor
Before you begin a feature, please ask first if we are working on it. If you don't, you risk spending a lot of time working on something that the project's developers might not want to merge into the project.

### Guidelines for pull requests
- Demo page - Each component has a demo page that demonstrates how to use it and what properties are available. You can use as examples those that are already implemented in the folder `/demo-app/`.
- Demo page - Each component has a demo page that demonstrates how to use it and what properties are available. You can use as examples those that are already implemented in the folder `/demo/`.
- Unit tests - Make sure that new features are covered by unit/view tests as per the other component's conventions. We suggest you do view tests instead of unit tests. These are easier to refactor and maintain as they don't rely on the code implementation but on the expected behaviors ([Black box test](http://softwaretestingfundamentals.com/black-box-testing/)).
- Readme - Update the readme.md file to include the feature in the list of availabe components/directives/services.
- Code convention - Verify that your code follows the other component's structure and implementation.
Expand All @@ -46,14 +46,14 @@ Before you begin a feature, please ask first if we are working on it. If you don
Our repository has been created with 2 sections in mind...

### The demo application
_Can be found in the `demo-app` folder located at the root of the repository_
_Can be found in the `demo` folder located at the root of the repository_

Serves as a "story book" to build and manually test our components. Each component has it's page with basic examples, snippets and a playground when possible.

To start the demo application, use `yarn start` from the root folder (it will move you to the `demo-app` folder) or run the command from the `demo-app` folder.
To start the demo application, use `yarn start` from the root folder (it will move you to the `demo` folder) or run the command from the `demo` folder.

### The library
_Can be found in the `src` folder located at the root of the repository_
_Can be found in the `lib` folder located at the root of the repository_

The library contains the components/services/directives that will be transpiled to javascript and published on npm.

Expand Down
Loading

0 comments on commit 3b60ea2

Please sign in to comment.