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

Commit 42e290e

Browse files
chiragobchiragob
authored
Merge pull request #437 from FlowzPlatform/develop
Develop
2 parents 0b5685c + e60ab26 commit 42e290e

File tree

186 files changed

+17115
-52056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+17115
-52056
lines changed

‎.travis.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@ branches:
1414

1515
jobs:
1616
include:
17-
- stage: Seneca-Jobqueue-Flowz
18-
script:
19-
- 'if [ ${TRAVIS_BRANCH} = "master" ]; then
20-
docker login -u="$DOCKER_USERNAME_FLOWZ" -p="$DOCKER_PASSWORD_FLOWZ";
21-
docker build -t seneca_jobqueue_flowz:latest ./JobQue/;
22-
docker images;
23-
docker tag seneca_jobqueue_flowz:latest $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
24-
docker push $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
25-
elif [ ${TRAVIS_BRANCH} = "develop" ]; then
26-
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
27-
docker build -t seneca_jobqueue_flowz:dev ./JobQue/;
28-
docker images;
29-
docker tag seneca_jobqueue_flowz:dev $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
30-
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
31-
elif [ ${TRAVIS_BRANCH} = "staging" ]; then
32-
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
33-
docker build -t seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER ./JobQue/;
34-
docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
35-
docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
36-
docker images;
37-
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
38-
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
39-
else
40-
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
41-
docker build -t seneca_jobqueue_flowz:qa ./JobQue/;
42-
docker images;
43-
docker tag seneca_jobqueue_flowz:qa $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
44-
docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
45-
fi'
17+
# - stage: Seneca-Jobqueue-Flowz
18+
# script:
19+
# - 'if [ ${TRAVIS_BRANCH} = "master" ]; then
20+
# docker login -u="$DOCKER_USERNAME_FLOWZ" -p="$DOCKER_PASSWORD_FLOWZ";
21+
# docker build -t seneca_jobqueue_flowz:latest ./JobQue/;
22+
# docker images;
23+
# docker tag seneca_jobqueue_flowz:latest $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
24+
# docker push $DOCKER_USERNAME_FLOWZ/seneca_jobqueue_flowz:latest;
25+
# elif [ ${TRAVIS_BRANCH} = "develop" ]; then
26+
# docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
27+
# docker build -t seneca_jobqueue_flowz:dev ./JobQue/;
28+
# docker images;
29+
# docker tag seneca_jobqueue_flowz:dev $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
30+
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:dev;
31+
# elif [ ${TRAVIS_BRANCH} = "staging" ]; then
32+
# docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
33+
# docker build -t seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER ./JobQue/;
34+
# docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
35+
# docker tag seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
36+
# docker images;
37+
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER;
38+
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:staging;
39+
# else
40+
# docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
41+
# docker build -t seneca_jobqueue_flowz:qa ./JobQue/;
42+
# docker images;
43+
# docker tag seneca_jobqueue_flowz:qa $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
44+
# docker push $DOCKER_USERNAME/seneca_jobqueue_flowz:qa;
45+
# fi'
4646
- stage: Flowz-Frontend-Flowz
4747
script:
4848
- 'if [ ${TRAVIS_BRANCH} = "master" ]; then

‎client/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ yarn-error.log*
77
test/unit/coverage
88
test/e2e/reports
99
selenium-debug.log
10-
package-lock.json
1110

1211
# Editor directories and files
1312
.idea

‎client/index.html‎

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,14 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<title>flowz-schema</title>
7-
<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.4/lodash.min.js"></script>
8-
<!-- <meta charset="utf-8"> -->
6+
<title>Workflow</title>
97
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
10-
<link rel="shortcut icon" href="./static/img/favicon.ico" type="image/ico" sizes="16x16">
11-
<title>Flowz Builder | The next generation Dynamic website builder.</title>
12-
13-
<!-- <link href="/static/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous"> -->
14-
15-
<!-- Fonts -->
16-
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
8+
<link rel="shortcut icon" href="/static/img/favicon.ico" type="image/ico" sizes="16x16">
9+
1710
<link href="/static/css/font-awesome.min.css" rel="stylesheet" crossorigin="anonymous">
18-
19-
<!-- jQuery -->
20-
<script src="/static/js/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
21-
<script src="/static/js/jquery-ui.min.js" crossorigin="anonymous"></script>
22-
23-
<!-- Grapes JS COmponent -->
24-
<link rel="stylesheet" type="text/css" href="/static/css/grapes.min.css">
25-
<script src="/static/grapes.min.js"></script>
26-
<script src="/static/js/grapesjs-plugin-forms.min.js"></script>
27-
<script src="/static/js/product-plugin.js"></script>
28-
<script src="/static/js/grapesjs-plugin-export.min.js"></script>
29-
<script type="text/javascript" src="/static/js/aviary-editor.js"></script>
30-
<script src="/static/js/grapesjs-aviary.min.js"></script>
31-
<script type="text/javascript" src="/static/js/grapesjs-preset-webpage.js"></script>
32-
<script src="/static/js/grapesjs-component-countdown.min.js"></script>
33-
<script src="/static/js/grapesjs-navbar.min.js"></script>
34-
35-
<!-- CanvasJS -->
36-
<script type="text/javascript" src="https://canvasjs.com/assets/script/canvasjs.min.js"></script>
37-
38-
<!-- Grapes MJML COmponent -->
39-
<!-- <link href="http://grapesjs.com/stylesheets/grapes.min.css?v0.12.25" rel="stylesheet"/>
40-
<script src="http://grapesjs.com/js/grapes.min.js?v0.12.25"></script>
41-
<script src="http://grapesjs.com/js/grapesjs-mjml.min.js?v=0.12.25"></script> -->
42-
43-
<link href="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.12.25/css/grapes.min.css" rel="stylesheet" />
44-
<script src="https://cdnjs.cloudflare.com/ajax/libs/grapesjs/0.12.25/grapes.min.js"></script>
45-
<script src="https://cdn.jsdelivr.net/npm/grapesjs-mjml@0.0.27/dist/grapesjs-mjml.min.js"></script>
46-
47-
<!-- Domenu Select2 -->
48-
<link href="/static/css/select2.min.css" rel="stylesheet" />
49-
<script src="/static/js/select2.min.js"></script>
50-
51-
11+
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
12+
<!-- <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script> -->
13+
<script src="https://cloud.tinymce.com/dev/tinymce.min.js?apiKey=qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc"></script>
5214
</head>
5315

5416
<body>

0 commit comments

Comments
 (0)