Merge branch 'main' of https://github.com/donaldzou/Wireguard-Dashboard into main

Update dashboard.py
Update README.md
2025-10-03 15:56:17 +00:00 · 2021-09-08 22:01:01 -04:00 · 2021-09-08 22:00:53 -04:00 · 2021-09-08 21:59:15 -04:00 · 2021-09-08 21:58:02 -04:00 · 2021-09-08 21:57:50 -04:00
49 changed files with 10321 additions and 670 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -0,0 +1,52 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "antonioag95",
+      "name": "antonioag95",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30556866?v=4",
+      "profile": "https://github.com/antonioag95",
+      "contributions": [
+        "test",
+        "code"
+      ]
+    },
+    {
+      "login": "tonjo",
+      "name": "tonjo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4726289?v=4",
+      "profile": "https://github.com/tonjo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "reafian",
+      "name": "Richard Newton",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11992416?v=4",
+      "profile": "https://github.com/reafian",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "davejlong",
+      "name": "David Long",
+      "avatar_url": "https://avatars.githubusercontent.com/u/175317?v=4",
+      "profile": "http://www.davejlong.com",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "projectName": "wireguard-dashboard",
+  "projectOwner": "donaldzou",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "skipCi": true
+}
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [donaldzou]
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe The Problem**
+A clear and concise description of what the bug is.
+
+**Expected Error / Traceback**
+```
+Please provide the error traceback here
+```
+
+**To Reproduce**
+Please provide how you run the dashboard
+
+**OS Information:**
+ - OS: [e.g. Ubuntu 18.02]
+ - Python Version: [e.g v3.7]
+
+**Sample of your `.conf` file**
+```
+Please provide a sample of your configuration file that you are having problem with. You can replace your public key and private key to ABCD...
+```
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,11 @@ wg.db
 *.json
 .idea
 src/test.py
+tmp
+__pycache__
+src/wg-dashboard.ini
+src/static/pic.xd
+*.conf
+private_key.txt
+public_key.txt
+
--- a/README.md
+++ b/README.md
@@ -1,49 +1,452 @@
-# Wireguard Dashboard
-Monitoring Wireguard is not convinient, need to login into server and type `wg show`. That's why this platform is being created, to view all configurations in a more straight forward way.
+<hr>
+<p align=center>Please provide your OS name and version if you can run the dashboard on it perfectly in <a href="https://github.com/donaldzou/wireguard-dashboard/issues/31">#31</a>, since I only tested on Ubuntu. Thank you!</p>
+<hr>

-## 💡Features

- Add peers in configuration
- Manage peer names
- Delete peers
- And many more coming up! Welcome to contribute to this project!
+<p align="center">
+  <img alt="WGDashboard" src="img/logo.png" width="128">
+</p>
+<h1 align="center">WGDashboard</h1>
+<p align="center"><small>Note: This project is not affiliate to the official WireGuard Project ;)</small></p>

-## 📝Requirement
+<p align="center">
+  <img src="http://ForTheBadge.com/images/badges/made-with-python.svg">
+</p>
+<p align="center">
+  <a href="https://github.com/donaldzou/wireguard-dashboard/releases/latest"><img src="https://img.shields.io/github/v/release/donaldzou/wireguard-dashboard"></a>
+</p>
+<p align="center">Monitoring WireGuard is not convinient, need to login into server and type <code>wg show</code>. That's why this platform is being created, to view all configurations and manage them in a easier way.</p>

- Ubuntu 18.04.1 LTS, other OS might work, but haven't test yet.
- **Wireguard**
- Configuration files under **/etc/wireguard**
- Python 3.7
+## 📣 What's New: v2.3

-## 🛠Install
+- 🎉  **New Features**
+  - **Update directly from `wgd.sh`:** Now you can update WGDashboard directly from the bash script.
+  - **Displaying Peers:** You can switch the display mode between list and table in the configuration page.
+- 🪚  **Bug Fixed**
+  - [Peer DNS Validation Fails #67](https://github.com/donaldzou/wireguard-dashboard/issues/67): Added DNS format check. [❤️ @realfian]
+  - [configparser.NoSectionError: No section: 'Interface' #66](https://github.com/donaldzou/wireguard-dashboard/issues/66): Changed permission requirement for `etc/wireguard` from `744` to `755`. [❤️ @ramalmaty]
+  - [Feature request: Interface not loading when information missing #73](https://github.com/donaldzou/wireguard-dashboard/issues/73): Fixed when Configuration Address and Listen Port is missing will crash the dashboard. [❤️ @js32]
+  - [Remote Peer, MTU and PersistentKeepalives added #70](https://github.com/donaldzou/wireguard-dashboard/pull/70): Added MTU, remote peer and Persistent Keepalive. [❤️ @realfian]
+  - [Fixes DNS check to support search domain #65](https://github.com/donaldzou/wireguard-dashboard/pull/65): Added allow input domain into DNS. [❤️@davejlong]
+- **🧐  Other Changes**
+  - Moved Add Peer Button into the right bottom corner.

-**1. Install Python Dependencies**

-```
-$ python3 -m pip install flask tinydb
+
+<hr>
+
+
+## Table of Content
+
+- [💡  Features](#-features)
+- [📝  Requirement](#-requirement)
+- [🛠  Install](#-install)
+- [🪜  Usage](#-usage)
+  - [Start/Stop/Restart WGDashboard](#startstoprestart-wireguard-dashboard)
+  - [Autostart WGDashboard on boot](#autostart-wireguard-dashboard-on-boot)
+- [✂️  Dashboard Configuration](#%EF%B8%8F-dashboard-configuration)
+  - [Dashboard Configuration file](#dashboard-configuration-file)
+  - [Generating QR code and peer configuration file (.conf)](#generating-qr-code-and-peer-configuration-file-conf)
+- [❓  How to update the dashboard?](#-how-to-update-the-dashboard)
+- [🔍  Screenshot](#-screenshot)
+- [⏰  Changelog](#--changelog)
+- [🛒  Dependencies](#-dependencies)
+- [✨  Contributors](#-contributors)
+
+## 💡 Features
+
+- **No need to re-configure existing WireGuard configuration! It can search for existed configuration files.**
+- Easy to use interface, provided username and password protection to the dashboard
+- Add peers and edit (Allowed IPs, DNS, Private Key...)
+- View peers and configuration real time details (Data Usage, Latest Handshakes...)
+- Share your peer configuration with QR code or file download
+- Testing tool: Ping and Traceroute to your peer's ip
+- **And more functions are coming up!**
+
+
+## 📝 Requirement
+
+- Recommend the following OS, tested by our beloved users:
+  - [x] Ubuntu 18.04.1 LTS - 20.04.1 LTS [@Me]
+  - [x] Debian GNU/Linux 10 (buster) [❤️ @[robchez](https://github.com/robchez)]
+  - [x] AlmaLinux 8.4 (Electric Cheetah) [❤️ @[barry-smithjr](https://github.com/)]
+  - [x] CentOS 7 [❤️ @[PrzemekSkw](https://github.com/PrzemekSkw)]
+
+  > **If you have tested on other OS and it works perfectly please provide it to me in [#31](https://github.com/donaldzou/wireguard-dashboard/issues/31). Thank you!**
+
+- **WireGuard** and **WireGuard-Tools (`wg-quick`)**  are installed.
+
+  > Don't know how? Check this <a href="https://www.wireguard.com/install/">official documentation</a>
+
+- Configuration files under **`/etc/wireguard`**, but please note the following sample
+
+  ```ini
+  [Interface]
+  ...
+  SaveConfig = true
+  # Need to include this line to allow WireGuard Tool to save your configuration, 
+  # or if you just want it to monitor your WireGuard Interface and don't need to
+  # make any changes with the dashboard, you can set it to false.
+  
+  [Peer]
+  PublicKey = abcd1234
+  AllowedIPs = 1.2.3.4/32
+  # Must have for each peer
+  ```
+
+- Python 3.7+ & Pip3
+
+## 🛠 Install
+1. Download WGDashboard
+
+   ```shell
+   git clone -b v2.3.1 https://github.com/donaldzou/wireguard-dashboard.git
+   
+2. Open the WGDashboard folder
+
+   ```shell
+   cd wireguard-dashboard/src
+   ```
+   
+3. Install WGDashboard
+
+   ```shell
+   sudo chmod u+x wgd.sh
+   sudo ./wgd.sh install
+   ```
+
+4. Give read and execute permission to root of the WireGuard configuration folder, you can change the path if your configuration files are not stored in `/etc/wireguard`
+
+   ```shell
+   sudo chmod -R 755 /etc/wireguard
+   ```
+
+5. Run WGDashboard
+
+   ```shell
+   ./wgd.sh start
+   ```
+   
+   **Note**:
+
+   > For [`pivpn`](https://github.com/pivpn/pivpn) user, please use `sudo ./wgd.sh start` to run if your current account does not have the permission to run `wg show` and `wg-quick`.
+
+6. Access dashboard
+
+   Access your server with port `10086` ! e.g (http://your_server_ip:10086), continue to read to on how to change port and ip that dashboard is running with.
+
+## 🪜 Usage
+
+#### Start/Stop/Restart WGDashboard
+
+
+```shell
+cd Wireguard-Dashboard/src
+-----------------------------
+./wgd.sh start    # Start the dashboard in background
+-----------------------------
+./wgd.sh debug    # Start the dashboard in foreground (debug mode)
+-----------------------------
+./wgd.sh stop     # Stop the dashboard
+-----------------------------
+./wgd.sh restart  # Restart the dasboard
 ```

-**2. Install Wireguard Dashboard**
+#### Autostart WGDashboard on boot (>= v2.2)

-```
-$ git clone https://github.com/donaldzou/Wireguard-Dashboard.git
-$ cd Wireguard-Dashboard/src
-$ python3 dashboard.py
+In the `src` folder, it contained a file called `wg-dashboard.service`, we can use this file to let our system to autostart the dashboard after reboot. The following guide has tested on **Ubuntu**, most **Debian** based OS might be the same, but some might not. Please don't hesitate to provide your system if you have tested the autostart on another system.
+
+1. Changing the directory to the dashboard's directory
+
+   ```shell
+   cd wireguard-dashboard/src
+   ```
+
+2. Get the full path of the dashboard's directory
+
+   ```shell
+   pwd
+   #Output: /root/wireguard-dashboard/src
+   ```
+
+   For this example, the output is `/root/wireguard-dashboard/src`, your path might be different since it depends on where you downloaded the dashboard in the first place. **Copy the the output to somewhere, we will need this in the next step.**
+
+3. Edit the service file, the service file is located in `wireguard-dashboard/src`, you can use other editor you like, here will be using `nano`
+
+   ```shell
+   nano wg-dashboard.service
+   ```
+
+   You will see something like this:
+
+   ```ini
+   [Unit]
+   After=netword.service
+   
+   [Service]
+   WorkingDirectory=<your dashboard directory full path here>
+   ExecStart=/usr/bin/python3 <your dashboard directory full path here>/dashboard.py
+   Restart=always
+   
+   
+   [Install]
+   WantedBy=default.target
+   ```
+
+   Now, we need to replace both `<your dashboard directory full path here>` to the one you just copied from step 2. After doing this, the file will become something like this, your file might be different:
+
+   ```ini
+   [Unit]
+   After=netword.service
+   
+   [Service]
+   WorkingDirectory=/root/wireguard-dashboard/src
+   ExecStart=/usr/bin/python3 /root/wireguard-dashboard/src/dashboard.py
+   Restart=always
+   
+   
+   [Install]
+   WantedBy=default.target
+   ```
+
+   **Be aware that after the value of `WorkingDirectory`, it does not have  a `/` (slash).** And then save the file after you edited it
+
+4. Copy the service file to systemd folder
+
+   ```bash
+   $ cp wg-dashboard.service /etc/systemd/system/wg-dashboard.service
+   ```
+
+   To make sure you copy the file successfully, you can use this command `cat /etc/systemd/system/wg-dashboard.service` to see if it will output the file you just edited.
+
+5. Enable the service
+
+   ```bash
+   $ sudo chmod 664 /etc/systemd/system/wg-dashboard.service
+   $ sudo systemctl daemon-reload
+   $ sudo systemctl enable wg-dashboard.service
+   $ sudo systemctl start wg-dashboard.service  # <-- To start the service
+   ```
+
+6. Check if the service run correctly
+
+   ```bash
+   $ sudo systemctl status wg-dashboard.service
+   ```
+
+   And you should see something like this
+
+   ```shell
+   ● wg-dashboard.service
+        Loaded: loaded (/etc/systemd/system/wg-dashboard.service; enabled; vendor preset: enabled)
+        Active: active (running) since Tue 2021-08-03 22:31:26 UTC; 4s ago
+      Main PID: 6602 (python3)
+         Tasks: 1 (limit: 453)
+        Memory: 26.1M
+        CGroup: /system.slice/wg-dashboard.service
+                └─6602 /usr/bin/python3 /root/wireguard-dashboard/src/dashboard.py
+   
+   Aug 03 22:31:26 ubuntu-wg systemd[1]: Started wg-dashboard.service.
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:  * Serving Flask app "WGDashboard" (lazy loading)
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:  * Environment: production
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:    WARNING: This is a development server. Do not use it in a production deployment.
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:    Use a production WSGI server instead.
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:  * Debug mode: off
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:  * Running on all addresses.
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:    WARNING: This is a development server. Do not use it in a production deployment.
+   Aug 03 22:31:27 ubuntu-wg python3[6602]:  * Running on http://0.0.0.0:10086/ (Press CTRL+C to quit)
+   ```
+
+   If you see `Active:` followed by `active (running) since...` then it means it run correctly. 
+
+7. Stop/Start/Restart the service
+
+   ```bash
+   sudo systemctl stop wg-dashboard.service      # <-- To stop the service
+   sudo systemctl start wg-dashboard.service     # <-- To start the service
+   sudo systemctl restart wg-dashboard.service   # <-- To restart the service
+   ```
+
+8. **And now you can reboot your system, and use the command at step 6 to see if it will auto start after the reboot, or just simply access the dashboard through your browser. If you have any questions or problem, please report it in the issue page.**
+
+## ✂️ Dashboard Configuration
+
+#### Dashboard Configuration file
+
+Since version 2.0, WGDashboard will be using a configuration file called `wg-dashboard.ini`, (It will generate automatically after first time running the dashboard). More options will include in future versions, and for now it included the following config:
+
+|                 | Description                                                  | Default                  | Available in Setting |
+| --------------- | ------------------------------------------------------------ | ------------------------ | -------------------- |
+| **`[Account]`** |                                                              |                          |                      |
+| `username`      | Dashboard login username                                     | `admin`                  | Yes                  |
+| `password`      | Password, will be hash with SHA256                           | `admin` hashed in SHA256 | Yes                  |
+| **`[Server]`**  |                                                              |                          |                      |
+| `wg_conf_path`  | The path of all the Wireguard configurations                 | `/etc/wireguard`         | Yes                  |
+| `app_ip`        | IP address the dashboard will run with                       | `0.0.0.0`                | Yes                  |
+| `app_port`      | Port the the dashboard will run with                         | `10086`                  | Yes                  |
+| `auth_req`      | Does the dashboard need authentication to access             | `true`                   | No                   |
+|                 | If `auth_req = false` , user will not be access the **Setting** tab due to security consideration. **User can only edit the file directly in system**. |                          |                      |
+| `version`       | Dashboard Version                                            | `v2.2`                   | No                   |
+
+**Except `auth_req` due to security consideration.**
+
+#### Generating QR code and peer configuration file (.conf)
+
+Starting version 2.2, dashboard can now generate QR code and configuration file for each peer. Here is a template of what each QR code encoded with and the same content will be inside the file:
+
+```ini
+[Interface]
+PrivateKey = QWERTYUIOPO234567890YUSDAKFH10E1B12JE129U21=
+Address = 0.0.0.0/32
+DNS = 1.1.1.1
+
+[Peer]
+PublicKey = QWERTYUIOPO234567890YUSDAKFH10E1B12JE129U21=
+AllowedIPs = 0.0.0.0/0
+Endpoint = 0.0.0.0:51820
 ```

-Access your server with port `10086` ! e.g (http://your_server_ip:10086)
+|                   | Description                                                  | Default Value                                                | Available in Peer setting |
+| ----------------- | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------- |
+| **`[Interface]`** |                                                              |                                                              |                           |
+| `PrivateKey`      | The private key of this peer                                 | Private key generated by WireGuard (`wg genkey`) or provided by user | Yes                       |
+| `Address`         | The `allowed_ips` of your peer                               | N/A                                                          | Yes                       |
+| `DNS`             | The DNS server your peer will use                            | `1.1.1.1` - Cloud flare DNS, you can change it when you adding the peer or in the peer setting. | Yes                       |
+| **`[Peer]`**      |                                                              |                                                              |                           |
+| `PublicKey`       | The public key of your server                                | N/A                                                          | No                        |
+| `AllowedIPs`      | IP ranges for which a peer will route traffic                | `0.0.0.0/0` - Indicated a default route to send all internet and VPN traffic through that peer. | Yes                       |
+| `Endpoint`        | Your wireguard server ip and port, the dashboard will search for your server's default interface's ip. | `<your server default interface ip>:<listen port>`           | Yes                       |

-**3. Install with Production Mode (Optional)**
+## ❓ How to update the dashboard?

-```
-$ cd Wireguard-Dashboard/src
-$ export FLASK_APP=dashboard.py
-$ export FLASK_RUN_HOST=0.0.0.0
-$ export FLASK_ENV=development
-$ export FLASK_DEBUG=0
-$ flask run
-```
+1. Change your directory to `wireguard-dashboard` 
+    ```shell
+    cd wireguard-dashboard/src
+    ```
+2. Update the dashboard
+    ```shell
+    sudo ./wgd.sh update
+    ```
+## 🔍 Screenshot
+
+![Sign In Page](img/SignIn.png)
+
+![Index Image](img/HomePage.png)
+
+![Configuration](img/Configuration.png)
+
+![Add Peer](img/AddPeer.png)
+
+![Edit Peer](img/EditPeer.png)
+
+![Delete Peer](img/DeletePeer.png)
+
+![Dashboard Setting](img/DashboardSetting.png)
+
+![Ping](img/Ping.png)
+
+![Traceroute](img/Traceroute.png)
+
+
+
+## ⏰  Changelog
+
+#### v2.2.1 - Aug 16, 2021
+
+Bug Fixed:
+- Added support for full subnet on Allowed IP
+- Peer setting Save button
+
+#### v2.2 - Aug 14, 2021
+
+- 🎉  **New Features**
+  - **Add new peers**: Now you can add peers directly on dashboard, it will generate a pair of private key and public key. You can also set its DNS, endpoint allowed IPs. Both can set a default value in the setting page. [❤️ in [#44](https://github.com/donaldzou/wireguard-dashboard/issues/44)]  
+  - **QR Code:** You can add the private key in peer setting of your existed peer to create a QR code. Or just create a new one, dashboard will now be able to auto generate a private key and public key ;) Don't worry, all keys will be generated on your machine, and **will delete all key files after they got generated**. [❤️ in [#29](https://github.com/donaldzou/wireguard-dashboard/issues/29)]  
+  - **Peer configuration file download:** Same as QR code, you now can download the peer configuration file, so you don't need to manually input all the details on the peer machine! [❤️ in [#40](https://github.com/donaldzou/wireguard-dashboard/issues/40)]
+  - **Search peers**: You can now search peers by their name.
+  - **Autostart on boot:** Added a tutorial on how to start the dashboard to on boot! Please read the [tutorial below](#autostart-wireguard-dashboard-on-boot). [❤️ in [#29](https://github.com/donaldzou/wireguard-dashboard/issues/29)]  
+  - **Click to copy**: You can now click and copy all peer's public key and configuration's public key.
+  - ....
+- 🪚  **Bug Fixed**
+  - When there are comments in the wireguard config file, will cause the dashboard to crash.
+  - Used regex to search for config files.
+- **🧐  Other Changes**
+  - Moved all external CSS and JavaScript file to local hosting (Except Bootstrap Icon, due to large amount of SVG files).
+  - Updated Python dependencies
+    - Flask: `v1.1.2 => v2.0.1`
+    - Jinja: `v2.10.1 => v3.0.1`
+    - icmplib: `v2.1.1 => v3.0.1`
+  - Updated CSS/JS dependencies
+    - Bootstrap: `v4.5.3 => v4.6.0`
+  - UI adjustment
+    - Adjusted how peers will display in larger screens, used to be 1 row per peer, now is 3 peers in 1 row.
+
+#### v2.1 - Jul 2, 2021
+
+- Added **Ping** and **Traceroute** tools!
+- Adjusted the calculation of data usage on each peers
+- Added refresh interval of the dashboard
+- Bug fixed when no configuration on fresh install ([#23](https://github.com/donaldzou/wireguard-dashboard/issues/23))
+- Fixed crash when too many peers ([#22](https://github.com/donaldzou/wireguard-dashboard/issues/22))
+
+#### v2.0 - May 5, 2021
+
+- Added login function to dashboard
+  - ***I'm not using the most ideal way to store the username and password, feel free to provide a better way to do this if you any good idea!***
+- Added a config file to the dashboard
+- Dashboard config can be change within the **Setting** tab on the side bar
+- Adjusted UI
+- And much more!
+
+#### v1.1.2 - Apr 3, 2021
+
+- Resolved issue [#3](https://github.com/donaldzou/wireguard-dashboard/issues/3).
+
+#### v1.1.1 - Apr 2, 2021
+
+- Able to add a friendly name to each peer. Thanks [#2](https://github.com/donaldzou/wireguard-dashboard/issues/2) !
+
+#### v1.0 - Dec 27, 2020
+
+- Added the function to remove peers
+
+## 🛒 Dependencies
+
+- CSS/JS
+  - [Bootstrap](https://getbootstrap.com/docs/4.6/getting-started/introduction/) `v4.6.0`
+  - [Bootstrap Icon](https://icons.getbootstrap.com) `v1.4.0`
+  - [jQuery](https://jquery.com) `v3.5.1`
+- Python
+  - [Flask](https://pypi.org/project/Flask/) `v2.0.1`
+  - [TinyDB](https://pypi.org/project/tinydb/) `v4.3.0`
+  - [ifcfg](https://pypi.org/project/ifcfg/) `v0.21`
+  - [icmplib](https://pypi.org/project/icmplib/) `v2.1.1`
+  - [flask-qrcode](https://pypi.org/project/Flask-QRcode/) `v3.0.0`
+
+## ✨ Contributors
+
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/antonioag95"><img src="https://avatars.githubusercontent.com/u/30556866?v=4?s=100" width="100px;" alt=""/><br /><sub><b>antonioag95</b></sub></a><br /><a href="https://github.com/donaldzou/wireguard-dashboard/commits?author=antonioag95" title="Tests">⚠️</a> <a href="https://github.com/donaldzou/wireguard-dashboard/commits?author=antonioag95" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/tonjo"><img src="https://avatars.githubusercontent.com/u/4726289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tonjo</b></sub></a><br /><a href="https://github.com/donaldzou/wireguard-dashboard/commits?author=tonjo" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/reafian"><img src="https://avatars.githubusercontent.com/u/11992416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard Newton</b></sub></a><br /><a href="https://github.com/donaldzou/wireguard-dashboard/commits?author=reafian" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/davejlong"><img src="https://avatars.githubusercontent.com/u/175317?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David Long</b></sub></a><br /><a href="https://github.com/donaldzou/wireguard-dashboard/commits?author=davejlong" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

-## 🔍Example
-![Index Image](https://github.com/donaldzou/Wireguard-Dashboard/raw/main/src/static/index.png)
-![Conf Image](https://github.com/donaldzou/Wireguard-Dashboard/raw/main/src/static/configuration.png)
--- a/img/AddPeer.png
+++ b/img/AddPeer.png
--- a/img/Configuration.png
+++ b/img/Configuration.png
--- a/img/DashboardSetting.png
+++ b/img/DashboardSetting.png
--- a/img/DeletePeer.png
+++ b/img/DeletePeer.png
--- a/img/EditPeer.png
+++ b/img/EditPeer.png
--- a/img/HomePage.png
+++ b/img/HomePage.png
--- a/img/Ping.png
+++ b/img/Ping.png
--- a/img/QRCode.png
+++ b/img/QRCode.png
--- a/img/SignIn.png
+++ b/img/SignIn.png
--- a/img/Traceroute.png
+++ b/img/Traceroute.png
--- a/img/logo.png
+++ b/img/logo.png
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +0,0 @@
-Flask==1.1.2
-tinydb==4.3.0
--- a/src/dashboard.py
+++ b/src/dashboard.py
--- a/src/json/conf.json
+++ b/src/json/conf.json
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -0,0 +1,5 @@
+Flask
+tinydb
+ifcfg
+icmplib
+flask-qrcode
--- a/src/static/bootstrap4-toggle.min.js
+++ b/src/static/bootstrap4-toggle.min.js
@@ -1 +0,0 @@
-!function(a){"use strict";function l(t,e){this.$element=a(t),this.options=a.extend({},this.defaults(),e),this.render()}l.VERSION="3.6.0",l.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"light",size:"normal",style:"",width:null,height:null},l.prototype.defaults=function(){return{on:this.$element.attr("data-on")||l.DEFAULTS.on,off:this.$element.attr("data-off")||l.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||l.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||l.DEFAULTS.offstyle,size:this.$element.attr("data-size")||l.DEFAULTS.size,style:this.$element.attr("data-style")||l.DEFAULTS.style,width:this.$element.attr("data-width")||l.DEFAULTS.width,height:this.$element.attr("data-height")||l.DEFAULTS.height}},l.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var t="large"===this.options.size||"lg"===this.options.size?"btn-lg":"small"===this.options.size||"sm"===this.options.size?"btn-sm":"mini"===this.options.size||"xs"===this.options.size?"btn-xs":"",e=a('<label for="'+this.$element.prop("id")+'" class="btn">').html(this.options.on).addClass(this._onstyle+" "+t),s=a('<label for="'+this.$element.prop("id")+'" class="btn">').html(this.options.off).addClass(this._offstyle+" "+t),o=a('<span class="toggle-handle btn btn-light">').addClass(t),i=a('<div class="toggle-group">').append(e,s,o),l=a('<div class="toggle btn" data-toggle="toggle" role="button">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(t).addClass(this.options.style);this.$element.wrap(l),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:e,$toggleOff:s,$toggleGroup:i}),this.$toggle.append(i);var n=this.options.width||Math.max(e.outerWidth(),s.outerWidth())+o.outerWidth()/2,h=this.options.height||Math.max(e.outerHeight(),s.outerHeight());e.addClass("toggle-on"),s.addClass("toggle-off"),this.$toggle.css({width:n,height:h}),this.options.height&&(e.css("line-height",e.height()+"px"),s.css("line-height",s.height()+"px")),this.update(!0),this.trigger(!0)},l.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},l.prototype.on=function(t){if(this.$element.prop("disabled"))return!1;this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),t||this.trigger()},l.prototype.off=function(t){if(this.$element.prop("disabled"))return!1;this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),t||this.trigger()},l.prototype.enable=function(){this.$toggle.removeClass("disabled"),this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},l.prototype.disable=function(){this.$toggle.addClass("disabled"),this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},l.prototype.update=function(t){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(t):this.off(t)},l.prototype.trigger=function(t){this.$element.off("change.bs.toggle"),t||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},l.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var t=a.fn.bootstrapToggle;a.fn.bootstrapToggle=function(o){var i=Array.prototype.slice.call(arguments,1)[0];return this.each(function(){var t=a(this),e=t.data("bs.toggle"),s="object"==typeof o&&o;e||t.data("bs.toggle",e=new l(this,s)),"string"==typeof o&&e[o]&&"boolean"==typeof i?e[o](i):"string"==typeof o&&e[o]&&e[o]()})},a.fn.bootstrapToggle.Constructor=l,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=t,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(t){a(this).find("input[type=checkbox]").bootstrapToggle("toggle"),t.preventDefault()})}(jQuery);
--- a/src/static/configuration.png
+++ b/src/static/configuration.png
--- a/src/static/css/bootstrap.min.css
+++ b/src/static/css/bootstrap.min.css
--- a/src/static/css/bootstrap.min.css.map
+++ b/src/static/css/bootstrap.min.css.map
--- a/src/static/css/dashboard.css
+++ b/src/static/css/dashboard.css
@@ -0,0 +1,277 @@
+body {
+    font-size: .875rem;
+}
+
+.feather {
+    width: 16px;
+    height: 16px;
+    vertical-align: text-bottom;
+}
+
+/*
+ * Sidebar
+ */
+
+.sidebar {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 100; /* Behind the navbar */
+    padding: 48px 0 0; /* Height of navbar */
+    box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
+}
+
+/*@media (max-width: 767.98px) {*/
+/*  .sidebar {*/
+/*    top: 5rem;*/
+/*  }*/
+/*}*/
+
+.sidebar-sticky {
+    position: relative;
+    top: 0;
+    height: calc(100vh - 48px);
+    padding-top: .5rem;
+    overflow-x: hidden;
+    overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
+}
+
+@supports ((position: -webkit-sticky) or (position: sticky)) {
+    .sidebar-sticky {
+        position: -webkit-sticky;
+        position: sticky;
+    }
+}
+
+.sidebar .nav-link {
+    font-weight: 500;
+    color: #333;
+    transition: 0.2s cubic-bezier(0.82, -0.07, 0, 1.01);
+}
+
+.nav-link:hover {
+    padding-left: 30px;
+}
+
+.sidebar .nav-link .feather {
+    margin-right: 4px;
+    color: #999;
+}
+
+.sidebar .nav-link.active {
+    color: #007bff;
+}
+
+.sidebar .nav-link:hover .feather,
+.sidebar .nav-link.active .feather {
+    color: inherit;
+}
+
+.sidebar-heading {
+    font-size: .75rem;
+    text-transform: uppercase;
+}
+
+/*
+ * Navbar
+ */
+
+.navbar-brand {
+    padding-top: .75rem;
+    padding-bottom: .75rem;
+    font-size: 1rem;
+    background-color: rgba(0, 0, 0, .25);
+    box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
+}
+
+.navbar .navbar-toggler {
+    top: .25rem;
+    right: 1rem;
+}
+
+.navbar .form-control {
+    padding: .75rem 1rem;
+    border-width: 0;
+    border-radius: 0;
+}
+
+.form-control-dark {
+    color: #fff;
+    background-color: rgba(255, 255, 255, .1);
+    border-color: rgba(255, 255, 255, .1);
+}
+
+.form-control-dark:focus {
+    border-color: transparent;
+    box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
+}
+
+.dot{
+    width: 10px;
+    height: 10px;
+    border-radius: 50px;
+    display: inline-block;
+    margin-left: 10px;
+}
+
+.dot-running{
+    background-color: #28a745!important;
+}
+
+.dot-stopped{
+    background-color: #6c757d!important;
+}
+
+
+.info h6{
+    line-break: anywhere;
+}
+
+.btn-control{
+    border: none !important;
+    padding: 0 1rem 0 0;
+}
+
+.share_peer_btn_group .btn-control{
+    padding: 0 0 0 1rem;
+}
+
+.btn-control:hover{
+    background: white;
+}
+
+.btn-delete-peer:hover{
+    color: #dc3545;
+}
+
+.btn-setting-peer:hover{
+    color:#007bff
+}
+
+.btn-download-peer:hover{
+    color: #17a2b8;
+}
+
+.login-container{
+    padding: 2rem;
+}
+
+@media (max-width: 992px){
+    .card-col{
+        margin-bottom: 1rem;
+    }
+}
+
+.switch{
+    font-size: 2rem;
+}
+.switch:hover{
+    text-decoration: none
+}
+
+.btn-group-label:hover{
+    color: #007bff;
+    border-color: #007bff;
+    background: white;
+}
+
+/*.peer_data_group{*/
+/*  text-align: right;*/
+/*}*/
+
+@media (max-width: 768px) {
+    .peer_data_group{
+        text-align: left;
+    }
+}
+
+.index-switch{
+    text-align: right;
+}
+
+main{
+    margin-bottom: 3rem;
+}
+
+.peer_list{
+    margin-bottom: 7rem
+}
+
+@media (max-width: 768px) {
+    .add_btn{
+        bottom: 1.5rem !important;
+    }
+
+    .peer_list{
+        margin-bottom: 4rem !important;
+    }
+}
+
+.add_btn{
+    position: fixed;
+    bottom: 3rem;
+    right: 2rem;
+    z-index: 99;
+    border-radius: 100px;
+    padding: 10px 20px;
+    box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+}
+
+
+@-webkit-keyframes rotating /* Safari and Chrome */ {
+    from {
+        -webkit-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    to {
+        -webkit-transform: rotate(360deg);
+        -o-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@keyframes rotating {
+    from {
+        -ms-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -webkit-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    to {
+        -ms-transform: rotate(360deg);
+        -moz-transform: rotate(360deg);
+        -webkit-transform: rotate(360deg);
+        -o-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+.rotating::before {
+    -webkit-animation: rotating 0.75s linear infinite;
+    -moz-animation: rotating 0.75s linear infinite;
+    -ms-animation: rotating 0.75s linear infinite;
+    -o-animation: rotating 0.75s linear infinite;
+    animation: rotating 0.75s linear infinite;
+}
+
+.peer_private_key_textbox_switch{
+    position: absolute;
+    right: 2rem;
+    transform: translateY(-28px);
+    font-size: 1.2rem;
+    cursor: pointer;
+}
+
+.progress-bar{
+    transition: 0.3s ease-in-out;
+}
+
+.key{
+    transition: 0.2s ease-in-out;
+    cursor: pointer;
+}
+
+.key:hover{
+    color: #007bff;
+}
--- a/src/static/dashboard.css
+++ b/src/static/dashboard.css
@@ -1,142 +0,0 @@
-body {
-  font-size: .875rem;
-}
-
-.feather {
-  width: 16px;
-  height: 16px;
-  vertical-align: text-bottom;
-}
-
-/*
- * Sidebar
- */
-
-.sidebar {
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 100; /* Behind the navbar */
-  padding: 48px 0 0; /* Height of navbar */
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1);
-}
-
-@media (max-width: 767.98px) {
-  .sidebar {
-    top: 5rem;
-  }
-}
-
-.sidebar-sticky {
-  position: relative;
-  top: 0;
-  height: calc(100vh - 48px);
-  padding-top: .5rem;
-  overflow-x: hidden;
-  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-}
-
-@supports ((position: -webkit-sticky) or (position: sticky)) {
-  .sidebar-sticky {
-    position: -webkit-sticky;
-    position: sticky;
-  }
-}
-
-.sidebar .nav-link {
-  font-weight: 500;
-  color: #333;
-}
-
-.sidebar .nav-link .feather {
-  margin-right: 4px;
-  color: #999;
-}
-
-.sidebar .nav-link.active {
-  color: #007bff;
-}
-
-.sidebar .nav-link:hover .feather,
-.sidebar .nav-link.active .feather {
-  color: inherit;
-}
-
-.sidebar-heading {
-  font-size: .75rem;
-  text-transform: uppercase;
-}
-
-/*
- * Navbar
- */
-
-.navbar-brand {
-  padding-top: .75rem;
-  padding-bottom: .75rem;
-  font-size: 1rem;
-  background-color: rgba(0, 0, 0, .25);
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
-}
-
-.navbar .navbar-toggler {
-  top: .25rem;
-  right: 1rem;
-}
-
-.navbar .form-control {
-  padding: .75rem 1rem;
-  border-width: 0;
-  border-radius: 0;
-}
-
-.form-control-dark {
-  color: #fff;
-  background-color: rgba(255, 255, 255, .1);
-  border-color: rgba(255, 255, 255, .1);
-}
-
-.form-control-dark:focus {
-  border-color: transparent;
-  box-shadow: 0 0 0 3px rgba(255, 255, 255, .25);
-}
-
-.dot{
-  width: 10px;
-  height: 10px;
-  border-radius: 50px;
-  display: inline-block;
-  margin-left: 10px;
-}
-
-.dot-running{
-  background-color: #28a745!important;
-}
-
-.dot-stopped{
-  background-color: #6c757d!important;
-}
-
-
-.info h6{
-  line-break: anywhere;
-}
-
-.btn-control{
-  border: none !important;
-  padding: 0;
-  padding-right: 0.5rem;
-}
-
-.btn-control:hover{
-  background: white;
-}
-
-.btn-delete-peer:hover{
-  color: #dc3545;
-}
-
-.btn-setting-peer:hover{
-  color:#007bff
-}
--- a/src/static/img/logo.png
+++ b/src/static/img/logo.png
--- a/src/static/index.png
+++ b/src/static/index.png
--- a/src/static/js/bootstrap.bundle.js
+++ b/src/static/js/bootstrap.bundle.js
--- a/src/static/js/bootstrap.bundle.js.map
+++ b/src/static/js/bootstrap.bundle.js.map
--- a/src/static/js/bootstrap.bundle.min.js
+++ b/src/static/js/bootstrap.bundle.min.js
--- a/src/static/js/bootstrap.bundle.min.js.map
+++ b/src/static/js/bootstrap.bundle.min.js.map
--- a/src/static/js/configuration.js
+++ b/src/static/js/configuration.js
@@ -0,0 +1,355 @@
+// Config Toggle
+$("body").on("click", ".switch", function (){
+    $(this).siblings($(".spinner-border")).css("display", "inline-block");
+     $(this).remove()
+   location.replace("/switch/"+$(this).attr('id'));
+})
+
+// Generating Keys
+function generate_key(){
+    $.ajax({
+        "url": "/generate_peer",
+        "method": "GET",
+    }).done(function(res){
+        $("#private_key").val(res.private_key)
+        $("#public_key").val(res.public_key)
+        $("#add_peer_alert").addClass("d-none");
+        $("#re_generate_key i").removeClass("rotating")
+    })
+}
+function generate_public_key(){
+    $.ajax({
+        "url": "/generate_public_key",
+        "method": "POST",
+        "headers":{"Content-Type": "application/json"},
+        "data": JSON.stringify({"private_key": $("#private_key").val()})
+    }).done(function(res){
+        if(res['status'] === "failed"){
+            $("#add_peer_alert").html(res['msg']);
+            $("#add_peer_alert").removeClass("d-none");
+        }else{
+            $("#add_peer_alert").addClass("d-none");
+        }
+        $("#public_key").val(res['data'])
+         $("#re_generate_key i").removeClass("rotating")
+    })
+}
+
+// Add Peer
+$("#private_key").change(function(){
+    if ($("#private_key").val().length > 0){
+        $("#re_generate_key i").addClass("rotating")
+        generate_public_key()
+    }else{
+        $("#public_key").removeAttr("disabled")
+        $("#public_key").val("")
+    }
+})
+$('#add_modal').on('show.bs.modal', function (event) {
+    generate_key()
+})
+$("#re_generate_key").click(function (){
+    $("#public_key").attr("disabled","disabled")
+    $("#re_generate_key i").addClass("rotating")
+    generate_key()
+})
+$("#save_peer").click(function(){
+    $(this).attr("disabled","disabled")
+    $(this).html("Saving...")
+
+    if ($("#allowed_ips").val() !== "" && $("#public_key").val() !== "" && $("#new_add_DNS").val() !== "" && $("#new_add_endpoint_allowed_ip").val() != ""){
+        var conf = $(this).attr('conf_id')
+        var data_list = [$("#private_key"), $("#allowed_ips"), $("#new_add_name"), $("#new_add_DNS"), $("#new_add_endpoint_allowed_ip"),$("#new_add_MTU"),$("#new_add_keep_alive")]
+        for (var i = 0; i < data_list.length; i++){
+            data_list[i].attr("disabled", "disabled")
+        }
+        $.ajax({
+            method: "POST",
+            url: "/add_peer/"+conf,
+            headers:{
+                "Content-Type": "application/json"
+            },
+            data: JSON.stringify({
+                "private_key":$("#private_key").val(),
+                "public_key":$("#public_key").val(),
+                "allowed_ips": $("#allowed_ips").val(),
+                "name":$("#new_add_name").val(),
+                "DNS": $("#new_add_DNS").val(),
+                "endpoint_allowed_ip": $("#new_add_endpoint_allowed_ip").val(),
+                "MTU": $("#new_add_MTU").val(),
+                "keep_alive": $("#new_add_keep_alive").val()
+            }),
+            success: function (response){
+                if(response != "true"){
+                    $("#add_peer_alert").html(response);
+                    $("#add_peer_alert").removeClass("d-none");
+                    for (var i = 0; i < data_list.length; i++){
+                        data_list[i].removeAttr("disabled", "disabled")
+                    }
+                    $("#save_peer").removeAttr("disabled")
+                    $("#save_peer").html("Save")
+                }
+                else{
+                    location.reload();
+                }
+            }
+        })
+    }else{
+        $("#add_peer_alert").html("Please fill in all required box.");
+        $("#add_peer_alert").removeClass("d-none");
+        $(this).removeAttr("disabled")
+        $(this).html("Save")
+    }
+})
+var qrcodeModal = new bootstrap.Modal(document.getElementById('qrcode_modal'), {
+    keyboard: false
+})
+
+// QR Code
+$("body").on("click", ".btn-qrcode-peer", function (){
+    qrcodeModal.toggle();
+    $("#qrcode_img").attr('src', $(this).attr('img_src'))
+})
+
+// Delete Peer Modal
+var deleteModal = new bootstrap.Modal(document.getElementById('delete_modal'), {
+    keyboard: false
+});
+
+$("body").on("click", ".btn-delete-peer", function(){
+    var peer_id = $(this).attr("id");
+    $("#delete_peer").attr("peer_id", peer_id);
+    deleteModal.toggle();
+})
+
+$("#delete_peer").click(function(){
+    $(this).attr("disabled","disabled")
+    $(this).html("Deleting...")
+    var peer_id = $(this).attr("peer_id");
+    var config = $(this).attr("conf_id");
+    $.ajax({
+        method: "POST",
+        url: "/remove_peer/"+config,
+        headers:{
+            "Content-Type": "application/json"
+        },
+        data: JSON.stringify({"action": "delete", "peer_id": peer_id}),
+        success: function (response){
+            if(response !== "true"){
+                $("#remove_peer_alert").html(response+$("#add_peer_alert").html());
+                $("#remove_peer_alert").removeClass("d-none");
+            }
+            else{
+                deleteModal.toggle();
+                load_data($('#search_peer_textbox').val());
+                $('#alertToast').toast('show');
+                $('#alertToast .toast-body').html("Peer deleted!");
+                $("#delete_peer").removeAttr("disabled")
+                $("#delete_peer").html("Delete")
+            }
+        }
+    })
+});
+
+// Peer Setting Modal
+var settingModal = new bootstrap.Modal(document.getElementById('setting_modal'), {
+    keyboard: false
+})
+$("body").on("click", ".btn-setting-peer", function(){
+    startProgressBar()
+    var peer_id = $(this).attr("id");
+    $("#save_peer_setting").attr("peer_id", peer_id);
+    $.ajax({
+        method: "POST",
+        url: "/get_peer_data/"+$("#setting_modal").attr("conf_id"),
+        headers:{
+            "Content-Type": "application/json"
+        },
+        data: JSON.stringify({"id": peer_id}),
+        success: function(response){
+            var peer_name = ((response['name'] === "") ? "Untitled Peer" : response['name'])
+            $("#setting_modal .peer_name").html(peer_name);
+            $("#setting_modal #peer_name_textbox").val(response['name'])
+            $("#setting_modal #peer_private_key_textbox").val(response['private_key'])
+            $("#setting_modal #peer_DNS_textbox").val(response['DNS'])
+            $("#setting_modal #peer_allowed_ip_textbox").val(response['allowed_ip'])
+            $("#setting_modal #peer_endpoint_allowed_ips").val(response['endpoint_allowed_ip'])
+            $("#setting_modal #peer_mtu").val(response['mtu'])
+            $("#setting_modal #peer_keep_alive").val(response['keep_alive'])
+            settingModal.toggle();
+            endProgressBar()
+        }
+    })
+});
+
+$('#setting_modal').on('hidden.bs.modal', function (event) {
+  $("#setting_peer_alert").addClass("d-none");
+})
+
+$("#peer_private_key_textbox").change(function(){
+    if ($(this).val().length > 0){
+        $.ajax({
+            "url": "/check_key_match/"+$("#save_peer_setting").attr("conf_id"),
+            "method": "POST",
+            "headers":{"Content-Type": "application/json"},
+            "data": JSON.stringify({
+                "private_key": $("#peer_private_key_textbox").val(),
+                "public_key": $("#save_peer_setting").attr("peer_id")
+            })
+        }).done(function(res){
+            if(res['status'] == "failed"){
+                $("#setting_peer_alert").html(res['msg']);
+                $("#setting_peer_alert").removeClass("d-none");
+            }else{
+                $("#setting_peer_alert").addClass("d-none");
+            }
+        })
+    }
+})
+
+$("#save_peer_setting").click(function (){
+    $(this).attr("disabled","disabled")
+    $(this).html("Saving...")
+    if ($("#peer_DNS_textbox").val() !== "" &&
+        $("#peer_allowed_ip_textbox").val() !== "" &&
+        $("#peer_endpoint_allowed_ips").val() != ""
+    ){
+        var peer_id = $(this).attr("peer_id");
+        var conf_id = $(this).attr("conf_id");
+        var data_list = [
+            $("#peer_name_textbox"), $("#peer_DNS_textbox"), $("#peer_private_key_textbox"),
+            $("#peer_allowed_ip_textbox"), $("#peer_endpoint_allowed_ips"), $("#peer_mtu"), $("#peer_keep_alive")
+        ]
+        for (var i = 0; i < data_list.length; i++){
+            data_list[i].attr("disabled", "disabled")
+        }
+        $.ajax({
+            method: "POST",
+            url: "/save_peer_setting/"+conf_id,
+            headers:{
+                "Content-Type": "application/json"
+            },
+            data: JSON.stringify({
+                id: peer_id,
+                name: $("#peer_name_textbox").val(),
+                DNS: $("#peer_DNS_textbox").val(),
+                private_key: $("#peer_private_key_textbox").val(),
+                allowed_ip: $("#peer_allowed_ip_textbox").val(),
+                endpoint_allowed_ip: $("#peer_endpoint_allowed_ips").val(),
+                MTU: $("#peer_mtu").val(),
+                keep_alive: $("#peer_keep_alive").val()
+            }),
+            success: function (response){
+                if (response['status'] === "failed"){
+                    $("#setting_peer_alert").html(response['msg']);
+                    $("#setting_peer_alert").removeClass("d-none");
+                }else{
+                    settingModal.toggle();
+                    load_data($('#search_peer_textbox').val())
+                    $('#alertToast').toast('show');
+                    $('#alertToast .toast-body').html("Peer Saved!");
+                }
+                $("#save_peer_setting").removeAttr("disabled")
+                $("#save_peer_setting").html("Save")
+                for (var i = 0; i < data_list.length; i++){
+                    data_list[i].removeAttr("disabled")
+                }
+            }
+        })
+        }else{
+        $("#setting_peer_alert").html("Please fill in all required box.");
+        $("#setting_peer_alert").removeClass("d-none");
+        $("#save_peer_setting").removeAttr("disabled")
+        $("#save_peer_setting").html("Save")
+    }
+
+
+})
+
+$(".peer_private_key_textbox_switch").click(function (){
+    let mode = (($("#peer_private_key_textbox").attr('type') === 'password') ? "text":"password")
+    let icon = (($("#peer_private_key_textbox").attr('type') === 'password') ? "bi bi-eye-slash-fill":"bi bi-eye-fill")
+    $("#peer_private_key_textbox").attr('type',mode)
+    $(".peer_private_key_textbox_switch i").removeClass().addClass(icon)
+})
+
+
+// Search Peer
+var typingTimer;
+var doneTypingInterval = 200;
+var $input = $('#search_peer_textbox');
+$input.on('keyup', function () {
+    clearTimeout(typingTimer);
+    typingTimer = setTimeout(doneTyping, doneTypingInterval);
+});
+$input.on('keydown', function () {
+    clearTimeout(typingTimer);
+});
+function doneTyping () {
+    load_data($('#search_peer_textbox').val());
+}
+
+// Sorting
+$("body").on("change", "#sort_by_dropdown", function (){
+    $.ajax({
+        method:"POST",
+        data: JSON.stringify({'sort':$("#sort_by_dropdown option:selected").val()}),
+        headers:{"Content-Type": "application/json"},
+        url: "/update_dashboard_sort",
+        success: function (res){
+            location.reload()
+        }
+    })
+})
+
+// Click key to copy
+$("body").on("mouseenter", ".key", function(){
+    var label = $(this).parent().siblings().children()[1]
+    label.style.opacity = "100"
+})
+$("body").on("mouseout", ".key", function(){
+    var label = $(this).parent().siblings().children()[1]
+    label.style.opacity = "0"
+    setTimeout(function (){
+        label.innerHTML = "CLICK TO COPY"
+    },200)
+
+});
+$("body").on("click", ".key", function(){
+    var label = $(this).parent().siblings().children()[1]
+    copyToClipboard($(this))
+    label.innerHTML = "COPIED!"
+})
+function copyToClipboard(element) {
+    var $temp = $("<input>");
+    $("body").append($temp);
+    $temp.val($(element).text()).select();
+    document.execCommand("copy");
+    $temp.remove();
+}
+
+// Update Interval
+$("body").on("click", ".update_interval", function(){
+	    $.ajax({
+            method:"POST",
+            data: "interval="+$(this).attr("refresh-interval"),
+            url: "/update_dashboard_refresh_interval",
+            success: function (res){
+                location.reload()
+            }
+        })
+    });
+$("body").on("click", ".refresh", function (){
+    load_data($('#search_peer_textbox').val());
+});
+
+// Switch display mode
+$("body").on("click", ".display_mode", function(){
+    $.ajax({
+        method:"GET",
+        url: "/switch_display_mode/"+$(this).attr("display-mode"),
+        success: function (res){
+            location.reload()
+        }
+    })
+})
--- a/src/static/js/jquery.min.js
+++ b/src/static/js/jquery.min.js
--- a/src/static/js/tools.js
+++ b/src/static/js/tools.js
@@ -0,0 +1,68 @@
+$(".ip_dropdown").change(function (){
+    $(".modal.show .btn").removeAttr("disabled")
+});
+$(".conf_dropdown").change(function (){
+    $(".modal.show .ip_dropdown").html('<option value="none" selected="selected" disabled>Loading...')
+    $.ajax({
+        url: "/get_ping_ip",
+        method: "POST",
+        data: "config="+$(this).children("option:selected").val(),
+        success: function (res){
+            $(".modal.show .ip_dropdown").html("")
+            $(".modal.show .ip_dropdown").append('<option value="none" selected="selected" disabled>Choose an IP')
+            $(".modal.show .ip_dropdown").append(res)
+        }
+    })
+});
+
+
+// Ping Tools
+
+
+
+$(".send_ping").click(function (){
+    $(this).attr("disabled","disabled")
+    $(this).html("Pinging...")
+    $("#ping_modal .form-control").attr("disabled","disabled")
+    $.ajax({
+        method:"POST",
+        data: "ip="+$(':selected', $("#ping_modal .ip_dropdown")).val()+"&count="+$("#ping_modal .ping_count").val(),
+        url: "/ping_ip",
+        success: function (res){
+            $(".ping_result tbody").html("")
+            html = '<tr><th scope="row">Address</th><td>'+res['address']+'</td></tr>' +
+                '<tr><th scope="row">Is Alive</th><td>'+res['is_alive']+'</td></tr>' +
+                '<tr><th scope="row">Min RTT</th><td>'+res['min_rtt']+'ms</td></tr>' +
+                '<tr><th scope="row">Average RTT </th><td>'+res['avg_rtt']+'ms</td></tr>' +
+                '<tr><th scope="row">Max RTT</th><td>'+res['max_rtt']+'ms</td></tr>' +
+                '<tr><th scope="row">Package Sent</th><td>'+res['package_sent']+'</td></tr>' +
+                '<tr><th scope="row">Package Received</th><td>'+res['package_received']+'</td></tr>' +
+                '<tr><th scope="row">Package Loss</th><td>'+res['package_loss']+'</td></tr>'
+            $(".ping_result tbody").html(html)
+            $(".send_ping").removeAttr("disabled")
+            $(".send_ping").html("Ping")
+            $("#ping_modal .form-control").removeAttr("disabled")
+        }
+    })
+});
+
+// Traceroute Tools
+$(".send_traceroute").click(function (){
+    $(this).attr("disabled","disabled")
+    $(this).html("Tracing...");
+    $("#traceroute_modal .form-control").attr("disabled","disabled")
+    $.ajax({
+        url: "/traceroute_ip",
+        method: "POST",
+        data: "ip="+$(':selected', $("#traceroute_modal .ip_dropdown")).val(),
+        success: function (res){
+            $(".traceroute_result tbody").html("");
+            for (i in res){
+               $(".traceroute_result tbody").append('<tr><th scope="row">'+res[i]['hop']+'</th><td>'+res[i]['ip']+'</td><td>'+res[i]['avg_rtt']+'</td><td>'+res[i]['min_rtt']+'</td><td>'+res[i]['max_rtt']+'</td></tr>')
+            }
+            $(".send_traceroute").removeAttr("disabled");
+            $(".send_traceroute").html("Traceroute");
+            $("#traceroute_modal .form-control").removeAttr("disabled")
+        }
+    })
+})
--- a/src/static/logo.png
+++ b/src/static/logo.png
--- a/src/templates/configuration.html
+++ b/src/templates/configuration.html
@@ -1,51 +1,21 @@
 <html>
-
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<title>Wireguard Dashboard</title>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-	<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='dashboard.css') }}">
-	<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.1/font/bootstrap-icons.css">
-</head>
-
+{% with title=title%}
+    {% include "header.html"%}
+{% endwith %}
 <body>
-	<nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-		<a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="/">Wireguard Dashboard</a>
-		<button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
-			data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
-		</button>
-	</nav>
+	{% include "navbar.html" %}
 	<div class="container-fluid">
-		<div class="row">
-			<div class="row">
-				<nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
-					<div class="sidebar-sticky pt-3">
-						<ul class="nav flex-column">
-							<li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-						</ul>
-						<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-							<span>Configurations</span>
-						</h6>
-						<ul class="nav flex-column">
-							{% for i in conf%}
-								<li class="nav-item"><a class="nav-link" href="/configuration/{{i['conf']}}">{{i['conf']}}</a></li>
-							{%endfor%}
-						</ul>
-					</div>
-				</nav>
-			</div>
-		</div>
-		<div id="config_body">
-
-		</div>
+		{% include "sidebar.html" %}
+        <div class="col-md-9 ml-sm-auto col-lg-10 px-md-4 mt-4 mb-4">
+            <div class="form-group">
+                <input type="text" class="form-control" id="search_peer_textbox" placeholder="Search Peer..." value="" style="display: none">
+            </div>
+        </div>
+		<div id="config_body"></div>
 	</div>
 	<div class="modal fade" id="add_modal" data-backdrop="static" data-keyboard="false" tabindex="-1"
 		aria-labelledby="staticBackdropLabel" aria-hidden="true">
-		<div class="modal-dialog modal-dialog-centered">
+		<div class="modal-dialog modal-dialog-centered modal-lg">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="modal-title" id="staticBackdropLabel">Add a new peer</h5>
@@ -59,15 +29,63 @@
 						  <span aria-hidden="true">&times;</span>
 						</button>
 					</div>
-					<form>
+					<form id="add_peer_form">
+                        <div class="alert alert-warning" role="alert" style="font-size: 0.8rem">
+                            To generate QR code for this new peer, you need to provide the private key, or use the generated key. If you don't need the QR code, simply remove the private key and insert your existed public key.
+                        </div>
+                        <div class="form-group">
+                            <div>
+                                <label for="private_key">Private Key</label>
+                            </div>
+                            <div class="input-group">
+                                <input type="text" class="form-control" id="private_key" aria-describedby="public_key">
+                                <div class="input-group-append">
+                                   <button type="button" class="btn btn-danger" id="re_generate_key"><i class="bi bi-arrow-repeat"></i></button>
+                                </div>
+                            </div>
+                        </div>
 						<div class="form-group">
-							<label for="public_key">Public Key</label>
-							<input type="text" class="form-control" id="public_key" aria-describedby="public_key">
-						</div>
-						<div class="form-group">
-							<label for="allowed_ips">Allowed IPs</label>
-							<input type="text" class="form-control" id="allowed_ips">
+							<label for="public_key">Public Key <code>(Required)</code></label>
+							<input type="text" class="form-control" id="public_key" aria-describedby="public_key" disabled>
 						</div>
+                        <div class="row">
+                            <div class="col-sm-6">
+                                 <div class="form-group">
+                                    <label for="new_add_name">Name</label>
+                                    <input type="text" class="form-control" id="new_add_name">
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label for="allowed_ips">Allowed IPs <code>(Required)</code></label>
+                                    <input type="text" class="form-control" id="allowed_ips">
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                 <div class="form-group">
+                                    <label for="new_add_DNS">DNS <code>(Required)</code></label>
+                                    <input type="text" class="form-control" id="new_add_DNS" value="{{ DNS }}">
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                 <div class="form-group">
+                                    <label for="new_add_endpoint_allowed_ip">Endpoint Allowed IPs <code>(Required)</code></label>
+                                    <input type="text" class="form-control" id="new_add_endpoint_allowed_ip" value="{{ endpoint_allowed_ip }}">
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                 <div class="form-group">
+                                    <label for="new_add_MTU">MTU</label>
+                                    <input type="text" class="form-control" id="new_add_MTU" value="{{ mtu }}">
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                 <div class="form-group">
+                                    <label for="new_add_keep_alive">Persistent keepalive</label>
+                                    <input type="text" class="form-control" id="new_add_keep_alive" value="{{ keep_alive }}">
+                                </div>
+                            </div>
+                        </div>
 					</form>
 				</div>
 				<div class="modal-footer">
@@ -105,7 +123,7 @@

    <div class="modal fade" id="setting_modal" data-backdrop="static" data-keyboard="false" tabindex="-1"
 		aria-labelledby="staticBackdropLabel" aria-hidden="true" conf_id={{conf_data['name']}} peer_id="">
-		<div class="modal-dialog modal-dialog-centered">
+		<div class="modal-dialog modal-dialog-centered modal-lg">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h5 class="peer_name"></h5>
@@ -114,15 +132,77 @@
 					</button>
 				</div>
 				<div class="modal-body">
+                    <div id="setting_peer_alert" class="alert alert-danger alert-dismissible fade show d-none" role="alert">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+						  <span aria-hidden="true">&times;</span>
+						</button>
+					</div>
+                    <div>
+                      <label for="peer_private_key_textbox" class="form-label">Private Key <code>(Required for QR Code and download)</code></label>
+                      <input type="password" class="form-control" id="peer_private_key_textbox" style="padding-right: 40px">
+                      <a class="peer_private_key_textbox_switch"><i class="bi bi-eye-fill"></i></a>
+                    </div>
+                    <hr>

-					<div class="mb-3">
-                      <label for="peer_name" class="form-label">Name</label>
-                      <input type="text" class="form-control" id="peer_name_textbox" placeholder="">
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <div class="mb-3">
+                              <label for="peer_name_textbox" class="form-label">Name</label>
+                              <input type="text" class="form-control" id="peer_name_textbox" placeholder="">
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="mb-3">
+                              <label for="peer_allowed_ip_textbox" class="form-label">Allowed IPs <code>(Required)</code></label>
+                              <input type="text" class="form-control" id="peer_allowed_ip_textbox">
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="mb-3">
+                              <label for="peer_DNS_textbox" class="form-label">DNS <code>(Required)</code></label>
+                              <input type="text" class="form-control" id="peer_DNS_textbox">
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="mb-3">
+                              <label for="peer_endpoint_allowed_ips" class="form-label">Endpoint Allowed IPs <code>(Required)</code></label>
+                              <input type="text" class="form-control" id="peer_endpoint_allowed_ips">
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="mb-3">
+                              <label for="peer_mtu" class="form-label">MTU</label>
+                              <input type="text" class="form-control" id="peer_mtu">
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="mb-3">
+                              <label for="peer_keep_alive" class="form-label">Persistent Keepalive</label>
+                              <input type="text" class="form-control" id="peer_keep_alive">
+                            </div>
+                        </div>
                    </div>
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-					<button type="button" class="btn btn-primary" id="save_peer_name" conf_id={{conf_data['name']}} peer_id="">Save</button>
+					<button type="button" class="btn btn-primary" id="save_peer_setting" conf_id={{conf_data['name']}} peer_id="">Save</button>
+				</div>
+			</div>
+		</div>
+	</div>
+
+    <div class="modal fade" id="qrcode_modal" data-backdrop="static" data-keyboard="false" tabindex="-1"
+		aria-labelledby="staticBackdropLabel" aria-hidden="true">
+		<div class="modal-dialog modal-dialog-centered">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="peer_name">QR Code</h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+                    <img src="" id="qrcode_img" style="width: 100%">
 				</div>
 			</div>
 		</div>
@@ -140,151 +220,57 @@
            </div>
          </div>
    </div>
+    {% include "tools.html" %}
 </body>
-<script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
-	integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
-	crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.min.js"
-	integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s"
-	crossorigin="anonymous"></script>
+{% include "footer.html" %}
 <script>
-	function load_data(){
+    var conf_name = "{{ conf_data['name'] }}"
+    $(".sb-"+conf_name+"-url").addClass("active");
+    // Progress Bar
+    let bar = $(".progress-bar")
+    function startProgressBar(){
+        bar.css("width","0%")
+        bar.css("opacity", "100")
+        bar.css("background", "rgb(255,69,69)")
+        bar.css("background", "linear-gradient(145deg, rgba(255,69,69,1) 0%, rgba(0,115,186,1) 100%)")
+        bar.css("width","25%")
+        setTimeout(function(){
+            stillLoadingProgressBar();
+        },300)
+    }
+    function stillLoadingProgressBar(){
+        bar.css("transition", "3s ease-in-out")
+        bar.css("width", "75%")
+    }
+    function endProgressBar(){
+        bar.css("transition", "0.3s ease-in-out")
+        bar.css("width","100%")
+        setTimeout(function(){
+            bar.css("opacity", "0")
+        },250)
+
+    }
+	function load_data(search){
+        startProgressBar()
 		$.ajax({
 			method: "GET",
-			url: "/get_config/"+"{{conf_data['name']}}",
+			url: "/get_config/"+conf_name+"?search="+encodeURIComponent(search),
 			headers:{
 				"Content-Type": "application/json"
 			},
-			async:false,
 			success: function (response){
 				$("#config_body").html(response);
-				$.ajax({
-					url: "{{ url_for('static',filename='bootstrap4-toggle.min.js') }}",
-					dataType: "script",
-            		cache: true
-				});
+                $("#search_peer_textbox").css("display", "block")
+                endProgressBar()
 			}
 		})
 	}
 	$(document).ready(function(){
-		load_data();
+		load_data($('#search_peer_textbox').val());
 		setInterval(function(){
-			load_data();
-		}, 10000)
+			load_data($('#search_peer_textbox').val());
+		}, {{dashboard_refresh_interval}})
 	});
 </script>
-<script>
-	$('.switch').change(function() {
-		if ($(this).prop('checked') == false){
-			if (confirm('Are you sure you want to turn off this connection?')){
-				location.replace("/switch/"+$(this).attr('id'));
-			}
-		}
-		else{
-			location.replace("/switch/"+$(this).attr('id'));
-		}
-    });
-	$("#save_peer").click(function(){
-		if ($("#allowed_ips") != "" && $("#public_key") != ""){
-			var conf = $(this).attr('conf_id')
-
-			$.ajax({
-				method: "POST",
-				url: "/add_peer/"+conf,
-				headers:{
-					"Content-Type": "application/json"
-				},
-				data: JSON.stringify({"public_key":$("#public_key").val(), "allowed_ips": $("#allowed_ips").val()}),
-				success: function (response){
-					if(response != "true"){
-						$("#add_peer_alert").html(response+$("#add_peer_alert").html());
-						$("#add_peer_alert").removeClass("d-none");
-					}
-					else{
-						location.reload();
-					}
-				}
-			})
-		}
-	})
-
-    $("body").on("click", ".btn-delete-peer", function(){
-        var peer_id = $(this).attr("id");
-		$("#delete_peer").attr("peer_id", peer_id);
-    })
-
-	$(".btn-delete-peer").click(function(){
-
-	});
-
-	$("#delete_peer").click(function(){
-		var peer_id = $(this).attr("peer_id");
-		var config = $(this).attr("conf_id");
-		$.ajax({
-			method: "POST",
-			url: "/remove_peer/"+config,
-			headers:{
-				"Content-Type": "application/json"
-			},
-			data: JSON.stringify({"action": "delete", "peer_id": peer_id}),
-			success: function (response){
-				if(response != "true"){
-						$("#remove_peer_alert").html(response+$("#add_peer_alert").html());
-						$("#remove_peer_alert").removeClass("d-none");
-					}
-					else{
-						location.reload();
-					}
-			}
-		})
-	});
-
-
-
-	var myModal = new bootstrap.Modal(document.getElementById('setting_modal'), {
-        keyboard: false
-    })
-	$("body").on("click", ".btn-setting-peer", function(){
-        myModal.toggle();
-        var peer_id = $(this).attr("id");
-		$("#save_peer_name").attr("peer_id", peer_id);
-        $.ajax({
-            method: "POST",
-            url: "/get_peer_name/"+$("#setting_modal").attr("conf_id"),
-            headers:{
-				"Content-Type": "application/json"
-			},
-			data: JSON.stringify({"id": peer_id}),
-            success: function(response){
-                if (response == ""){
-                    $("#setting_modal .peer_name").html("Untitled Peer");
-                    $("#peer_name_textbox").val("")
-                }else{
-                    $("#setting_modal .peer_name").html(response);
-                    $("#peer_name_textbox").val(response)
-                }
-            }
-        })
-    });
-
-
-	$("#save_peer_name").click(function (){
-	    var peer_id = $(this).attr("peer_id");
-	    $.ajax({
-            method: "POST",
-            url: "/save_peer_name/"+"{{conf_data['name']}}",
-            headers:{
-				"Content-Type": "application/json"
-			},
-            data: JSON.stringify({id: peer_id, name: $("#peer_name_textbox").val()}),
-            success: function (response){
-                myModal.toggle();
-                load_data();
-                $('#alertToast').toast('show');
-                $('#alertToast .toast-body').html("Name Saved!");
-            }
-        })
-    })
-</script>
+<script src="{{ url_for('static',filename='js/configuration.js') }}"></script>
 </html>	
--- a/src/templates/footer.html
+++ b/src/templates/footer.html
@@ -0,0 +1,3 @@
+<script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
+<script src="{{ url_for('static',filename='js/bootstrap.bundle.js') }}"></script>
+<script src="{{ url_for('static',filename='js/tools.js') }}"></script>
--- a/src/templates/get_conf.html
+++ b/src/templates/get_conf.html
@@ -1,20 +1,37 @@
-<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4 mt-4">
+<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4 mt-4 mb-4">
 	<div class="info mt-4">
+        {% if conf_data['listen_port'] == "" and conf_data['status'] == "stopped" %}
+            <div class="alert alert-warning" role="alert">
+                Peer QR Code and configuration file download required a specified <strong>Listen Port</strong>.
+            </div>
+        {% endif %}
+        {% if conf_data['conf_address'] == "N/A" %}
+            <div class="alert alert-warning" role="alert">
+                Configuration <strong>Address</strong> not be specified to have peer connect to it.
+            </div>
+        {% endif %}
 		<div class="row">
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>CONFIGURATION</strong></small>
-				<h1 class="mb-3">{{conf_data['name']}}</h1>
+				<h1 class="mb-3"><samp>{{conf_data['name']}}</samp></h1>
 			</div>
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>ACTION</strong></small><br>
-				<input class="mt-2 switch" id="{{conf_data['name']}}" type="checkbox" data-toggle="toggle"  {{conf_data['checked']}} data-size="sm">
+                {% if conf_data['checked'] == "checked" %}
+                    <a href="#" id="{{conf_data['name']}}" {{conf_data['checked']}} class="switch text-primary"><i class="bi bi-toggle2-on"></i> ON</a>
+                {% else %}
+                    <a href="#" id="{{conf_data['name']}}" {{conf_data['checked']}} class="switch text-secondary"><i class="bi bi-toggle2-off"></i> OFF</a>
+                {% endif %}
+                <div class="spinner-border text-primary" role="status" style="display: none; margin-top: 10px">
+                    <span class="sr-only">Loading...</span>
+                </div>
 			</div>
 			<div class="w-100"></div>
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>STATUS</strong></small>
 				<h6 style="text-transform: uppercase;">{{conf_data['status']}}<span class="dot dot-{{conf_data['status']}}"></span></h6>
 			</div>
-			<div class="col-sm">
+			<div class="col">
 				<small class="text-muted"><strong>CONNECTED PEERS</strong></small>
 				<h6 style="text-transform: uppercase;">{{conf_data['running_peer']}}</h6>
 			</div>
@@ -23,7 +40,7 @@
 				<h6 style="text-transform: uppercase;">{{conf_data['total_data_usage'][0]}} GB</h6>
 			</div>
 			<div class="col-sm">
-				<small class="text-muted"><strong>TOTAL RECIEVED</strong></small>
+				<small class="text-muted"><strong>TOTAL RECEIVED</strong></small>
 				<h6 style="text-transform: uppercase;">{{conf_data['total_data_usage'][1]}} GB</h6>
 			</div>
 			<div class="col-sm">
@@ -32,81 +49,158 @@
 			</div>
 			<div class="w-100"></div>
 			<div class="col-sm">
-				<small class="text-muted"><strong>PUBLIC KEY</strong></small>
-				<h6 style="text-transform: uppercase;"><samp>{{conf_data['public_key']}}</samp></h6>
+				<small class="text-muted">
+                    <strong>PUBLIC KEY</strong>
+                    <strong style="margin-left: auto!important; opacity: 0; transition: 0.2s ease-in-out" class="text-primary">CLICK TO COPY</strong></small>
+                </small>
+				<h6><samp class="key">{{conf_data['public_key']}}</samp></h6>
 			</div>
 			<div class="col-sm">
 				<small class="text-muted"><strong>LISTEN PORT</strong></small>
-				<h6 style="text-transform: uppercase;"><samp>{{conf_data['listen_port']}}</samp></h6>
+				<h6 style="text-transform: uppercase;"><samp>
+                    {% if conf_data['listen_port'] == "" %}
+                        N/A
+                    {% else %}
+                        {{conf_data['listen_port']}}
+                    {% endif %}
+
+                </samp></h6>
+			</div>
+            <div class="col-sm">
+				<small class="text-muted"><strong>ADDRESS</strong></small>
+				<h6 style="text-transform: uppercase;"><samp>{{conf_data['conf_address']}}</samp></h6>
 			</div>
 		</div>
 		<hr>
-		<div class="button-div" style="text-align: right;">
-			<button type="button" class="btn btn-outline-primary btn-sm mb-3" data-toggle="modal" data-target="#add_modal">
-				<strong>ADD PEER</strong>
-			</button>
-			
+		<div class="button-div mb-3">
+            <div class="row">
+                <div class="col-sm">
+                     <div class="form-group">
+                        <label for="sort_by_dropdown"><small class="text-muted">Sort Peers By</small></label>
+                        <select class="form-control" id="sort_by_dropdown">
+                            <option value="status" {% if sort_tag == "status" %} {{ "selected" }} {% endif %}>Status</option>
+                            <option value="name" {% if sort_tag == "name" %} {{ "selected" }} {% endif %}>Name</option>
+                            <option value="allowed_ip" {% if sort_tag == "allowed_ip" %} {{ "selected" }} {% endif %}>Allowed IP</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-sm">
+                    <div class="form-group">
+                        <label><small class="text-muted">Refresh Interval</small></label><br>
+                        <div class="btn-group" role="group" style="width: 100%">
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary btn-group-label refresh"><i class="bi bi-arrow-repeat"></i></button>
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary update_interval {% if dashboard_refresh_interval == 5000 %} {{ "active" }} {% endif %}" refresh-interval="5000">5s</button>
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary update_interval {% if dashboard_refresh_interval == 10000 %} {{ "active" }} {% endif %}" refresh-interval="10000">10s</button>
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary update_interval {% if dashboard_refresh_interval == 30000 %} {{ "active" }} {% endif %}" refresh-interval="30000">30s</button>
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary update_interval {% if dashboard_refresh_interval == 60000 %} {{ "active" }} {% endif %}" refresh-interval="60000">1m</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm">
+                    <div class="form-group">
+                        <label><small class="text-muted">Display Mode</small></label><br>
+                        <div class="btn-group" role="group" style="width: 100%">
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary display_mode {% if peer_display_mode == "grid" %} {{ "active" }} {% endif %}" display-mode="grid"><i class="bi bi-grid-fill" style="font-size: 1.5rem;"></i></button>
+                            <button style="width: 20%" type="button" class="btn btn-outline-primary display_mode {% if peer_display_mode == "list" %} {{ "active" }} {% endif %}" display-mode="list"><i class="bi bi-list" style="font-size: 1.5rem;"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <button type="button" class="btn btn-primary add_btn" data-toggle="modal" data-target="#add_modal">
+                    <i class="bi bi-plus-circle-fill" style=""></i> Add Peer
+                </button>
+            </div>
+            <hr>
 		</div>
 	</div>
-	
-	{% for i in conf_data['peer_data']%}
-		<div class="card mb-3">
-            <div class="card-header">
-                    {% if not i['name']%}
-                        {{ "Untitled Peer" }}
-                    {% else %}
-                        {{i['name']}}
-                    {% endif %}
-            </div>
-			<div class="card-body">

-				<div class="row">
-					<div class="col-sm">
-						<small class="text-muted"><strong>STATUS</strong></small>
-						<h6 style="text-transform: uppercase;">{{i['status']}}<span class="dot dot-{{i['status']}}"></span></h6>
-					</div>
-					<div class="col-sm">
-						<small class="text-muted"><strong>PEER</strong></small>
-						<h6><samp>{{i['id']}}</samp></h6>
-					</div>
-					
-					<div class="w-100"></div>
-					<div class="col-sm">
-						<small class="text-muted"><strong>ALLOWED IP</strong></small>
-						<h6 style="text-transform: uppercase;">{{i['allowed_ip']}}</h6>
-					</div>
-					<div class="col-sm">
-						<small class="text-muted"><strong>LATEST HANDSHAKE</strong></small>
-						<h6 style="text-transform: uppercase;">{{i['latest_handshake']}}</h6>
-					</div>
-					<div class="col-sm">
-						<small class="text-muted"><strong>END POINT</strong></small>
-						<h6 style="text-transform: uppercase;">{{i['endpoint']}}</h6>
-					</div>
-					<div class="w-100"></div>
-{#					<div class="col-sm">#}
-{#						<small class="text-muted"><strong>TOTAL DATA USAGE</strong></small>#}
-{#						<h6 style="text-transform: uppercase;">{{i['total_data']}} GB</h6>#}
-{#					</div>#}
-					<div class="col-sm">
-						<small class="text-muted"><strong>TOTAL RECEIVED</strong></small>
-						<h6 style="text-transform: uppercase;"><i class="bi bi-arrow-down-right"></i> {{i['total_receive']}} GB</h6>
-					</div>
-					<div class="col-sm">
-						<small class="text-muted"><strong>TOTAL SENT</strong></small>
-						<h6 style="text-transform: uppercase;"><i class="bi bi-arrow-up-right"></i> {{i['total_sent']}} GB</h6>
-					</div>
-					<div class="w-100"></div>
-					<div class="col-sm">
-						<!-- <small class="text-muted"><strong>ACTION</strong></small> -->
-						<div class="button-group">
+    <div class="row peer_list">
+        {% if conf_data['peer_data']|length == 0 %}
+            <div class="col-12" style="text-align: center; margin-top: 1.5rem">
+                <h3 class="text-muted">Oops! No peers found ‘︿’</h3>
+            </div>
+        {% endif %}
+
+        {% for i in conf_data['peer_data']%}
+            {% if peer_display_mode == "list" %}
+                <div class="col-12">
+            {% else %}
+                <div class="col-sm-6 col-lg-4">
+            {% endif %}
+                <div class="card mb-3">
+                <div class="card-header">
+                    <div class="row">
+                        <div class="col">
+                            <div class="card-header-body ">
+                                {% if not i['name']%}
+                                    {{ "Untitled" }}
+                                {% else %}
+                                    {{i['name']}}
+                                {% endif %}
+{#                                <span class="dot dot-{{i['status']}}"></span>#}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-6">
+                            <small class="text-muted"><strong>STATUS</strong></small>
+                            <h6 style="text-transform: uppercase;" class="mb-2"><span class="dot dot-{{i['status']}}" style="margin-left: 0 !important;margin-top: 5px"></span></h6>
+                        </div>
+                        <div class="col-6 peer_data_group" style="text-align: right">
+                            <small class="text-muted"><strong>TRANSFER</strong></small>
+                            <p class="text-primary" style="text-transform: uppercase; margin-bottom: 0;"><small><i class="bi bi-arrow-down-right"></i> {{i['total_receive']}} GB</small></p>
+                            <p class="text-success" style="text-transform: uppercase; margin-bottom: 0"><small><i class="bi bi-arrow-up-right"></i> {{i['total_sent']}} GB</small></p>
+                        </div>
+                        <div class="col-sm">
+                            <small class="text-muted" style="display: flex">
+                                <strong>PEER</strong>
+                                <strong style="margin-left: auto!important; opacity: 0; transition: 0.2s ease-in-out" class="text-primary">CLICK TO COPY</strong></small>
+                            <h6><samp class="ml-auto key">{{i['id']}}</samp></h6>
+                        </div>
+                        <div class="col-sm">
+                            <small class="text-muted"><strong>ALLOWED IP</strong></small>
+                            <h6 style="text-transform: uppercase;">{{i['allowed_ip']}}</h6>
+                        </div>
+                        <div class="w-100"></div>
+
+                        <div class="col-sm">
+                            <small class="text-muted"><strong>LATEST HANDSHAKE</strong></small>
+                            <h6 style="text-transform: uppercase;">{{i['latest_handshake']}}</h6>
+                        </div>
+                        <div class="w-100"></div>
+                        <div class="col-sm">
+                            <small class="text-muted"><strong>END POINT</strong></small>
+                            <h6 style="text-transform: uppercase;">{{i['endpoint']}}</h6>
+                        </div>
+                        <div class="w-100"></div>
+                        <div class="col-sm">
                            <hr>
-                            <button type="button" class="btn btn-outline-primary btn-setting-peer btn-control" id="{{i['id']}}" data-toggle="modal"><i class="bi bi-gear-fill"></i></button>
-							<button type="button" class="btn btn-outline-danger btn-delete-peer btn-control" id="{{i['id']}}" data-toggle="modal" data-target="#delete_modal"><i class="bi bi-x-circle-fill"></i></button>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	{%endfor%}
+                            <div class="button-group" style="display:flex">
+
+                                <button type="button" class="btn btn-outline-primary btn-setting-peer btn-control" id="{{i['id']}}" data-toggle="modal"><i class="bi bi-gear-fill"></i></button>
+                                <button type="button" class="btn btn-outline-danger btn-delete-peer btn-control" id="{{i['id']}}" data-toggle="modal"><i class="bi bi-x-circle-fill"></i></button>
+                                {% if i['private_key'] %}
+                                    <div class="share_peer_btn_group" style="margin-left: auto !important; display: inline">
+                                        <button type="button" class="btn btn-outline-success btn-qrcode-peer btn-control" img_src="{{ qrcode("[Interface]\nPrivateKey = "+i['private_key']+"\nAddress = "+i['allowed_ip']+"\nDNS = "+i['DNS']+"\n\n[Peer]\nPublicKey = "+conf_data['public_key']+"\nAllowedIPs = "+i['endpoint_allowed_ip']+"\nEndpoint = "+wg_ip+":"+conf_data['listen_port']) }}">
+                                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" style="width: 19px;" fill="#28a745"><path d="M3 11h8V3H3v8zm2-6h4v4H5V5zM3 21h8v-8H3v8zm2-6h4v4H5v-4zM13 3v8h8V3h-8zm6 6h-4V5h4v4zM13 13h2v2h-2zM15 15h2v2h-2zM13 17h2v2h-2zM17 17h2v2h-2zM19 19h2v2h-2zM15 19h2v2h-2zM17 13h2v2h-2zM19 15h2v2h-2z"/></svg>
+                                        </button>
+                                        <a href="/download/{{ conf_data['name'] }}?id={{ i['id']|urlencode }}" class="btn btn-outline-info btn-download-peer btn-control">
+                                            <i class="bi bi-download"></i>
+                                        </a>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            </div>
+
+
+        {%endfor%}
+    </div>
+
+
+
 </main>
--- a/src/templates/header.html
+++ b/src/templates/header.html
@@ -0,0 +1,10 @@
+<head>
+<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<title>WGDashboard | {{ title }}</title>
+    <link rel="icon" href="{{ url_for('static',filename='img/logo.png') }}"/>
+	<link rel="stylesheet" href="{{ url_for('static',filename='css/bootstrap.min.css') }}">
+	<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='css/dashboard.css') }}">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.4.1/font/bootstrap-icons.css">
+</head>
+
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -1,96 +1,61 @@
 <html>
-
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<title>Wireguard Dashboard</title>
-	<link rel="icon" href="{{ url_for('static',filename='logo.png') }}"/>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-	<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='dashboard.css') }}">
-	<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">
-</head>
+{% with %}
+    {% set title="Home" %}
+    {% include "header.html"%}
+{% endwith %}

 <body>
-	<nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-		<a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="#">Wireguard Dashboard</a>
-		<button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
-			data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
-		</button>
-	</nav>
+	{% include "navbar.html" %}
 	<div class="container-fluid">
-		<div class="row">
-			<div class="row">
-				<nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
-					<div class="sidebar-sticky pt-3">
-						<ul class="nav flex-column">
-							<li class="nav-item"><a class="nav-link" href="/">Home</a></li>
-						</ul>
-						<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-							<span>Configurations</span>
-						</h6>
-						<ul class="nav flex-column">
-							{% for i in conf%}
-								<li class="nav-item"><a class="nav-link" href="/configuration/{{i['conf']}}">{{i['conf']}}</a></li>
-							{%endfor%}
-						</ul>
-					</div>
-				</nav>
-			</div>
-		</div>
-		<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
+        {% include "sidebar.html" %}
+		<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4 mb-4">
+            <h1 class="pb-4 mt-4">Home</h1>
+            {% if conf == [] %}
+                <p class="text-muted">You don't have any WireGuard configurations yet. Please check the configuration folder or change it in "Settings". By default the folder is "/etc/wireguard".</p>
+            {% endif %}
 			{% for i in conf%}
 				<div class="card mt-3">
 					<div class="card-body">
-						
 						<div class="row">
-							<div class="col">
+							<div class="col card-col">
 								<small class="text-muted"><strong>CONFIGURATION</strong></small>
 								<a href="/configuration/{{i['conf']}}">
-									<h5 class="card-title">{{i['conf']}}</h5>
+									<h6 class="card-title" style="margin:0 !important;">{{i['conf']}}</h6>
 								</a>
 							</div>
-							<div class="col">
-								<input class="mt-2 switch" id="{{i['conf']}}"  type="checkbox" data-toggle="toggle"  {{i['checked']}} data-size="sm">
-							</div>
-							
-							<div class="w-100"></div>
-							<div class="col-sm">
+							<div class="col card-col">
 								<small class="text-muted"><strong>STATUS</strong></small>
-								<h6 style="text-transform: uppercase;">{{i['status']}}<span class="dot dot-{{i['status']}}"></span></h6>
+								<h6 style="text-transform: uppercase; margin:0 !important;">{{i['status']}}<span class="dot dot-{{i['status']}}"></span></h6>
 							</div>
-							<div class="col-sm">
+							<div class="col-md card-col">
 								<small class="text-muted"><strong>PUBLIC KEY</strong></small>
-								<h6 style="text-transform: uppercase;"><samp>{{i['public_key']}}</samp></h6>
+								<h6 style="text-transform: uppercase; margin:0 !important;"><samp>{{i['public_key']}}</samp></h6>
+							</div>
+							<div class="col-md index-switch">
+                                {% if i['checked'] == "checked" %}
+                                    <a href="#" id="{{i['conf']}}" {{i['checked']}} class="switch text-primary tt"><i class="bi bi-toggle2-on"></i></a>
+                                {% else %}
+                                    <a href="#" id="{{i['conf']}}" {{i['checked']}} class="switch text-secondary"><i class="bi bi-toggle2-off"></i></a>
+                                {% endif %}
+                                <div class="spinner-border text-primary" role="status" style="display: none">
+                                    <span class="sr-only">Loading...</span>
+                                </div>
 							</div>
-							
-
 						</div>
 					</div>
 				</div>
 			{%endfor%}
 		</main>
 	</div>
+{% include "tools.html" %}
 </body>
-<script src="https://code.jquery.com/jquery-3.5.1.min.js"
-	integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"
-	integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
-	crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.min.js"
-	integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s"
-	crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>
+{% include "footer.html" %}
 <script>
-	$('.switch').change(function() {
-		if ($(this).prop('checked') == false){
-			if (confirm('Are you sure you want to turn off this connection?')){
-				location.replace("/switch/"+$(this).attr('id'))
-			}
-		}
-		else{
-			location.replace("/switch/"+$(this).attr('id'))
-		}
+	$('.switch').click(function() {
+	    $(this).siblings($(".spinner-border")).css("display", "inline-block")
+	    $(this).remove()
+		location.replace("/switch/"+$(this).attr('id'))
    });
+	$(".sb-home-url").addClass("active")
 </script>
 </html>
--- a/src/templates/navbar.html
+++ b/src/templates/navbar.html
@@ -0,0 +1,10 @@
+<nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
+    <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-3" href="/">WGDashboard</a>
+    <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
+        data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+</nav>
+<div class="progress" style="height: 3px; position: fixed; width: 100%; z-index: 10000; background-color: transparent">
+  <div class="progress-bar" role="progressbar" style="z-index: 10000; width: 0%"></div>
+</div>
--- a/src/templates/settings.html
+++ b/src/templates/settings.html
@@ -0,0 +1,204 @@
+<html>
+{% with %}
+    {% set title="Settings" %}
+    {% include "header.html" %}
+{% endwith %}
+<body>
+{% include "navbar.html" %}
+<div class="container-fluid">
+    {% include "sidebar.html" %}
+    <main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
+        <div class="setting-container mt-4">
+            {% if message != "" %}
+                <div class="alert alert-{{ status }}" role="alert">
+                    {{ message }}
+                </div>
+            {% endif %}
+            <h1 class="">Settings</h1>
+            <hr>
+            {% if required_auth == "true" %}
+                <div class="card mb-3">
+                    <h6 class="card-header">Peer Default Settings</h6>
+                    <div class="card-body">
+                        <form action="/update_peer_default_config" method="post">
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        <label for="peer_global_DNS">DNS</label>
+                                        <input type="text" class="form-control mb-4" id="peer_global_DNS"
+                                               name="peer_global_DNS"
+                                               value="{{ peer_global_DNS }}" required>
+                                    </div>
+                                    <div class="col-sm-6">
+                                        <label for="peer_endpoint_allowed_ip">Peer Endpoint Allowed IPs</label>
+                                        <input type="text" class="form-control mb-4" id="peer_endpoint_allowed_ip"
+                                               name="peer_endpoint_allowed_ip"
+                                               value="{{ peer_endpoint_allowed_ip }}" required>
+                                    </div>
+                                    <div class="col-sm-6">
+                                        <label for="peer_mtu">MTU</label>
+                                        <input type="text" class="form-control mb-4" id="peer_mtu"
+                                               name="peer_mtu"
+                                               value="{{ peer_mtu }}">
+                                    </div>
+                                    <div class="col-sm-6">
+                                        <label for="peer_keep_alive">Persistent Keepalive</label>
+                                        <input type="text" class="form-control mb-4" id="peer_keep_alive"
+                                               name="peer_keep_alive"
+                                               value="{{ peer_keepalive }}">
+                                    </div>
+                                    <div class="col-sm-12">
+                                        <label for="peer_remote_endpoint"><strong>Peer Remote Endpoint (This will be change globally, and will be apply to all peer's QR code and configuration file.)</strong></label>
+                                        <input type="text" class="form-control mb-4" id="peer_remote_endpoint"
+                                               name="peer_remote_endpoint"
+                                               value="{{ peer_remote_endpoint }}" required>
+                                    </div>
+                                </div>
+                                <button class="btn btn-success" type="submit">Update Peer Default Settings</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <hr>
+                <div class="card mb-3">
+                    <h6 class="card-header">WireGuard Configuration Path</h6>
+                    <div class="card-body">
+                        <form action="/update_wg_conf_path" method="post" class="update_wg_conf_path">
+                            <div class="form-group">
+                                <label for="wg_conf_path">Path</label>
+                                <input type="text" class="form-control mb-2" id="wg_conf_path" name="wg_conf_path"
+                                       value="{{ wg_conf_path }}">
+                                <p class="text-muted">Remember to remove <code>/</code> at the end of your path. e.g <code>/etc/wireguard</code>
+                                </p>
+                                <button class="btn btn-danger change_path">Update Path & Restart Dashboard</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="card mb-3">
+                    <h6 class="card-header">Account</h6>
+                    <div class="card-body">
+                        <form action="/update_acct" method="post">
+                            <div class="form-group">
+                                <label for="username">Username</label>
+                                <input type="text" class="form-control mb-4" id="username" name="username"
+                                       value="{{ session['username'] }}" required>
+                                <button type="submit" class="btn btn-danger">Update Account</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="card mb-3">
+                    <h6 class="card-header">Security</h6>
+                    <div class="card-body">
+                        <form action="/update_pwd" method="post">
+                            <div class="form-group">
+                                <label for="currentpass">Current Password</label>
+                                <input type="password" class="form-control mb-2" id="currentpass" name="currentpass">
+                                <label for="newpass">New Password</label>
+                                <input type="password" class="form-control mb-2" id="newpass" name="newpass">
+                                <label for="repnewpass">Repeat New Password</label>
+                                <input type="password" class="form-control mb-4" id="repnewpass" name="repnewpass">
+                                <button type="submit" class="btn btn-danger">Update Password</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            {% endif %}
+            <div class="card">
+                <h6 class="card-header">Dashboard Configuration</h6>
+                <div class="card-body">
+                    <form action="/update_app_ip_port" method="post" class="update_app_ip_port">
+                        <div class="form-group">
+                            <div class="row">
+                                <div class="col-sm">
+                                    <label for="app_ip">Dashboard IP</label>
+                                    <input type="text" class="form-control mb-2" id="app_ip" name="app_ip" value="{{ app_ip }}">
+                                    <p><small class="text-danger mb-4">0.0.0.0 means it can be access by anyone with your server
+                                        IP Address.</small></p>
+                                </div>
+                                <div class="col-sm">
+                                    <label for="app_port">Dashboard Port</label>
+                                    <input type="text" class="form-control mb-4" id="app_port" name="app_port"
+                                           value="{{ app_port }}">
+                                </div>
+                            </div>
+                            <button type="button" class="btn btn-danger confirm_modal" data-toggle="modal"
+                                    data-target="#confirmModal">Update Configuration & Restart Dashboard
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </main>
+    <!-- Modal -->
+    <div class="modal fade" id="confirmModal" data-backdrop="static" data-keyboard="false" tabindex="-1"
+         aria-labelledby="staticBackdropLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="staticBackdropLabel">Confirm Dashboard Configuration</h5>
+                </div>
+                <div class="modal-body">
+                    <small>Dashboard Original IP</small>
+                    <p>{{ app_ip }}</p>
+                    <small style="font-weight: bold" class="text-bold">Dashboard New IP</small>
+                    <p class="app_new_ip text-bold text-danger" style="font-weight: bold"></p>
+                    <small>Dashboard Original Port</small>
+                    <p>{{ app_port }}</p>
+                    <small style="font-weight: bold" class="text-bold">Dashboard New Port</small>
+                    <p class="app_new_port text-bold text-danger" style="font-weight: bold"></p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary cancel_restart" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-danger confirm_restart">Confirm & Restart Dashboard</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% include "tools.html" %}
+</body>
+
+{% include "footer.html" %}
+<script>
+    $(".sb-settings-url").addClass("active")
+    $(".confirm_modal").click(function () {
+        $(".app_new_ip").html($("#app_ip")[0].value)
+        $(".app_new_port").html($("#app_port")[0].value)
+    })
+
+    $(".confirm_restart").click(function () {
+        $(".cancel_restart").remove()
+        countdown = 7;
+        $.post('/update_app_ip_port', $('.update_app_ip_port').serialize())
+        url = $("#app_ip")[0].value + ":" + $("#app_port")[0].value;
+        $(".confirm_restart").attr("disabled", "disabled")
+        setInterval(function () {
+            if (countdown === 0) {
+                window.location.replace("http://" + url);
+            }
+            $(".confirm_restart").html("Redirecting you in " + countdown + " seconds.")
+            countdown--;
+        }, 1000)
+    });
+
+    $(".change_path").click(function () {
+        $(this).attr("disabled", "disabled");
+        countdown = 5;
+        setInterval(function () {
+            if (countdown === 0) {
+                location.reload()
+            }
+            $(".change_path").html("Redirecting you in " + countdown + " seconds.")
+            countdown--;
+        }, 1000)
+        $.post('/update_wg_conf_path', $('.update_wg_conf_path').serialize())
+
+    });
+
+</script>
+</html>
--- a/src/templates/sidebar.html
+++ b/src/templates/sidebar.html
@@ -0,0 +1,47 @@
+<div class="row">
+    <div class="row">
+        <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
+            <div class="sidebar-sticky pt-3">
+                <ul class="nav flex-column">
+                    <li class="nav-item"><a class="nav-link sb-home-url" href="/">Home</a></li>
+                    {% if "username" in session %}
+                        <li class="nav-item"><a class="nav-link sb-settings-url" href="/settings">Settings</a></li>
+                    {% endif %}
+                    {% if session['update'] == "true" %}
+                    <li class="nav-item sb-update-li">
+                        <a class="nav-link sb-update-url" href="https://github.com/donaldzou/wireguard-dashboard#-how-to-update-the-dashboard">New Update Available!<span class="dot dot-running"></span></a>
+                    </li>
+                    {% endif %}
+                </ul>
+                <hr>
+                <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
+                    <span>Configurations</span>
+                </h6>
+                <ul class="nav flex-column">
+                    {% for i in conf%}
+                        <li class="nav-item"><a class="nav-link sb-{{i['conf']}}-url" href="/configuration/{{i['conf']}}"><samp>{{i['conf']}}</samp></a></li>
+                    {%endfor%}
+                </ul>
+                <hr>
+                <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
+                    <span>Tools</span>
+                </h6>
+                <ul class="nav flex-column">
+                    <ul class="nav flex-column">
+                            <li class="nav-item"><a class="nav-link" data-toggle="modal" data-target="#ping_modal" href="#">Ping</a></li>
+                        <li class="nav-item"><a class="nav-link" data-toggle="modal" data-target="#traceroute_modal" href="#">Traceroute</a></li>
+                    </ul>
+                </ul>
+                <hr>
+                {% if "username" in session %}
+                    <ul class="nav flex-column">
+                            <li class="nav-item"><a class="nav-link text-danger" href="/signout" style="font-weight: bold">Sign Out</a></li>
+                    </ul>
+                {% endif %}
+                 <ul class="nav flex-column">
+                     <li class="nav-item"><a href="https://github.com/donaldzou/wireguard-dashboard/releases/tag/{{ session['dashboard_version'] }}"><small class="nav-link text-muted">{{ session['dashboard_version'] }}</small></a></li>
+                 </ul>
+            </div>
+        </nav>
+    </div>
+</div>
--- a/src/templates/signin.html
+++ b/src/templates/signin.html
@@ -0,0 +1,44 @@
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <title>WGDashboard | Login</title>
+        <link rel="icon" href="{{ url_for('static',filename='logo.png') }}"/>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+        <link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='css/dashboard.css') }}">
+    </head>
+    <body>
+        {% include "navbar.html" %}
+        <div class="container-fluid">
+
+            <main role="main" class="container login-container">
+                <div class="login-box" style="margin: auto !important;">
+                    <h1 class="text-center">Sign In</h1>
+
+                    <form style="margin-left: auto !important; margin-right: auto !important; max-width: 500px;" action="/auth" method="post">
+                        {% if message != ""%}
+                            <div class="alert alert-danger" role="alert">
+                                {{ message }}
+                            </div>
+                        {% endif %}
+                        <div class="form-group">
+                        <label for="username" class="text-left">Username</label>
+                        <input type="text" class="form-control" id="username" name="username" required>
+                      </div>
+                      <div class="form-group">
+                        <label for="password" class="text-left">Password</label>
+                        <input type="password" class="form-control" id="password" name="password" required>
+                      </div>
+                      <button type="submit" class="btn btn-dark" style="width: 100%;">Sign In</button>
+                    </form>
+                </div>
+            </main>
+        </div>
+    </body>
+{% include "footer.html" %}
+<script>
+    $("button").click(function(){
+        $(this).html("Signing In...")
+    })
+</script>
+</html>
--- a/src/templates/tools.html
+++ b/src/templates/tools.html
@@ -0,0 +1,121 @@
+<div class="modal fade" id="ping_modal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="staticBackdropLabel">Ping</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-sm">
+                        <div class="mb-3">
+                            <small>Configuration</small>
+                            <select class="form-control mt-2 conf_dropdown">
+                                <option value="none" selected="selected" disabled>Select Configuration</option>
+                                {% for i in conf%}
+                                    <option value="{{ i['conf'] }}">{{ i['conf'] }}</option>
+                                {%endfor%}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm">
+                        <div class="mb-3">
+                            <small>IP</small>
+                            <select class="form-control mt-2 ip_dropdown">
+                                <option value="none" selected="selected" disabled>Choose an IP</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm">
+                        <div class="mb-3">
+                            <small>Ping Count</small>
+                            <input type="number" class="form-control mt-2 ping_count" min=1 value=4>
+                        </div>
+                    </div>
+                </div>
+                <hr>
+                <div class="ping_result">
+                    <table class="table">
+                        <tbody></tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-primary send_ping" disabled>Ping</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="traceroute_modal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="staticBackdropLabel">Traceroute</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-sm">
+                        <div class="mb-3">
+                            <small>Configuration</small>
+                            <select class="form-control mt-2 conf_dropdown">
+                                <option value="none" selected="selected" disabled>Select Configuration</option>
+                                {% for i in conf%}
+                                    <option value="{{ i['conf'] }}">{{ i['conf'] }}</option>
+                                {%endfor%}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm">
+                        <div class="mb-3">
+                            <small>IP</small>
+                            <select class="form-control mt-2 ip_dropdown">
+                                <option value="none" selected="selected" disabled>Choose an IP</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <button class="btn btn-primary send_traceroute" disabled>Traceroute</button>
+                <hr>
+                <div class="traceroute_result">
+                    <table class="table table-sm">
+                        <thead>
+                        <tr>
+                          <th scope="col">Hop</th>
+                          <th scope="col">IP</th>
+                          <th scope="col">Avg RTT</th>
+                          <th scope="col">Min RTT</th>
+                            <th scope="col">Max RTT</th>
+                        </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="update_modal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="staticBackdropLabel">How to update dashboard</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <pre><code>$ sudo sh wgd.sh stop</code><br><code>$ sudo sh wgd.sh update</code><br><code>$ sudo sh wgd.sh start</code></pre>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
--- a/src/wg-dashboard.service
+++ b/src/wg-dashboard.service
@@ -0,0 +1,11 @@
+[Unit]
+After=netword.service
+
+[Service]
+WorkingDirectory=<your dashboard directory full path here>
+ExecStart=/usr/bin/python3 <your dashboard directory full path here>dashboard.py
+Restart=always
+
+
+[Install]
+WantedBy=default.target
--- a/src/wgd.sh
+++ b/src/wgd.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+app_name="dashboard.py"
+app_official_name="WGDashboard"
+dashes='------------------------------------------------------------'
+equals='============================================================'
+help () {
+  printf "=================================================================================\n"
+  printf "+          <WGDashboard> by Donald Zou - https://github.com/donaldzou           +\n"
+  printf "=================================================================================\n"
+  printf "| Usage: ./wgd.sh <option>                                                      |\n"
+  printf "|                                                                               |\n"
+  printf "| Available options:                                                            |\n"
+  printf "|    start: To start WGDashboard.                                               |\n"
+  printf "|    stop: To stop WGDashboard.                                                 |\n"
+  printf "|    debug: To start WGDashboard in debug mode (i.e run in foreground).         |\n"
+  printf "|    update: To update WGDashboard to the newest version from GitHub.           |\n"
+  printf "|    install: To install WGDashboard.                                           |\n"
+  printf "| Thank you for using! Your support is my motivation ;)                         |\n"
+  printf "=================================================================================\n"
+}
+
+install_wgd(){
+    # Check Python3 version
+    version_pass=$(python3 -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 7) else print("0");')
+    if [ $version_pass == "0" ]
+      then printf "| WGDashboard required Python3.7+                  |\n"
+      printf "%s\n" "$dashes"
+      exit 1
+    fi
+    rm db/hi.txt >  /dev/null 2>&1
+    if [ ! -d "log" ]
+      then mkdir "log"
+    fi
+    printf "| Installing latest Python dependencies                    |\n"
+    python3 -m pip install -r requirements.txt >  /dev/null 2>&1
+    printf "| WGDashboard installed successfully!              |\n"
+    printf "| Starting Dashboard                                       |\n"
+    start_wgd
+}
+
+
+check_wgd_status(){
+  if ps aux | grep '[p]ython3 '$app_name > /dev/null;
+    then
+      return 0
+      else
+        return 1
+  fi
+}
+
+start_wgd () {
+    printf "%s\n" "$dashes"
+    printf "| Starting WGDashboard in the background.          |\n"
+    if [ ! -d "log" ]
+      then mkdir "log"
+    fi
+    d=$(date '+%Y%m%d%H%M%S')
+    python3 "$app_name" > log/"$d".txt 2>&1 &
+    printf "| Log files is under log/                                  |\n"
+    printf "%s\n" "$dashes"
+}
+
+stop_wgd() {
+  kill "$(ps aux | grep "[p]ython3 $app_name" | awk '{print $2}')"
+}
+
+start_wgd_debug() {
+  printf "%s\n" "$dashes"
+  printf "| Starting WGDashboard in the foreground.                  |\n"
+  python3 "$app_name"
+  printf "%s\n" "$dashes"
+}
+
+update_wgd() {
+  new_ver=$(python3 -c "import json; import urllib.request; data = urllib.request.urlopen('https://api.github.com/repos/donaldzou/wireguard-dashboard/releases/latest').read(); output = json.loads(data);print(output['tag_name'])")
+  printf "%s\n" "$dashes"
+  printf "| Are you sure you want to update to the %s? (Y/N): " "$new_ver"
+  read up
+  if [ "$up" = "Y" ]; then
+    printf "| Shutting down WGDashboard...                             |\n"
+    kill "$(ps aux | grep "[p]ython3 $app_name" | awk '{print $2}')"
+    printf "| Downloading %s from GitHub...                            |\n" "$new_ver"
+    git stash > /dev/null 2>&1
+    git pull https://github.com/donaldzou/wireguard-dashboard.git $new_ver --force >  /dev/null 2>&1
+    printf "| Installing latest Python dependencies                    |\n"
+    python3 -m pip install -r requirements.txt >  /dev/null 2>&1
+    printf "| Update Successfully!                                     |\n"
+    start_wgd
+  else
+    printf "%s\n" "$dashes"
+    printf "| Update Canceled.                                         |\n"
+    printf "%s\n" "$dashes"
+  fi
+}
+
+
+if [ "$#" != 1 ];
+  then
+    help
+  else
+    if [ "$1" = "start" ]; then
+        if check_wgd_status; then
+          printf "%s\n" "$dashes"
+          printf "| WGDashboard is already running.                          |\n"
+          printf "%s\n" "$dashes"
+          else
+            start_wgd
+        fi
+      elif [ "$1" = "stop" ]; then
+        if check_wgd_status; then
+            printf "%s\n" "$dashes"
+            stop_wgd
+            printf "| WGDashboard is stopped.                                  |\n"
+            printf "%s\n" "$dashes"
+            else
+              printf "%s\n" "$dashes"
+              printf "| WGDashboard is not running.                              |\n"
+              printf "%s\n" "$dashes"
+        fi
+      elif [ "$1" = "update" ]; then
+        update_wgd
+      elif [ "$1" = "install" ]; then
+        install_wgd
+      elif [ "$1" = "restart" ]; then
+         if check_wgd_status; then
+           printf "%s\n" "$dashes"
+           stop_wgd
+           printf "| WGDashboard is stopped.                                  |\n"
+           sleep 2
+           start_wgd
+        else
+          start_wgd
+        fi
+      elif [ "$1" = "debug" ]; then
+        if check_wgd_status; then
+          printf "| WGDashboard is already running.                          |\n"
+          else
+            start_wgd_debug
+        fi
+      else
+        help
+    fi
+fi
+
Author	SHA1	Message	Date
Donald Cheng Hong Zou	ed13babf6a	Merge branch 'main' of https://github.com/donaldzou/Wireguard-Dashboard into main	2021-09-08 22:01:01 -04:00
Donald Cheng Hong Zou	80db82eb93	Update dashboard.py	2021-09-08 22:00:53 -04:00
Donald Zou	8d20334d6e	Update README.md	2021-09-08 21:59:15 -04:00
Donald Zou	03a95ad018	Merge pull request #79 from donaldzou/v2.3.1 Update README.md	2021-09-08 21:58:02 -04:00
Donald Cheng Hong Zou	aa59cc8af0	Update README.md	2021-09-08 21:57:50 -04:00
Donald Zou	80d63c2c89	Merge pull request #78 from donaldzou/v2.3.1 Changed dashboard naming to WGDashboard	2021-09-08 21:56:48 -04:00
Donald Cheng Hong Zou	03a4acd72b	Changed dashboard naming to WGDashboard	2021-09-08 21:56:31 -04:00
Donald Cheng Hong Zou	53118cf660	Merge branch 'main' of https://github.com/donaldzou/Wireguard-Dashboard into main	2021-09-08 16:58:40 -04:00
Donald Cheng Hong Zou	16b1baf81e	Update README.md	2021-09-08 16:58:36 -04:00
Donald Zou	960e0d0965	Update README.md	2021-09-08 14:50:26 -04:00
Donald Zou	8f41222e43	Merge pull request #77 from donaldzou/v2.3 Update README.md	2021-09-08 12:43:09 -04:00
Donald Cheng Hong Zou	e7bc447166	Update README.md	2021-09-08 12:42:50 -04:00
Donald Zou	1736359615	Merge pull request #76 from donaldzou/v2.3 V2.3	2021-09-08 12:42:11 -04:00
Donald Cheng Hong Zou	58784b1e22	v2.3 Final Commit	2021-09-08 12:39:25 -04:00
Donald Zou	07f2bfd279	Merge pull request #75 from donaldzou/all-contributors/add-davejlong docs: add davejlong as a contributor for code	2021-09-08 11:24:04 -04:00
allcontributors[bot]	6d62db2890	docs: update .all-contributorsrc [skip ci]	2021-09-08 15:23:38 +00:00
allcontributors[bot]	a1b23c4aab	docs: update README.md [skip ci]	2021-09-08 15:23:37 +00:00
Donald Zou	e272a096da	Merge pull request #74 from donaldzou/all-contributors/add-reafian docs: add reafian as a contributor for code	2021-09-05 16:38:57 -04:00
allcontributors[bot]	b8ca24c5bf	docs: update .all-contributorsrc [skip ci]	2021-09-05 20:38:34 +00:00
allcontributors[bot]	a05d09f0de	docs: update README.md [skip ci]	2021-09-05 20:38:33 +00:00
Donald Zou	1807a79c4f	Create FUNDING.yml	2021-09-04 17:16:31 -04:00
Donald Cheng Hong Zou	77f6826af9	Adjusted UI and edit readme	2021-09-03 17:32:51 -04:00
Donald Cheng Hong Zou	7e39eedf35	Update wgd.sh	2021-09-03 14:40:57 -04:00
Donald Cheng Hong Zou	0b4b48ceae	Update wgd.sh	2021-09-03 14:30:13 -04:00
Donald Cheng Hong Zou	dad931e898	Update wgd.sh	2021-09-03 14:26:27 -04:00
Donald Cheng Hong Zou	2e387730cb	Update wgd.sh	2021-09-03 14:26:05 -04:00
Donald Cheng Hong Zou	c9b6775793	Update wgd.sh	2021-09-03 14:24:38 -04:00
Donald Cheng Hong Zou	a6eaf30c2b	Update wgd.sh	2021-09-03 14:24:14 -04:00
Donald Cheng Hong Zou	6f91d199d8	Update wgd.sh	2021-09-03 14:23:08 -04:00
Donald Cheng Hong Zou	7ea486307a	Update wgd.sh	2021-09-03 14:22:14 -04:00
Donald Cheng Hong Zou	37d254c827	Update wgd.sh	2021-09-03 13:55:41 -04:00
Donald Cheng Hong Zou	b4014eb317	Update wgd.sh	2021-09-03 13:55:03 -04:00
Donald Cheng Hong Zou	c7824fa184	Update wgd.sh	2021-09-03 13:52:23 -04:00
Donald Cheng Hong Zou	13c5bd45f9	Update wgd.sh	2021-09-02 22:52:22 -04:00
Donald Cheng Hong Zou	465d102bd0	Update wgd.sh	2021-09-02 22:52:01 -04:00
Donald Cheng Hong Zou	93007cd56c	Update wgd.sh	2021-09-02 22:27:05 -04:00
Donald Cheng Hong Zou	8367576dc8	Update wgd.sh	2021-09-02 22:24:40 -04:00
Donald Cheng Hong Zou	dbc06145b3	Update wgd.sh	2021-09-02 22:24:07 -04:00
Donald Cheng Hong Zou	4efcf0e7c8	Update wgd.sh	2021-09-02 22:13:00 -04:00
Donald Cheng Hong Zou	0a4bbc1106	Update wgd.sh	2021-09-02 22:09:06 -04:00
Donald Cheng Hong Zou	b08c1f6699	Updated requirement.txt and wgd.sh	2021-09-02 21:56:50 -04:00
Donald Cheng Hong Zou	6828b905ef	Added checking if peers removed directly from config file by not from dashboard, and fixed DNS did not get check from editing peers	2021-08-24 21:04:01 -04:00
Donald Zou	f72b405f6d	Merge pull request #64 from Kofl/patch-1 Update typo3 fix	2021-08-24 20:19:22 -04:00
Donald Zou	27ae99864c	Merge pull request #71 from donaldzou/v2.2.2 v2.2.2 Merge	2021-08-24 20:16:21 -04:00
Donald Cheng Hong Zou	82ba15ba5a	Small fix on HTML files	2021-08-24 20:15:28 -04:00
Kofl	af01db7bc9	Update typo3 fix TOTAL RECIEVED replaced with TOTAL RECEIVED	2021-08-18 21:46:06 +02:00
Donald Cheng Hong Zou	6ec0a65d0c	Update README.md	2021-08-16 15:32:14 -04:00
Donald Zou	c32ccfc9ed	Merge pull request #51 from donaldzou/v2.2.1 V2.2.1	2021-08-16 15:29:49 -04:00
Donald Cheng Hong Zou	ef818388c8	Update dashboard.py	2021-08-16 15:28:43 -04:00
Donald Cheng Hong Zou	f5aa45a3e1	Update README.md	2021-08-16 15:27:10 -04:00
Donald Cheng Hong Zou	b7a047a743	Bug fixed	2021-08-16 15:26:15 -04:00
Donald Zou	05ec985453	Update README.md	2021-08-16 12:23:56 -04:00
Donald Cheng Hong Zou	88ed9c3e79	Update README.md	2021-08-15 02:23:35 -04:00
Donald Zou	3fb03c8dfe	Update README.md	2021-08-15 00:16:36 -04:00
Donald Zou	ff304027cd	Merge pull request #46 from donaldzou/v2.2-beta V2.2 pull request	2021-08-14 23:57:07 -04:00
Donald Cheng Hong Zou	3140d46c94	Finalizing the documentation	2021-08-14 23:43:30 -04:00
Donald Cheng Hong Zou	9d476af384	v2.2beta almost done!!!!!	2021-08-14 23:30:05 -04:00
Donald Cheng Hong Zou	0d380672f3	v2.2 beta 4	2021-08-14 17:13:16 -04:00
Donald Cheng Hong Zou	e2fb8dca5b	Update README.md	2021-08-06 00:08:30 -04:00
Donald Cheng Hong Zou	eaba4c90c5	Edit Readme	2021-08-06 00:00:32 -04:00
Donald Cheng Hong Zou	b4ca7373f3	Update Readme	2021-08-05 23:47:18 -04:00
Donald Cheng Hong Zou	905c068ed5	v2.2-beta4 Finished testing the QR code function and finish debugging the peer file download function.	2021-08-05 23:15:50 -04:00
Donald Cheng Hong Zou	02886dd420	Remove public and private key txt	2021-08-05 01:39:32 -04:00
Donald Cheng Hong Zou	5bf7754d6c	Update README.md	2021-08-05 01:21:44 -04:00
Donald Cheng Hong Zou	7a0a3055c4	Update README.md	2021-08-05 01:16:22 -04:00
Donald Cheng Hong Zou	bf73efb3b4	Update README.md	2021-08-05 01:15:17 -04:00
Donald Cheng Hong Zou	b4da212158	Update README.md	2021-08-05 01:07:10 -04:00
Donald Cheng Hong Zou	4a04d42600	v2.2-beta3 Finished QR code function and starting to test.	2021-08-05 00:45:15 -04:00
Donald Cheng Hong Zou	42bbfbe538	v2.2-beta update	2021-08-03 18:45:40 -04:00
Donald Cheng Hong Zou	31ec2430c4	Update README.md	2021-08-03 18:06:43 -04:00
Donald Cheng Hong Zou	f0b56c9f1d	Update README.md	2021-08-03 18:06:22 -04:00
Donald Zou	6f9f01c991	Update README.md	2021-07-12 16:35:07 -04:00
Donald Cheng Hong Zou	b822ccb19d	Update README.md	2021-07-11 13:07:27 -04:00
Donald Zou	dcb11671f3	Update README.md	2021-07-11 12:49:58 -04:00
Donald Zou	282599d36f	Update README.md	2021-07-05 16:09:02 -04:00
Donald Zou	f11acdc68f	Update README.md	2021-07-05 15:35:23 -04:00
Donald Zou	971e127cfd	Update README.md	2021-07-03 10:30:54 -04:00
Donald Zou	9b2c59d529	Delete wg0.conf	2021-07-02 14:35:34 -04:00
Donald Zou	14dc049a66	Update README.md	2021-07-02 14:31:33 -04:00
Donald Zou	d3d0e7c615	Merge pull request #24 from donaldzou/v2.1-beta v2.1 Merge	2021-07-02 13:28:36 -04:00
Donald Zou	89423ccb8b	Merge branch 'main' into v2.1-beta	2021-07-02 13:28:29 -04:00
Donald Cheng Hong Zou	746f31f70c	Update README.md	2021-07-02 13:25:35 -04:00
Donald Cheng Hong Zou	3aa9eab2bd	Commit June 2	2021-07-02 13:23:04 -04:00
Donald Zou	1bcc8fed5e	Update README.md	2021-07-02 12:00:12 -04:00
Donald Zou	1213a030e3	Update README.md	2021-05-13 19:54:37 -04:00
Donald Zou	3b2344b477	Delete .github/workflows directory	2021-05-13 19:51:54 -04:00
Donald Zou	c53b0fe2d4	Create main.yml	2021-05-13 19:38:22 -04:00
Donald Cheng Hong Zou	0a92269456	v2.0-beta-6 Commit	2021-05-13 18:47:59 -04:00
Donald Cheng Hong Zou	1cb8906893	v2.0-beta-6 Commit	2021-05-13 18:21:10 -04:00
Donald Cheng Hong Zou	f76579fe5e	v2.0-beta-6 Commit	2021-05-13 18:00:40 -04:00
Donald Zou	db05ff5e98	Update README.md	2021-05-08 12:35:22 -04:00
Donald Zou	a05d6979ec	Update README.md	2021-05-07 15:27:37 -04:00
Donald Zou	be40d17172	Update README.md	2021-05-07 15:25:23 -04:00
Donald Zou	9e11339979	Update README.md	2021-05-06 11:20:28 -04:00
Donald Zou	a56129afe0	Update README.md	2021-05-05 17:25:23 -04:00
Donald Zou	8933ea999c	Update README.md	2021-05-05 15:52:13 -04:00
Donald Zou	ae3b8f6494	Merge pull request #19 from donaldzou/v2.0-beta-6 v2.0 merge to main	2021-05-05 15:29:41 -04:00
Donald Cheng Hong Zou	33487ee03f	v2.0-beta-6 Commit	2021-05-05 15:16:32 -04:00
Donald Cheng Hong Zou	58ecae1162	v2.0-beta-6 Commit	2021-05-05 15:09:34 -04:00
Donald Cheng Hong Zou	8777da10e4	v2.0-beta-1 Commit	2021-05-05 14:59:00 -04:00
Donald Zou	4ea971c1b9	v2.0-beta-1 Commit	2021-05-05 14:52:28 -04:00
Donald Cheng Hong Zou	0fa4759c3a	Update	2021-05-05 14:38:10 -04:00
Donald Cheng Hong Zou	fe7b9730d3	Update README.md	2021-05-04 21:41:13 -04:00
Donald Cheng Hong Zou	040f6a8393	Commit	2021-05-04 21:26:40 -04:00
Donald Cheng Hong Zou	b17575b197	Update requirements.txt	2021-05-04 15:55:52 -04:00
Donald Cheng Hong Zou	dee4f757e7	Upload README pictures	2021-05-04 15:42:04 -04:00
Donald Cheng Hong Zou	5ae08d02ab	Merge branch 'main' of https://github.com/donaldzou/Wireguard-Dashboard into main	2021-05-04 02:10:32 -04:00
Donald Cheng Hong Zou	b83aec4965	v2.0-beta-2 Commit	2021-05-04 02:10:06 -04:00
Donald Zou	68c4837780	Merge pull request #18 from donaldzou/testing Update .gitignore	2021-05-04 01:39:51 -04:00
Donald Cheng Hong Zou	46fe5e99fe	Update .gitignore	2021-05-04 01:39:32 -04:00
Donald Zou	9ffb537cfb	Delete wg-dashboard.ini	2021-05-04 01:39:14 -04:00
Donald Zou	cc7e6f852d	Merge pull request #17 from donaldzou/testing v2.0-beta1 Merge	2021-05-04 01:37:27 -04:00
Donald Cheng Hong Zou	f83e99c62c	Merge branch 'testing' of https://github.com/donaldzou/Wireguard-Dashboard into testing	2021-05-04 01:36:32 -04:00
Donald Zou	bc8b8e7982	v2.0-beta-1 Commit	2021-05-04 01:32:34 -04:00
Donald Zou	3b761ca2a8	Update README.md	2021-05-04 01:20:20 -04:00
Donald Cheng Hong Zou	edc21f9830	Update README.md	2021-04-12 23:18:57 -04:00
Donald Cheng Hong Zou	d025ec4dff	Push Logo	2021-04-12 23:16:12 -04:00
Donald Cheng Hong Zou	ab334a393f	Logo	2021-04-12 23:15:53 -04:00
Donald Cheng Hong Zou	2a9044086f	Push Logo	2021-04-12 23:14:53 -04:00
Donald Zou	c3038ec60c	Merge pull request #14 from donaldzou/all-contributors/add-tonjo docs: add tonjo as a contributor	2021-04-12 22:30:23 -04:00
allcontributors[bot]	0fa827ba00	docs: update .all-contributorsrc [skip ci]	2021-04-13 02:29:48 +00:00
allcontributors[bot]	26002fc372	docs: update README.md [skip ci]	2021-04-13 02:29:47 +00:00
Donald Zou	59acba8c08	Update README.md	2021-04-12 22:29:00 -04:00
Donald Zou	4c5ee45fdb	Update README.md	2021-04-12 22:28:30 -04:00
Donald Zou	6062120d0d	Merge pull request #13 from donaldzou/all-contributors/add-antonioag95 docs: add antonioag95 as a contributor	2021-04-12 22:27:54 -04:00
allcontributors[bot]	cd3ffb2126	docs: create .all-contributorsrc [skip ci]	2021-04-13 02:26:56 +00:00
allcontributors[bot]	a8c11cc445	docs: update README.md [skip ci]	2021-04-13 02:26:55 +00:00
Donald Zou	fcb89aac6b	Update README.md	2021-04-12 11:05:19 -04:00
Donald Zou	3704d8f6e7	Merge pull request #11 from tonjo/patch-1 Avoid error when `AllowedIPs` is not defined for a peer.	2021-04-12 11:01:38 -04:00
Donald Zou	8c75d172c5	Update issue templates	2021-04-10 12:49:34 -04:00
Donald Zou	5687302081	Update issue templates	2021-04-10 12:47:18 -04:00
Donald Zou	9020b16a9a	Update README.md	2021-04-10 00:49:32 -04:00
tonjo	d5462df4da	Update dashboard.py	2021-04-09 11:15:25 +02:00
tonjo	9021ca31af	Avoid error when AllowedIps is not defined	2021-04-09 11:08:41 +02:00
Donald Zou	83cb8b7f03	Update README.md	2021-04-09 00:42:42 -04:00
Donald Cheng Hong Zou	baf2658eb8	v20210409	2021-04-09 00:07:37 -04:00
Donald Zou	3f19b05d28	Update README.md	2021-04-07 17:25:21 -04:00
Donald Zou	5e6be1f830	Update README.md	2021-04-07 15:58:00 -04:00
Donald Zou	14d1a3038f	Update README.md	2021-04-07 12:19:23 -04:00
Donald Zou	6a15e2e587	Update README.md	2021-04-07 12:15:45 -04:00
Donald Zou	0679805728	Update README.md	2021-04-07 12:01:35 -04:00
Donald Zou	62a03419a5	Update README.md	2021-04-07 11:52:24 -04:00
Donald Zou	81f6b0767e	Update README.md	2021-04-07 11:52:03 -04:00
Donald Zou	c7ca5c749b	Update README.md	2021-04-06 19:52:33 -04:00
Donald Zou	1daac09b7c	Update README.md	2021-04-06 19:51:50 -04:00
Donald Zou	4d3dd68ac0	Merge pull request #5 from antonioag95/main - Fixed a bug where a peer without last handshake date was showing wrong date in UI - Hidden and temp `.conf` files will be excluded from interfaces list	2021-04-06 19:43:52 -04:00
Donald Zou	de9e4a6270	Update README.md	2021-04-06 16:51:37 -04:00
Donald Zou	bf8f347245	Update README.md	2021-04-06 15:03:49 -04:00
Donald Zou	a70d09ac7a	Update README.md	2021-04-06 10:14:11 -04:00
Donald Zou	919b344da4	Update README.md	2021-04-05 22:41:55 -04:00
antonioag95	44f013a678	Update dashboard.py - Fixed a bug where a peer without last handshake date was showing wrong date in webui - Hidden and temp conf files will be excluded from interfaces list	2021-04-03 23:48:07 +02:00
Donald Zou	742191111b	Merge pull request #4 from donaldzou/v20210403-alpha v20210403 Bug Fixed	2021-04-03 14:31:11 -04:00
Donald Cheng Hong Zou	8dc0031475	Update dashboard.py	2021-04-03 14:30:02 -04:00
Donald Cheng Hong Zou	19fb90a300	Update dashboard.py	2021-04-03 14:10:07 -04:00
Donald Cheng Hong Zou	0c3960d8d9	Commit	2021-04-03 14:06:21 -04:00
				`@@ -1 +0,0 @@`
				!function(a){"use strict";function l(t,e){this.$element=a(t),this.options=a.extend({},this.defaults(),e),this.render()}l.VERSION="3.6.0",l.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"light",size:"normal",style:"",width:null,height:null},l.prototype.defaults=function(){return{on:this.$element.attr("data-on")\|\|l.DEFAULTS.on,off:this.$element.attr("data-off")\|\|l.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")\|\|l.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")\|\|l.DEFAULTS.offstyle,size:this.$element.attr("data-size")\|\|l.DEFAULTS.size,style:this.$element.attr("data-style")\|\|l.DEFAULTS.style,width:this.$element.attr("data-width")\|\|l.DEFAULTS.width,height:this.$element.attr("data-height")\|\|l.DEFAULTS.height}},l.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var t="large"===this.options.size\|\|"lg"===this.options.size?"btn-lg":"small"===this.options.size\|\|"sm"===this.options.size?"btn-sm":"mini"===this.options.size\|\|"xs"===this.options.size?"btn-xs":"",e=a('<label for="'+this.$element.prop("id")+'" class="btn">').html(this.options.on).addClass(this._onstyle+" "+t),s=a('<label for="'+this.$element.prop("id")+'" class="btn">').html(this.options.off).addClass(this._offstyle+" "+t),o=a('<span class="toggle-handle btn btn-light">').addClass(t),i=a('<div class="toggle-group">').append(e,s,o),l=a('<div class="toggle btn" data-toggle="toggle" role="button">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(t).addClass(this.options.style);this.$element.wrap(l),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:e,$toggleOff:s,$toggleGroup:i}),this.$toggle.append(i);var n=this.options.width\|\|Math.max(e.outerWidth(),s.outerWidth())+o.outerWidth()/2,h=this.options.height\|\|Math.max(e.outerHeight(),s.outerHeight());e.addClass("toggle-on"),s.addClass("toggle-off"),this.$toggle.css({width:n,height:h}),this.options.height&&(e.css("line-height",e.height()+"px"),s.css("line-height",s.height()+"px")),this.update(!0),this.trigger(!0)},l.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},l.prototype.on=function(t){if(this.$element.prop("disabled"))return!1;this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),t\|\|this.trigger()},l.prototype.off=function(t){if(this.$element.prop("disabled"))return!1;this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),t\|\|this.trigger()},l.prototype.enable=function(){this.$toggle.removeClass("disabled"),this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},l.prototype.disable=function(){this.$toggle.addClass("disabled"),this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},l.prototype.update=function(t){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(t):this.off(t)},l.prototype.trigger=function(t){this.$element.off("change.bs.toggle"),t\|\|this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},l.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var t=a.fn.bootstrapToggle;a.fn.bootstrapToggle=function(o){var i=Array.prototype.slice.call(arguments,1)[0];return this.each(function(){var t=a(this),e=t.data("bs.toggle"),s="object"==typeof o&&o;e\|\|t.data("bs.toggle",e=new l(this,s)),"string"==typeof o&&e[o]&&"boolean"==typeof i?e[o](i):"string"==typeof o&&e[o]&&e[o]()})},a.fn.bootstrapToggle.Constructor=l,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=t,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(t){a(this).find("input[type=checkbox]").bootstrapToggle("toggle"),t.preventDefault()})}(jQuery);