diff --git a/.gitignore b/.gitignore
index d190d47..734e4b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ dist
*.zip
*.pem
*.crx
+*.afphoto
web-ext-artifacts
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a6a1cb3..3f03123 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Ora",
- "version": "0.4",
+ "version": "0.5",
"description": "See how much time you spend on each website and set limits",
"icons": {
@@ -33,5 +33,5 @@
"js": ["./src/client/index.js"]
}
],
- "web_accessible_resources": ["./icons/watch.svg"]
+ "web_accessible_resources": ["./icons/watch.png", "./icons/watch-alt.png"]
}
diff --git a/package.json b/package.json
index 875ace0..a4cc735 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"devDependencies": {
"@types/firefox-webext-browser": "^78.0.1",
"@types/lodash": "^4.14.161",
- "crx": "^5.0.1",
+ "crx3": "^1.1.2",
"parcel-bundler": "^1.12.4",
"parcel-plugin-svelte": "^4.0.6",
"parcel-plugin-web-extension": "^1.6.1",
diff --git a/src/dashboard/App.svelte b/src/dashboard/App.svelte
index e50ccd6..8e5d9ac 100644
--- a/src/dashboard/App.svelte
+++ b/src/dashboard/App.svelte
@@ -4,6 +4,7 @@
import Dev from './components/Dev.svelte'
import Dashboard from './pages/Dashboard.svelte'
import Limits from './pages/Limits.svelte'
+ import Footer from '../shared/footer.svelte'
import { isDev } from '../shared/utils'
@@ -34,4 +35,6 @@
+
+
diff --git a/src/options/App.svelte b/src/options/App.svelte
index 7b87790..249ff1c 100644
--- a/src/options/App.svelte
+++ b/src/options/App.svelte
@@ -5,6 +5,7 @@
import dj from 'dayjs'
import FileUpload from './FileUpload.svelte'
+ import Footer from '../shared/footer.svelte'
import { dashboard, isDev } from '../shared/utils'
import { dump as dumpDB, load as loadDB, clear as clearDB, validate } from '../shared/db'
@@ -103,4 +104,6 @@
+
+
diff --git a/src/shared/footer.svelte b/src/shared/footer.svelte
new file mode 100644
index 0000000..8b6afe2
--- /dev/null
+++ b/src/shared/footer.svelte
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/src/shared/utils.js b/src/shared/utils.js
index b0b83f9..c0e2f36 100644
--- a/src/shared/utils.js
+++ b/src/shared/utils.js
@@ -2,4 +2,4 @@ import browser from 'webextension-polyfill'
export const dashboard = browser.runtime.getURL('./src/dashboard/index.html')
-export const isDev = process.env.NODE_ENV !== 'production'
\ No newline at end of file
+export const isDev = process.env.NODE_ENV !== 'production'
diff --git a/store/a.png b/store/a.png
new file mode 100644
index 0000000..6b4f30f
Binary files /dev/null and b/store/a.png differ
diff --git a/store/b.png b/store/b.png
new file mode 100644
index 0000000..6b2adc6
Binary files /dev/null and b/store/b.png differ
diff --git a/store/c.png b/store/c.png
new file mode 100644
index 0000000..ca308f3
Binary files /dev/null and b/store/c.png differ
diff --git a/store/logo.png b/store/logo.png
new file mode 100644
index 0000000..57a7adb
Binary files /dev/null and b/store/logo.png differ
diff --git a/yarn.lock b/yarn.lock
index 18fd37c..e7926a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1302,19 +1302,6 @@ archiver-utils@^2.1.0:
normalize-path "^3.0.0"
readable-stream "^2.0.0"
-archiver@^3.0.3:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/archiver/-/archiver-3.1.1.tgz#9db7819d4daf60aec10fe86b16cb9258ced66ea0"
- integrity sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==
- dependencies:
- archiver-utils "^2.1.0"
- async "^2.6.3"
- buffer-crc32 "^0.2.1"
- glob "^7.1.4"
- readable-stream "^3.4.0"
- tar-stream "^2.1.0"
- zip-stream "^2.1.2"
-
archiver@~5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.0.2.tgz#b2c435823499b1f46eb07aa18e7bcb332f6ca3fc"
@@ -1400,7 +1387,7 @@ asn1.js@^5.2.0:
minimalistic-assert "^1.0.0"
safer-buffer "^2.1.0"
-asn1@^0.2.4, asn1@~0.2.3:
+asn1@~0.2.3:
version "0.2.4"
resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
@@ -1445,13 +1432,6 @@ async@^1.5.2:
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-async@^2.6.3:
- version "2.6.3"
- resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
- integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
- dependencies:
- lodash "^4.17.14"
-
async@^3.2.0, async@~3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
@@ -2186,16 +2166,6 @@ component-emitter@^1.2.1:
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-compress-commons@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-2.1.1.tgz#9410d9a534cf8435e3fbbb7c6ce48de2dc2f0610"
- integrity sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==
- dependencies:
- buffer-crc32 "^0.2.13"
- crc32-stream "^3.0.1"
- normalize-path "^3.0.0"
- readable-stream "^2.3.6"
-
compress-commons@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.1.tgz#c5fa908a791a0c71329fba211d73cd2a32005ea8"
@@ -2288,14 +2258,6 @@ cosmiconfig@^5.0.0:
js-yaml "^3.13.1"
parse-json "^4.0.0"
-crc32-stream@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85"
- integrity sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==
- dependencies:
- crc "^3.4.4"
- readable-stream "^3.4.0"
-
crc32-stream@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.0.tgz#05b7ca047d831e98c215538666f372b756d91893"
@@ -2362,15 +2324,14 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
shebang-command "^2.0.0"
which "^2.0.1"
-crx@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/crx/-/crx-5.0.1.tgz#33f7a81375acfab1aa3a8291424223434dc0978b"
- integrity sha512-n/PzBx/fR1+xZCiJBats9y5zw/a+YBcoJ0ABnUaY56xb1RpXuFhsiCMpNY6WjVtylLzhUUXSWsbitesVg7v2vg==
+crx3@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/crx3/-/crx3-1.1.2.tgz#d87c1859176f55e87648fbab9d337a0d3ee17789"
+ integrity sha512-EYp/rDiA7RbvsUJDAYaiUMEh2unG4bS6jX+4Qtv+JjuMf5CqFmGK0StdlKpSy06kgg7iosb8EtijznCsg5rnjw==
dependencies:
- archiver "^3.0.3"
- commander "^2.20.0"
- node-rsa "^1.0.5"
+ mri "^1.1.4"
pbf "^3.2.0"
+ yazl "^2.5.1"
crypto-browserify@^3.11.0:
version "3.12.0"
@@ -5229,6 +5190,11 @@ moment@^2.19.3:
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+mri@^1.1.4:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6"
+ integrity sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==
+
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -5393,13 +5359,6 @@ node-releases@^1.1.61:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
-node-rsa@^1.0.5:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/node-rsa/-/node-rsa-1.1.1.tgz#efd9ad382097782f506153398496f79e4464434d"
- integrity sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==
- dependencies:
- asn1 "^0.2.4"
-
normalize-html-whitespace@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz#5e3c8e192f1b06c3b9eee4b7e7f28854c7601e34"
@@ -7499,7 +7458,7 @@ tailwindcss@^1.8.10:
reduce-css-calc "^2.1.6"
resolve "^1.14.2"
-tar-stream@^2.1.0, tar-stream@^2.1.4:
+tar-stream@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa"
integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==
@@ -8247,6 +8206,13 @@ yauzl@2.10.0:
buffer-crc32 "~0.2.3"
fd-slicer "~1.1.0"
+yazl@^2.5.1:
+ version "2.5.1"
+ resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
+ integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
+ dependencies:
+ buffer-crc32 "~0.2.3"
+
zip-dir@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/zip-dir/-/zip-dir-1.0.2.tgz#253f907aead62a21acd8721d8b88032b2411c051"
@@ -8255,15 +8221,6 @@ zip-dir@1.0.2:
async "^1.5.2"
jszip "^2.4.0"
-zip-stream@^2.1.2:
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.3.tgz#26cc4bdb93641a8590dd07112e1f77af1758865b"
- integrity sha512-EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q==
- dependencies:
- archiver-utils "^2.1.0"
- compress-commons "^2.1.1"
- readable-stream "^3.4.0"
-
zip-stream@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.2.tgz#3a20f1bd7729c2b59fd4efa04df5eb7a5a217d2e"