Skip to content

Commit

Permalink
[ADD] 설청 추가 및 1차 배포
Browse files Browse the repository at this point in the history
  • Loading branch information
tbvjaos510 committed Oct 25, 2018
1 parent 044c405 commit ed83ffd
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 8 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"system-font-families": "^0.4.1",
"vue": "^2.5.16",
"vue-bus": "^1.1.0",
"vue-color": "^2.7.0",
"vue-datetime": "^1.0.0-beta.8",
"vue-electron": "^1.0.6",
"vue-linkify": "^1.0.1",
Expand Down
26 changes: 22 additions & 4 deletions src/renderer/components/Settings/SettingCalendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,39 @@
<vk-button type="primary" size="small" @click="deleteToken">
다른 계정으로 로그인
</vk-button>

<!-- <p>
<input type="text" class="uk-input uk-form-small uk-width-small" :value="setting.calendar.background" @focus="backColor = true" @blur="backColor = false" readonly>
<chrome-picker v-model="setting.calendar.background" v-if="backColor" @focus="backColor = true"/>
</input>
</p> -->
</span>
</div>
</template>

<script>
import fs from 'fs'
import { Chrome } from 'vue-color'
export default {
data () {
return {
backColor: false
}
},
components: {
'chrome-picker': Chrome
},
name: 'setting-calendar',
methods: {
deleteToken () {
fs.unlink('token.json', (err) => {
if (err) return console.error(err)
if (fs.existsSync('token.json')) {
fs.unlink('token.json', (err) => {
if (err) return console.error(err)
this.parents.webContents.reload()
})
} else {
this.parents.webContents.reload()
})
}
}
},
props: ['setting', 'parents']
Expand Down
5 changes: 3 additions & 2 deletions src/renderer/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Vue.use(Vuikit)
Vue.use(VuikitIcons)
Vue.use(VueBus)
Vue.use(Datetime)

Vue.directive('linkified', linkify)

if (!process.env.IS_WEB) Vue.use(require('vue-electron'))
Expand All @@ -55,7 +54,9 @@ Vue.config.productionTip = false

/* eslint-disable no-new */
new Vue({
components: { App },
components: {
App
},
router,
render: h => h(App),
store,
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/store/modules/Setting.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default {
size: '6em'
},
calendar: {
background: 'rgba(255, 255, 255, 0.4)'
background: '#00000066'
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/views/Setting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var settings = {
size: '6em'
},
calendar: {
background: 'rgba(255, 255, 255, 0.4)'
background: '#00000066'
},
changeOption (key, value) {
remote.getCurrentWindow().getParentWindow().webContents.send('setOption', {
Expand Down
25 changes: 25 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,10 @@ circular-json@^0.3.1:
version "0.3.3"
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"

clamp@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634"

clap@^1.0.9:
version "1.2.3"
resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
Expand Down Expand Up @@ -5960,6 +5964,10 @@ lodash.tail@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"

lodash.throttle@^4.0.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"

lodash.toplainobject@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d"
Expand Down Expand Up @@ -6060,6 +6068,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"

material-colors@^1.0.0:
version "1.2.6"
resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"

material-design-icons-iconfont@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/material-design-icons-iconfont/-/material-design-icons-iconfont-3.0.3.tgz#154a1084047d4e27237fa7f5a37e1075ceea6df2"
Expand Down Expand Up @@ -8823,6 +8835,10 @@ timers-browserify@^2.0.4:
dependencies:
setimmediate "^1.0.4"

tinycolor2@^1.1.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"

title-case@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"
Expand Down Expand Up @@ -9215,6 +9231,15 @@ vue-clickaway@^2.1.0:
dependencies:
loose-envify "^1.2.0"

vue-color@^2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/vue-color/-/vue-color-2.7.0.tgz#31e898370a5786fd6c3007388cb7242db6ba6988"
dependencies:
clamp "^1.0.1"
lodash.throttle "^4.0.0"
material-colors "^1.0.0"
tinycolor2 "^1.1.2"

vue-datetime@^1.0.0-beta.8:
version "1.0.0-beta.8"
resolved "https://registry.yarnpkg.com/vue-datetime/-/vue-datetime-1.0.0-beta.8.tgz#0bd0e637aaa23d7b3428872c5ff40cce997fa273"
Expand Down

0 comments on commit ed83ffd

Please sign in to comment.