itube-specs 0.0.529 → 0.0.533

package/components/auth/s-auth-icon.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="s-auth-icon">
+    <SIcon
+        class="s-auth-icon__icon"
+        :name="icon"
+        size="24"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = withDefaults(defineProps<{
+  icon?: string
+}>(), {
+  icon: 'user-filled'
+})
+</script>
+
+<style scoped lang="scss">
+</style>

package/components/auth/s-auth-login.vue

@@ -3,11 +3,8 @@
       class="s-auth-login"
       :class="{'_loading': loading}"
   >
-    <SIcon
-        class="s-auth-login__icon"
-        name="user-circle"
-        size="40"
-    />
+
+    <SAuthIcon class="s-auth-login__icon"/>
 
     <SInput
         v-model="form.username"
@@ -33,20 +30,24 @@
           @click="login"
       >{{ t('auth.log_in') }}
       </SButton>
-      <SButton
-          wide
-          size="l"
-          theme="ghost"
+      <button
+          class="s-auth-login__forgot"
+          type="button"
           @click="onForgotClick"
-      >{{ t('auth.forgot') }}
-      </SButton>
-      <SButton
-          wide
-          size="l"
-          theme="ghost"
-          @click="onCreateClick"
-      >{{ t('auth_no_account') }}
-      </SButton>
+      >
+        {{ t('auth.forgot') }}
+      </button>
+
+      <p class="s-auth-login__back">
+        {{ t('register_text') }}
+        <button
+            class="s-auth-login__back-button"
+            type="button"
+            @click="onCreateClick"
+        >
+          {{ t('auth.sign_up') }}
+        </button>
+      </p>
     </div>
   </div>
 </template>
@@ -55,7 +56,7 @@
 import { validatePassword, validateUsername } from '../../runtime';
 import { AuthorizationApiService } from '~/services/api/authorization.service';
 
-const {t} = useI18n();
+const { t } = useI18n();
 
 const form = ref({
   username: '',

package/components/auth/s-auth-recovery.vue

@@ -3,12 +3,13 @@
       class="s-auth-recovery"
       :class="{'_loading': loading}"
   >
-    <SIcon
+
+    <SAuthIcon
         class="s-auth-recovery__icon"
-        name="envelope-open"
-        size="40"
+        icon="envelope"
     />
-    <p class="s-auth-recovery__text">{{ t('auth.recovery_text')}}</p>
+
+    <p class="s-auth-recovery__text">{{ t('auth.recovery_text') }}</p>
     <SInput
         v-model="form.email"
         label="Email"
@@ -17,23 +18,21 @@
         @update:error="(val: boolean) => error.email = val"
     />
 
-    <div class="s-auth-recovery__buttons">
-      <SButton
-          wide
-          size="l"
-          :disabled="loading"
-          theme="primary"
-          @click="submit"
-      >{{ t('auth.get_recovery') }}
-      </SButton>
-      <SButton
-          wide
-          size="l"
-          theme="ghost"
-          @click="onLoginClick"
-      >{{ t('auth.back_to_login')}}
-      </SButton>
-    </div>
+    <SButton
+        class="s-auth-recovery__button"
+        wide
+        size="l"
+        :disabled="loading"
+        theme="primary"
+        @click="submit"
+    >{{ t('auth.get_recovery') }}
+    </SButton>
+    <button
+        class="s-auth-recovery__login"
+        type="button"
+        @click="onLoginClick"
+    >{{ t('auth.back_to_login') }}
+    </button>
   </div>
 </template>
 
@@ -44,7 +43,7 @@ import { AuthorizationApiService } from '~/services/api/authorization.service';
 
 const { initRecaptcha, getRecaptchaToken } = useRecaptcha();
 
-const {t} = useI18n();
+const { t } = useI18n();
 
 const form = ref({
   email: '',

package/components/auth/s-auth-register.vue

@@ -4,22 +4,12 @@
         class="s-auth-register"
         :class="{'_loading': loading}"
     >
-      <SIcon
-          class="s-auth-register__icon"
-          name="user-circle"
-          size="40"
-      />
+      <SAuthIcon class="s-auth-register__icon" />
       <p
           v-if="additionalText"
           class="s-auth-register__text"
-      >{{ t(additionalText) }}</p>
-      <SInput
-          v-model="form.username"
-          :label="t('auth.username')"
-          name="login-name"
-          :error="error.username"
-          @update:error="(val: boolean) => error.username = val"
-      />
+      >{{ t(additionalText) }}
+      </p>
       <SInput
           v-model="form.email"
           :label="t('email')"
@@ -27,6 +17,13 @@
           :error="error.email"
           @update:error="(val: boolean) => error.email = val"
       />
+      <SInput
+          v-model="form.username"
+          :label="t('login')"
+          name="login-name"
+          :error="error.username"
+          @update:error="(val: boolean) => error.username = val"
+      />
       <SInput
           v-model="form.password_hash"
           :label="t('auth.password')"
@@ -45,13 +42,15 @@
             @click="submit"
         >{{ t('auth.sign_up') }}
         </SButton>
-        <SButton
-            wide
-            size="l"
-            theme="secondary"
-            @click="onLoginClick"
-        >{{ t('auth.log_in') }}
-        </SButton>
+        <p class="s-auth-register__login">
+          {{ t('login_text') }}
+          <button
+              class="s-auth-register__login-button"
+              type="button"
+              @click="onLoginClick">
+            {{ t('auth.log_in') }}
+          </button>
+        </p>
       </div>
 
       <p class="s-auth-register__agreement">{{ t('auth.agree_begin') }}
@@ -59,8 +58,9 @@
             class="s-auth-register__agreement-link"
             to="/terms"
             target="_blank"
-        >{{ t('auth.agree_terms')}}
-        </NuxtLink>{{ t('auth.agree_and')}}
+        >{{ t('auth.agree_terms') }}
+        </NuxtLink>
+                                            {{ t('auth.agree_and') }}
         <NuxtLink
             class="s-auth-register__agreement-link"
             to="/policy"
@@ -145,7 +145,7 @@ async function submit() {
     loading.value = true;
 
     // Уникальное действие для каждой формы
-     // здесь 'register', в других формах — 'password_reset' или 'contact_form'
+    // здесь 'register', в других формах — 'password_reset' или 'contact_form'
     form.value.token = await getRecaptchaToken('register');
 
     await useUser(AuthorizationApiService).register(form.value);

package/components/page-components/s-pagination.vue

@@ -97,8 +97,8 @@
     >
       <SIcon
           v-if="arrowIcon"
-          name="arrow-left"
-          size="24"
+          name="angle-left"
+          size="16"
       />
       {{ t('previous' )}}
     </SLink>
@@ -112,8 +112,8 @@
       {{ t('next') }}
       <SIcon
           v-if="arrowIcon"
-          name="arrow-right"
-          size="24"
+          name="angle-right"
+          size="16"
       />
     </SLink>
   </nav>

package/components/page-components/s-videos-title.vue

@@ -3,7 +3,11 @@
     <h1 v-if="titleTag === 'h1'" class="s-videos-title__title _title" v-html="title"/>
     <h2 v-else-if="titleTag === 'h2'" class="s-videos-title__title _title" v-html="title"/>
     <h3 v-else-if="titleTag === 'h3'" class="s-videos-title__title _title" v-html="title"/>
-    <SCount v-if="count" class="s-videos-title__count">{{ count }}</SCount>
+    <SCount
+        v-if="count"
+        class="s-videos-title__count"
+        :icon="icon"
+    >{{ count }}</SCount>
   </div>
 </template>
 
@@ -12,6 +16,7 @@ withDefaults(defineProps<{
   count?: number
   titleTag?: string
   title: string
+  icon?: string
 }>(), {
   titleTag: 'h1'
 })

package/components/ui/s-count.vue

@@ -1,11 +1,16 @@
 <template>
   <span
       class="s-count"
-  ><slot/>
+  >
+    <SIcon v-if="icon" :name="icon" size="16" />
+    <slot/>
   </span>
 </template>
 
 <script setup lang="ts">
+defineProps<{
+  icon?: string
+}>()
 </script>
 
 <style scoped lang="scss">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.529",
+  "version": "0.0.533",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {