From 6d9ddaa9a144da7cc025ec17d5216bc742ae8f3e Mon Sep 17 00:00:00 2001 From: thomas-suedbroecker Date: Fri, 10 May 2019 13:29:35 +0200 Subject: [PATCH] update scores: - gitignore - remove cfee bash - update app-template - update scoresMain emoji - add deployment scripts to cfee --- .gitignore | 2 +- scores/webapp/client/src/App-template.vue | 26 ++- .../src/components/scoreMain-template.vue | 12 +- .../ibmcloud-deploy-webapp-to-cfee.sh | 166 ++++++++++++++++++ 4 files changed, 197 insertions(+), 9 deletions(-) create mode 100755 scores/webapp/deploy_apps/ibmcloud-deploy-webapp-to-cfee.sh diff --git a/.gitignore b/.gitignore index 0baaabc..5b6cd8c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,7 @@ scores/webapp/client/src/App.vue scores/webapp/client/src/components/scoreMain.vue scores/webapp/deploy_apps/*.log scores/scores.local.root.env -scores/webapp/deploy_apps/ibmcloud-deploy-webapp-to-cfee.sh +#scores/webapp/deploy_apps/ibmcloud-deploy-webapp-to-cfee.sh scores/webapp/server/config/manifest.yml # icp-k8s harald diff --git a/scores/webapp/client/src/App-template.vue b/scores/webapp/client/src/App-template.vue index c0ef31f..c96e63e 100644 --- a/scores/webapp/client/src/App-template.vue +++ b/scores/webapp/client/src/App-template.vue @@ -37,11 +37,20 @@ - +
+ + + + +
Brought to you by the IBM Developer Advocacy DACH team
+ +
Get a free IBM Cloud account. Get the code
+ + -
+
GDPR Consent for the processing of Personal Data within BlueCloudMirror Showcase:
Data protection and privacy are important to us, which is why we want to ensure transparency. Your consent to play the IBM BlueCloudMirror game is absolutely freely and voluntarily.
@@ -49,9 +58,18 @@
If you decide that you want your name to appear on the highscore table: The input of name and e-mail address is voluntary and will only be used to create the high score. A further storage and data processing of these data does not take place either. If you just want to have fun and don't want to provide any personal data play anonymously. If you decide to participate in the competition (not offered always): The input of name and e-mail address is voluntary as well and will be used to create the high score table (see statement above) and to participate in the raffle of the prize. A further storage and processing of these data does not occur. -
+
+
+
+
+ + + + +
- IBM Privacy Statement and Terms of Use
+ IBM Privacy Statement and Terms of Use + diff --git a/scores/webapp/client/src/components/scoreMain-template.vue b/scores/webapp/client/src/components/scoreMain-template.vue index 96ec8a0..dae8b0b 100644 --- a/scores/webapp/client/src/components/scoreMain-template.vue +++ b/scores/webapp/client/src/components/scoreMain-template.vue @@ -220,9 +220,11 @@ export default { } if (i == 0) { - image = ''; + // image = ''; + image = '🏆'; } else { - image = ''; + // image = ''; + image = '🏅'; }; list.push({ @@ -240,7 +242,8 @@ export default { } else { if (returnlist[i].score == lasthighscore) { ranking = highscorerange; - image = ''; + // image = ''; + image = '🏆'; list.push({ ranking: ranking, id: returnlist[i]._id, @@ -255,7 +258,8 @@ export default { }); } else { ranking = ranking + 1; - image = ''; + //image = ''; + image = '😴'; list.push({ ranking: ranking, id: returnlist[i]._id, diff --git a/scores/webapp/deploy_apps/ibmcloud-deploy-webapp-to-cfee.sh b/scores/webapp/deploy_apps/ibmcloud-deploy-webapp-to-cfee.sh new file mode 100755 index 0000000..342f65b --- /dev/null +++ b/scores/webapp/deploy_apps/ibmcloud-deploy-webapp-to-cfee.sh @@ -0,0 +1,166 @@ +#!/bin/bash + +#!/bin/bash + +# Build Webapp +SOURCE="dist" +DESTINATION="/scores/webapp/server" +CLIENT_DEVELOPMENT_DIR="/scores/webapp/client" +SERVER_DEVELOPMENT_DIR="/scores/webapp/server" +SERVER_DEPLOY_DIR="scores/webapp/server/deploy_apps" + +#SET ACTUAL PATH +CURRENT_FOLDER=$(cd $(dirname $0); pwd) +cd "../../.." +ROOT_FOLDER=$(cd $(dirname $0); pwd) +cd $CURRENT_FOLDER + +# SETUP logging (redirect stdout and stderr to a log file) +readonly LOG_FILE="${CURRENT_FOLDER}/ibmcloud-deploy-webapp-to-cfee.log" +readonly ENV_ROOT_FILE="${ROOT_FOLDER}/scores/scores.local.root.env" +ENV_SERVER_FILE="${ROOT_FOLDER}/scores/webapp/server/.env" +source $ENV_ROOT_FILE +touch $ENV_SERVER_FILE + +touch $LOG_FILE +exec 3>&1 # Save stdout +exec 4>&2 # Save stderr +exec 1>$LOG_FILE 2>&1 + +function _out() { + echo "$@" >&3 + echo "$(date +'%F %H:%M:%S') $@" +} + +function _err() { + echo "$@" >&4 + echo "$(date +'%F %H:%M:%S') $@" +} + +function ibmcloud_login_and_set_cfee_env() { +# Skip version check updates + ibmcloud config --check-version=false + + # Login to Cloud + _out 1. Login to IBM Cloud + _out + + _out _set USER: $IBMCLOUD_USER_ID REGION: $IBMCLOUD_CFEE_CONTAINER_REGION + ibmcloud login -u $IBMCLOUD_USER_ID -apikey $IBMCLOUD_CLI_DEVOPS_PLATFORM_KEY -r $IBMCLOUD_CFEE_CONTAINER_REGION + + #ibmcloud cs region-set $IBMCLOUD_CFEE_CONTAINER_REGION + _out _set CFEE-API: $IBMCLOUD_CFEE_API_ENDPOINT CFEE-ORG: $IBMCLOUD_CFEE_ORGANIZATION CFEE-SPACE: $IBMCLOUD_CEFF_SPACE + ibmcloud target --cf-api $IBMCLOUD_CFEE_API_ENDPOINT -o $IBMCLOUD_CFEE_ORGANIZATION -s $IBMCLOUD_CEFF_SPACE + + # Show the result of login to stdout + ibmcloud target + _out + + _out Login end + _out +} + +function setEnv(){ + _out + _out 2. SetEnv + _out + # set env + printf "\n# CF APP" >> $ENV_SERVER_FILE + printf "\nSERVICE_USER=$IBMCLOUD_CF_APP_WEB_APP_USER" >> $ENV_SERVER_FILE + printf "\nSERVICE_PASSWORD=$IBMCLOUD_CF_APP_WEB_APP_PASSWORD" >> $ENV_SERVER_FILE +} + +function prepareVUEClientCode() { + _out + _out 3. prepare VUE client code start + _out + cd $ROOT_FOLDER/scores/webapp/client/src + + _out _copy App.vue template definition + rm "App.vue" + cp "App-template.vue" "App.vue" + + cd $ROOT_FOLDER/scores/webapp/client/src/components + _out _copy scoreMain.vue template definition + rm "scoreMain.vue" + cp "scoreMain-template.vue" "scoreMain.vue" + + _out _setup text-replace + cd $ROOT_FOLDER/scores/webapp/text-replace + npm install + cd .. + _out _replace $IBMCLOUD_CF_APP_WEBAPP_REPLACE_GAME_URL with $IBMCLOUD_CF_APP_WEBAPP_GAME_URL + npm --prefix "${ROOT_FOLDER}/scores/webapp/text-replace" start "${ROOT_FOLDER}/scores/webapp/client/src/App.vue" $IBMCLOUD_CF_APP_WEBAPP_REPLACE_GAME_URL "$IBMCLOUD_CF_APP_WEBAPP_GAME_URL" + _out _replace $IBMCLOUD_CF_APP_WEBAPP_REPLACE_FUNCTIONS_API_URL with $IBMCLOUD_CF_APP_WEBAPP_FUNCTIONS_API_URL + npm --prefix "${ROOT_FOLDER}/scores/webapp/text-replace" start "${ROOT_FOLDER}/scores/webapp/client/src/components/scoreMain.vue" $IBMCLOUD_CF_APP_WEBAPP_REPLACE_FUNCTIONS_API_URL $IBMCLOUD_CF_APP_WEBAPP_FUNCTIONS_API_URL + + _out + _out Prepare VUE client code end + _out +} + +function createClient() { + _out + _out 4. Create Client start + _out + cd "${ROOT_FOLDER}${CLIENT_DEVELOPMENT_DIR}" + pwd + rm -rf $IBMCLOUD_CF_APP_WEBAPP_SOURCE + + _out _npm install + npm install + + _out _build Vue application "${ROOT_FOLDER}${IBMCLOUD_CF_APP_WEBAPP_CLIENT_DEVELOPMENT_DIR}" + npm run build + + _out _copy VUE webapp to folder "${ROOT_FOLDER}${IBMCLOUD_CF_APP_WEBAPP_DESTINATION}" + cp -R -f $IBMCLOUD_CF_APP_WEBAPP_SOURCE $ROOT_FOLDER$IBMCLOUD_CF_APP_WEBAPP_DESTINATION + + _out + _out Create client end + _out +} + +function deployClientToServer() { + _out + _out 5. Deploy to CF start + _out + _out _path "${ROOT_FOLDER}${IBMCLOUD_CF_APP_WEBAPP_SERVER_DEVELOPMENT_DIR}" + cd "$ROOT_FOLDER$IBMCLOUD_CF_APP_WEBAPP_SERVER_DEVELOPMENT_DIR" + + _out _deploying Vue application to Cloud Foundry App "${IBMCLOUD_CF_APP_WEBAPP_NAME}" + cd "$ROOT_FOLDER$IBMCLOUD_CF_APP_WEBAPP_SERVER_DEVELOPMENT_DIR" + pwd + + _out _npm install + npm install + + _out _show existing spaces + ibmcloud cf spaces + + _out _show existing apps + ibmcloud cf apps + + _out _push PUSH APP TO CF ENTERPRISE ENVIRONMENT + pwd + ibmcloud cf push -f $IBMCLOUD_CFEE_WEBAPP_MANIFEST + + HIGHSCORE_CLOUD_FOUNDRY=$(ibmcloud cf r | awk '/$IBMCLOUD_CF_APP_WEBAPP_NAME*/' | awk '{print $2}') + _out _application has been deployed "${HIGHSCORE_CLOUD_FOUNDRY}" + _out Deploy to CF end + _out +} + +function endMessage() { + _out + _out "Now please verify the setup in IBM Cloud and for details use the logfile" + _out +} + +# Main tasks +ibmcloud_login_and_set_cfee_env +setEnv +prepareVUEClientCode +createClient +deployClientToServer +endMessage \ No newline at end of file