Skip to content
This repository has been archived by the owner on Oct 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #437 from FlowzPlatform/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@chiragob
chiragob authored Sep 12, 2018
2 parents 0b5685c + e60ab26 commit 42e290e
Show file tree
Hide file tree
Showing 186 changed files with 17,115 additions and 52,056 deletions.
58 changes: 29 additions & 29 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ branches:

jobs:
include:
- stage: Seneca-Jobqueue-Flowz
script:
- 'if [ ${TRAVIS_BRANCH} = "master" ]; then
docker login -u="$DOCKER_USERNAME_FLOWZ" -p="$DOCKER_PASSWORD_FLOWZ";
docker build -t seneca_jobqueue_flowz:latest ./JobQue/;
docker images;
docker tag seneca_jobqueue_flowz:latest $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
docker push $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
elif [ ${TRAVIS_BRANCH} = "develop" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
docker build -t seneca_jobqueue_flowz:dev ./JobQue/;
docker images;
docker tag seneca_jobqueue_flowz:dev $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
elif [ ${TRAVIS_BRANCH} = "staging" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
docker build -t seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER ./JobQue/;
docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
docker images;
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
else
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
docker build -t seneca_jobqueue_flowz:qa ./JobQue/;
docker images;
docker tag seneca_jobqueue_flowz:qa $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
fi'
# - stage: Seneca-Jobqueue-Flowz
# script:
# - 'if [ ${TRAVIS_BRANCH} = "master" ]; then
# docker login -u="$DOCKER_USERNAME_FLOWZ" -p="$DOCKER_PASSWORD_FLOWZ";
# docker build -t seneca_jobqueue_flowz:latest ./JobQue/;
# docker images;
# docker tag seneca_jobqueue_flowz:latest $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
# docker push $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
# elif [ ${TRAVIS_BRANCH} = "develop" ]; then
# docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
# docker build -t seneca_jobqueue_flowz:dev ./JobQue/;
# docker images;
# docker tag seneca_jobqueue_flowz:dev $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
# elif [ ${TRAVIS_BRANCH} = "staging" ]; then
# docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
# docker build -t seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER ./JobQue/;
# docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
# docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
# docker images;
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
# else
# docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
# docker build -t seneca_jobqueue_flowz:qa ./JobQue/;
# docker images;
# docker tag seneca_jobqueue_flowz:qa $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
# fi'
- stage: Flowz-Frontend-Flowz
script:
- 'if [ ${TRAVIS_BRANCH} = "master" ]; then
Expand Down
1 change: 0 additions & 1 deletion client/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ yarn-error.log*
test/unit/coverage
test/e2e/reports
selenium-debug.log
package-lock.json

# Editor directories and files
.idea
Expand Down
50 changes: 6 additions & 44 deletions client/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,14 @@

<head>
<meta charset="utf-8">
<title>flowz-schema</title>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js"></script>
<!-- <meta charset="utf-8"> -->
<title>Workflow</title>
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
<link rel="shortcut icon" href="./static/img/favicon.ico" type="image/ico" sizes="16x16">
<title>Flowz Builder | The next generation Dynamic website builder.</title>

<!-- <link href="/static/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"> -->

<!-- Fonts -->
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
<link rel="shortcut icon" href="/static/img/favicon.ico" type="image/ico" sizes="16x16">

<link href="/static/css/font-awesome.min.css" rel="stylesheet" crossorigin="anonymous">

<!-- jQuery -->
<script src="/static/js/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
<script src="/static/js/jquery-ui.min.js" crossorigin="anonymous"></script>

<!-- Grapes JS COmponent -->
<link rel="stylesheet" type="text/css" href="/static/css/grapes.min.css">
<script src="/static/grapes.min.js"></script>
<script src="/static/js/grapesjs-plugin-forms.min.js"></script>
<script src="/static/js/product-plugin.js"></script>
<script src="/static/js/grapesjs-plugin-export.min.js"></script>
<script type="text/javascript" src="/static/js/aviary-editor.js"></script>
<script src="/static/js/grapesjs-aviary.min.js"></script>
<script type="text/javascript" src="/static/js/grapesjs-preset-webpage.js"></script>
<script src="/static/js/grapesjs-component-countdown.min.js"></script>
<script src="/static/js/grapesjs-navbar.min.js"></script>

<!-- CanvasJS -->
<script type="text/javascript" src="https://canvasjs.com/assets/script/canvasjs.min.js"></script>

<!-- Grapes MJML COmponent -->
<!-- <link href="http://grapesjs.com/stylesheets/grapes.min.css?v0.12.25" rel="stylesheet"/>
<script src="http://grapesjs.com/js/grapes.min.js?v0.12.25"></script>
<script src="http://grapesjs.com/js/grapesjs-mjml.min.js?v=0.12.25"></script> -->

<link href="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.12.25/css/grapes.min.css" rel="stylesheet" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.12.25/grapes.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/grapesjs-mjml.min.js"></script>

<!-- Domenu Select2 -->
<link href="/static/css/select2.min.css" rel="stylesheet" />
<script src="/static/js/select2.min.js"></script>


<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
<!-- <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script> -->
<script src="https://cloud.tinymce.com/dev/tinymce.min.js?apiKey=qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc"></script>
</head>

<body>
Expand Down
Loading

0 comments on commit 42e290e

Please sign in to comment.