Skip to content

Commit a2d0886

Browse files
author
greg@ksv3-prod-server
committed
adding docker files
1 parent d130503 commit a2d0886

8 files changed

Lines changed: 49 additions & 15 deletions

File tree

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.43.26
1+
0.43.31

client/src/hooks/app/usePinnedInterface.hook.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { cloneDeep, isBoolean } from "lodash-es";
12
import { getApi } from "../api/api.hook";
23
import { useBackendState } from "../useBackendState.hook"
34
import React, { useEffect, useState } from 'react';
@@ -17,10 +18,6 @@ export const usePinStatus= () => {
1718

1819
useEffect(() => {
1920
refreshPinStatus()
20-
// getApi(api => {
21-
// if (api.userSettings.get("beta_floating_windows") === true) return
22-
// updatePinStatus("bottomBar")(false)
23-
// })
2421
},[])
2522

2623
const updatePinStatus = (key: pinStatusKey) => (value: boolean) => {
@@ -37,9 +34,13 @@ export const usePinStatus= () => {
3734
[key]: !pinStatus[key]
3835
})
3936
}
37+
38+
console.log('usePinStatus', pinStatus)
39+
let pinStatus2 = (!isBoolean(pinStatus.topTab) && !isBoolean(pinStatus.bottomBar)) ? { topTab: true, bottomBar: true } : cloneDeep(pinStatus)
40+
console.log('usePinStatus2', pinStatus2)
4041

4142
return {
42-
pinStatus,
43+
pinStatus:pinStatus2,
4344

4445
updatePinStatus,
4546
togglePinStatus,

client/src/hooks/useBackendState.hook.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export function useBackendState<T>(
7575
api.file.getContent(pathToNote, raw => {
7676
let obj:any = undefined
7777

78-
if (raw === "NO_FILE") obj = undefined
78+
if (raw === "NO_FILE") obj = {}
7979
else {
8080
try {
8181
obj = JSON.parse(raw)
@@ -84,7 +84,7 @@ export function useBackendState<T>(
8484
}
8585
}
8686

87-
if (obj !== undefined && raw === "NO_FILE") {
87+
if (obj !== undefined) {
8888
if(opts?.debug === true) console.log(`[BACKEND STATE] refreshValFromBackend: ${key} => `, obj);
8989
setStoredValue(obj);
9090
hasBackendLoadedRef.current = true

docs/blog/sitemap.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@
5757
</url>
5858

5959
<url>
60-
<loc>https://tiro-notes.org/blog/tags/release/</loc>
60+
<loc>https://tiro-notes.org/blog/tags/productivity/</loc>
6161
<lastmod>2023-10-14</lastmod>
6262
</url>
6363

6464
<url>
65-
<loc>https://tiro-notes.org/blog/tags/changelog/</loc>
65+
<loc>https://tiro-notes.org/blog/tags/omnibox/</loc>
6666
<lastmod>2023-10-14</lastmod>
6767
</url>
6868

6969
<url>
70-
<loc>https://tiro-notes.org/blog/tags/productivity/</loc>
70+
<loc>https://tiro-notes.org/blog/tags/task-management/</loc>
7171
<lastmod>2023-10-14</lastmod>
7272
</url>
7373

7474
<url>
75-
<loc>https://tiro-notes.org/blog/tags/omnibox/</loc>
75+
<loc>https://tiro-notes.org/blog/tags/release/</loc>
7676
<lastmod>2023-10-14</lastmod>
7777
</url>
7878

7979
<url>
80-
<loc>https://tiro-notes.org/blog/tags/task-management/</loc>
80+
<loc>https://tiro-notes.org/blog/tags/changelog/</loc>
8181
<lastmod>2023-10-14</lastmod>
8282
</url>
8383
</urlset>

platforms/docker/Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Start from Ubuntu
2+
FROM ubuntu
3+
# Install dependencies (Node.js, npm, ripgrep, pandoc)
4+
RUN apt-get update -y && \
5+
apt-get install -y \
6+
curl \
7+
git \
8+
ripgrep \
9+
pandoc \
10+
nodejs\
11+
npm
12+
RUN npm install -g tiro-notes@develop
13+
# Set working directory
14+
WORKDIR /app
15+
16+
# Default command: Start http-server on port 8080
17+
# CMD ["ls"]
18+
# CMD ["echo", "helloworld", ">", "test"]
19+
# CMD ["tiro-notes"]
20+
# CMD ["npx", "http-server", "-p", "8080", "--host", "0.0.0.0"]
21+
CMD ["npx", "tiro-notes@develop"]
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
services:
2+
app:
3+
build:
4+
context: .
5+
dockerfile: Dockerfile
6+
# command: sleep infinity
7+
ports:
8+
- "3023:3023" # Map host:container port for http-server
9+
volumes:
10+
- ./:/app
11+
working_dir: /app
12+
# tty: true

platforms/npm-cli-module/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tiro-notes",
3-
"version": "0.43.26",
3+
"version": "0.43.31",
44
"description": "Tiro Notes CLI to start Tiro Notes from the command line!",
55
"scripts": {
66
"dev": "ISDEV=true node cli.js",

shared/shared.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { sharedStrings } from './shared.strings'
22
// THIRD LINE AUTOMATICALLY GENERATED, SHOULD ALWAYS BE THE THIRD LINE!
3-
const version = "0.43.26";
3+
const version = "0.43.31";
44
// END OF AUTOMATICALLY GENERATED BLOCK
55

66
export const sharedConfig = {

0 commit comments

Comments
 (0)