Skip to content

Commit 0f30b09

Browse files
kaizumakikaizumaki
committed
Merge branch 'develop' into feature/modify-dayjs
# Conflicts: # package.json # src/components/PeriodSection.vue # yarn.lock
2 parents 46e9157 + 90ed9e9 commit 0f30b09

32 files changed

+4874
-5425
lines changed

‎.eslintrc.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,20 @@ module.exports = {
55
'@nuxtjs/eslint-config-typescript',
66
'plugin:prettier/recommended',
77
'prettier',
8-
'prettier/vue',
98
],
109
rules: {
1110
'require-await': 'off',
1211
'nuxt/no-cjs-in-config': 'off',
1312
'vue/max-attributes-per-line': 'off',
13+
'vue/experimental-script-setup-vars': 'off',
14+
'vue/no-arrow-functions-in-watch': 'off',
15+
'vue/no-custom-modifiers-on-v-model': 'off',
16+
'vue/no-dupe-v-else-if': 'off',
17+
'vue/no-multiple-template-root': 'off',
18+
'vue/no-mutating-props': 'off',
19+
'vue/no-v-for-template-key': 'off',
20+
'vue/no-v-model-argument': 'off',
21+
'vue/one-component-per-file': 'off',
1422
'vue/html-self-closing': [
1523
'error',
1624
{

‎nuxt.config.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Sass from 'sass'
2+
import Fiber from 'fibers'
13
import i18nConfig from './nuxt-i18n.config.js'
24
const environment = process.env.NODE_ENV || 'development'
35

@@ -159,6 +161,14 @@ export default {
159161
*/
160162
build: {
161163
publicPath: '/assets/',
164+
loaders: {
165+
scss: {
166+
implementation: Sass,
167+
sassOptions: {
168+
fiber: Fiber,
169+
},
170+
},
171+
},
162172
babel: {
163173
presets({ isServer }) {
164174
return [

‎package.json‎

Lines changed: 53 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"name": "StudyAtHome",
2+
"name": "study-at-home",
33
"version": "1.0.0",
44
"description": "Ouchi De Jikanwari Web Version",
55
"author": "Nekoya3",
66
"private": true,
77
"scripts": {
8-
"dev": "cross-env NODE_ENV=development nuxt-ts",
9-
"build": "nuxt-ts build",
8+
"dev": "cross-env NODE_ENV=development nuxt",
9+
"build": "nuxt build",
1010
"test:unit": "jest --config jest.config.js",
11-
"start": "nuxt-ts start",
12-
"generate": "nuxt-ts generate",
11+
"start": "nuxt start",
12+
"generate": "nuxt generate",
1313
"lint": "eslint --ext .js,.vue,.ts --ignore-path .eslintignore ."
1414
},
1515
"lint-staged": {
@@ -24,67 +24,72 @@
2424
}
2525
},
2626
"dependencies": {
27-
"@aws-amplify/api": "^3.2.7",
28-
"@babel/core": "^7.12.1",
29-
"@babel/runtime-corejs3": "^7.12.1",
30-
"@nuxt/typescript-runtime": "^2.0.0",
31-
"@nuxtjs/axios": "^5.12.2",
32-
"@nuxtjs/dayjs": "^1.4.0",
27+
"@aws-amplify/api": "^4.0.0",
28+
"@babel/core": "^7.14.3",
29+
"@babel/runtime-corejs3": "^7.14.0",
30+
"@nuxtjs/axios": "^5.13.4",
3331
"@nuxtjs/dotenv": "^1.4.1",
3432
"@nuxtjs/google-analytics": "^2.4.0",
35-
"@nuxtjs/pwa": "^3.2.2",
33+
"@nuxtjs/pwa": "^3.3.5",
3634
"@nuxtjs/style-resources": "^1.0.0",
37-
"@types/node": "^14.11.8",
38-
"aws-amplify": "^3.3.4",
39-
"core-js": "^3.6.5",
40-
"cross-env": "^7.0.2",
35+
"@types/node": "^15.3.0",
36+
"aws-amplify": "^4.0.2",
37+
"core-js": "^3.12.1",
38+
"cross-env": "^7.0.3",
39+
"date-fns": "^2.21.3",
40+
"dayjs": "^1.10.4",
4141
"express": "^4.17.1",
42-
"nuxt": "^2.14.7",
43-
"nuxt-i18n": "^6.15.3",
44-
"nuxt-property-decorator": "^2.8.8",
42+
"nuxt": "^2.15.6",
43+
"nuxt-i18n": "^6.27.0",
44+
"nuxt-property-decorator": "^2.9.1",
4545
"nuxt-svg-loader": "^1.2.0",
4646
"nuxt-webfontloader": "^1.1.0",
47-
"uuid": "^8.3.1",
48-
"vue-property-decorator": "^9.0.2",
49-
"vuetify": "^2.3.14",
50-
"vuex": "^3.5.1",
47+
"uuid": "^8.3.2",
48+
"vue-property-decorator": "^9.1.2",
49+
"vuetify": "^2.5.0",
50+
"vuex": "^3.6.2",
5151
"vuex-class-component": "^2.3.5"
5252
},
5353
"devDependencies": {
54-
"@mdi/font": "^5.7.55",
55-
"@nuxt/types": "^2.14.7",
56-
"@nuxt/typescript-build": "^2.0.3",
57-
"@nuxtjs/eslint-config-typescript": "^3.0.0",
54+
"@mdi/font": "^5.9.55",
55+
"@nuxt/types": "^2.15.6",
56+
"@nuxt/typescript-build": "^2.1.0",
57+
"@nuxtjs/eslint-config-typescript": "^6.0.0",
5858
"@nuxtjs/stylelint-module": "^4.0.0",
59-
"@types/jest": "^26.0.14",
60-
"@vue/test-utils": "^1.1.0",
59+
"@types/jest": "^26.0.23",
60+
"@vue/test-utils": "^1.2.0",
6161
"babel-core": "^6.26.3",
6262
"babel-eslint": "^10.1.0",
63-
"babel-jest": "^26.5.2",
63+
"babel-jest": "^26.6.3",
64+
"consola": "^2.15.3",
6465
"cpx": "^1.5.0",
65-
"eslint": "^7.11.0",
66-
"eslint-config-prettier": "^6.12.0",
66+
"eslint": "^7.26.0",
67+
"eslint-config-prettier": "^8.3.0",
6768
"eslint-loader": "^4.0.2",
68-
"eslint-plugin-nuxt": "^1.0.0",
69-
"eslint-plugin-prettier": "^3.1.4",
70-
"eslint-plugin-tsdoc": "^0.2.7",
71-
"husky": "^4.3.0",
72-
"jest": "^26.5.3",
73-
"lint-staged": "^10.4.0",
74-
"node-sass": "^4.14.1",
75-
"nodemon": "^2.0.5",
76-
"prettier": "^2.1.2",
69+
"eslint-plugin-nuxt": "^2.0.0",
70+
"eslint-plugin-prettier": "^3.4.0",
71+
"eslint-plugin-tsdoc": "^0.2.14",
72+
"fibers": "^5.0.0",
73+
"husky": "^6.0.0",
74+
"jest": "^26.6.3",
75+
"lint-staged": "^11.0.0",
76+
"nodemon": "^2.0.7",
77+
"prettier": "^2.3.0",
7778
"rimraf": "^3.0.2",
78-
"sass-loader": "^10.0.3",
79-
"stylelint": "^13.7.2",
79+
"sass": "^1.32.13",
80+
"sass-loader": "10.1.1",
81+
"stylelint": "^13.13.1",
8082
"stylelint-config-prettier": "^8.0.2",
81-
"stylelint-config-standard": "^20.0.0",
82-
"stylelint-scss": "^3.18.0",
83-
"ts-jest": "^26.4.1",
84-
"ts-loader": "^8.0.5",
83+
"stylelint-config-standard": "^22.0.0",
84+
"stylelint-scss": "^3.19.0",
85+
"ts-jest": "^26.5.6",
86+
"ts-loader": "^8.2.0",
87+
"typescript": "4.0.5",
8588
"vue": "^2.6.12",
89+
"vue-class-component": "^7.2.6",
8690
"vue-jest": "^3.0.7",
8791
"vue-server-renderer": "^2.6.12",
88-
"vue-template-compiler": "^2.6.12"
92+
"vue-template-compiler": "^2.6.12",
93+
"webpack": "4.46.0"
8994
}
9095
}

‎src/components/AppLanguageSelector.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export default Vue.extend({
2626
return { locales: [{ text: 'N/A', value: '', format: '' }] }
2727
2828
return {
29+
// @ts-ignore
2930
locales: this.$root.$i18n.locales.map((l) => {
3031
if (typeof l === 'string') return { text: l, value: l, format: l }
3132
else return { text: l.displayName, value: l.code, format: l.format }

‎src/components/BaseInputField.vue‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
outlined
1515
@input="$emit('input', $event)"
1616
>
17-
<template v-slot:prepend-inner>
18-
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
17+
<template #prepend-inner>
18+
<v-icon :color="prependIconColor">
19+
{{ prependIcon }}
20+
</v-icon>
1921
</template>
20-
<template v-slot:append>
22+
<template #append>
2123
<v-icon
2224
color="blue"
2325
@click="show = !show"
@@ -40,8 +42,10 @@
4042
outlined
4143
@input="$emit('input', $event)"
4244
>
43-
<template v-slot:prepend-inner>
44-
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
45+
<template #prepend-inner>
46+
<v-icon :color="prependIconColor">
47+
{{ prependIcon }}
48+
</v-icon>
4549
</template>
4650
</v-text-field>
4751
<v-text-field
@@ -59,8 +63,10 @@
5963
outlined
6064
@input="$emit('input', $event)"
6165
>
62-
<template v-slot:prepend-inner>
63-
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
66+
<template #prepend-inner>
67+
<v-icon :color="prependIconColor">
68+
{{ prependIcon }}
69+
</v-icon>
6470
</template>
6571
</v-text-field>
6672
<v-text-field
@@ -78,8 +84,10 @@
7884
outlined
7985
@input="$emit('input', $event)"
8086
>
81-
<template v-slot:prepend-inner>
82-
<v-icon :color="prependIconColor">{{ prependIcon }}</v-icon>
87+
<template #prepend-inner>
88+
<v-icon :color="prependIconColor">
89+
{{ prependIcon }}
90+
</v-icon>
8391
</template>
8492
</v-text-field>
8593
</template>

‎src/components/EditLessonScreen.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ import EditLessonScreenInner3 from '@/components/EditLessonScreenInner3.vue'
6060
import EditLessonScreenInner4 from '@/components/EditLessonScreenInner4.vue'
6161
import classData from '@/types/store/classData'
6262
63-
type stateType = {
64-
error: boolean
65-
lessonData: LessonDataType
66-
}
67-
6863
type LessonDataType = {
6964
lessonId: string
7065
isHidden: boolean
@@ -84,6 +79,11 @@ type LessonDataType = {
8479
materialsUrl: string
8580
}
8681
82+
type stateType = {
83+
error: boolean
84+
lessonData: LessonDataType
85+
}
86+
8787
export default Vue.extend({
8888
components: {
8989
BaseActionButton,

‎src/components/EditLessonScreenInner1.vue‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
<editor-input-field-pickable
126126
v-model="tempFormData.startTime"
127127
:title="`${$t('components.editing_screen.labels.time')} *`"
128-
label="start_time"
129128
placeholder="00:00"
130129
:transparent="true"
131130
icon-name="mdi-clock-outline"
@@ -136,7 +135,6 @@
136135
<span class="Hyphen">-</span>
137136
<editor-input-field-pickable
138137
v-model="tempFormData.endTime"
139-
label="end_time"
140138
placeholder="00:00"
141139
:transparent="true"
142140
icon-name="mdi-clock-outline"
@@ -149,7 +147,6 @@
149147
<editor-input-field-pickable
150148
v-model="tempFormData.subjectName"
151149
:title="`${$t('common.lesson_data.labels.subject_name')} *`"
152-
label="lesson"
153150
placeholder="例）理科"
154151
class="LessonField"
155152
/>
@@ -165,7 +162,6 @@
165162
<editor-input-field-pickable
166163
v-model="tempFormData.title"
167164
:title="`${$t('common.lesson_data.labels.title')} *`"
168-
:label="$t('common.lesson_data.labels.title')"
169165
placeholder="例）理科"
170166
/>
171167
</div>

‎src/components/EditLessonScreenInner3.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<editor-input-field-pickable
44
v-model="tempFormData.videoUrl"
55
:title="$t('components.editing_screen.labels.video_url')"
6-
label="video"
76
placeholder="https://"
87
/>
98

‎src/components/EditLessonScreenInner4.vue‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@
33
<editor-input-field-pickable
44
v-model="tempFormData.pages"
55
:title="$t('components.editing_screen.labels.textbook_page')"
6-
label="textbook_page"
76
placeholder="例）10〜14ページ"
87
/>
98
<editor-input-field-pickable
109
v-model="tempFormData.materialsTitle"
1110
:title="$t('components.editing_screen.labels.material_title')"
12-
label="sub_text"
1311
placeholder="例）やさしい理科教材"
1412
/>
1513
<editor-input-field-pickable
1614
v-model="tempFormData.materialsUrl"
1715
:title="$t('components.editing_screen.labels.material_url')"
18-
label="sub_text_url"
1916
placeholder="https://"
2017
/>
2118
</div>

‎src/components/EditingVisibilityDialog.vue‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
]"
2727
@click-outside="closeModal"
2828
>
29-
<template v-slot:title>
29+
<template #title>
3030
{{ modalTitle }}
3131
</template>
32-
<template v-slot:default>
32+
<template #default>
3333
<div class="EditingVisibilityModal-Contents">
3434
<p class="EditingVisibilityModal-Text">
3535
{{ date }} <br />
@@ -78,9 +78,6 @@ export default Vue.extend({
7878
value: {
7979
type: Object as () => classData.LessonWithId,
8080
required: true,
81-
default: {
82-
id: '',
83-
},
8481
},
8582
},
8683
data(): LocalData {

0 commit comments

Comments
 (0)