-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update app btns & QR code #3681
Merged
amiraabouhadid
merged 15 commits into
development_2.7
from
development_2.7_fix_google_play_btn
Dec 10, 2024
+79
−104
Merged
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
8b5a961
update src for playstore and app store imgs, move qrcode and playstor…
amiraabouhadid b0489e2
add light mode playstore btns
amiraabouhadid a4dec10
update google play img in light mode, remove links surrounding btns
amiraabouhadid f002516
use qrplaystore component in profile manager
amiraabouhadid 9885150
remove light app store btns
amiraabouhadid 73ceee0
remove unused img
amiraabouhadid b0496db
adjust google play store btn width
amiraabouhadid 9281da3
enlarge google play btn
amiraabouhadid 3e9ccb4
add qrplaystore component to twin page
amiraabouhadid 3c327c0
Merge branch 'development_2.7' into development_2.7_fix_google_play_btn
amiraabouhadid 908f758
pass msg above qr code as prop to qrplaystore component
amiraabouhadid 5cac27a
use slot instead of v-html
amiraabouhadid 3451519
remove msg prop
amiraabouhadid 1030aa8
wrap slot in p
amiraabouhadid 2e632f7
remove p wrapping from slot, move it around text
amiraabouhadid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
<template> | ||
<div class="d-flex flex-column text-center align-center"> | ||
<span v-html="msg"></span> | ||
<div class="d-flex justify-center py-2"> | ||
<QrcodeGenerator :data="props.qr" /> | ||
</div> | ||
<div class="d-flex justify-center align-center my-4"> | ||
<a | ||
v-for="app in apps" | ||
:key="app.alt" | ||
:style="{ cursor: 'pointer', width: '9rem' }" | ||
class="mx-2" | ||
:title="app.alt" | ||
v-html="app.src" | ||
:href="app.url" | ||
target="_blank" | ||
/> | ||
</div> | ||
</div> | ||
</template> | ||
<script setup lang="ts"> | ||
const props = defineProps({ | ||
qr: String, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great! we can use this component to have the login QR code as well! |
||
msg: String, | ||
}); | ||
const apps = [ | ||
{ | ||
src: `<img width="140" src="https://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Google_Play_Store_badge_EN.svg/128px-Google_Play_Store_badge_EN.svg.png?20220907104002">`, | ||
alt: "Threefold Connect on Google Play Store", | ||
url: "https://play.google.com/store/apps/details?id=org.jimber.threebotlogin&hl=en&gl=US", | ||
}, | ||
{ | ||
src: `<img width="128" src="https://upload.wikimedia.org/wikipedia/commons/thumb/9/91/Download_on_the_App_Store_RGB_blk.svg/128px-Download_on_the_App_Store_RGB_blk.svg.png?20180317110059"/>`, | ||
alt: "Threefold Connect on Apple App Store", | ||
url: "https://apps.apple.com/us/app/threefold-connect/id1459845885", | ||
}, | ||
]; | ||
</script> | ||
<script lang="ts"> | ||
import { defineComponent } from "vue"; | ||
import QrcodeGenerator from "../components/qrcode_generator.vue"; | ||
export default defineComponent({ | ||
name: "QRPlayStore", | ||
components: { QrcodeGenerator }, | ||
}); | ||
</script> |
Oops, something went wrong.
Unchanged files with check annotations Beta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
const verify = async (payload: Payload) => { | ||
try { | ||
const hash = MD5(payload.content!).toString(); | ||
const messageBytes = Uint8Array.from(Buffer.from(hash.toString(), "hex")); | ||
const keyring = new Keyring({ type: payload.keypairType }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
if (config.pdfData) { | ||
data = await sign(config.pdfData, account?.mnemonic ?? "", config.keypairType); | ||
} else { | ||
data = await sign(config.scriptContent!, account?.mnemonic ?? "", config.keypairType); | ||
} | ||
if (!data.publicKey || !data.signature) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Account, | ||
ArrayWhere, | ||
BaseWhere, | ||
BigInt, | ||
BoolWhere, | ||
BurnTransaction, | ||
City, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import { ValidationError } from "@threefold/types"; | ||
type AssertReturn = void | never; | ||
function panic(message: string): never { | ||
throw new Error(message); | ||
} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
log("================= Getting deployment information ================="); | ||
} | ||
async function cancel(client, vms) { | ||
const resultVM = await client.machines.delete(vms); | ||
log("================= Canceling the deployment ================="); | ||
log(resultVM); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
log("================= Getting deployment information ================="); | ||
} | ||
async function cancel(client, vms, gw) { | ||
const resultVM = await client.machines.delete(vms); | ||
const resultGateway = await client.gateway.delete_name(gw); | ||
log("================= Canceling the deployment ================="); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
log("================= Getting deployment information ================="); | ||
} | ||
async function cancel(client, vms, gw) { | ||
const resultVM = await client.machines.delete(vms); | ||
const resultGateway = await client.gateway.delete_name(gw); | ||
log("================= Canceling the deployment ================="); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
log("================= Getting deployment information ================="); | ||
} | ||
async function cancel(client, vms, gw) { | ||
const resultVM = await client.machines.delete(vms); | ||
const resultGateway = await client.gateway.delete_name(gw); | ||
log("================= Canceling the deployment ================="); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
log("================= Getting deployment information ================="); | ||
} | ||
async function cancel(client, vms, gw) { | ||
const resultVM = await client.machines.delete(vms); | ||
const resultGateway = await client.gateway.delete_name(gw); | ||
log("================= Canceling the deployment ================="); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
log("================= Getting deployment information ================="); | ||
} | ||
async function cancel(client, vms, gw) { | ||
const resultVM = await client.machines.delete(vms); | ||
const resultGateway = await client.gateway.delete_name(gw); | ||
log("================= Canceling the deployment ================="); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think the best practice is to use slot,