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

Mansya master #37

Merged
merged 6 commits into from
Nov 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"angularexampleapp": "ismaestro-angularexampleapp"
}
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
/dist
/tmp
/out-tsc
/public
/.firebase

# dependencies
/node_modules
Expand Down
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ before_script:
- set -e
- npm install
- npm run build:library
- npm install -g angular-cli-ghpages
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

Expand All @@ -35,9 +34,6 @@ script:
- ng build --prod --base-href /

after_success:
- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
angular-cli-ghpages --repo=https://GH_TOKEN@$GH_REPO --name="New release" --email=$EMAIL;
fi
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

notifications:
Expand Down
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
[![GitHub forks](https://img.shields.io/github/forks/ismaestro/angular7-example-app.svg?style=social&label=Fork)](https://github.com/ismaestro/angular7-example-app/fork)
[![GitHub stars](https://img.shields.io/github/stars/ismaestro/angular7-example-app.svg?style=social&label=Star)](https://github.com/ismaestro/angular7-example-app)


## [LIVE DEMO](http://angularexampleapp.com/)

<p align="center">
Expand Down Expand Up @@ -67,7 +68,7 @@ npm run lint | Run the linter (tslint)
npm run ci | Execute linter and tests
npm run extract | Generate all json files with the translations in assets folder
npm run translate | Translate all keys remaining using Google Translate and using English language as the origin
npm run deploy | Build the app and deploy dist folder to Github pages (angular-cli-ghpages) (fork to do this and remove CNAME file)
npm run deploy | Build the app and deploy it to firebase hosting
npm run bundle-report | Build and run webpack-bundle-analyzer over stats json
npm run release | Create a new release using standard-version
npm run docker | Build the docker image and run the container
Expand Down Expand Up @@ -134,14 +135,16 @@ We use Travis CI to run this tasks in order:

This repo is using Firebase. We use Cloud Firestore and Cloud Storage to handle CRUD operations over the heroes and to store their images.

## License

MIT

## Contributors

Thanks to all contributors and their support!
Thanks to all contributors and their support:
[mansya](https://github.com/mansya) - App logo!

If you have an idea or you want to do something, tell me or just do it!
I'm always happy to hear your feedback!

## License

MIT

Enjoy :metal:
10 changes: 10 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"hosting": {
"public": "public",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
}
}
23 changes: 0 additions & 23 deletions package-lock.json

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

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"build": "ng build",
"build:prod": "ng build --prod",
"build:library": "ng build ngx-example-library",
"deploy": "npm run build:prod && npx ngh",
"test": "ng test",
"e2e": "ng e2e",
"lint": "ng lint",
Expand All @@ -19,7 +18,8 @@
"release:minor": "standard-version --release-as minor && git push --follow-tags origin master",
"release:major": "standard-version --release-as major && git push --follow-tags origin master",
"docker": "docker build -t angularexampleapp . && docker run -d -p 4200:80 angularexampleapp",
"update": "ng update --all --force"
"update": "ng update --all --force",
"deploy": "bash scripts/deploy.sh"
},
"private": true,
"engines": {
Expand Down Expand Up @@ -65,7 +65,6 @@
"@types/jasmine": "2.8.9",
"@types/jasminewd2": "2.0.5",
"@types/node": "10.12.2",
"angular-cli-ghpages": "0.5.3",
"axios": "0.18.0",
"bowser": "2.0.0-beta.3",
"codelyzer": "4.5.0",
Expand Down
7 changes: 7 additions & 0 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash

npm run build:prod &&
rm -Rf public &&
mkdir public &&
cp -a dist/. public/ &&
firebase deploy
6 changes: 6 additions & 0 deletions src/app/shared/components/header/header.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<header>
<nav>
<div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center center">
<div id="logo">
<a href="/">
<img matTooltip="{{'Thank\'s mansya!' | translate}}"
[matTooltipPosition]="'below'" src="assets/images/logo.svg">
</a>
</div>
<div fxFlex="40">
<a mat-raised-button *ngFor="let item of menuItems" routerLink="{{item.link}}">
{{item.name | translate | uppercase}}
Expand Down
24 changes: 24 additions & 0 deletions src/app/shared/components/header/header.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,26 @@
#today {
font-size: 0.7rem;
}

#logo {
display: flex;
margin-right: 1rem;

a {
width: 4.25rem;
height: 4.25rem;

img {
width: 100%;
height: auto;
opacity: 0.8;

&:hover {
opacity: 1;
}
}
}
}
}
}
}
Expand All @@ -51,6 +71,10 @@
#today {
width: 50%;
}

#logo {
display: none;
}
}

@media (max-width: 680px) {
Expand Down
33 changes: 33 additions & 0 deletions src/assets/images/logo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.