Commit 3c14d916 authored by Дмитрий Малюгин's avatar Дмитрий Малюгин 🕓
Browse files

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.idea/vcs.xml
parents 9805b99e 668bf4e9
Loading
Loading
Loading
Loading
+79 −0
Original line number Diff line number Diff line
{
  "javascript": {
    "globals": [
      "Component",
      "ComponentPublicInstance",
      "ComputedRef",
      "EffectScope",
      "ExtractDefaultPropTypes",
      "ExtractPropTypes",
      "ExtractPublicPropTypes",
      "InjectionKey",
      "PropType",
      "Ref",
      "RouteLocationRaw",
      "VNode",
      "WritableComputedRef",
      "[alias]",
      "[import-names]",
      "axios",
      "computed",
      "createApp",
      "customRef",
      "defineAsyncComponent",
      "defineComponent",
      "effectScope",
      "getCurrentInstance",
      "getCurrentScope",
      "h",
      "inject",
      "isProxy",
      "isReactive",
      "isReadonly",
      "isRef",
      "markRaw",
      "nextTick",
      "onActivated",
      "onBeforeMount",
      "onBeforeRouteLeave",
      "onBeforeRouteUpdate",
      "onBeforeUnmount",
      "onBeforeUpdate",
      "onDeactivated",
      "onErrorCaptured",
      "onMounted",
      "onRenderTracked",
      "onRenderTriggered",
      "onScopeDispose",
      "onServerPrefetch",
      "onUnmounted",
      "onUpdated",
      "provide",
      "reactive",
      "readonly",
      "ref",
      "resolveComponent",
      "shallowReactive",
      "shallowReadonly",
      "shallowRef",
      "toRaw",
      "toRef",
      "toRefs",
      "toValue",
      "triggerRef",
      "unref",
      "useAttrs",
      "useCssModule",
      "useCssVars",
      "useLink",
      "useMyFetch",
      "useRoute",
      "useRouter",
      "useSlots",
      "watch",
      "watchEffect",
      "watchPostEffect",
      "watchSyncEffect"
    ]
  }
}
 No newline at end of file

.eslintrc.cjs

0 → 100644
+18 −0
Original line number Diff line number Diff line
/* eslint-env node */
require('@rushstack/eslint-patch/modern-module-resolution')

module.exports = {
  root: true,
  'extends': [
    'plugin:vue/vue3-essential',
    'eslint:recommended',
    '@vue/eslint-config-typescript',
    '@vue/eslint-config-prettier/skip-formatting'
  ],
  parserOptions: {
    ecmaVersion: 'latest'
  },
  rules: {
    "no-undef": "off",
  }
}

.gitignore

0 → 100644
+30 −0
Original line number Diff line number Diff line
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
.DS_Store
dist
dist-ssr
coverage
*.local

/cypress/videos/
/cypress/screenshots/

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

*.tsbuildinfo

.idea/modules.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/.idea/motion.iml" filepath="$PROJECT_DIR$/.idea/motion.iml" />
    </modules>
  </component>
</project>
 No newline at end of file

.idea/motion.iml

0 → 100644
+12 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
      <excludeFolder url="file://$MODULE_DIR$/temp" />
      <excludeFolder url="file://$MODULE_DIR$/tmp" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
</module>
 No newline at end of file
Loading