Include MerlinAU Add-on WebUI

[ExtremeFiretop]

PoC to include MerlinAU Add-on WebUI

[ExtremeFiretop]

@Martinski4GitHub

Just a friendly check in, are you thinking we are good to merge this in for tomorrow or was there anything outstanding you wanted to add or double check?

Let me know, if we are in the clear still on both our sides I'll merge this into dev tomorrow evening.

[ExtremeFiretop]

Or we could do it Saturday, your call, ideally your around when we merge it into dev for a good review from both of us before we do

[Martinski4GitHub]

@Martinski4GitHub

Just a friendly check in, are you thinking we are good to merge this in for tomorrow or was there anything outstanding you wanted to add or double check?

Let me know, if we are in the clear still on both our sides I'll merge this into dev tomorrow evening.

Apologies for the delayed response. I've been very busy the past few days, and yesterday evening after an early dinner, I went to the couch to watch some TV and fell asleep right away. I didn't wake up until almost midnight and finally went straight to bed to sleep again, like a baby...LOL!! I came home from work about 20 minutes ago, and I was going to take a half-hour nap before dinner to "recharge" a little bit. It's been a long work week.

Anyway, I'm good to merge the WebGUI into the development branch, either tonight or tomorrow. Either way is fine with me. I have nothing else left to tweak or improve for this Beta release.

[ExtremeFiretop]

@Martinski4GitHub
Just a friendly check in, are you thinking we are good to merge this in for tomorrow or was there anything outstanding you wanted to add or double check?
Let me know, if we are in the clear still on both our sides I'll merge this into dev tomorrow evening.

Apologies for the delayed response. I've been very busy the past few days, and yesterday evening after an early dinner, I went to the couch to watch some TV and fell asleep right away. I didn't wake up until almost midnight and finally went straight to bed to sleep again, like a baby...LOL!! I came home from work about 20 minutes ago, and I was going to take a half-hour nap before dinner to "recharge" a little bit. It's been a long work week.

Anyway, I'm good to merge the WebGUI into the development branch, either tonight or tomorrow. Either way is fine with me. I have nothing else left to tweak or improve for this Beta release.

Oh buddy I feel that message, been there done that!

I've been pretty busy myself, not so busy that I've been passing out right after work. But I'm sure that's apart of the fun of the recent promotion 😜 luckily I get the next week off from work for my birthday I decided I'd take next week off.

If your good tonight then I can merge into dev and make a post tonight, otherwise I'm also available tomorrow evening so no matter to me! Just wanted to be sure when we both had time to really review this open PR and confirm we are happy.

I joked with Tom the other day that I was happy with the WebUI about 3 PRs ago! 😉😅 Your just too good at finding things to improve! At this point I'm ready to let the people try it if they want it and let that feedback shape the rest.

Of course, if you have anything on your to do list remaining I won't stop you! Just my list all has green check marks on my side!

[Martinski4GitHub]

@Martinski4GitHub
Just a friendly check in, are you thinking we are good to merge this in for tomorrow or was there anything outstanding you wanted to add or double check?
Let me know, if we are in the clear still on both our sides I'll merge this into dev tomorrow evening.

Apologies for the delayed response. I've been very busy the past few days, and yesterday evening after an early dinner, I went to the couch to watch some TV and fell asleep right away. I didn't wake up until almost midnight and finally went straight to bed to sleep again, like a baby...LOL!! I came home from work about 20 minutes ago, and I was going to take a half-hour nap before dinner to "recharge" a little bit. It's been a long work week.
Anyway, I'm good to merge the WebGUI into the development branch, either tonight or tomorrow. Either way is fine with me. I have nothing else left to tweak or improve for this Beta release.

Oh buddy I feel that message, been there done that!

I've been pretty busy myself, not so busy that I've been passing out right after work. But I'm sure that's apart of the fun of the recent promotion 😜

Yeah, this line of work is certainly not a regular 8-to-5 type of job. I rarely work only 8 hours a day; more often than not it's at least 9 hours per day, and sometimes 10 or 11 hours when necessary to meet a deadline or investigate some odd, intermittent bug that keeps eluding us. But I cannot complain - it pays well, I enjoy doing it, and it challenges me so it keeps things interesting.😉

... luckily I get the next week off from work for my birthday I decided I'd take next week off.

Well, here's an early Happy Birthday wish for you, buddy!!! 🥳 🎂

If your good tonight then I can merge into dev and make a post tonight, otherwise I'm also available tomorrow evening so no matter to me! Just wanted to be sure when we both had time to really review this open PR and confirm we are happy.

Yeah, tonight is good. While making the last few PRs this past week, I have also reviewed the code and I'm happy with it as it is. The Linter tool came back with "clean code" (i.e. no reported errors at all). So, AFAIC, we are good to go LIVE!!!!

I joked with Tom the other day that I was happy with the WebUI about 3 PRs ago! 😉😅 Your just too good at finding things to improve! At this point I'm ready to let the people try it if they want it and let that feedback shape the rest.

Yeah, exactly. We'll take user feedback as a guide for what needs improvement or more tweaking, or fixing.

Of course, if you have anything on your to do list remaining I won't stop you! Just my list all has green check marks on my side!

Let it rip!!!! 👍

P.S.
I'm going offline in a few minutes to get some dinner, chat with my wife, help with the dishes, etc. I'll come back in about an hour and a half.

[ExtremeFiretop]

Yeah, this line of work is certainly not a regular 8-to-5 type of job. I rarely work only 8 hours a day; more often than not it's at least 9 hours per day, and sometimes 10 or 11 hours when necessary to meet a deadline or investigate some odd, intermittent bug that keeps eluding us. But I cannot complain - it pays well, I enjoy doing it, and it challenges me so it keeps things interesting.😉

I always thought I was well compensated, until I recently learned my salary in USD is only about 82K USD :(
The life of a public servant; private here would pay me more but I always figured the benefits and job security balanced it out.

But apparently Technical Advisors like myself (I specifically advise in VPN and Citrix technologies) in the US Gov would easily be much more, so that puts things into perspective, makes me want to start finding a place in New York to move too. xD Across the boarder but close enough for a drive to the family on holidays ;)

Well, here's an early Happy Birthday wish for you, buddy!!! 🥳 🎂

THANK YOU! Turning 29. I don't even want to think about 30.... In my mind i'm still the 19-21 year old that was drinking and partying in college! Then I realize i did things like buy my girlfriend a car and realize how much I've aged.

[ExtremeFiretop]

@Martinski4GitHub

Updating the Wiki and drafting a post now.

[ExtremeFiretop]

Please review new FAQ question 26:

https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140

I also just updated FAQ question 2.
I had updated FAQ question 13 last week.

[ExtremeFiretop]

Updated the readme. Going to have dinner and work on drafting the post next.

[ExtremeFiretop]

Post is drafted and found below for your review:

Hi everyone!

Happy to officially announce that the new MerlinAU 1.4.0 version with WebUI support has now been merged into the development branch and is available for Beta testing.

What this means:

1. As previously mentioned, if you wish to update to the latest 1.4.0 Beta version, you MUST have version 1.3.10 already installed. Please update first to the latest 1.3.10 production release before attempting to upgrade to the 1.4.0 Beta version.

2. You may now test the WebUI and report any bugs or issues you identify. We ask that anyone testing the 1.4.0 Beta version open issues on our GitHub repository as 1.4.0 has not been officially released into production yet.

3. The WebUI is still in the "Beta" stage so currently under active development. Changes can happen quickly without any notice after any reported issues. Any recent changes can be obtained with a forced update via the following command:

/jffs/scripts/MerlinAU.sh forceupdate

4. At any point, you can roll back to the production version of MerlinAU by switching to the main branch and then rebooting the router.

The development branch is controlled by the "develop" parameter.

To switch to the development branch use the following command:

sh /jffs/scripts/MerlinAU.sh develop

To switch back to the production stable branch, use the following command:

sh /jffs/scripts/MerlinAU.sh stable

Thanks and happy testing!

Probably time to remove this as well:

##FOR TESTING/DEBUG ONLY##
if true ; then SCRIPT_BRANCH="WebFun" ; fi
##FOR TESTING/DEBUG ONLY##

Edit my bad. We didn't merge it yet! Expected behavior

[Martinski4GitHub]

Please review new FAQ question 26:

https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140

I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Reviewing it now...

[Martinski4GitHub]

Please review new FAQ question 26:

https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140

I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Review was completed with some revisions.

[ExtremeFiretop]

Please review new FAQ question 26:
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140
I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Review was completed with some revisions.

Looking good! 👍 I removed the reference to WebFun, we are good to merge!

[Martinski4GitHub]

Post is drafted and found below for your review:

Hi everyone!
Happy to report a friendly FYI that Martinski and I have now merged MerlinAU version 1.4.0 with the long awaited WebUI into the development branch.
I know many of you have been eager to test this with us.
-What this means:

1. As previously mentioned, if you choose to update the version 1.4.0; you MUST be already on version 1.3.10. Please update to version 1.3.10 before attempting to test version 1.4.0.
2. You may now test the WebUI with us and report any active bugs or issues identified. We please ask that anyone that installs 1.4.0 please open issues on our Github as 1.4.0 is not officially released into production yet.
3. The WebUI is now considered "beta" stage; but is still under active development. Changes can happen quickly without any notice after any reported issues. Any changes can be pushed down with a forced update through MerlinAU (Main menu --> option "up")
4. At any point, you can rollback to the production version of MerlinAU by switching to the main branch.

The development branch is still controlled by the "develop" parameter; more info below:
To switch to the development branch use the following command:
[CODE]sh /jffs/scripts/MerlinAU.sh develop[/CODE]
To switch back to the production branch, use the following command:
[CODE]sh /jffs/scripts/MerlinAU.sh stable[/CODE]
Thanks and happy testing!

Reviewing the above now.

[Martinski4GitHub]

Post is drafted and found below for your review:

Hi everyone!
Happy to officially announce that the new MerlinAU 1.4.0 version with WebUI support has now been merged into the development branch and is available for Beta testing.
What this means:

1. As previously mentioned, if you wish to update to the latest 1.4.0 Beta version, you MUST have version 1.3.10 already installed. Please update first to the latest 1.3.10 production release before attempting to upgrade to the 1.4.0 Beta version.
2. You may now test the WebUI and report any bugs or issues you identify. We ask that anyone testing the 1.4.0 Beta version open issues on our GitHub repository as 1.4.0 has not been officially released into production yet.
3. The WebUI is still in the "Beta" stage so currently under active development. Changes can happen quickly without any notice after any reported issues. Any recent changes can be obtained with a forced update via the following command:

/jffs/scripts/MerlinAU.sh forceupdate

4. At any point, you can roll back to the production version of MerlinAU by switching to the main branch and then rebooting the router.

The development branch is controlled by the "develop" parameter.
To switch to the development branch use the following command:

sh /jffs/scripts/MerlinAU.sh develop

To switch back to the production stable branch, use the following command:

sh /jffs/scripts/MerlinAU.sh stable

Thanks and happy testing!

Review was completed with some revisions.

[Martinski4GitHub]

Please review new FAQ question 26:
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140
I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Review was completed with some revisions.

Looking good! 👍 I removed the reference to WebFun, we are good to merge!

Go for it!!

[ExtremeFiretop]

Please review new FAQ question 26:
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140
I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Review was completed with some revisions.

Looking good! 👍 I removed the reference to WebFun, we are good to merge!

Go for it!!

Done and posted! Thanks @Martinski4GitHub !!!

[Martinski4GitHub]

Please review new FAQ question 26:
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140
I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Review was completed with some revisions.

Looking good! 👍 I removed the reference to WebFun, we are good to merge!

And let the good times roll!!!! LOL!! :>)

[ExtremeFiretop]

Please review new FAQ question 26:
https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki#question-26-how-do-i-manage-configuration-changes-when-using-the-new-webui-alongside-the-core-script-in-merlinau-v140
I also just updated FAQ question 2. I had updated FAQ question 13 last week.

Review was completed with some revisions.

Looking good! 👍 I removed the reference to WebFun, we are good to merge!

And let the good times roll!!!! LOL!! :>)

Time to see what we did right, and what we did wrong ;)
Let the fun begin!

[Martinski4GitHub]

4. At any point, you can roll back to the production version of MerlinAU by switching to the main branch and then rebooting the router.

Note that when switching from the Beta 1.4.0 version back to the production 1.3.10 version, a reboot is necessary because the WebGUI hooks are still left behind during the switch, so the reboot "cleans" that up. However, the ASP file will remain inside the script directory but will be dormant.