Merge branch 'develop'

Warehouse0 · Dec 25, 2018 · d809ea3 · d809ea3
2 parents 82a92ce + f201a6c
commit d809ea3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/client/src/pages/progress/progress-card/skill-control-modal/skill-control-modal.ts b/client/src/pages/progress/progress-card/skill-control-modal/skill-control-modal.ts
@@ -65,7 +65,11 @@ export class SkillControlModal extends FundamentalModal {
                 this.conversion = false;
                 return false;
               }
-              this.createSkill(data.content);
+              if (data.content.replace(/\s+/g, '').length === 0) {
+                this.showError('空白文字を除いて1文字以上入力してください');
+                return false;
+              }
+              this.createSkill(data.content.replace(/(^\s+)|(\s+$)/g, ''));
             }
           }
         ]

diff --git a/client/src/pages/settings-button/settings-modal/settings-modal.html b/client/src/pages/settings-button/settings-modal/settings-modal.html
@@ -9,6 +9,10 @@
 
 <ion-content padding>
   <ion-item-group>
+    <a ion-item detail-none href="https://github.com/TsundokuApp/Tsundoku" target="_blank">
+      <ion-icon item-start name="logo-github"></ion-icon>
+      <ion-label>GitHub リポジトリ</ion-label>
+    </a>
     <a ion-item detail-none href="https://scrapbox.io/Tsundoku" target="_blank">
       <ion-icon item-start name="help"></ion-icon>
       <ion-label>ヘルプ</ion-label>

diff --git a/functions/src/skill.ts b/functions/src/skill.ts
@@ -6,6 +6,9 @@ export const _createSkill = (db: FirebaseFirestore.Firestore) => async (args: {
   uid: string;
 }) => {
   const date = admin.firestore.FieldValue.serverTimestamp();
+  if (args.content.replace(/\s+/g, '').length === 0) {
+    throw new Error('不正なフォーマットのスキルです');
+  }
   return (await db.collection('skills').add({
     ...args,
     created: date