Pushed version 1.7.4

Author: pawelmalak

.dev/bookmarks_importer.py

@@ -163,5 +163,4 @@ def AddFlameBookmark(website_name, url, cat_id, icon_name):
 
 
 if __name__ == "__main__":
-	FlameBookmarkParser(bookmarks_path)
-
+	FlameBookmarkParser(bookmarks_path)

.env

@@ -1,3 +1,3 @@
 PORT=5005
 NODE_ENV=development
-VERSION=1.7.3
+VERSION=1.7.4

CHANGELOG.md

@@ -1,7 +1,8 @@
-### v1.7.4 (TBA)
+### v1.7.4 (2021-11-08)
 - Added option to set custom greetings and date ([#103](https://github.com/pawelmalak/flame/issues/103))
 - Fallback to web search if local search has zero results ([#129](https://github.com/pawelmalak/flame/issues/129))
 - Added iOS "Add to homescreen" icon ([#131](https://github.com/pawelmalak/flame/issues/131))
+- Added experimental script to import bookmarks ([#141](https://github.com/pawelmalak/flame/issues/141))
 - Added 3 new themes
 
 ### v1.7.3 (2021-10-28)

Dockerfile

@@ -1,6 +1,4 @@
-FROM node:14-alpine as builder
-
-RUN apk update && apk add --no-cache nano curl
+FROM node:14 as builder
 
 WORKDIR /app
 

Dockerfile.multiarch

@@ -1,24 +1,20 @@
-FROM node:14-alpine as builder
-
-RUN apk update && apk add --no-cache nano curl
+FROM node:14 as builder
 
 WORKDIR /app
 
 COPY package*.json ./
 
-RUN apk --no-cache --virtual build-dependencies add python make g++ \
-    && npm install --production
+RUN npm install --production
 
-COPY . .
+COPY . .    
 
 RUN mkdir -p ./public ./data \
     && cd ./client \
     && npm install --production \
     && npm run build \
     && cd .. \
     && mv ./client/build/* ./public \
-    && rm -rf ./client \
-    && apk del build-dependencies
+    && rm -rf ./client
 
 FROM node:14-alpine
 

README.md

@@ -121,21 +121,6 @@ Follow instructions from wiki: [Installation without Docker](https://github.com/
 
 ## Usage
 
-### Import HTML Bookmarks (Experimental)
-- Requirements
-  - Python3
-  - pip packages: Pillow, beautifulsoup4
-- Backup your db.sqlite before running script!
-- Known Issues:
-  - generated icons are sometimes incorrect
-```shell
-
-pip3 install Pillow, beautifulsoup4
-
-cd flame/.dev
-python3 bookmarks_importer.py --bookmarks <path to bookmarks.html> --data <path to flame data folder>
-```
-
 ### Search bar
 
 #### Searching
@@ -216,6 +201,22 @@ metadata:
 
 > "Use Kubernetes Ingress API" option must be enabled for this to work. You can find it in Settings > Other > Kubernetes section
 
+### Import HTML Bookmarks (Experimental)
+
+- Requirements
+  - python3
+  - pip packages: Pillow, beautifulsoup4
+- Backup your `db.sqlite` before running script!
+- Known Issues:
+  - generated icons are sometimes incorrect
+  
+```bash
+pip3 install Pillow, beautifulsoup4
+
+cd flame/.dev
+python3 bookmarks_importer.py --bookmarks <path to bookmarks.html> --data <path to flame data folder>
+```
+
 ### Custom CSS and themes
 
 See project wiki for [Custom CSS](https://github.com/pawelmalak/flame/wiki/Custom-CSS) and [Custom theme with CSS](https://github.com/pawelmalak/flame/wiki/Custom-theme-with-CSS).

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.7.3
+REACT_APP_VERSION=1.7.4