Commit 54bf2893 authored by Benoit Lavenier's avatar Benoit Lavenier

[fix] modal cactegory style: use full height modal

[enh] replace icons
[enh] add release scripts
parent 2601c014
......@@ -3,21 +3,58 @@
"defaultLanguage": "fr-FR",
"timeout": 4000,
"cacheTimeMs": 60000,
"useRelative": true,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"useLocalStorage": false,
"rememberMe": false,
"showUDHistory": false,
"useLocalStorage": true,
"rememberMe": true,
"node": {
"host": "g1.duniter.org",
"port": "9201"
"port": "443"
},
"login": {
"templateUrl": "plugins/market/templates/login/modal_simple_login.html"
},
"plugins":{
"es": {
"enable": true,
"host": "data.gchange.fr",
"port": "80"
"port": "443"
},
"market": {
"defaultCurrency": "€",
"homeMessage": "<i class=\"icon ion-location\"></i> Vide-grenier de Villiers-charlemagne",
"defaultTags": [
{
"tag": "vide-grenier",
"name": "Vide-grenier"
},
{
"tag": "villers-charlemagne-2017",
"name": "Vide-grenier de Villiers-charlemagne"
}
],
"record": {
"type": {
"show": false,
"default": "offer",
"canEdit": false
},
"category": {
"show": true,
"filter": "localSale"
},
"description": {
"show": false
},
"location": {
"show": true,
"required": true,
"label": "MARKET.LOCAL_SALE.LOCATION",
"help": "MARKET.LOCAL_SALE.LOCATION_HELP",
"prefix": "MARKET.LOCAL_SALE.LOCATION_PREFIX"
},
"unit": {
"canEdit": false
}
}
}
}
},
......@@ -27,11 +64,8 @@
"timeout": 6000,
"cacheTimeMs": 60000,
"useRelative": true,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"useLocalStorage": true,
"rememberMe": true,
"showUDHistory": false,
"node": {
"host": "g1-test.duniter.org",
"port": "10900"
......
#!/bin/bash
### Control that the script is run on `dev` branch
branch=`git rev-parse --abbrev-ref HEAD`
if [[ ! "$branch" = "master" ]];
then
echo ">> This script must be run under \`master\` branch"
exit
fi
### Releasing
current=`grep -P "version\": \"\d+.\d+.\d+(\w*)" package.json | grep -oP "\d+.\d+.\d+(\w*)"`
echo "Current version: $current"
case "$1" in
del)
if [[ $2 =~ ^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+$ ]]; then
result=`curl -i 'https://api.github.com/repos/duniter-gchange/gchange-client/releases/tags/v'"$current"''`
release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://api.github.com/repos/duniter-gchange/gchange-client/releases/\d+"`
if [[ $release_url != "" ]]; then
echo "Deleting existing release..."
curl -XDELETE $release_url -u $2
fi
else
echo "Wrong argument"
echo "Usage:"
echo " > ./github.sh del user:password"
exit
fi
;;
pre|rel)
if [[ $2 =~ ^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+$ && $3 != "" ]]; then
if [[ $1 = "pre" ]]; then
prerelease="true"
else
prerelease="false"
fi
result=`curl -i 'https://api.github.com/repos/duniter-gchange/gchange-client/releases/tags/v'"$current"''`
release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://api.github.com/repos/duniter-gchange/gchange-client/releases/\d+"`
if [[ $release_url != "" ]]; then
echo "Deleting existing release..."
curl -XDELETE $release_url -u $2
fi
echo "Creating new release..."
result=`curl -i https://api.github.com/repos/duniter-gchange/gchange-client/releases -u $2 -d '{"tag_name": "v'"$current"'","target_commitish": "master","name": "'"$current"'","body": "'"$3"'","draft": false,"prerelease": '"$prerelease"'}'`
upload_url=`echo "$result" | grep -P "\"upload_url\": \"[^\"]+" | grep -oP "https://[a-z0-9/.]+"`
### Sending files
echo "Uploading files to GitHub..."
dirname=`pwd`
curl -i -u $2 -H 'Content-Type: application/zip' -T $dirname/platforms/web/build/gchange-web-$current.zip $upload_url?name=gchange-v$current-web.zip
#curl -i -u $2 -H 'Content-Type: application/zip' -T $dirname/platforms/firefoxos/build/package.zip $upload_url?name=gchange-v$current-firefoxos.zip
curl -i -u $2 -H 'Content-Type: application/vnd.android.package-archive' -T $dirname/platforms/android/build/outputs/apk/android-release.apk $upload_url?name=gchange-v$current-android.apk
#curl -i -u $2 -H 'Content-Type: application/x-debian-package' -T $dirname/platforms/ubuntu/native/gchange_${current}_amd64.deb $upload_url?name=gchange-v${current}-ubuntu-amd64.deb
echo "Successfully uploading files"
release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://api.github.com/repos/[a-z0-9/.]+"`
echo " -> Release url: $release_url"
else
echo "Wrong arguments"
echo "Usage:"
echo " > ./github.sh pre|rel user:password <release_description>"
echo "With:"
echo " - pre: use for pre-release"
echo " - rel: for full release"
exit
fi
;;
*)
echo "No task given"
;;
esac
......@@ -425,7 +425,7 @@ gulp.task('zip:web', ['clean-unused-directories:web'], function(done) {
.pipe(header('\ufeff'))
.pipe(txtFilter.restore)
.pipe(zip('cesium-web-'+version+'.zip'))
.pipe(zip('gchange-web-'+version+'.zip'))
.pipe(gulp.dest('./platforms/web/build'))
.on('end', done);
......@@ -433,7 +433,7 @@ gulp.task('zip:web', ['clean-unused-directories:web'], function(done) {
gulp.task('build:web', ['git-check', 'zip:web'], function(done) {
var version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
gutil.log(gutil.colors.green("Build for web created at: 'plateforms/web/build/cesium-web-" + version + ".zip'"));
gutil.log(gutil.colors.green("Build for web created at: 'plateforms/web/build/gchange-web-" + version + ".zip'"));
return del([
'./tmp'
]);
......
#!/bin/bash
### Control that the script is run on `dev` branch
branch=`git rev-parse --abbrev-ref HEAD`
if [[ ! "$branch" = "master" ]];
then
echo ">> This script must be run under \`master\` branch"
exit
fi
DIRNAME=`pwd`
### Releasing
current=`grep -oP "version\": \"\d+.\d+.\d+((a|b)[0-9]+)?" package.json | grep -oP "\d+.\d+.\d+((a|b)[0-9]+)?"`
echo "Current version: $current"
currentAndroid=`grep -oP "android-versionCode=\"[0-9]+\"" config.xml | grep -oP "\d+"`
echo "Current Android version: $currentAndroid"
if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then
echo "new build version: $2"
echo "new build android version: $3"
case "$1" in
rel|pre)
# Change the version in package.json and test file
sed -i "s/version\": \"$current/version\": \"$2/g" package.json
sed -i "s/ version=\".*\"/ version=\"$2\"/g" config.xml
sed -i "s/ android-versionCode=\".*\"/ android-versionCode=\"$3\"/g" config.xml
# Bump the install.sh
sed -i "s/echo \"v.*\" #lastest/echo \"v$2\" #lastest/g" install.sh
;;
*)
echo "No task given"
;;
esac
# Update config file
gulp config --env default
# Build assets for mobile device
ionic build android --release
#ionic build firefoxos --release
# Update config file
gulp build:web --release
#ionic build ubuntu --release
#cd platforms/ubuntu/native/gchange; debuild
cd $DIRNAME
# Commit
git reset HEAD
git add package.json config.xml install.sh www/js/config.js
git commit -m "v$2"
git tag "v$2"
git push
echo "**********************************"
echo "* Build release succeed !"
echo "**********************************"
if [[ $4 =~ ^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+$ && "_$5" != "_" ]]; then
./github.sh $1 $4 "'"$5"'"
else
echo " WARN - missing arguments: "
echo " user:password 'release_description'"
echo
echo " Binaries files NOT sending to github repository"
echo " Please run:"
echo " > ./github.sh pre|rel user:password 'release_description'"
echo
fi
else
echo "Wrong version format"
echo "Usage:"
echo " > ./release.sh [pre|rel] <version> <android-version> <github_credentials>"
echo "with:"
echo " version: x.y.z"
echo " android-version: nnn"
echo " github_credentials: user:password (a valid GitHub user account)"
fi
......@@ -1340,7 +1340,6 @@ $ionicon-var-badge-editable: $ionicon-var-edit + "\00a0";
**********/
.modal.modal-full-height {
//height: 100% !important;
bottom: 0px;
}
......
www/img/favicon.ico

16.6 KB | W: | H:

www/img/favicon.ico

16.6 KB | W: | H:

www/img/favicon.ico
www/img/favicon.ico
www/img/favicon.ico
www/img/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
www/img/logo.png

9.64 KB | W: | H:

www/img/logo.png

12.6 KB | W: | H:

www/img/logo.png
www/img/logo.png
www/img/logo.png
www/img/logo.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
www/img/logo_128px.png

13.1 KB | W: | H:

www/img/logo_128px.png

17.9 KB | W: | H:

www/img/logo_128px.png
www/img/logo_128px.png
www/img/logo_128px.png
www/img/logo_128px.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -4,9 +4,12 @@
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, width=device-width, minimal-ui">
<meta name="apple-mobile-web-app-capable" content="yes">
<title>Cesium</title>
<title>ğchange</title>
<link rel="icon" href="./img/favicon.ico">
<link rel="apple-touch-icon" href="./img/logo_57px.png">
<link rel="apple-touch-icon" href="./img/logo_128px.png">
<link rel="apple-touch-icon" sizes="180x180" href="./img/logo_180px.png">
<link rel="apple-touch-icon" sizes="152x152" href="./img/logo_152px.png">
<link rel="apple-touch-icon" sizes="167x167" href="./img/logo_167px.png">
<link rel="manifest" href="/manifest.json">
<!-- build:css dist_css/cesium.css -->
<link href="css/ionic.app.css" rel="stylesheet">
......@@ -22,6 +25,16 @@
<link href="dist/dist_css/plugins/market/css/style.css" rel="stylesheet">
<!--endRemoveIf(device)-->
<!-- endbuild -->
</head>
<body ng-app="cesium" id="cesium" ng-strict-di ng-class="{'nobackdrop': $root.tour}">
<ion-nav-view>
<h3 style="text-align: center; margin-top: 44px;">
ğ<b>change</b>
</h3>
<h4 style="text-align: center; margin-top: 10px;">Chargement en cours. Veuillez patienter...</h4>
</ion-nav-view>
<!-- build:js dist_js/vendor.js -->
<!-- vendor js -->
<script src="js/vendor/moment.min.js"></script>
......@@ -152,8 +165,5 @@
<!-- config -->
<script src="dist/dist_js/app/config.js"></script>
<!-- endbuild -->
</head>
<body ng-app="cesium" id="cesium" ng-strict-di ng-class="{'nobackdrop': $root.tour}">
<ion-nav-view></ion-nav-view>
</body>
</html>
......@@ -10,27 +10,22 @@ angular.module("cesium.config", [])
.constant("csConfig", {
"defaultLanguage": "fr-FR",
"timeout": 6000,
"timeout": 4000,
"cacheTimeMs": 60000,
"useRelative": true,
"timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000,
"useLocalStorage": true,
"rememberMe": true,
"showUDHistory": false,
"node": {
"host": "g1-test.duniter.org",
"port": "10900"
"host": "g1.duniter.org",
"port": "443"
},
"login": {
"templateUrl": "plugins/market/templates/login/modal_simple_login.html"
},
"plugins": {
"es": {
"enable": false,
"host": "localhost",
"port": "9200",
"wsPort": "9400"
"enable": true,
"host": "data.gchange.fr",
"port": "443"
},
"market": {
"defaultCurrency": "€",
......@@ -72,7 +67,7 @@ angular.module("cesium.config", [])
}
},
"version": "0.3.3",
"build": "2017-06-14T07:53:44.446Z",
"build": "2017-06-14T10:29:58.942Z",
"newIssueUrl": "https://github.com/duniter-gchange/gchange-client/issues/new?labels=bug"
})
......
{
"short_name": "Cesium",
"name": "Cesium",
"short_name": "ğchange",
"name": "ğchange",
"icons": [
{
"src": "img/logo_96px.png",
"sizes": "96x96",
"src": "img/logo_64px.png",
"sizes": "64x64",
"type": "image/png"
},
{
"src": "img/logo_144px.png",
"sizes": "144x144",
"src": "img/logo_128px.png",
"sizes": "128x128",
"type": "image/png"
},
{
"src": "img/logo_256px.png",
"sizes": "256x256",
"type": "image/png"
},
{
"src": "img/logo.svg",
"sizes": "192x192",
"sizes": "512x512",
"type": "image/svg"
}
],
"start_url": "/#/app/home",
"start_url": "index.html/#/app/home",
"display": "standalone",
"orientation": "portrait"
"background_color": "#1A237E",
"theme_color": "#1A237E"
}
<ion-modal-view>
<ion-modal-view class="modal-full-height">
<ion-header-bar class="bar-positive">
<button class="button button-clear" ng-click="closeModal()" translate>COMMON.BTN_CANCEL</button>
<h1 class="title" translate>COMMON.CATEGORIES</h1>
......
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