Delete components/captive_portal directory

moved to common
author: Kaufman Home Automation <[email protected]> 2022-03-02 11:08:04 -0700
committer: GitHub <[email protected]> 2022-03-02 11:08:04 -0700
commit: 66f10f46e542d5641b4abfb9bf91472b858c4252 (patch)
tree: 56de25375e05d92dcca1e9e1f2eb207e99f36ca1
parent: 9388bb68d5b900b576bbf0e355bbb3b615dba7eb (diff)
download: PLF10-66f10f46e542d5641b4abfb9bf91472b858c4252.tar.gz
PLF10-66f10f46e542d5641b4abfb9bf91472b858c4252.zip
10 files changed, 0 insertions, 390 deletions
diff --git a/components/captive_portal/__init__.py b/components/captive_portal/__init__.py
deleted file mode 100644
index f024c94..0000000
--- a/components/captive_portal/__init__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import web_server_base
-from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
-from esphome.const import CONF_ID
-from esphome.core import coroutine_with_priority, CORE
-
-AUTO_LOAD = ["web_server_base"]
-DEPENDENCIES = ["wifi"]
-CODEOWNERS = ["@OttoWinter"]
-
-captive_portal_ns = cg.esphome_ns.namespace("captive_portal")
-CaptivePortal = captive_portal_ns.class_("CaptivePortal", cg.Component)
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(CaptivePortal),
-            cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(
-                web_server_base.WebServerBase
-            ),
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    cv.only_with_arduino,
-)
-
-
-@coroutine_with_priority(64.0)
-async def to_code(config):
-    paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
-
-    var = cg.new_Pvariable(config[CONF_ID], paren)
-    await cg.register_component(var, config)
-    cg.add_define("USE_CAPTIVE_PORTAL")
-
-    if CORE.is_esp32:
-        cg.add_library("DNSServer", None)
-        cg.add_library("WiFi", None)
-    if CORE.is_esp8266:
-        cg.add_library("DNSServer", None)
diff --git a/components/captive_portal/captive_portal.cpp b/components/captive_portal/captive_portal.cpp
deleted file mode 100644
index 464096f..0000000
--- a/components/captive_portal/captive_portal.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifdef USE_ARDUINO
-
-#include "captive_portal.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include "esphome/components/wifi/wifi_component.h"
-
-namespace esphome {
-namespace captive_portal {
-
-static const char *const TAG = "captive_portal";
-
-void CaptivePortal::handle_index(AsyncWebServerRequest *request) {
-  AsyncResponseStream *stream = request->beginResponseStream("text/html");
-  stream->print(F("<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" "
-                  "content=\"width=device-width,initial-scale=1,user-scalable=no\"/><title>"));
-  stream->print(App.get_name().c_str());
-  stream->print(F("</title><link rel=\"stylesheet\" href=\"/stylesheet.css\">"));
-  stream->print(F("<script>function c(l){document.getElementById('ssid').value=l.innerText||l.textContent; "
-                  "document.getElementById('psk').focus();}</script>"));
-  stream->print(F("</head>"));
-  stream->print(F("<body><div class=\"main\"><h1>WiFi Networks</h1>"));
-
-  if (request->hasArg("save")) {
-    stream->print(F("<div class=\"info\">The KAUF Smart Plug will now try to connect to the network...<br/><br/>Please give it some "
-                    "time to connect.</div>"));
-  }
-
-  for (auto &scan : wifi::global_wifi_component->get_scan_result()) {
-    if (scan.get_is_hidden())
-      continue;
-
-    stream->print(F("<div class=\"network\" onclick=\"c(this)\"><a href=\"#\" class=\"network-left\">"));
-
-    if (scan.get_rssi() >= -50) {
-      stream->print(F("<img src=\"/wifi-strength-4.svg\">"));
-    } else if (scan.get_rssi() >= -65) {
-      stream->print(F("<img src=\"/wifi-strength-3.svg\">"));
-    } else if (scan.get_rssi() >= -85) {
-      stream->print(F("<img src=\"/wifi-strength-2.svg\">"));
-    } else {
-      stream->print(F("<img src=\"/wifi-strength-1.svg\">"));
-    }
-
-    stream->print(F("<span class=\"network-ssid\">"));
-    stream->print(scan.get_ssid().c_str());
-    stream->print(F("</span></a>"));
-    if (scan.get_with_auth()) {
-      stream->print(F("<img src=\"/lock.svg\">"));
-    }
-    stream->print(F("</div>"));
-  }
-
-  stream->print(F("<h3>WiFi Settings</h3><form method=\"GET\" action=\"/wifisave\"><input id=\"ssid\" name=\"ssid\" "
-                  "length=32 placeholder=\"SSID\"><br/><input id=\"psk\" name=\"psk\" length=64 type=\"password\" "
-                  "placeholder=\"Password\"><br/><br/><button type=\"submit\">Save</button></form><br><hr><br>"));
-  // add warning about not flashing tasmota-minimal.
-  stream->print(F("<h1>OTA Update: </h1>"
-                  "<br />**** DO NOT USE <b>TASMOTA-MINIMAL</b>.BIN or .BIN.GZ. **** Use tasmota.bin.gz."
-                  "<form method=\"POST\" action=\"/update\" enctype=\"multipart/form-data\"><input "
-                  "type=\"file\" name=\"update\"><button type=\"submit\">Update</button></form>"));
-  stream->print(F("</div></body></html>"));
-  request->send(stream);
-}
-void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
-  std::string ssid = request->arg("ssid").c_str();
-  std::string psk = request->arg("psk").c_str();
-  ESP_LOGI(TAG, "Captive Portal Requested WiFi Settings Change:");
-  ESP_LOGI(TAG, "  SSID='%s'", ssid.c_str());
-  ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
-  wifi::global_wifi_component->save_wifi_sta(ssid, psk);
-  wifi::global_wifi_component->start_scanning();
-  request->redirect("/?save=true");
-}
-
-void CaptivePortal::setup() {}
-void CaptivePortal::start() {
-  this->base_->init();
-  if (!this->initialized_) {
-    this->base_->add_handler(this);
-    this->base_->add_ota_handler();
-  }
-
-  this->dns_server_ = make_unique<DNSServer>();
-  this->dns_server_->setErrorReplyCode(DNSReplyCode::NoError);
-  network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
-  this->dns_server_->start(53, "*", (uint32_t) ip);
-
-  this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {
-    if (!this->active_ || req->host().c_str() == wifi::global_wifi_component->wifi_soft_ap_ip().str()) {
-      req->send(404, "text/html", "File not found");
-      return;
-    }
-
-    auto url = "http://" + wifi::global_wifi_component->wifi_soft_ap_ip().str();
-    req->redirect(url.c_str());
-  });
-
-  this->initialized_ = true;
-  this->active_ = true;
-}
-
-const char STYLESHEET_CSS[] PROGMEM =
-    R"(*{box-sizing:inherit}div,input{padding:5px;font-size:1em}input{width:95%}body{text-align:center;font-family:sans-serif}button{border:0;border-radius:.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;padding:0}.main{text-align:left;display:inline-block;min-width:260px}.network{display:flex;justify-content:space-between;align-items:center}.network-left{display:flex;align-items:center}.network-ssid{margin-bottom:-7px;margin-left:10px}.info{border:1px solid;margin:10px 0;padding:15px 10px;color:#4f8a10;background-color:#dff2bf})";
-const char LOCK_SVG[] PROGMEM =
-    R"(<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M12 17a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>)";
-
-void CaptivePortal::handleRequest(AsyncWebServerRequest *req) {
-  if (req->url() == "/") {
-    this->handle_index(req);
-    return;
-  } else if (req->url() == "/wifisave") {
-    this->handle_wifisave(req);
-    return;
-  } else if (req->url() == "/stylesheet.css") {
-    req->send_P(200, "text/css", STYLESHEET_CSS);
-    return;
-  } else if (req->url() == "/lock.svg") {
-    req->send_P(200, "image/svg+xml", LOCK_SVG);
-    return;
-  }
-
-  AsyncResponseStream *stream = req->beginResponseStream("image/svg+xml");
-  stream->print(F("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\"><path d=\"M12 3A18.9 18.9 0 0 "
-                  "0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 "));
-  if (req->url() == "/wifi-strength-4.svg") {
-    stream->print(F("3z"));
-  } else {
-    if (req->url() == "/wifi-strength-1.svg") {
-      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-5.1 6.36a8.43 8.43 0 0 0-7.22-.01L3.27 7.4"));
-    } else if (req->url() == "/wifi-strength-2.svg") {
-      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-3.21 3.98a11.32 11.32 0 0 0-11 0L3.27 7.4"));
-    } else if (req->url() == "/wifi-strength-3.svg") {
-      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-1.94 2.43A13.6 13.6 0 0 0 12 8C9 8 6.68 9 5.21 9.84l-1.94-2."));
-    }
-    stream->print(F("4A16.94 16.94 0 0 1 12 5z"));
-  }
-  stream->print(F("\"/></svg>"));
-  req->send(stream);
-}
-CaptivePortal::CaptivePortal(web_server_base::WebServerBase *base) : base_(base) { global_captive_portal = this; }
-float CaptivePortal::get_setup_priority() const {
-  // Before WiFi
-  return setup_priority::WIFI + 1.0f;
-}
-void CaptivePortal::dump_config() { ESP_LOGCONFIG(TAG, "Captive Portal:"); }
-
-CaptivePortal *global_captive_portal = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-}  // namespace captive_portal
-}  // namespace esphome
-
-#endif  // USE_ARDUINO
diff --git a/components/captive_portal/captive_portal.h b/components/captive_portal/captive_portal.h
deleted file mode 100644
index b308de4..0000000
--- a/components/captive_portal/captive_portal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#ifdef USE_ARDUINO
-
-#include <memory>
-#include <DNSServer.h>
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/preferences.h"
-#include "esphome/components/web_server_base/web_server_base.h"
-
-namespace esphome {
-
-namespace captive_portal {
-
-class CaptivePortal : public AsyncWebHandler, public Component {
- public:
-  CaptivePortal(web_server_base::WebServerBase *base);
-  void setup() override;
-  void dump_config() override;
-  void loop() override {
-    if (this->dns_server_ != nullptr)
-      this->dns_server_->processNextRequest();
-  }
-  float get_setup_priority() const override;
-  void start();
-  bool is_active() const { return this->active_; }
-  void end() {
-    this->active_ = false;
-    this->base_->deinit();
-    this->dns_server_->stop();
-    this->dns_server_ = nullptr;
-  }
-
-  bool canHandle(AsyncWebServerRequest *request) override {
-    if (!this->active_)
-      return false;
-
-    if (request->method() == HTTP_GET) {
-      if (request->url() == "/")
-        return true;
-      if (request->url() == "/stylesheet.css")
-        return true;
-      if (request->url() == "/wifi-strength-1.svg")
-        return true;
-      if (request->url() == "/wifi-strength-2.svg")
-        return true;
-      if (request->url() == "/wifi-strength-3.svg")
-        return true;
-      if (request->url() == "/wifi-strength-4.svg")
-        return true;
-      if (request->url() == "/lock.svg")
-        return true;
-      if (request->url() == "/wifisave")
-        return true;
-    }
-
-    return false;
-  }
-
-  void handle_index(AsyncWebServerRequest *request);
-
-  void handle_wifisave(AsyncWebServerRequest *request);
-
-  void handleRequest(AsyncWebServerRequest *req) override;
-
- protected:
-  web_server_base::WebServerBase *base_;
-  bool initialized_{false};
-  bool active_{false};
-  std::unique_ptr<DNSServer> dns_server_{nullptr};
-};
-
-extern CaptivePortal *global_captive_portal;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-}  // namespace captive_portal
-}  // namespace esphome
-
-#endif  // USE_ARDUINO
diff --git a/components/captive_portal/index.html b/components/captive_portal/index.html
deleted file mode 100644
index 627bf81..0000000
--- a/components/captive_portal/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- HTTP_HEAD -->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
-    <title>{{ App.get_name() }}</title>
-    <link rel="stylesheet" href="./stylesheet.css">
-    <script>
-        function c(l) {
-            document.getElementById('ssid').value = l.innerText || l.textContent;
-            document.getElementById('psk').focus();
-        }
-    </script>
-</head>
-<body>
-<div class="main">
-    <h1>WiFi Networks</h1>
-    <div class="info">
-        The ESP will now try to connect to the network...<br/>
-        Please give it some time to connect.<br/>
-        Note: Copy the changed network to your YAML file - the next OTA update will overwrite these settings.
-    </div>
-    <div class="network" onclick="c(this)">
-        <a href="#" class="network-left">
-            <img src="./wifi-strength-4.svg">
-            <span class="network-ssid">AP1</span>
-        </a>
-        <img src="./lock.svg">
-    </div>
-    <div class="network" onclick="c(this)">
-        <a href="#" class="network-left">
-            <img src="./wifi-strength-2.svg">
-            <span class="network-ssid">AP2</span>
-        </a>
-    </div>
-
-    <h3>WiFi Settings</h3>
-    <form method="GET" action="/wifisave">
-        <input id="ssid" name="ssid" length=32 placeholder="SSID"><br/>
-        <input id="psk" name="psk" length=64 type="password" placeholder="Password"><br/>
-        <br/>
-        <button type="submit">Save</button>
-    </form>
-    <br><hr>
-    <br>
-
-    <h1>OTA Update</h1>
-    <form method="POST" action="/update" enctype="multipart/form-data">
-        <input type="file" name="update">
-        <button type="submit">Update</button>
-    </form>
-</div>
-</body>
-</html>
diff --git a/components/captive_portal/lock.svg b/components/captive_portal/lock.svg
deleted file mode 100644
index 743a1cc..0000000
--- a/components/captive_portal/lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M12 17a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>
-\ No newline at end of file
diff --git a/components/captive_portal/stylesheet.css b/components/captive_portal/stylesheet.css
deleted file mode 100644
index 73f82f0..0000000
--- a/components/captive_portal/stylesheet.css
+++ /dev/null
@@ -1,58 +0,0 @@
-* {
-    box-sizing: inherit;
-}
-
-div, input {
-    padding: 5px;
-    font-size: 1em;
-}
-
-input {
-    width: 95%;
-}
-
-body {
-    text-align: center;
-    font-family: sans-serif;
-}
-
-button {
-    border: 0;
-    border-radius: 0.3rem;
-    background-color: #1fa3ec;
-    color: #fff;
-    line-height: 2.4rem;
-    font-size: 1.2rem;
-    width: 100%;
-    padding: 0;
-}
-
-.main {
-    text-align: left;
-    display: inline-block;
-    min-width: 260px;
-}
-
-.network {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.network-left {
-    display: flex;
-    align-items: center;
-}
-
-.network-ssid {
-    margin-bottom: -7px;
-    margin-left: 10px;
-}
-
-.info {
-    border: 1px solid;
-    margin: 10px 0px;
-    padding: 15px 10px;
-    color: #4f8a10;
-    background-color: #dff2bf;
-}
diff --git a/components/captive_portal/wifi-strength-1.svg b/components/captive_portal/wifi-strength-1.svg
deleted file mode 100644
index 189a381..0000000
--- a/components/captive_portal/wifi-strength-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-5.1 6.36a8.43 8.43 0 0 0-7.22-.01L3.27 7.44A16.94 16.94 0 0 1 12 5z"/></svg>
-\ No newline at end of file
diff --git a/components/captive_portal/wifi-strength-2.svg b/components/captive_portal/wifi-strength-2.svg
deleted file mode 100644
index 9b4b2d2..0000000
--- a/components/captive_portal/wifi-strength-2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-3.21 3.98a11.32 11.32 0 0 0-11 0L3.27 7.44A16.94 16.94 0 0 1 12 5z"/></svg>
-\ No newline at end of file
diff --git a/components/captive_portal/wifi-strength-3.svg b/components/captive_portal/wifi-strength-3.svg
deleted file mode 100644
index 44b7532..0000000
--- a/components/captive_portal/wifi-strength-3.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-1.94 2.43A13.6 13.6 0 0 0 12 8C9 8 6.68 9 5.21 9.84l-1.94-2.4A16.94 16.94 0 0 1 12 5z"/></svg>
-\ No newline at end of file
diff --git a/components/captive_portal/wifi-strength-4.svg b/components/captive_portal/wifi-strength-4.svg
deleted file mode 100644
index a22b0b8..0000000
--- a/components/captive_portal/wifi-strength-4.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3z"/></svg>
-\ No newline at end of file
author	Kaufman Home Automation <[email protected]>	2022-03-02 11:08:04 -0700
committer	GitHub <[email protected]>	2022-03-02 11:08:04 -0700
commit	66f10f46e542d5641b4abfb9bf91472b858c4252 (patch)
tree	56de25375e05d92dcca1e9e1f2eb207e99f36ca1
parent	9388bb68d5b900b576bbf0e355bbb3b615dba7eb (diff)
download	PLF10-66f10f46e542d5641b4abfb9bf91472b858c4252.tar.gz PLF10-66f10f46e542d5641b4abfb9bf91472b858c4252.zip