diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-04-19 21:24:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 21:24:31 +0900 |
| commit | e1f9ab77f86f5a12091c864cdb502970715cd46e (patch) | |
| tree | 46990eae87d352e6674e43a64c3bdcd74c13119e /packages/frontend/src/components/MkSignupDialog.vue | |
| parent | Update test-frontend.yml (diff) | |
| download | misskey-e1f9ab77f86f5a12091c864cdb502970715cd46e.tar.gz misskey-e1f9ab77f86f5a12091c864cdb502970715cd46e.tar.bz2 misskey-e1f9ab77f86f5a12091c864cdb502970715cd46e.zip | |
feat: Server rules (#10660)
* enhance(frontend): サーバールールのデザイン調整
* enhance(frontend): i18n
* enhance(frontend): 利用規約URLの設定を「モデレーション」ページへ移動
* enhance(frontend): サーバールールのデザイン調整
* Update CHANGELOG.md
* 不要な差分を削除
* fix(frontend): lint
* ui tweak
* test: add stories
* tweak
* test: bind args
* test: add interaction tests
* fix bug
* Update packages/frontend/src/pages/admin/server-rules.vue
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
* Update misskey-js.api.md
* chore: windowを明示
* :art:
* refactor
* :art:
* :art:
* fix e2e test
* :art:
* :art:
* fix icon
* fix e2e
---------
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Diffstat (limited to 'packages/frontend/src/components/MkSignupDialog.vue')
| -rw-r--r-- | packages/frontend/src/components/MkSignupDialog.vue | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue index 790c1e94df..b4fc564d36 100644 --- a/packages/frontend/src/components/MkSignupDialog.vue +++ b/packages/frontend/src/components/MkSignupDialog.vue @@ -1,24 +1,40 @@ <template> <MkModalWindow ref="dialog" - :width="366" - :height="500" + :width="500" + :height="600" @close="dialog.close()" @closed="$emit('closed')" > <template #header>{{ i18n.ts.signup }}</template> - <MkSpacer :margin-min="20" :margin-max="28"> - <XSignup :auto-set="autoSet" @signup="onSignup" @signup-email-pending="onSignupEmailPending"/> - </MkSpacer> + <div style="overflow-x: clip;"> + <Transition + mode="out-in" + :enter-active-class="$style.transition_x_enterActive" + :leave-active-class="$style.transition_x_leaveActive" + :enter-from-class="$style.transition_x_enterFrom" + :leave-to-class="$style.transition_x_leaveTo" + > + <template v-if="!isAcceptedServerRule"> + <XServerRules @accept="isAcceptedServerRule = true"/> + </template> + <template v-else> + <XSignup :auto-set="autoSet" @signup="onSignup" @signup-email-pending="onSignupEmailPending"/> + </template> + </Transition> + </div> </MkModalWindow> </template> <script lang="ts" setup> import { } from 'vue'; -import XSignup from '@/components/MkSignup.vue'; +import { $ref } from 'vue/macros'; +import XSignup from '@/components/MkSignupDialog.form.vue'; +import XServerRules from '@/components/MkSignupDialog.rules.vue'; import MkModalWindow from '@/components/MkModalWindow.vue'; import { i18n } from '@/i18n'; +import { instance } from '@/instance'; const props = withDefaults(defineProps<{ autoSet?: boolean; @@ -33,6 +49,8 @@ const emit = defineEmits<{ const dialog = $shallowRef<InstanceType<typeof MkModalWindow>>(); +const isAcceptedServerRule = $ref(false); + function onSignup(res) { emit('done', res); dialog.close(); @@ -42,3 +60,18 @@ function onSignupEmailPending() { dialog.close(); } </script> + +<style lang="scss" module> +.transition_x_enterActive, +.transition_x_leaveActive { + transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1); +} +.transition_x_enterFrom { + opacity: 0; + transform: translateX(50px); +} +.transition_x_leaveTo { + opacity: 0; + transform: translateX(-50px); +} +</style> |