Skip to content

Commit

Permalink
Merge pull request #3 from dwilding/dev
Browse files Browse the repository at this point in the history
Updates for release v.07
  • Loading branch information
dwilding authored Oct 27, 2024
2 parents 63c5884 + 19f9f66 commit dbd0a2e
Show file tree
Hide file tree
Showing 18 changed files with 260 additions and 113 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ To install Frogtab on your own server:

2. Enter the following commands:

```sh
```
git clone https://github.com/dwilding/frogtab.git
cd frogtab
./dev_build_server.sh
Expand Down Expand Up @@ -167,6 +167,7 @@ For details, see [LICENSE_openpgp](LICENSE_openpgp).
| Date | Change | Available in Server | Frogtab Local Version |
| --- | --- | --- | --- |
| Oct 27, 2024 | You can now send tasks to Frogtab via a terminal, without registering for a personal link | No | v1.07 |
| Oct 18, 2024 | You can now stop Frogtab Local via your browser. See the bottom of the help page | No | v1.06 |
| Oct 18, 2024 | Reorganized the menu to always show Achievements. Removed Send to Frogtab from the menu | Yes | v1.06 |
| Oct 18, 2024 | Reorganized the help page and explained Achievements in a more approachable way | Yes | v1.06 |
Expand Down
2 changes: 1 addition & 1 deletion app/achievements.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="favicons/icon-180-apple.png">
<link rel="manifest" href="manifest.webmanifest">
<link rel="stylesheet" href="simple.min.css?sha1=7217da6f3e55e123bd9e735d928d8aaf05afc5a2">
<link rel="stylesheet" href="simple-customizations.css?sha1=8ea27f16ee29df158a92d2cf4b95e3c19182b5ea">
<link rel="stylesheet" href="simple-customizations.css?sha1=37543e3ca2e575b95d9a8fbc5cbc62e9b678bfa7">
</head>
<body>
<header>
Expand Down
66 changes: 55 additions & 11 deletions app/help.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="favicons/icon-180-apple.png">
<link rel="manifest" href="manifest.webmanifest">
<link rel="stylesheet" href="simple.min.css?sha1=7217da6f3e55e123bd9e735d928d8aaf05afc5a2">
<link rel="stylesheet" href="simple-customizations.css?sha1=8ea27f16ee29df158a92d2cf4b95e3c19182b5ea">
<link rel="stylesheet" href="simple-customizations.css?sha1=37543e3ca2e575b95d9a8fbc5cbc62e9b678bfa7">
</head>
<body>
<header>
Expand Down Expand Up @@ -58,6 +58,7 @@ <h1>Frogtab Help</h1>
<li><a tabindex="0" href="#completion-commands">Completion commands</a></li>
<li><a tabindex="0" href="#customizing-the-tab-icon">Customizing the tab icon</a></li>
<li><a tabindex="0" href="#changing-the-theme">Changing the theme</a></li>
<li class="service-save-only"><a tabindex="0" href="#sending-tasks-via-a-terminal">Sending tasks via a terminal</a></li>
</ul>
</article>
<h2 id="overview-of-frogtab">Overview of Frogtab</h2>
Expand Down Expand Up @@ -110,12 +111,14 @@ <h2 id="adding-tasks-to-your-inbox">Adding tasks to your inbox</h2>
Open <a tabindex="0" href="send" target="_blank">Send to Frogtab</a> in a new tab, then write down the task and click the send button.
This method is great if you want to capture the task without revealing your inbox (e.g., during a meeting).
</p>
<p class="service-save-only">
You can also <a tabindex="0" href="#sending-tasks-via-a-terminal" title="Sending tasks via a terminal">send tasks to Frogtab via a terminal</a>.
</p>
</li>
</ul>
<p>
These methods don't work from other devices.
To capture tasks from other devices, first register for a personal link.
To learn more, see <a tabindex="0" href="#registering-for-a-personal-link">Registering for a personal link</a>.
To send tasks from other devices, first <a tabindex="0" href="#registering-for-a-personal-link" title="Registering for a personal link">register for a personal link</a>.
</p>
<h2 id="triaging-your-inbox">Triaging your inbox</h2>
<p>
Expand Down Expand Up @@ -425,7 +428,7 @@ <h2 id="exporting-your-data">Exporting your data</h2>
To enable automatic backups, select a backup method:
</p>
<div>
<select id="save-method">
<select tabindex="0" id="save-method">
<option value="none" selected>None</option>
</select>
</div>
Expand Down Expand Up @@ -702,6 +705,40 @@ <h2 id="changing-the-theme">Changing the theme</h2>
</div>
</div>
</div>
<div class="service-save-only">
<h2 id="sending-tasks-via-a-terminal">Sending tasks via a terminal</h2>
<p>
As an alternative to using <a tabindex="0" href="send" target="_blank">Send to Frogtab</a>,
you can send tasks to Frogtab via a terminal. To enable this feature:
</p>
<ol>
<li>
<p>
Choose a label for Frogtab.
For example, <code>work</code> or <code>personal</code>.
</p>
</li>
<li>
<p>
Modify the URL of Frogtab to include the label.
For example, <code><span class="origin">http://127.0.0.1:5000</span>/#work</code>.
</p>
</li>
</ol>
<p>
To send a task to Frogtab, use <code>python send.py</code>.
For example:
</p>
<pre><code>python send.py work "Record a new product demo"</code></pre>
<p>
The task will appear in your inbox after a few seconds.
</p>
<p>
You can't use <code>python send.py</code> to send tasks from other devices.
To send tasks from other devices, first <a tabindex="0" href="#registering-for-a-personal-link" title="Registering for a personal link">register for a personal link</a>,
then <a tabindex="0" href="https://maybecoding.bearblog.dev/making-a-command-line-tool-for-your-frogtab-personal-link/" target="_blank">make a command-line tool for your personal link</a>.
</p>
</div>
</main>
<footer>
<p>
Expand Down Expand Up @@ -956,7 +993,7 @@ <h2 id="changing-the-theme">Changing the theme</h2>
async function fetchSaveMethods() {
let response;
try {
response = await fetch("save/get-methods");
response = await fetch("service/get-methods");
}
catch (err) {
return;
Expand Down Expand Up @@ -984,18 +1021,18 @@ <h2 id="changing-the-theme">Changing the theme</h2>
verify();
updateSelectedTheme();
setAchievements();
if (document.documentElement.getAttribute("data-save") == "service") {
if (usingLocalService) {
fetchSaveMethods();
document.getElementById("action-stop-service").addEventListener("click", async event => {
event.preventDefault();
try {
await fetch("save/post-stop", {
await fetch("service/post-stop", {
method: "POST"
});
}
catch (err) {}
await delayForUX(() => {
document.getElementById("stop-service").innerText = "Stopping…";
document.getElementById("stop-service").textContent = "Stopping…";
});
document.getElementById("stop-service").remove();
});
Expand Down Expand Up @@ -1053,7 +1090,7 @@ <h2 id="changing-the-theme">Changing the theme</h2>
}
else {
dom.register.disabled = false;
dom.register.innerText = "Register This Device";
dom.register.textContent = "Register This Device";
}
dom.register.addEventListener("click", () => {
register();
Expand Down Expand Up @@ -1126,7 +1163,7 @@ <h2 id="changing-the-theme">Changing the theme</h2>
document.documentElement.setAttribute("data-theme", localStorage.getItem("ui.theme"));
updateSelectedTheme();
setAchievements();
if (document.documentElement.getAttribute("data-save") == "service") {
if (usingLocalService) {
setSaveMethod();
}
if (
Expand Down Expand Up @@ -1186,10 +1223,17 @@ <h2 id="changing-the-theme">Changing the theme</h2>
// ^ If serverBase is absolute, gets hostname from serverBase
// If serverBase is relative, gets hostname from window.location.origin
for (const element of document.querySelectorAll(".server-hostname")) {
element.innerText = serverHostname;
element.textContent = serverHostname;
}
for (const element of document.querySelectorAll(".origin")) {
element.textContent = window.location.origin;
}
let verifiedUser = false;
let openpgp;
let usingLocalService = false;
if (document.documentElement.getAttribute("data-save") == "service") {
usingLocalService = true;
}
startApp();
</script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion app/icon-normal.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
</div>
</div>
</div>
<script src="main.js?sha1=762a08965274f6dfc19ad1d818caae9863ac1cda"></script>
<script src="main.js?sha1=108795555fded7832703d55a29ec2da76ec16ab8"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion app/icon-notify.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
</div>
</div>
</div>
<script src="main.js?sha1=762a08965274f6dfc19ad1d818caae9863ac1cda"></script>
<script src="main.js?sha1=108795555fded7832703d55a29ec2da76ec16ab8"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@
</div>
</div>
</div>
<script src="main.js?sha1=762a08965274f6dfc19ad1d818caae9863ac1cda"></script>
<script src="main.js?sha1=108795555fded7832703d55a29ec2da76ec16ab8"></script>
</body>
</html>
Loading

0 comments on commit dbd0a2e

Please sign in to comment.