Browse Source

Merge branch 'master' into new-web-push

pull/65/head
anomalist 1 year ago
parent
commit
249811efe3
  1. 11
      project.task.yaml
  2. 15
      src/components/EntityIcon.vue
  3. 2
      src/router/index.ts
  4. 6
      src/views/ContactGiftingView.vue
  5. 2
      src/views/DiscoverView.vue
  6. 2
      src/views/HomeView.vue
  7. 2
      src/views/ProjectViewView.vue

11
project.task.yaml

@ -1,8 +1,10 @@
tasks: tasks:
- fix "any" warnings
- fix missing updateAllFeed in ContactGiftingView page - 08 Scan QR code to import into contacts assignee:matthew
- check that Anonymous users jdenticon are nulls (not "Anonymous") - SEE - https://github.com/gruhn/vue-qrcode-reader
- in endorser-push-server - mount folder for persistent sqlite DB outside of container
- test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView) - test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView)
- .2 bug - on contacts view, click on "to" & "from" and nothing happens - .2 bug - on contacts view, click on "to" & "from" and nothing happens
- 40 notifications : - 40 notifications :
@ -12,9 +14,6 @@ tasks:
- 01 fix the Discovery map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui - 01 fix the Discovery map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
- 08 Scan QR code to import into contacts assignee:matthew
- SEE: https://github.com/gruhn/vue-qrcode-reader
- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew assignee-group:ui - 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew assignee-group:ui
- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) assignee-group:ui - 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) assignee-group:ui

15
src/components/EntityIcon.vue

@ -5,13 +5,26 @@
import { Vue, Component, Prop } from "vue-facing-decorator"; import { Vue, Component, Prop } from "vue-facing-decorator";
import { toSvg } from "jdenticon"; import { toSvg } from "jdenticon";
const BLANK_CONFIG = {
lightness: {
color: [1.0, 1.0],
grayscale: [1.0, 1.0],
},
saturation: {
color: 0.0,
grayscale: 0.0,
},
backColor: "#0000",
};
@Component @Component
export default class EntityIcon extends Vue { export default class EntityIcon extends Vue {
@Prop entityId = ""; @Prop entityId = "";
@Prop iconSize = 0; @Prop iconSize = 0;
generateIdenticon() { generateIdenticon() {
const svgString = toSvg(this.entityId, this.iconSize); const config = this.entityId ? undefined : BLANK_CONFIG;
const svgString = toSvg(this.entityId, this.iconSize, config);
return svgString; return svgString;
} }
} }

2
src/router/index.ts

@ -189,7 +189,7 @@ const routes: Array<RouteRecordRaw> = [
name: "contact-gives", name: "contact-gives",
component: () => component: () =>
import( import(
/* webpackChunkName: "statistics" */ "../views/ContactGiftingView.vue" /* webpackChunkName: "contact-gives" */ "../views/ContactGiftingView.vue"
), ),
}, },
]; ];

6
src/views/ContactGiftingView.vue

@ -26,9 +26,9 @@
<h2 class="text-base flex gap-4 items-center"> <h2 class="text-base flex gap-4 items-center">
<span class="grow italic text-slate-500" <span class="grow italic text-slate-500"
><EntityIcon ><EntityIcon
entityId="Anonymous" :entityId="null"
:iconSize="32" :iconSize="32"
class="opacity-50 inline-block align-middle border border-dashed border-slate-400 bg-slate-200 rounded-md mr-1" class="inline-block align-middle border border-slate-300 rounded-md mr-1"
></EntityIcon> ></EntityIcon>
Anonymous Anonymous
</span> </span>
@ -108,7 +108,7 @@ interface Notification {
@Component({ @Component({
components: { GiftedDialog, QuickNav, EntityIcon }, components: { GiftedDialog, QuickNav, EntityIcon },
}) })
export default class HomeView extends Vue { export default class ContactGiftingView extends Vue {
$notify!: (notification: Notification, timeout?: number) => void; $notify!: (notification: Notification, timeout?: number) => void;
activeDid = ""; activeDid = "";

2
src/views/DiscoverView.vue

@ -56,7 +56,7 @@
searchAll(); searchAll();
" "
> >
Remote Anywhere
<span <span
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md" class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
>{{ remoteCount }}</span >{{ remoteCount }}</span

2
src/views/HomeView.vue

@ -116,7 +116,7 @@
<ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5"> <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
<li @click="openDialog()"> <li @click="openDialog()">
<EntityIcon <EntityIcon
:entityId="Anonymous" :entityId="null"
:iconSize="64" :iconSize="64"
class="mx-auto border border-slate-300 rounded-md mb-1" class="mx-auto border border-slate-300 rounded-md mb-1"
></EntityIcon> ></EntityIcon>

2
src/views/ProjectViewView.vue

@ -95,7 +95,7 @@
<ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5"> <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
<li @click="openDialog()"> <li @click="openDialog()">
<EntityIcon <EntityIcon
:entityId="Anonymous" :entityId="null"
:iconSize="64" :iconSize="64"
class="mx-auto border border-slate-300 rounded-md mb-1" class="mx-auto border border-slate-300 rounded-md mb-1"
></EntityIcon> ></EntityIcon>

Loading…
Cancel
Save