Skip to content

GitLab

Commit 0277980b authored by maso's avatar maso
Browse files

Merge branch 'release/0.2.3'

parents 633537a2 3e4adb6a
Pipeline #14957698 passed with stage
in 1 minute and 54 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11158 additions and 734 deletions
.gitlab-ci.yml
View file @ 0277980b
# Official framework image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/node/tags/
image: node:6
before_script:
- apt-get update -yq
- apt-get install -y npm
- apt-get install nodejs-legacy
- apt-get install git
- npm install -g bower grunt-cli
- npm install
- bower install --allow-root
# This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
cache:
paths:
- node_modules/
build:
script:
- grunt
Gruntfile.js
View file @ 0277980b
This diff is collapsed.
bower.json
View file @ 0277980b
{
"name": "angular-material-weburger-common",
"version": "0.2.3",
"authors": [
"Mostafa Barmshory <mostafa.barmshory@dpq.co.ir>",
"Hadi mansouri <mohammad.hadi.mansouri@dpq.co.ir>",
"Mohammad Ghorishi <m.ghoreshi@gmail.com>"
],
"moduleType": [],
"keywords": [
"Material",
"Widget",
"AngularJS",
"Pluf"
],
"license": "MIT",
"main": [
"dist/angular-material-weburger-common.js",
"dist/angular-material-weburger-common.css"
],
"dependencies": {
"angular-material-weburger": "https://gitlab.com/weburger/angular-material-weburger.git#^0.2.2"
},
"devDependencies": {
"angular-mocks": "^1.6.0"
},
"moduleName": "ngMaterialWeburgerCommon",
"backend":{
"host": "webpich.com"
}
"name": "angular-material-weburger-common",
"version": "0.2.4",
"authors": [
"Mostafa Barmshory <mostafa.barmshory@dpq.co.ir>",
"Hadi mansouri <mohammad.hadi.mansouri@dpq.co.ir>",
"Mohammad Ghorishi <m.ghoreshi@gmail.com>"
],
"moduleType": [],
"keywords": [
"Material",
"Widget",
"AngularJS",
"Pluf"
],
"license": "MIT",
"main": [
"dist/angular-material-weburger-common.js",
"dist/angular-material-weburger-common.css"
],
"dependencies": {
"angular-material-weburger": "https://gitlab.com/weburger/angular-material-weburger.git#^0.2.2"
},
"resolutions": {
"angular": "^1.6.0"
},
"devDependencies": {
"angular-mocks": "^1.6.0"
},
"moduleName": "ngMaterialWeburgerCommon",
"backend": {
"host": "webpich.com"
}
}
demo/index.html
View file @ 0277980b
......@@ -18,11 +18,13 @@
<link rel="stylesheet" href="bower_components/angular-material-weburger/dist/angular-material-weburger.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/feature-list.css">
<link rel="stylesheet" href="styles/main-demo.css">
<!-- endbuild -->
<!-- build:css({.tmp/serve,src}) styles/app.css -->
<!-- injector:css -->
<link rel="stylesheet" href="styles/feature-list.css">
<link rel="stylesheet" href="styles/main.css">
<!-- endinjector -->
<!-- endbuild -->
</head>
<div
layout="row"
......@@ -68,49 +70,46 @@
</div>
</div>
<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-aria/angular-aria.js"></script>
<script src="bower_components/angular-messages/angular-messages.js"></script>
<script src="bower_components/angular-material/angular-material.js"></script>
<script src="bower_components/angular-translate/angular-translate.js"></script>
<script src="bower_components/tinycolor/tinycolor.js"></script>
<script src="bower_components/md-color-picker/dist/mdColorPicker.min.js"></script>
<script src="bower_components/tinymce/tinymce.js"></script>
<script src="bower_components/angular-ui-tinymce/src/tinymce.js"></script>
<script src="bower_components/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js"></script>
<script src="bower_components/angular-material-expansion-panel/dist/md-expansion-panel.js"></script>
<script src="bower_components/angular-material-icons/angular-material-icons.min.js"></script>
<script src="bower_components/weakmap-polyfill/weakmap-polyfill.js"></script>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/numbro/numbro.js"></script>
<script src="bower_components/pikaday/pikaday.js"></script>
<script src="bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
<script src="bower_components/handsontable/dist/handsontable.js"></script>
<script src="bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
<script src="bower_components/angular-material-weburger/dist/angular-material-weburger.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-aria/angular-aria.js"></script>
<script src="bower_components/angular-messages/angular-messages.js"></script>
<script src="bower_components/angular-material/angular-material.js"></script>
<script src="bower_components/angular-translate/angular-translate.js"></script>
<script src="bower_components/tinycolor/tinycolor.js"></script>
<script src="bower_components/md-color-picker/dist/mdColorPicker.min.js"></script>
<script src="bower_components/tinymce/tinymce.js"></script>
<script src="bower_components/angular-ui-tinymce/src/tinymce.js"></script>
<script src="bower_components/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js"></script>
<script src="bower_components/angular-material-expansion-panel/dist/md-expansion-panel.js"></script>
<script src="bower_components/angular-material-icons/angular-material-icons.min.js"></script>
<script src="bower_components/weakmap-polyfill/weakmap-polyfill.js"></script>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/numbro/numbro.js"></script>
<script src="bower_components/pikaday/pikaday.js"></script>
<script src="bower_components/zeroclipboard/dist/ZeroClipboard.js"></script>
<script src="bower_components/handsontable/dist/handsontable.js"></script>
<script src="bower_components/ngHandsontable/dist/ngHandsontable.js"></script>
<script src="bower_components/angular-material-weburger/dist/angular-material-weburger.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/demo.js"></script>
<script src="scripts/app.js"></script>
<script src="scripts/configs/icons.js"></script>
<script src="scripts/configs/filters.js"></script>
<script src="scripts/runs/widgets.js"></script>
<script src="scripts/runs/settings.js"></script>
<script src="scripts/controllers/action.js"></script>
<script src="scripts/controllers/features.js"></script>
<script src="scripts/controllers/dialogmodel.js"></script>
<script src="scripts/controllers/video-player.js"></script>
<script src="scripts/controllers/audio-player.js"></script>
<!-- build:js({.tmp,app}) scripts/scripts.js -->
<!-- injector:js -->
<script src="scripts/app.js"></script>
<script src="scripts/configs/filters.js"></script>
<script src="scripts/configs/icons.js"></script>
<script src="scripts/controllers/audio-player.js"></script>
<script src="scripts/controllers/dialogmodel.js"></script>
<script src="scripts/controllers/features.js"></script>
<script src="scripts/controllers/video-player.js"></script>
<script src="scripts/runs/settings.js"></script>
<script src="scripts/runs/widgets.js"></script>
<!-- endinjector -->
<!-- endbuild -->
</body>
</html>
demo/temp.json
View file @ 0277980b
......@@ -58,24 +58,19 @@
"features": [
{
"icon": "assignment_turned_in",
"title": "Home",
"title": "Feature title",
"text": "Feature description.",
"image": "/images/logo.svg",
"action": {
"type": "link",
"link": "https://gitlab.com/weburger/am-wb-common",
"label": "Common widget home"
}
"image": "/images/logo.svg"
},
{
"icon": "assignment_turned_in",
"title": "Feature title",
"text": "Feature description.",
"image": "/images/logo.svg"
"text": "Feature description."
}
],
"label": "Common widgets",
"description": "This is a demo of common widgets."
"description": "This is a demo of common widgets.",
"cover": "/images/logo.svg"
},
{
"type": "CommonActionCall",
......
dist/angular-material-weburger-common.js
View file @ 0277980b
......@@ -96,9 +96,13 @@ angular.module('ngMaterialWeburgerCommon')
.config(['ngMdIconServiceProvider', function(ngMdIconServiceProvider) {
ngMdIconServiceProvider
// Move actions
.addShape('wb-common-link', ngMdIconServiceProvider.getShape('link'))
.addShape('wb-common-toolbar', ngMdIconServiceProvider.getShape('more_horiz'))
.addShape('wb-common-video', ngMdIconServiceProvider.getShape('video_library'))
.addShape('wb-common-audio', ngMdIconServiceProvider.getShape('audiotrack'))
.addShape('wb-common-moveup', '<path d="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z" />')
.addShape('wb-common-movedown', '<path d="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />')
.addShape('wb-common-html', ' <path id="path2" d="M12,0C9.694,0,7.781,1.758,7.53,4L7.5,5c0,2.2,1.8,4,4,4h1h3h2l2-4h12l-1.961,3.921 C29.521,8.958,29.548,9,29.588,9h0.211H50.5V0H12z" style="fill:#EAD8BB;" /><path id="path4" d="M29.5,9v26.201c0,0.505-0.665,0.69-0.925,0.256L23.5,27l-5.075,8.458 c-0.26,0.433-0.925,0.249-0.925-0.256V9h-6c-2.2,0-4-1.8-4-4v48.958C7.5,56.19,9.31,58,11.542,58H50.5V9H29.5z" style="fill:#6B4842;" /><path id="path6" d="M12.5,9h-1c-2.2,0-4-1.8-4-4v48.958C7.5,56.19,9.31,58,11.542,58H12.5V9z" style="fill:#513531;" /><path id="path8" d="M50.5,2h-9c-0.553,0-1,0.447-1,1s0.447,1,1,1h9V2z" style="fill:#D3BEA1;" /><path id="path10" d="M50.5,5h-8c-0.553,0-1,0.447-1,1s0.447,1,1,1h8V5z" style="fill:#D3BEA1;" /><path id="path12" d="M19.5,5l-2,4v26.201c0,0.505,0.666,0.69,0.925,0.256L23.5,27l5.075,8.458 c0.26,0.433,0.925,0.249,0.925-0.256V9l2-4H19.5z" style="fill:#DD352E;" /><polygon id="polygon14" points="19.5,5 17.5,9 29.5,9 31.5,5 " style="fill:#B02721;" /> ')
;
}])
/*
......@@ -474,7 +478,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-list.html',
label : 'Vertical feature list',
description : 'Vertical feature list',
icon : 'wb-common-html',
icon : 'wb-common-link',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/home',
controller: 'AmWbCommonFeaturesCtrl',
setting:['text', 'common-features', ],
......@@ -485,6 +489,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-links.html',
label : 'Feature link',
description : 'Vertical features link list',
icon : 'wb-common-link',
help : 'http://dpq.co.ir',
controller: 'AmWbCommonFeaturesCtrl',
setting:['text', 'common-features'],
......@@ -495,6 +500,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-mozaic.html',
label : 'Feature mozaic',
description : 'Vertical features mozaic',
icon : 'wb-common-link',
help : 'http://dpq.co.ir',
controller: 'AmWbCommonFeaturesCtrl',
setting:['text', 'common-features'],
......@@ -505,6 +511,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/action-call.html',
label : 'Action call',
description : 'Call action with brand, title and text.',
icon : 'wb-common-link',
help : 'http://dpq.co.ir',
controller: 'AmWbCommonFeaturesCtrl',
setting:['description', 'common-features',],
......@@ -515,6 +522,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-toolbar.html',
label : 'Toolbar',
description : 'A toolbar to show actions with sidenav.',
icon : 'wb-common-toolbar',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/toolbar',
controller: 'AmWbCommonFeaturesCtrl',
setting:['description','common-features',],
......@@ -524,7 +532,8 @@ angular.module('ngMaterialWeburgerCommon')
type: 'CommonVideoPlayer',
templateUrl : 'views/am-wb-common-widgets/video-player.html',
label : 'Video Player',
description : 'A player to show video contents.',
description : 'A video player component.',
icon : 'wb-common-video',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/video-player',
controller: 'AmWbCommonVideoCtrl',
setting:['common-video-player'],
......@@ -533,7 +542,8 @@ angular.module('ngMaterialWeburgerCommon')
type: 'CommonAudioPlayer',
templateUrl : 'views/am-wb-common-widgets/audio-player.html',
label : 'Audio Player',
description : 'A player to play audio contents.',
description : 'An audio player component.',
icon : 'wb-common-audio',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/audio-player',
controller: 'AmWbCommonAudioCtrl',
setting:['common-audio-player'],
......@@ -624,7 +634,7 @@ angular.module('ngMaterialWeburgerCommon').run(['$templateCache', function($temp
$templateCache.put('views/am-wb-common-widgets/feature-toolbar.html',
"<md-toolbar layout=row layout-align=\"center center\"> <md-truncate ng-if=wbModel.label> {{ wbModel.label }}</md-truncate> <md-button hide show-gt-md ng-repeat=\"feature in wbModel.features | limitTo: 8\" aria-label=menu ng-click=runAction(feature) class=md-icon-button> <img height=32px ng-src=\"{{ feature.image }}\"> <md-tooltip>{{ feature.title }} <br> {{ feature.text }}</md-tooltip> </md-button> <span flex></span> <md-menu ng-show=wbModel.features> <md-button aria-label=\"Open demo menu\" class=md-icon-button ng-click=$mdMenu.open($event)> <wb-icon>more_vert</wb-icon> </md-button> <md-menu-content> <md-menu-item ng-repeat=\"feature in wbModel.features\"> <md-button show-gt-md aria-label=menu ng-click=runAction(feature)> <img height=24px ng-src=\"{{ feature.image }}\"> {{ feature.title }} </md-button> </md-menu-item> </md-menu-content> </md-menu> </md-toolbar>"
"<md-toolbar layout=row layout-align=\"center center\"> <img ng-if=wbModel.cover height=42px ng-src=\"{{ wbModel.cover }}\" ng-class=\"md-icon-button\"> <md-truncate ng-if=wbModel.label> {{ wbModel.label }}</md-truncate> <md-button hide show-gt-md ng-repeat=\"feature in wbModel.features | limitTo: 8\" aria-label={{feature.title}} ng-click=runAction(feature) ng-class=\"{'md-icon-button': feature.image}\"> <img ng-if=feature.image height=32px ng-src=\"{{ feature.image }}\"> <span ng-if=!feature.image>{{ feature.title }}</span> <md-tooltip ng-if=feature.text>{{ feature.text }}</md-tooltip> </md-button> <span flex></span> <md-menu ng-show=wbModel.features> <md-button aria-label=\"Open demo menu\" class=md-icon-button ng-click=$mdMenu.open($event)> <wb-icon>more_vert</wb-icon> </md-button> <md-menu-content> <md-menu-item ng-repeat=\"feature in wbModel.features\"> <md-button show-gt-md aria-label=menu ng-click=runAction(feature)> <img height=24px ng-src=\"{{ feature.image }}\"> {{ feature.title }} </md-button> </md-menu-item> </md-menu-content> </md-menu> </md-toolbar>"
);
......
package-lock.json 0 → 100644
View file @ 0277980b
This diff is collapsed.
src/scripts/configs/icons.js
View file @ 0277980b
......@@ -34,8 +34,12 @@ angular.module('ngMaterialWeburgerCommon')
.config(['ngMdIconServiceProvider', function(ngMdIconServiceProvider) {
ngMdIconServiceProvider
// Move actions
.addShape('wb-common-link', ngMdIconServiceProvider.getShape('link'))
.addShape('wb-common-toolbar', ngMdIconServiceProvider.getShape('more_horiz'))
.addShape('wb-common-video', ngMdIconServiceProvider.getShape('video_library'))
.addShape('wb-common-audio', ngMdIconServiceProvider.getShape('audiotrack'))
.addShape('wb-common-moveup', '<path d="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z" />')
.addShape('wb-common-movedown', '<path d="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />')
.addShape('wb-common-html', ' <path id="path2" d="M12,0C9.694,0,7.781,1.758,7.53,4L7.5,5c0,2.2,1.8,4,4,4h1h3h2l2-4h12l-1.961,3.921 C29.521,8.958,29.548,9,29.588,9h0.211H50.5V0H12z" style="fill:#EAD8BB;" /><path id="path4" d="M29.5,9v26.201c0,0.505-0.665,0.69-0.925,0.256L23.5,27l-5.075,8.458 c-0.26,0.433-0.925,0.249-0.925-0.256V9h-6c-2.2,0-4-1.8-4-4v48.958C7.5,56.19,9.31,58,11.542,58H50.5V9H29.5z" style="fill:#6B4842;" /><path id="path6" d="M12.5,9h-1c-2.2,0-4-1.8-4-4v48.958C7.5,56.19,9.31,58,11.542,58H12.5V9z" style="fill:#513531;" /><path id="path8" d="M50.5,2h-9c-0.553,0-1,0.447-1,1s0.447,1,1,1h9V2z" style="fill:#D3BEA1;" /><path id="path10" d="M50.5,5h-8c-0.553,0-1,0.447-1,1s0.447,1,1,1h8V5z" style="fill:#D3BEA1;" /><path id="path12" d="M19.5,5l-2,4v26.201c0,0.505,0.666,0.69,0.925,0.256L23.5,27l5.075,8.458 c0.26,0.433,0.925,0.249,0.925-0.256V9l2-4H19.5z" style="fill:#DD352E;" /><polygon id="polygon14" points="19.5,5 17.5,9 29.5,9 31.5,5 " style="fill:#B02721;" /> ')
;
}])
\ No newline at end of file
src/scripts/runs/widgets.js
View file @ 0277980b
......@@ -37,7 +37,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-list.html',
label : 'Vertical feature list',
description : 'Vertical feature list',
icon : 'wb-common-html',
icon : 'wb-common-link',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/home',
controller: 'AmWbCommonFeaturesCtrl',
setting:['text', 'common-features', ],
......@@ -48,6 +48,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-links.html',
label : 'Feature link',
description : 'Vertical features link list',
icon : 'wb-common-link',
help : 'http://dpq.co.ir',
controller: 'AmWbCommonFeaturesCtrl',
setting:['text', 'common-features'],
......@@ -58,6 +59,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-mozaic.html',
label : 'Feature mozaic',
description : 'Vertical features mozaic',
icon : 'wb-common-link',
help : 'http://dpq.co.ir',
controller: 'AmWbCommonFeaturesCtrl',
setting:['text', 'common-features'],
......@@ -68,6 +70,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/action-call.html',
label : 'Action call',
description : 'Call action with brand, title and text.',
icon : 'wb-common-link',
help : 'http://dpq.co.ir',
controller: 'AmWbCommonFeaturesCtrl',
setting:['description', 'common-features',],
......@@ -78,6 +81,7 @@ angular.module('ngMaterialWeburgerCommon')
templateUrl : 'views/am-wb-common-widgets/feature-toolbar.html',
label : 'Toolbar',
description : 'A toolbar to show actions with sidenav.',
icon : 'wb-common-toolbar',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/toolbar',
controller: 'AmWbCommonFeaturesCtrl',
setting:['description','common-features',],
......@@ -87,7 +91,8 @@ angular.module('ngMaterialWeburgerCommon')
type: 'CommonVideoPlayer',
templateUrl : 'views/am-wb-common-widgets/video-player.html',
label : 'Video Player',
description : 'A player to show video contents.',
description : 'A video player component.',
icon : 'wb-common-video',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/video-player',
controller: 'AmWbCommonVideoCtrl',
setting:['common-video-player'],
......@@ -96,7 +101,8 @@ angular.module('ngMaterialWeburgerCommon')
type: 'CommonAudioPlayer',
templateUrl : 'views/am-wb-common-widgets/audio-player.html',
label : 'Audio Player',
description : 'A player to play audio contents.',
description : 'An audio player component.',
icon : 'wb-common-audio',
help : 'https://gitlab.com/weburger/am-wb-common/wikis/audio-player',
controller: 'AmWbCommonAudioCtrl',
setting:['common-audio-player'],
......
src/views/am-wb-common-widgets/feature-toolbar.html
View file @ 0277980b
<md-toolbar
layout="row"
layout-align="center center">
<img
ng-if="wbModel.cover"
height="42px"
ng-src="{{ wbModel.cover }}"
ng-class="md-icon-button"/>
<md-truncate
ng-if="wbModel.label"> {{ wbModel.label }}</md-truncate>
<md-button
hide show-gt-md
ng-repeat="feature in wbModel.features | limitTo: 8"
aria-label="menu"
aria-label="{{feature.title}}"
ng-click="runAction(feature)"
class="md-icon-button">
<img height="32px" ng-src="{{ feature.image }}" />
<md-tooltip>{{ feature.title }} <br/> {{ feature.text }}</md-tooltip>
ng-class="{'md-icon-button': feature.image}">
<img
ng-if="feature.image"
height="32px"
ng-src="{{ feature.image }}" />
<span
ng-if="!feature.image">{{ feature.title }}</span>
<md-tooltip
ng-if="feature.text">{{ feature.text }}</md-tooltip>
</md-button>
<span flex></span>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment