v1.0.12 🎉

1. Fix the autoExpand issue of 所有教材 2. Move 「授課大綱」, 「教師資訊」 button to the top right corner of card
pionxzh · Feb 24, 2019 · 905a68d · 905a68d
1 parent d63c8c3
commit 905a68d
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 24 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -2,4 +2,4 @@
         function gtag(){dataLayer.push(arguments);}
         gtag('js', new Date());
         gtag('config', 'UA-105316326-2');
-        //gtag('set', {'user_id': 'UA-105316326-2'});</script><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="ie=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta name=fragment content=!><title>Ecourse+</title><link rel=canonical href=https://ecourse.pionxzh.com><link rel=icon type=image/png sizes=32x32 href=/static/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/favicon-16x16.png><link rel=apple-touch-icon sizes=180x180 href=/static/apple-touch-icon.png><link rel=manifest href=/static/manifest.json><link rel=mask-icon href=/static/safari-pinned-tab.svg color=#009688><link rel="shortcut icon" href=/static/favicon.ico><link rel=stylesheet href=https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.1.19/css/materialdesignicons.min.css><meta name=theme-color content=#2a3a4e><meta name=description content=Ecourse+提供簡潔的介面，輕鬆瀏覽中正大學Ecourse上的公告、作業、教材與成績><meta property=og:title content=Ecourse+><meta property=og:type content=website><meta property=og:description content=Ecourse+提供簡潔的介面，輕鬆瀏覽中正大學Ecourse上的公告、作業、教材與成績><meta property=og:url content=ecourse.pionxzh.com><meta property=og:image content=https://i.imgur.com/S8vOuJI.png><meta name=application-name content=Ecourse+><meta name=apple-mobile-web-app-title content=Ecourse+><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><link href=/static/css/app.4b0a4302682d71431e1cc394fb860794.css rel=stylesheet></head><body><div id=app></div><script>!function(){"use strict";window.addEventListener("load",function(){"serviceWorker"in navigator&&"https:"===window.location.protocol&&navigator.serviceWorker.register("/service-worker.js").then(function(e){e.onupdatefound=function(){if(navigator.serviceWorker.controller){var o=e.installing;o.onstatechange=function(){switch(o.state){case"installed":navigator.serviceWorker.controller?(console.log("New or updated content is available."),confirm("有新版本更新! 現在重新整理?")&&location.reload()):console.log("Content is now available offline!");break;case"redundant":console.error("The installing service worker became redundant.")}}}}}).catch(function(e){console.error("Error during service worker registration:",e)})})}();</script><script src=https://cdnjs.cloudflare.com/ajax/libs/smoothscroll/1.4.6/SmoothScroll.min.js></script><noscript>您的瀏覽器不支援本站，請使用Chrome, Firefox 或 Safari。</noscript><script type=text/javascript src=/static/js/vendor.ddbd8fc7b4b1bf331991.js></script><script type=text/javascript src=/static/js/app.11af2acc8db9c670a236.js></script></body></html>
+        //gtag('set', {'user_id': 'UA-105316326-2'});</script><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="ie=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta name=fragment content=!><title>Ecourse+</title><link rel=canonical href=https://ecourse.pionxzh.com><link rel=icon type=image/png sizes=32x32 href=/static/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/favicon-16x16.png><link rel=apple-touch-icon sizes=180x180 href=/static/apple-touch-icon.png><link rel=manifest href=/static/manifest.json><link rel=mask-icon href=/static/safari-pinned-tab.svg color=#009688><link rel="shortcut icon" href=/static/favicon.ico><link rel=stylesheet href=https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/3.4.93/css/materialdesignicons.min.css><meta name=theme-color content=#2a3a4e><meta name=description content=Ecourse+提供簡潔的介面，輕鬆瀏覽中正大學Ecourse上的公告、作業、教材與成績><meta property=og:title content=Ecourse+><meta property=og:type content=website><meta property=og:description content=Ecourse+提供簡潔的介面，輕鬆瀏覽中正大學Ecourse上的公告、作業、教材與成績><meta property=og:url content=ecourse.pionxzh.com><meta property=og:image content=https://i.imgur.com/S8vOuJI.png><meta name=application-name content=Ecourse+><meta name=apple-mobile-web-app-title content=Ecourse+><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><link href=/static/css/app.4b0a4302682d71431e1cc394fb860794.css rel=stylesheet></head><body><div id=app></div><script>!function(){"use strict";window.addEventListener("load",function(){"serviceWorker"in navigator&&"https:"===window.location.protocol&&navigator.serviceWorker.register("/service-worker.js").then(function(e){e.onupdatefound=function(){if(navigator.serviceWorker.controller){var o=e.installing;o.onstatechange=function(){switch(o.state){case"installed":navigator.serviceWorker.controller?(console.log("New or updated content is available."),confirm("有新版本更新! 現在重新整理?")&&location.reload()):console.log("Content is now available offline!");break;case"redundant":console.error("The installing service worker became redundant.")}}}}}).catch(function(e){console.error("Error during service worker registration:",e)})})}();</script><script src=https://cdnjs.cloudflare.com/ajax/libs/smoothscroll/1.4.6/SmoothScroll.min.js></script><noscript>您的瀏覽器不支援本站，請使用Chrome, Firefox 或 Safari。</noscript><script type=text/javascript src=/static/js/vendor.46670df4699e2b9d00e9.js></script><script type=text/javascript src=/static/js/app.b7865aabc451d56c7969.js></script></body></html>
diff --git a/dist/service-worker.js b/dist/service-worker.js
diff --git a/dist/static/js/app.11af2acc8db9c670a236.js b/dist/static/js/app.11af2acc8db9c670a236.js
diff --git a/dist/static/js/app.b7865aabc451d56c7969.js b/dist/static/js/app.b7865aabc451d56c7969.js
diff --git a/.../static/js/vendor.ddbd8fc7b4b1bf331991.js → .../static/js/vendor.46670df4699e2b9d00e9.js b/.../static/js/vendor.ddbd8fc7b4b1bf331991.js → .../static/js/vendor.46670df4699e2b9d00e9.js
diff --git a/index.html b/index.html
@@ -23,7 +23,7 @@
     <link rel="manifest" href="/static/manifest.json">
     <link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#009688">
     <link rel="shortcut icon" href="/static/favicon.ico">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/2.1.19/css/materialdesignicons.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/3.4.93/css/materialdesignicons.min.css" />
     <meta name="theme-color" content="#2a3a4e">
     <meta name="description" content="Ecourse+提供簡潔的介面，輕鬆瀏覽中正大學Ecourse上的公告、作業、教材與成績">
     <meta property="og:title" content="Ecourse+" />

diff --git a/src/components/App.vue b/src/components/App.vue
@@ -158,12 +158,16 @@
                         v-flex(xs6)
                             v-card.theme-card(@click.native='setting.weatherTheme=false')
                                 v-img(:src="require('../assets/nav.png')" height='200px')
-                                v-card-text 預設主題<br class='hidden-md-and-up'> ( • ̀ω•́ )
+                                v-card-text 預設主題
+                                    br.hidden-md-and-up
+                                    | ( • ̀ω•́ )
 
                         v-flex(xs6)
                             v-card.theme-card(@click.native='setting.weatherTheme=true')
                                 v-img(:src="require('../assets/weather.png')" height='200px')
-                                v-card-text 天色主題<br class='hidden-md-and-up'> ε≡ﾍ( ´∀`)ﾉ
+                                v-card-text 天色主題
+                                    br.hidden-md-and-up
+                                    | ε≡ﾍ( ´∀`)ﾉ
 
         v-dialog(v-model='flag.setting' max-width=450 :fullscreen='isMobile' scroll)
             v-toolbar.blue.no-select(dark :fixed='isMobile')

diff --git a/src/components/Course.vue b/src/components/Course.vue
@@ -70,20 +70,16 @@
                     v-toolbar(color='orange' flat dark)
                         v-toolbar-side-icon: v-icon mdi-menu
                         v-toolbar-title.no-select 教材
-                        //v-spacer
-                        //v-btn(aria-label='search' icon): v-icon mdi-magnify
+                        v-spacer
+                        v-tooltip.mr-0.hidden-sm-and-down(left)
+                            v-btn(aria-label='outline' slot='activator' @click='getIntro' icon)
+                                v-icon mdi-book-open
+                            span 授課大綱
+                        v-tooltip.mr-0.hidden-sm-and-down(left)
+                            v-btn(aria-label='info' slot='activator' @click='getTeacherInfo' icon)
+                                v-icon mdi-account-card-details
+                            span 教師資訊
                     v-list.pa-0(two-line subheader)
-                        v-list-tile(v-if='Setting.showIntro' @click='getIntro')
-                            v-list-tile-avatar
-                                v-icon(large) mdi-file-account
-                            v-list-tile-content
-                                v-list-tile-title 授課大綱
-                        v-divider(v-if='Setting.showDivider')
-                        v-list-tile(v-if='Setting.showTeacherInfo' @click='getTeacherInfo')
-                            v-list-tile-avatar
-                                v-icon(large) mdi-file-account
-                            v-list-tile-content
-                                v-list-tile-title 教師資訊
                         v-divider(v-if='Setting.showDivider')
                         template(v-for='(item, index) in TextbookList.list')
                             v-list-group(:key='item[0]' :value='index === 0 && Setting.expandFirstFolder' prepend-icon='mdi-folder' append-icon='mdi-chevron-down' v-if='TextbookList.content[index]')
@@ -99,6 +95,11 @@
                                             v-list-tile-sub-title {{ nitem.time.split(' ')[0] }}
                                     v-divider(v-if='Setting.showDivider')
                             v-divider(v-if='Setting.showDivider')
+                        v-list-tile(v-if='!TextbookList.content[0]')
+                            v-list-tile-action
+                                v-icon(large) mdi-code
+                            v-list-tile-content
+                                v-list-tile-title 暫無教材
         transition(:name='isMobile ? "slide-x-transition" : "slide-y-reverse-transition"')
             v-flex.pl-2(xs12 md6 offset-md1 v-if='tag === "score"')
                 v-card#score-card.main-card(color='grey lighten-5' flat :class='{"elevation-1": !Setting.scoreStyle2}' light)

diff --git a/src/components/Main.vue b/src/components/Main.vue
@@ -25,9 +25,9 @@
                 | #[v-icon mdi-apps] #[strong 添加為App]
             v-btn.mb-2(color='pink' v-if='User.loggedIn && (!isMobile | isApp)' to='/timeTable' large)
                 | #[v-icon mdi-apps] #[strong 查看課表]
-            div.mt-3 v1.0.11
-            div - 修正多個錯誤
-            div - 改進效能
+            div.mt-3 v1.0.12
+            div - 修正所有教材不會自動展開的問題
+            div -「授課大綱」、「教師資訊」現在移到卡片的右上角囉
 </template>
 
 <script>

diff --git a/src/eventBus.js b/src/eventBus.js
@@ -64,7 +64,7 @@ const Bus = new Vue({
             let temp = {}
             this.template.forEach((element, index) => {
                 temp[element] = {}
-                temp[element].list = chapter[index] || {0: {0: '所有教材'}}
+                temp[element].list = chapter[index] || [ ['所有教材'] ]
                 temp[element].content = textbook[index].map(subject => {
                     return subject[0] === null ? null : subject[0].map(item => {
                         return {