Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md
#	assets/manifest.json
#	npm-shrinkwrap.json
#	package.json
This commit is contained in:
Derrick Hammer 2023-08-13 18:57:43 -04:00
commit b4757dec86
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
7 changed files with 42 additions and 21 deletions

View File

@ -48,6 +48,7 @@ jobs:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Publish to S3 - name: Publish to S3
if: ${{ env.PKG != null }}
run: | run: |
s3cmd put "${{ env.PKG }}" s3://${{ vars.S3_BUCKET }}/$(basename "${{ env.PKG }}") s3cmd put "${{ env.PKG }}" s3://${{ vars.S3_BUCKET }}/$(basename "${{ env.PKG }}")
@ -55,11 +56,11 @@ jobs:
echo Release Zip SHA56: $(sha256sum "${{ env.PKG }}" | awk '{print $1}') echo Release Zip SHA56: $(sha256sum "${{ env.PKG }}" | awk '{print $1}')
- name: Publish to Firefox - name: Publish to Firefox
uses: yayuyokitano/firefox-addon@v0.0.6-alpha uses: yayuyokitano/firefox-addon@v0.0.6-alpha
if: ${{ github.ref_name == 'master' }} if: ${{ github.ref_name == 'master' && env.PKG != null }}
with: with:
api_key: ${{ secrets.AMO_ISSUER }} api_key: ${{ secrets.AMO_ISSUER }}
api_secret: ${{ secrets.AMO_SECRET }} api_secret: ${{ secrets.AMO_SECRET }}
guid: ${{ env.EXTENSION_GUID }} guid: ${{ vars.EXTENSION_GUID }}
xpi_path: ${{ env.PKG }} xpi_path: ${{ env.PKG }}
src_path: ${{ env.PKG_SRC }} src_path: ${{ env.PKG_SRC }}
- name: Setup tmate session - name: Setup tmate session

View File

@ -1,4 +1,25 @@
# [0.4.0-develop.6](https://git.lumeweb.com/LumeWeb/extension/compare/v0.4.0-develop.5...v0.4.0-develop.6) (2023-08-13) ## [0.4.1](https://git.lumeweb.com/LumeWeb/extension/compare/v0.4.0...v0.4.1) (2023-08-13)
### Bug Fixes
* update social links ([9de1301](https://git.lumeweb.com/LumeWeb/extension/commit/9de130107aa6ed631dd2246a5aa7322e27e2eedc))
# [0.4.0](https://git.lumeweb.com/LumeWeb/extension/compare/v0.3.0...v0.4.0) (2023-08-13)
### Bug Fixes
* **ci:** change publish step to prepare ([a3ba768](https://git.lumeweb.com/LumeWeb/extension/commit/a3ba768885d0102cbd941fce78c089876734be49))
* **ci:** echo out url for release zip, and provide sha256 hash checksum. ([265bbe3](https://git.lumeweb.com/LumeWeb/extension/commit/265bbe3b9171b5711a58a89a70938dd0c709b3ea))
* **ci:** install rename, not util-linux ([461e611](https://git.lumeweb.com/LumeWeb/extension/commit/461e6116707df95d994d47eedb80cdee1a0bbe34))
* **ci:** install util-linux for rename command ([6659de6](https://git.lumeweb.com/LumeWeb/extension/commit/6659de6550a01a3cf0184bc54c8680a1baf89662))
* **ci:** strip out filename ([13c51dd](https://git.lumeweb.com/LumeWeb/extension/commit/13c51dd7d024da830055b7671c371d1292b2c06a))
### Features
* add new popup app to go to login, dashboard, and logout ([df1895f](https://git.lumeweb.com/LumeWeb/extension/commit/df1895f8243b515921210dd6248b4126a96564c6))
# [0.4.0-develop.5](https://git.lumeweb.com/LumeWeb/extension/compare/v0.4.0-develop.4...v0.4.0-develop.5) (2023-08-11) # [0.4.0-develop.5](https://git.lumeweb.com/LumeWeb/extension/compare/v0.4.0-develop.4...v0.4.0-develop.5) (2023-08-11)

View File

@ -2,7 +2,7 @@
"description": "Lume Web is your decentralized gateway into the web3 internet, the web owned and controlled by its users", "description": "Lume Web is your decentralized gateway into the web3 internet, the web owned and controlled by its users",
"manifest_version": 2, "manifest_version": 2,
"name": "Lume Web", "name": "Lume Web",
"version": "0.4.0-develop.6", "version": "0.4.1",
"homepage_url": "https://lumeweb.com", "homepage_url": "https://lumeweb.com",
"icons": { "icons": {
"48": "icon.png", "48": "icon.png",

4
npm-shrinkwrap.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@lumeweb/extension", "name": "@lumeweb/extension",
"version": "0.4.0-develop.6", "version": "0.4.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@lumeweb/extension", "name": "@lumeweb/extension",
"version": "0.4.0-develop.6", "version": "0.4.1",
"dependencies": { "dependencies": {
"@helia/unixfs": "^1.4.0", "@helia/unixfs": "^1.4.0",
"@lumeweb/kernel-dns-client": "^0.1.0-develop.4", "@lumeweb/kernel-dns-client": "^0.1.0-develop.4",

View File

@ -1,6 +1,6 @@
{ {
"name": "@lumeweb/extension", "name": "@lumeweb/extension",
"version": "0.4.0-develop.6", "version": "0.4.1",
"description": "Lume Web is your decentralized gateway into the web3 internet, the web owned and controlled by its users", "description": "Lume Web is your decentralized gateway into the web3 internet, the web owned and controlled by its users",
"main": "index.js", "main": "index.js",
"type": "module", "type": "module",

View File

@ -59,13 +59,7 @@
} }
.gradient-4 { .gradient-4 {
background: conic-gradient( background: radial-gradient(circle, rgba(75,75,75,1) 0%, rgba(0,0,0,1) 100%);
from 180deg at 50% 50%,
#2f2f2f -15.8deg,
#66d155 222.32deg,
#2f2f2f 344.2deg,
#66d155 582.32deg
);
opacity: 0; opacity: 0;
z-index: -4; z-index: -4;
} }

View File

@ -3,24 +3,29 @@ import classNames from "classnames";
import svgGithub from "../../../assets/icon/github.svg?raw"; import svgGithub from "../../../assets/icon/github.svg?raw";
import svgDiscord from "../../../assets/icon/discord.svg?raw"; import svgDiscord from "../../../assets/icon/discord.svg?raw";
import svgTwitter from "../../../assets/icon/twitter.svg?raw"; import svgTwitter from "../../../assets/icon/twitter.svg?raw";
import svgFacebook from "../../../assets/icon/facebook.svg?raw";
import parse from "html-react-parser"; import parse from "html-react-parser";
export default function Footer({ connected }) { export default function Footer({ connected }) {
return ( return (
<div className={classNames("socials", { connected })}> <div className={classNames("socials", { connected })}>
<a href="#" title="GitHub" className="github-logo"> <a
href="https://github.com/LumeWeb"
title="GitHub"
className="github-logo">
{parse(svgGithub)} {parse(svgGithub)}
</a> </a>
<a href="#" title="Discord" className="discord-logo"> <a
href="https://discord.gg/qpC8ADp3rS"
title="Discord"
className="discord-logo">
{parse(svgDiscord)} {parse(svgDiscord)}
</a> </a>
<a href="#" title="Twitter" className="twitter-logo"> <a
href="https://twitter.com/lumeweb3"
title="Twitter"
className="twitter-logo">
{parse(svgTwitter)} {parse(svgTwitter)}
</a> </a>
<a href="#" title="Facebook" className="facebook-logo">
{parse(svgFacebook)}
</a>
</div> </div>
); );
} }