From 07f6117a01083f9602a333862aad66a449aefa5a Mon Sep 17 00:00:00 2001 From: kwaroran Date: Wed, 19 Jul 2023 22:01:23 +0900 Subject: [PATCH] [feat] added license --- package.json | 1 + pnpm-lock.yaml | 13 ++++ src/lib/Others/AlertComp.svelte | 45 ++++++++--- src/lib/SideBars/Sidebar.svelte | 2 +- src/lib/UI/GUI/TextInput.svelte | 2 + src/lib/UI/Realm/RealmLicense.svelte | 30 ++++++++ src/lib/UI/Realm/RealmMain.svelte | 87 +-------------------- src/lib/UI/Realm/RealmPopUp.svelte | 98 ++++++++++++++++++++++++ src/lib/UI/Realm/RealmUpload.svelte | 28 +++++-- src/ts/alert.ts | 37 ++++++++- src/ts/characterCards.ts | 8 +- src/ts/{creator => copyright}/creator.ts | 0 src/ts/copyright/license.ts | 24 ++++++ 13 files changed, 269 insertions(+), 106 deletions(-) create mode 100644 src/lib/UI/Realm/RealmLicense.svelte create mode 100644 src/lib/UI/Realm/RealmPopUp.svelte rename src/ts/{creator => copyright}/creator.ts (100%) create mode 100644 src/ts/copyright/license.ts diff --git a/package.json b/package.json index c992d1c0..85bdbd9e 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "rollup": "^3.21.3", "showdown": "^2.1.0", "three": "^0.154.0", + "tippy.js": "^6.3.7", "uuid": "^9.0.0", "wasmoon": "^1.15.0", "web-streams-polyfill": "^3.2.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b92e52ff..fae9589d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,6 +101,9 @@ dependencies: three: specifier: ^0.154.0 version: 0.154.0 + tippy.js: + specifier: ^6.3.7 + version: 6.3.7 uuid: specifier: ^9.0.0 version: 9.0.0 @@ -491,6 +494,10 @@ packages: fastq: 1.15.0 dev: true + /@popperjs/core@2.11.8: + resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + dev: false + /@rollup/plugin-virtual@3.0.1(rollup@3.21.3): resolution: {integrity: sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og==} engines: {node: '>=14.0.0'} @@ -2853,6 +2860,12 @@ packages: resolution: {integrity: sha512-Uzz8C/5GesJzv8i+Y2prEMYUwodwZySPcNhuJUdsVMH2Yn4Nm8qlbQe6qRN5fOhg55XB0WiLfTPBxVHxpE60ug==} dev: false + /tippy.js@6.3.7: + resolution: {integrity: sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==} + dependencies: + '@popperjs/core': 2.11.8 + dev: false + /to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} diff --git a/src/lib/Others/AlertComp.svelte b/src/lib/Others/AlertComp.svelte index 2c68c0f0..9f3cc408 100644 --- a/src/lib/Others/AlertComp.svelte +++ b/src/lib/Others/AlertComp.svelte @@ -8,6 +8,8 @@ import { User } from 'lucide-svelte'; import { hubURL } from 'src/ts/characterCards'; import TextInput from '../UI/GUI/TextInput.svelte'; + import { openURL } from 'src/ts/storage/globalApi'; + import Button from '../UI/GUI/Button.svelte'; let btn let input = '' @@ -56,49 +58,70 @@ {@html msg} {/await} + {:else if $alertStore.type === 'tos'} + + +
You should accept RisuRealm's { + openURL('https://sv.risuai.xyz/hub/tos') + }}>Terms of Service to continue
{:else if $alertStore.type !== 'select'} {$alertStore.msg} {/if} {#if $alertStore.type === 'ask'}
- - + + }}>NO +
+ {:else if $alertStore.type === 'tos'} +
+ +
{:else if $alertStore.type === 'select'} {#each $alertStore.msg.split('||') as n, i} - + }}>{n} {/each} {:else if $alertStore.type === 'error' || $alertStore.type === 'normal' || $alertStore.type === 'markdown'} - + }}>OK {:else if $alertStore.type === 'input'} - - + }}>OK {:else if $alertStore.type === 'login'}