diff --git a/src/components/Lesson.vue b/src/components/Lesson.vue index ba6690242..b2986b5be 100644 --- a/src/components/Lesson.vue +++ b/src/components/Lesson.vue @@ -1,121 +1,124 @@ @@ -125,6 +128,7 @@ import Vue from 'vue' import MonacoEditor from 'vue-monaco-editor' import Explorer from './Explorer.vue' import Button from './Button.vue' +import Header from './Header.vue' const IPFS = require('ipfs') const CID = require('cids') const marked = require('marked') @@ -181,7 +185,8 @@ export default { components: { MonacoEditor, Explorer, - Button + Button, + Header }, data: self => { return { @@ -198,7 +203,6 @@ export default { lessonKey: 'passed' + self.$route.path, lessonPassed: !!localStorage['passed' + self.$route.path], lessonTitle: self.$attrs.lessonTitle, - issueUrl: `https://github.com/ipfs-shipyard/proto.school/issues/new?labels=question&title=Question+on+Lesson+${self.$route.path.slice(self.$route.path.lastIndexOf('/') + 1)}:+${self.$attrs.lessonTitle}+(${self.$route.path})&body=Have%20a%20question%20or%20suggestion%20regarding%20a%20ProtoSchool%20lesson%3F%20Please%20use%20this%0Atemplate%20to%20share%20it!%0A%0A1.%20URL%20of%20the%20lesson%20that's%20confusing%3A%0A%20https%3A%2F%2Fproto.school%2F%23${self.$route.path}%0A%0A2.%20What%27s%20confusing%20about%20this%20lesson%3F%0A%0A3.%20What%20additional%20context%20could%20we%20provide%20to%20help%20you%20succeed%3F%0A%0A4.%20What%20other%20feedback%20would%20you%20like%20to%20share%20about%20ProtoSchool%3F%0A`, output: self.output, IPFS, expandExercise: false, @@ -221,7 +225,19 @@ export default { return parseInt(this.$route.path.slice(this.$route.path.lastIndexOf('/') + 1), 10) }, workshopShortname: function () { - return this.$route.path.charAt(1).toUpperCase() + this.$route.path.slice(2, this.$route.path.lastIndexOf('/')) + let shortname = this.$route.path.charAt(1).toUpperCase() + this.$route.path.slice(2, this.$route.path.lastIndexOf('/')) + // // ADD THIS LATER IF WE DECIDE WE WANT ALL WORDS CAPITALIZED + // if (shortname.includes("-")) { + // let shortnameArray = shortname.split("-") + // let shortnameArrayUpper = shortnameArray.map( word => { + // return (word.charAt(0).toUpperCase() + word.slice(1)) + // }) + // shortname = shortnameArrayUpper.join(" ") + // } + return shortname.split('-').join(" ") + }, + issueUrl: function () { + return `https://github.com/ProtoSchool/protoschool.github.io/issues/new?assignees=&labels=lesson-feedback&template=lesson-feedback.md&title=Lesson+Feedback%3A+${this.workshopShortname}+-+Lesson+${this.lessonNumber}+(${this.lessonTitle})` }, lessonsInWorkshop: function () { let basePath = this.$route.path.slice(0, -2) @@ -336,13 +352,23 @@ export default { } }, next: function () { - Vue.set(this.output, 'test', null) + if (this.exercise) { + Vue.set(this.output, 'test', null) + } else { + localStorage[this.lessonKey] = 'passed' + this.lessonPassed = !!localStorage[this.lessonKey] + } let current = this.lessonNumber let next = (parseInt(current) + 1).toString().padStart(2, '0') this.$router.push({path: next}) }, workshopMenu: function () { - Vue.set(this.output, 'test', null) + if (this.exercise) { + Vue.set(this.output, 'test', null) + } else { + localStorage[this.lessonKey] = 'passed' + this.lessonPassed = !!localStorage[this.lessonKey] + } this.$router.push({path: '/'}) }, toggleExpandExercise: function () { @@ -384,6 +410,10 @@ span.textLink { text-decoration: underline; } +footer a { + color: aqua; +} + @media screen and (min-width: 60rem) { .indent-1 { margin-left: 93px; diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue index 2c90fa403..90e496f4f 100644 --- a/src/components/Navigation.vue +++ b/src/components/Navigation.vue @@ -1,7 +1,12 @@