Correcting the code, adding a button when creating a container

Author: SimpleMethod

src/main/resources/public/app.js

@@ -44,6 +44,7 @@ angular.module("CombineModule", ["mainApp", "dashboard"]);
 
 app.controller('ContainersCreateController', ['$filter', '$routeParams', '$scope', '$http', function ($filter, $routeParams, $scope, $http) {
     $scope.supportedPlatforms = ["Java", "C", "C++", "Python", "HTML", "JavaScript", "CSS"];
+    $scope.referId=$routeParams.id;
     $scope.progressBar=0;
     $http({
         url: 'http://127.0.0.1/github/user/repos/' + $routeParams.id,
@@ -114,8 +115,9 @@ app.controller('ContainersCreateController', ['$filter', '$routeParams', '$scope
                             console.log("Nazwa dokeru:" + $scope.id);
                             console.log("Ilość pamięci ram: " + $scope.rammemory + " i dysku: " + $scope.diskquota);
                             $scope.progressBar=90;
+
                             $http({
-                                url: 'http://127.0.0.1/srv/container/create3',
+                                url: 'http://127.0.0.1/srv/container/create',
                                 method: 'POST',
                                 params: {
                                     dockerimage: $scope.dockerImages,
@@ -131,7 +133,7 @@ app.controller('ContainersCreateController', ['$filter', '$routeParams', '$scope
                                 function (create) {
                                     console.log(create.data);
                                     $scope.progressBar=100;
-
+                                    $scope.finish=1;
                                 },
                                 function (create) {
                                     $scope.errors= "Problem with creating a container";
@@ -204,7 +206,7 @@ app.controller('ContainersController', ['$filter', '$routeParams', '$scope', '$h
                     method: 'DELETE'
                 }).then(
                     function (response) {
-                        $window.location.href="/";
+                        window.location = "/";
                     },
                     function (response) {
                         $scope.errors= "Problem with deleteing a container";
@@ -236,6 +238,7 @@ app.controller('ContainersController', ['$filter', '$routeParams', '$scope', '$h
         },
         function (response) {
             $scope.errors= "Fatal error";
+            window.location = "/";
         }
     );
 }]);

src/main/resources/public/dashboard/container.html

@@ -75,7 +75,8 @@ <h6 class="m-0">General view</h6>
                                 class="mr-1">Creation time:</strong> <mydate>{{creationTime * 1000 | date:'dd-MM-yyyy HH:mm:ss'}}</mydate> </span>
 
                         <span class="d-flex mb-2">
-                        <button type="button" class="mb-2 btn btn-danger mr-2" data-toggle="modal" data-target="#remove">Remove container</button>
+                        <button type="button" class="mb-2 btn btn-danger mr-2" data-toggle="modal"
+                                data-target="#remove">Remove container</button>
                             <button type="button" class=" ml-auto mb-2 btn btn-warning mr-2" ng-click="dockerRestart()">Restart container</button>
                         </span>
                 </ul>
@@ -87,7 +88,7 @@ <h6 class="m-0">General view</h6>
                 <h6 class="m-0">Advertising</h6>
             </div>
             <div class="card-body p-0">
-                <div style="text-align: center"><img src="https://i.imgur.com/8jVsNBp.png"> </div>
+                <div style="text-align: center"><img src="https://i.imgur.com/8jVsNBp.png"></div>
             </div>
         </div>
     </div>
@@ -141,8 +142,10 @@ <h5 class="modal-title">Warning!</h5>
                 </button>
             </div>
             <div class="modal-body">
-                <div style="text-align: center"> <h5>Are you sure about delete the container?</h5>
-               <button type="button" class="mb-2 btn btn-danger mr-2" ng-click="dockerRemove()">Remove container</button></div>
+                <div style="text-align: center"><h5>Are you sure about delete the container?</h5>
+                    <button type="button" class="mb-2 btn btn-danger mr-2" ng-click="dockerRemove()">Remove container
+                    </button>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>

src/main/resources/public/dashboard/containercreate.html

@@ -24,7 +24,7 @@ <h5 class="card-title">{{name}}</h5>
 <div class="col-lg-12">
     <div class="card card-small card-post mb-4">
         <div class="card-body">
-           <h3>Basic information</h3>
+            <h3>Basic information</h3>
             <div class="row">
                 <hr>
                 <div class="col">
@@ -43,16 +43,22 @@ <h3>Basic information</h3>
             <hr>
             <h5><b>Installation process:</b></h5>
 
+            <div style="text-align:center;" ng-if="finish">
+                <a href="/dashboard.html#!/containers/{{referId}}"><button type="button" class="mb-2 btn btn-primary mr-2">Go to the container </button> </a>
+            </div>
+
             <div ng-if="errors">
                 <h5 style="text-align:center; color: #ff2600"><b>{{errors}}</b></h5>
             </div>
-            <span id="percentage">({{progressBar}}%)</span>
-            <div class="progress progress-sm mb-3">
-                <div id="" class="progress-bar" role="progressbar" ng-style="{width : ( progressBar + '%' ) }" aria-valuenow="{{progressBar}}" aria-valuemin="0" aria-valuemax="100"></div>
-            </div>
-            <div style="text-align:center;" ng-if="progressBar==100">
-                <button type="button"  onclick="location.href='/dashboard.html#!/containers/{{id}}'" class="mb-2 btn btn-primary mr-2">Go to the container</button>
+            <div ng-if="!finish">
+                <span id="percentage">({{progressBar}}%)</span>
+                <div class="progress progress-sm mb-3">
+                    <div id="" class="progress-bar" role="progressbar" ng-style="{width : ( progressBar + '%' ) }"
+                         aria-valuenow="{{progressBar}}" aria-valuemin="0" aria-valuemax="100"></div>
+                </div>
             </div>
+
+
         </div>
     </div>
 </div>