From 122191e0c8375e2c0113c06ff1508e6b43769097 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Fri, 8 Dec 2017 22:36:17 +0100
Subject: [PATCH] Fixed docker hub deployment only on non PR and master branch

---
 .gitignore                      | 1 +
 .travis.yml                     | 4 +---
 static/src/About/About.js       | 2 +-
 static/src/Card/Card.js         | 2 +-
 static/src/Home/Home.css        | 5 -----
 static/src/Home/Home.js         | 4 ++--
 static/src/Lookup/Lookup.js     | 2 +-
 static/src/Recent/Recent.js     | 2 +-
 static/src/ShareX/ShareX.js     | 2 +-
 static/src/Visitors/Visitors.js | 2 +-
 static/src/util/util.js         | 2 +-
 11 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca9fdc3..b07ce39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Binaries for programs and plugins
 *.exe
+*.exe~
 *.dll
 *.so
 *.dylib
diff --git a/.travis.yml b/.travis.yml
index 444fe63..bdae8f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,7 @@ script:
   - make
   - goveralls -service=travis-ci -ignore="handlers/static.go,handlers/tmpls/tmpls.go"
   - make buildDockerImage 
-  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
-  - docker push maxibanki/golang_url_shortener
-  - docker push maxibanki/golang_url_shortener:arm
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then make docker && docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker push maxibanki/golang_url_shortener && docker push maxibanki/golang_url_shortener:arm; fi'
 deploy:
   provider: bintray
   user: maxibanki
diff --git a/static/src/About/About.js b/static/src/About/About.js
index 8a1a548..90677c8 100644
--- a/static/src/About/About.js
+++ b/static/src/About/About.js
@@ -65,4 +65,4 @@ export default class AboutComponent extends Component {
             </Container>
         )
     }
-};
+}
diff --git a/static/src/Card/Card.js b/static/src/Card/Card.js
index 85a641e..85d08dd 100644
--- a/static/src/Card/Card.js
+++ b/static/src/Card/Card.js
@@ -47,4 +47,4 @@ export default class CardComponent extends Component {
             </Card.Content>
         </Card>)
     }
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/static/src/Home/Home.css b/static/src/Home/Home.css
index 0dd4f24..943d9d2 100644
--- a/static/src/Home/Home.css
+++ b/static/src/Home/Home.css
@@ -4,8 +4,3 @@
 .react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list {
     padding: 0 0;
 }
-@media only screen and (max-width: 767px) {
-    .FieldsMarginButtomFix {
-        margin-bottom: 1rem !important;
-    }
-}
\ No newline at end of file
diff --git a/static/src/Home/Home.js b/static/src/Home/Home.js
index 3f55325..ac475b4 100644
--- a/static/src/Home/Home.js
+++ b/static/src/Home/Home.js
@@ -72,7 +72,7 @@ export default class HomeComponent extends Component {
                 <Select options={options} placeholder='Settings' onChange={this.onSettingsChange} multiple fluid />
               </Form.Field>
             </MediaQuery>
-            <Form.Group className="FieldsMarginButtomFix">
+            <Form.Group style={{ marginBottom: "1rem" }}>
               {usedSettings.includes("custom") && <Form.Field error={showCustomIDError} width={16}>
                 <Input label={window.location.origin + "/"} onChange={this.handleCustomIDChange} placeholder='my-shortened-url' />
               </Form.Field>}
@@ -100,4 +100,4 @@ export default class HomeComponent extends Component {
       </div >
     )
   }
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/static/src/Lookup/Lookup.js b/static/src/Lookup/Lookup.js
index ab154fe..00620f2 100644
--- a/static/src/Lookup/Lookup.js
+++ b/static/src/Lookup/Lookup.js
@@ -43,4 +43,4 @@ export default class LookupComponent extends Component {
             </div>
         )
     }
-};
+}
diff --git a/static/src/Recent/Recent.js b/static/src/Recent/Recent.js
index 8bc1bc7..c9f133b 100644
--- a/static/src/Recent/Recent.js
+++ b/static/src/Recent/Recent.js
@@ -55,4 +55,4 @@ export default class RecentComponent extends Component {
             </Container>
         )
     }
-};
+}
diff --git a/static/src/ShareX/ShareX.js b/static/src/ShareX/ShareX.js
index c084630..7be3a50 100644
--- a/static/src/ShareX/ShareX.js
+++ b/static/src/ShareX/ShareX.js
@@ -82,4 +82,4 @@ export default class ShareXComponent extends Component {
             </Container>
         )
     }
-};
+}
diff --git a/static/src/Visitors/Visitors.js b/static/src/Visitors/Visitors.js
index 9cb01c2..3232965 100644
--- a/static/src/Visitors/Visitors.js
+++ b/static/src/Visitors/Visitors.js
@@ -64,4 +64,4 @@ export default class VisitorComponent extends Component {
             </Container>
         )
     }
-};
+}
diff --git a/static/src/util/util.js b/static/src/util/util.js
index 296575d..55a2886 100644
--- a/static/src/util/util.js
+++ b/static/src/util/util.js
@@ -54,4 +54,4 @@ export default class UtilHelper {
             .then(res => cbSucc ? cbSucc(res) : null)
             .catch(e => this._reportError(e, "recent"))
     }
-};
\ No newline at end of file
+}
\ No newline at end of file