Skip to content

Commit f0db340

Browse files
authored
Merge pull request #393 from Nekoya3/aws-migration
依存関係の更新 & カレンダーバーの記述の修正
2 parents e0ac03d + c3acb85 commit f0db340

File tree

3 files changed

+359
-476
lines changed

3 files changed

+359
-476
lines changed

package.json

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,69 +25,67 @@
2525
}
2626
},
2727
"dependencies": {
28-
"@aws-amplify/api": "^3.2.2",
29-
"@babel/core": "^7.11.4",
28+
"@aws-amplify/api": "^3.2.5",
29+
"@babel/core": "^7.11.6",
3030
"@babel/runtime-corejs3": "^7.11.2",
31-
"@nuxt/typescript-runtime": "^1.0.0",
32-
"@nuxtjs/axios": "^5.12.1",
31+
"@nuxt/typescript-runtime": "^2.0.0",
32+
"@nuxtjs/axios": "^5.12.2",
3333
"@nuxtjs/dotenv": "^1.4.1",
34-
"@nuxtjs/pwa": "^3.0.1",
34+
"@nuxtjs/pwa": "^3.0.2",
3535
"@types/js-cookie": "^2.2.6",
3636
"@types/jwt-decode": "^2.2.1",
37-
"@types/node": "^14.6.0",
38-
"aws-amplify": "^3.0.24",
37+
"@types/node": "^14.11.2",
38+
"aws-amplify": "^3.3.2",
3939
"cookieparser": "^0.1.0",
4040
"core-js": "3.6.5",
4141
"cross-env": "^7.0.2",
42-
"date-fns": "^2.15.0",
43-
"dayjs": "^1.8.34",
42+
"date-fns": "^2.16.1",
43+
"dayjs": "^1.8.36",
4444
"express": "^4.17.1",
45-
"google-auth-library": "^6.0.6",
4645
"js-cookie": "^2.2.1",
4746
"jwt-decode": "^2.2.0",
48-
"lodash.clonedeep": "^4.5.0",
49-
"nuxt": "^2.14.3",
50-
"nuxt-i18n": "^6.13.11",
51-
"nuxt-property-decorator": "^2.7.2",
47+
"nuxt": "^2.14.6",
48+
"nuxt-i18n": "^6.15.1",
49+
"nuxt-property-decorator": "^2.8.8",
5250
"nuxt-svg-loader": "^1.2.0",
5351
"nuxt-webfontloader": "^1.1.0",
5452
"uuid": "^8.3.0",
5553
"vue-property-decorator": "^9.0.0",
5654
"vuex": "^3.5.1",
57-
"vuex-class-component": "2.3.5"
55+
"vuex-class-component": "^2.3.5"
5856
},
5957
"devDependencies": {
60-
"@nuxt/types": "^2.14.3",
61-
"@nuxt/typescript-build": "^2.0.2",
58+
"@nuxt/types": "^2.14.6",
59+
"@nuxt/typescript-build": "^2.0.3",
6260
"@nuxtjs/eslint-config-typescript": "^3.0.0",
6361
"@nuxtjs/stylelint-module": "^4.0.0",
6462
"@nuxtjs/vuetify": "^1.11.2",
65-
"@types/jest": "^26.0.10",
66-
"@vue/test-utils": "^1.0.4",
63+
"@types/jest": "^26.0.14",
64+
"@vue/test-utils": "^1.1.0",
6765
"babel-core": "^6.26.3",
6866
"babel-eslint": "^10.1.0",
6967
"babel-jest": "^26.3.0",
7068
"cpx": "^1.5.0",
71-
"eslint": "^7.7.0",
69+
"eslint": "^7.9.0",
7270
"eslint-config-prettier": "^6.11.0",
7371
"eslint-loader": "^4.0.2",
7472
"eslint-plugin-nuxt": "^1.0.0",
7573
"eslint-plugin-prettier": "^3.1.4",
76-
"eslint-plugin-tsdoc": "^0.2.6",
77-
"husky": "^4.2.5",
78-
"jest": "^26.4.1",
79-
"lint-staged": "^10.2.11",
74+
"eslint-plugin-tsdoc": "^0.2.7",
75+
"husky": "^4.3.0",
76+
"jest": "^26.4.2",
77+
"lint-staged": "^10.4.0",
8078
"nodemon": "^2.0.4",
81-
"prettier": "^2.0.5",
79+
"prettier": "^2.1.2",
8280
"rimraf": "^3.0.2",
83-
"stylelint": "^13.6.1",
81+
"stylelint": "^13.7.1",
8482
"stylelint-config-prettier": "^8.0.2",
8583
"stylelint-config-standard": "^20.0.0",
8684
"stylelint-scss": "^3.18.0",
87-
"ts-jest": "^26.2.0",
88-
"ts-loader": "^8.0.3",
85+
"ts-jest": "^26.4.0",
86+
"ts-loader": "^8.0.4",
8987
"vue": "^2.6.12",
90-
"vue-jest": "^3.0.6",
88+
"vue-jest": "^3.0.7",
9189
"vue-server-renderer": "^2.6.12",
9290
"vue-template-compiler": "^2.6.12"
9391
}

src/components/CalendarBar.vue

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,13 @@ class DateListWindowImpl implements DateListWindow {
201201
202202
@Component
203203
export default class CalendarBar extends Vue {
204+
dateListWindow: DateListWindow = new DateListWindowImpl(
205+
'Week',
206+
'Monday',
207+
new Date(),
208+
this.input
209+
)
210+
204211
@Prop({
205212
default() {
206213
return { view: 'Week', startWeekOn: 'Monday' }
@@ -215,12 +222,15 @@ export default class CalendarBar extends Vue {
215222
})
216223
public value!: Date
217224
218-
dateListWindow: DateListWindow = new DateListWindowImpl(
219-
this.config?.view ?? 'Week',
220-
this.config?.startWeekOn ?? 'Monday',
221-
this.value ?? new Date(),
222-
this.input
223-
)
225+
constructor() {
226+
super()
227+
this.dateListWindow = new DateListWindowImpl(
228+
this.config?.view ?? 'Week',
229+
this.config?.startWeekOn ?? 'Monday',
230+
this.value ?? new Date(),
231+
this.input
232+
)
233+
}
224234
225235
@Emit()
226236
public input(value: Date) {

0 commit comments

Comments
 (0)