Fixs

Author: SimpleMethod

src/main/java/pl/simplemethod/codebin/githubOauth/GithubClient.java

@@ -49,6 +49,7 @@ protected org.json.JSONObject getCloneReposMinimalInfo(String token, String user
  body.put("html_url", jsonObject.get("html_url"));
  body.put("description", jsonObject.get("description"));
  body.put("language", jsonObject.get("language"));
+ body.put("id", jsonObject.get("id"));
  try {
  if (!url.isEmpty()) {
  String error = (String) jsonObject.get("error");

src/main/java/pl/simplemethod/codebin/model/Containers.java

@@ -11,7 +11,7 @@ public class Containers implements Serializable {
  @Id
  @GeneratedValue(strategy = GenerationType.IDENTITY)
  @Column(name = "id")
- private Integer id;
+ private Long id;
 
  @Column(unique = true, nullable = false)
  private String name;
@@ -68,11 +68,11 @@ public void setShareUrl(String shareUrl) {
  }
 
 
- public Integer getId() {
+ public Long getId() {
  return id;
  }
 
- public void setId(Integer id) {
+ public void setId(Long id) {
  this.id = id;
  }
 

src/main/java/pl/simplemethod/codebin/repository/ContainersRepository.java

@@ -13,7 +13,15 @@
 @Transactional
 public interface ContainersRepository extends JpaRepository<Containers, Long> {
 
- Containers getFirstById(Integer id);
+ Containers removeById(Long id);
+
+ Containers deleteByName(String name);
+
+ Containers removeByName(String name);
+
+ Containers deleteContainersByName(String name);
+
+ Containers getFirstById(Long id);
 
  Containers getFirstByIdDocker(String dockerId);
 

src/main/java/pl/simplemethod/codebin/srv/SrvRestController.java

@@ -255,6 +255,10 @@ ResponseEntity deleteContainer(@PathVariable(value = "ID") String containerId) {
  HttpHeaders headers = new HttpHeaders();
  headers.setContentType(MediaType.APPLICATION_JSON);
  org.json.JSONObject response = srvClient.deleteContainer(containerId);
+
+ // TODO: 02.06.2019 Poprawić usuwanie
+
+
  return new ResponseEntity<>(response.toString(), headers, HttpStatus.valueOf(response.getInt("status")));
  }
 

src/main/resources/public/app.js

@@ -62,6 +62,36 @@ app.controller('ContainersController', ['$filter', '$routeParams', '$scope', '$h
  $scope.containersId = response.data.idDocker;
  $scope.hostPorts = response.data.hostPorts;
 
+ $scope.dockerRestart = function(msg)
+ {
+ console.log("Takbyło:"+$scope.containersId);
+ $http({
+ url: 'http://127.0.0.1/srv/container/'+$scope.containersId+'/restart',
+ method: 'POST'
+ }).then(
+ function (response) {
+ console.log(response)
+ },
+ function (response) {
+ console.error(response)
+ }
+ );
+ };
+
+ $scope.dockerRemove = function()
+ {
+ $http({
+ url: 'http://127.0.0.1/srv/container/'+$scope.containersId+'/delete',
+ method: 'DELETE'
+ }).then(
+ function (response) {
+ },
+ function (response) {
+ $scope.passCheck = false;
+ }
+ );
+ };
+
  $http({
  url: 'http://127.0.0.1/srv/container/' + $scope.containersId + '/logs',
  method: 'GET'
@@ -94,6 +124,7 @@ app.controller('ContainersController', ['$filter', '$routeParams', '$scope', '$h
  );
 
 
+
 }]);
 
 

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

@@ -53,14 +53,12 @@ <h6 class="m-0">General view</h6>
  <a class="ml-auto" href="http://127.0.0.1/share/{{shareStatus}}">Share link</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=""
- data-toggle="modal"
- data-target="#local">Local access</a> </strong></span>
+ class="mr-1">Visibility:</strong> <strong class="text-danger"><a href="" data-toggle="modal" data-target="#local">Local access</a> </strong></span>
  <span class="d-flex mb-2"><i class="material-icons mr-1">calendar_today</i><strong 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">Remove container</button><button
-  type="button" class=" ml-auto mb-2 btn btn-warning mr-2">Restart container</button>
+ <button type="button" class="mb-2 btn btn-danger mr-2" ng-click="dockerRemove()">Remove container</button>
+ <button type="button" class=" ml-auto mb-2 btn btn-warning mr-2" ng-click="dockerRestart()">Restart container</button>
  </span>
  </ul>
  </div>