Kaynağa Gözat

d04 Добавление кнопок добавления бота

SVI 2 yıl önce
ebeveyn
işleme
cd9536e4f6
3 değiştirilmiş dosya ile 54 ekleme ve 11 silme
  1. 3 1
      Makefile
  2. 43 4
      web/static/bry/index.py
  3. 8 6
      web/tmpl/index.tmpl.html

+ 3 - 1
Makefile

@@ -12,12 +12,14 @@ runner.build:
 	upx -f ./bin/serv_run
 dev.run:
 	clear
+	rm -r ./bin_dev
 	go fmt ./...
 	go build -race -o ./bin_dev/wartank_dev ./cmd/server/main.go
-		cp -fR ./web ./bin_dev/web
+	cp -fR ./web ./bin_dev/web
 	./run_dev.sh
 prod.run:
 	clear
+	rm -r ./bin_dev
 	go fmt ./...
 	go build -o ./bin/wartank ./cmd/server/main.go
 		cp -fR ./web ./bin/web

+ 43 - 4
web/static/bry/index.py

@@ -31,10 +31,12 @@ class FormBotNew():
         self.box_new["class"] = "container bg-secondary text-white p-3 border"
 
         self.ent_login = document.createElement("input")
-        self.ent_login["class"] = "col-9"
+        self.ent_login["class"] = "col"
+        self.ent_login["id"] = "bot_login"
 
         self.ent_pass = document.createElement("input")
-        self.ent_pass["class"] = "col-9"
+        self.ent_pass["class"] = "col"
+        self.ent_pass["id"] = "bot_pass"
 
         self.add_container_new()
 
@@ -43,13 +45,14 @@ class FormBotNew():
         print("FormBotNew.add_container_new()")
         self.add_row_login()
         self.add_row_pass()
+        self.add_row_btn()
         self.div_new.appendChild(self.box_new)
 
     def add_row_login(self) -> None:
         """Добавляет ряд логина"""
         print("FormBotNew.add_row_login()")
         row_login = document.createElement("div")
-        row_login["class"] = "row"
+        row_login["class"] = "row p-3"
         lbl_login = document.createElement("label")
         lbl_login["class"] = "col-2"
         lbl_login.text = "Логин"
@@ -63,7 +66,7 @@ class FormBotNew():
         """Добавляет ряд пароля"""
         print("FormBotNew.add_row_pass()")
         row_pass = document.createElement("div")
-        row_pass["class"] = "row"
+        row_pass["class"] = "row p-3"
         lbl_pass = document.createElement("label")
         lbl_pass["class"] = "col-2"
         lbl_pass.text = "Пароль"
@@ -73,6 +76,42 @@ class FormBotNew():
 
         self.box_new.appendChild(row_pass)
 
+    def add_row_btn(self) -> None:
+        """добавляет ряд кнопок формы"""
+        row_btn = document.createElement("div")
+        row_btn["class"] = "row p-3"
+        lbl_btn = document.createElement("label")
+        lbl_btn["class"] = "col-6"
+        row_btn.appendChild(lbl_btn)
+
+        btn_cancel = document.createElement("button")
+        btn_cancel["class"] = "btn btn-dark col-3"
+        btn_cancel.text = "Отмена"
+        btn_cancel.bind("click", self.clear)
+        row_btn.appendChild(btn_cancel)
+
+        btn_add = document.createElement("button")
+        btn_add["class"] = "btn btn-primary col-3"
+        btn_add.text = "Добавить"
+        btn_add.bind("click", self.add)
+        row_btn.appendChild(btn_add)
+
+        self.box_new.appendChild(row_btn)
+
+    def add(self, event) -> None:
+        """Получает логин и пароль нового боты из формы"""
+        print("FormBotNew.clear()")
+        login = self.ent_login.value
+        _pass = self.ent_pass.value
+        print(f"FormBotNew.clear(): login={login}, " +
+              f"pass={_pass}, event={event}")
+        self.div_new.clear()
+
+    def clear(self, event) -> None:
+        """Зачищает форму логина"""
+        print("FormBotNew.clear()")
+        self.div_new.clear()
+
 
 document["bot_list_update"].bind("click", bot_list_update)
 document["bot_list_add"].bind("click", bot_list_add)

+ 8 - 6
web/tmpl/index.tmpl.html

@@ -15,17 +15,19 @@
     </head>
 
     <body onload="brython({debug:1})">
-        <h1>WarTank</h1>
         <div class="container">
+            <h1>WarTank</h1>
+        </div>
+        <div class="container p-3">
             <h2>Список танков</h2>
-            <div class="btn-group" role="group" aria-label="Управление списком">
-                <button type="button" id="bot_list_update" class="btn btn-primary">Обновить</button>
-                <button type="button" id="bot_list_add" class="btn btn-primary">Добавить</button>
+            <div class="btn-group p-3" role="group" aria-label="Управление списком">
+                <button type="button" id="bot_list_update" class="btn btn-primary p-3">Обновить</button>
+                <button type="button" id="bot_list_add" class="btn btn-primary p-3">Добавить</button>
             </div>
-            <div class="container" id="bot_list">
+            <div class="container p-3" id="bot_list">
 
             </div>
-            <div class="container" id="bot_list_new">
+            <div class="container p-3" id="bot_list_new">
                 <!-- Форма для добавления нового бота -->
 
             </div>