A lot of minor changes

TobyNartowski · TobyNartowski · commit d4b96769ffa8 · 2019-06-09T15:30:50.000+02:00
diff --git a/src/main/java/pl/simplemethod/codebin/CodebinApplication.java b/src/main/java/pl/simplemethod/codebin/CodebinApplication.java
@@ -26,17 +26,11 @@ public LinkClient linkClient()
 
     @Bean
     public SrvClient srvClient() {
-        return new SrvClient("http://srv.simplemethod.io:4815");
+        return new SrvClient("https://simplemethod.io:8433");
     }
 
     @Bean
     public GithubClient githubClient() {
         return new GithubClient("2f5c2010372081b036ff", "29e08d58c97f1448d3bd16f2ac10e5541be53937");
     }
-
-    @Bean
-    public String string() {
-        return "";
-    }
-
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -10,7 +10,7 @@ spring.jmx.unique-names=true
 spring.security.oauth2.client.registration.github.client-id=2f5c2010372081b036ff
 spring.security.oauth2.client.registration.github.client-secret=29e08d58c97f1448d3bd16f2ac10e5541be53937
 spring.security.oauth2.client.registration.github.scope=read:user,user:email,repo
-spring.security.oauth2.client.registration.github.redirect-uri=http://127.0.0.1/postlogin
+spring.security.oauth2.client.registration.github.redirect-uri=https://127.0.0.1/postlogin
 
 #---------------------------------------------------
 #                   THYMELEAF PROPERTIES
@@ -45,6 +45,5 @@ paypal.mode=sandbox
 #                   HTTPS PROPERTIES
 #---------------------------------------------------
 server.ssl.key-store-type=PKCS12
-server.ssl.key-store=classpath:keystore/key.p12
-server.ssl.key-store-password=chardonnay71
-server.ssl.key-alias=key
+server.ssl.key-store=classpath:keystore/cert.p12
+server.ssl.key-store-password=chardonnay71
diff --git a/src/main/resources/keystore/cert.p12 b/src/main/resources/keystore/cert.p12
diff --git a/src/main/resources/keystore/key.p12 b/src/main/resources/keystore/key.p12
diff --git a/src/main/resources/public/app.js b/src/main/resources/public/app.js
@@ -121,7 +121,7 @@ app.controller('ContainersCreateController', ['$filter', '$routeParams', '$scope
 
                             var str = "" + $scope.id;
                             var res = str.substring(0, 3);
-                            $scope.exposedports = 8080;
+                            $scope.exposedports = 8443;
                             $scope.hostports = (1 + res);
                             $scope.dockerName = $scope.id;
                             $scope.progressBar = 90;
@@ -289,6 +289,7 @@ app.controller('HomeController', function ($scope, $http, $cookies) {
             $scope.numbersColl = response.data.collaborators;
             $scope.followers = response.data.followers;
             $scope.following = response.data.following;
+            $scope.loaded = true;
         },
         function () {
             $scope.passCheck = false;
@@ -366,11 +367,12 @@ app.controller('ProfileController', function ($scope, $http) {
     $http.get('https://127.0.0.1/github/user/subscription').then(
         function (response) {
             $scope.subscriber = response.data.subscriber;
+            $scope.loaded = true;
         }, function () {
             console.error('Cookie not set');
+            $scope.loaded = true;
         }
     )
-
 });
 
 
diff --git a/src/main/resources/public/dashboard.html b/src/main/resources/public/dashboard.html
@@ -6,6 +6,7 @@
     <meta name="description" content="Run your code online">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 
     <!-- Title -->
     <title>Codebin | Dashboard</title>
@@ -25,11 +26,6 @@
 </head>
 
 <body class="h-100" ng-controller="dashboardGithub">
-<!-- Preloader -->
-<div id="preloader">
-    <div class="loader"></div>
-</div>
-
 <div class="container-fluid">
     <div class="row">
         <!-- Main Sidebar -->
@@ -91,7 +87,7 @@
                                 <a class="dropdown-item" href="#!profile">
                                     <i class="material-icons">&#xE7FD;</i> Profile</a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item text-danger" ng-click="logout()">
+                                <a class="dropdown-item text-danger" href="#" ng-click="logout()">
                                     <i class="material-icons text-danger">&#xE879;</i> Logout</a>
                             </div>
                         </li>
diff --git a/src/main/resources/public/dashboard/container.html b/src/main/resources/public/dashboard/container.html
@@ -35,7 +35,7 @@ <h6 class="m-0">General view</h6>
                         <span ng-if="shareStatus !== null" class="d-flex mb-2"><i
                                 class="material-icons mr-1">visibility</i><strong
                                 class="mr-1">Visibility:</strong> <strong class="text-success">Available</strong>
-                        <a class="ml-auto" href="http://127.0.0.1/share/{{shareStatus}}"><i class="fas fa-external-link-alt"></i> Open container</a></span>
+                        <a class="ml-auto" href="https://127.0.0.1/share/{{shareStatus}}"><i class="fas fa-external-link-alt"></i> Open container</a></span>
                         <span ng-if="shareStatus === null" class="d-flex mb-2"><i
                                 class="material-icons mr-1">visibility</i><strong
                                 class="mr-1">Visibility:</strong> <strong class="text-danger"><a href=""
@@ -127,7 +127,7 @@ <h5 style="float:right;" class="modal-title">Local access</h5>
             </div>
             <div class="modal-body">
                 <object style="float:right; width:100%;height:100vh;"
-                        data="http://waw1.simplemethod.io:{{hostPorts}}" type="text/html">
+                        data="https://srv.simplemethod.io:{{hostPorts}}" type="text/html">
                     Docker
                 </object>
             </div>
diff --git a/src/main/resources/public/dashboard/home.html b/src/main/resources/public/dashboard/home.html
@@ -1,3 +1,8 @@
+<!-- Preloader -->
+<div ng-if="loaded != true" id="preloader">
+    <div class="loader"></div>
+</div>
+
 <!-- Page Header -->
 <div class="page-header row no-gutters py-4">
     <div class="col-12 col-sm-4 text-center text-sm-left mb-0">
diff --git a/src/main/resources/public/dashboard/profile.html b/src/main/resources/public/dashboard/profile.html
@@ -1,3 +1,8 @@
+<!-- Preloader -->
+<div ng-if="loaded != true" id="preloader">
+    <div class="loader"></div>
+</div>
+
 <div ng-if="subscriber != true">
     <!-- Page Header -->
     <div class="page-header row no-gutters py-4">
diff --git a/src/main/resources/public/login.html b/src/main/resources/public/login.html
@@ -47,7 +47,7 @@ <h4 class="card-title">
                                 <h4>S</h4>
                             </div>
                         </h4>
-                        <form target="_blank" action="/oauth/github" method="GET">
+                        <form  action="/oauth/github" method="GET">
                             <div class="form-group no-margin">
                                 <button type="submit" class="btn btn-block btn-social btn-github" >
                                     <span class="fa fa-github"></span> Sign in with GitHub
diff --git a/src/main/resources/public/share.html b/src/main/resources/public/share.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="UTF-8">
-    <title>Codebin </title>
+    <title>Codebin | Container</title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <style>
         #video-background {
diff --git a/src/main/resources/static/css/shards-dashboards.1.1.0.css b/src/main/resources/static/css/shards-dashboards.1.1.0.css
@@ -4197,7 +4197,8 @@ a.text-accent:hover, a.text-accent:focus {
 
 .main-content > .main-navbar,
 .main-content .header-navbar {
-  box-shadow: 0 0.125rem 0.625rem rgba(90, 97, 105, 0.12); }
+  /*box-shadow: 0 0.125rem 0.625rem rgba(90, 97, 105, 0.12); */
+}
 
 .main-sidebar {
   top: 0;

Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,11 @@ public LinkClient linkClient()`
`26`	`26`
`27`	`27`	`@Bean`
`28`	`28`	`public SrvClient srvClient() {`
`29`		`- return new SrvClient("http://srv.simplemethod.io:4815");`
	`29`	`+ return new SrvClient("https://simplemethod.io:8433");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Bean`
`33`	`33`	`public GithubClient githubClient() {`
`34`	`34`	`return new GithubClient("2f5c2010372081b036ff", "29e08d58c97f1448d3bd16f2ac10e5541be53937");`
`35`	`35`	`}`
`36`		`-`
`37`		`- @Bean`
`38`		`- public String string() {`
`39`		`- return "";`
`40`		`- }`
`41`		`-`
`42`	`36`	`}`