Skip to content

Commit

Permalink
Refactor component loading
Browse files Browse the repository at this point in the history
* Move dynamicRequire content to bottom of Router, organize by chunk
* Set up Router to handle loading, wrapping Vue components
* Directly load four components
* Add .gitignore for stats.json

Refactor FlatLayout to a .vue file

Refactor PageErrors to a .vue file

Refactor StudentAssessments to a .vue file

Update chunking object in Router

Revert "Refactor StudentAssessments to a .vue file"

This reverts commit ccab1d8.
  • Loading branch information
sderickson committed Feb 2, 2018
1 parent 8331141 commit b534493
Show file tree
Hide file tree
Showing 19 changed files with 215 additions and 89 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -117,3 +117,6 @@ scripts/analytics/mongodb/.mainAuth.json

# Build info file served by the production server
.build_info.json

# Webpack stats
stats.json
170 changes: 162 additions & 8 deletions app/core/Router.coffee

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions app/core/components/FlatLayout.coffee

This file was deleted.

22 changes: 22 additions & 0 deletions app/core/components/FlatLayout.vue
@@ -0,0 +1,22 @@
<template lang="jade">

div
page-errors(v-if="errors.length")
slot(v-else)

</template>

<script lang="coffee">
PageErrors = require('core/components/PageErrors.vue').default
module.exports = {
name: 'flat-layout'
components:
'page-errors': PageErrors
computed: Vuex.mapState({
errors: (state) -> state.pageErrors
})
}
</script>
13 changes: 0 additions & 13 deletions app/core/components/PageErrors.coffee

This file was deleted.

@@ -1,3 +1,22 @@
<script lang="coffee">
module.exports = {
name: 'page-errors'
computed: _.assign(
Vuex.mapState({
error: (state) -> _.first(state.pageErrors)
}),
Vuex.mapGetters('me', [
'isAnonymous'
'forumLink'
])
)
}
</script>

<template lang="jade">

#loading-error.text-center
div(v-if="error.stack")
h1 {{ $t("loading_error.unknown") }}
Expand Down Expand Up @@ -93,3 +112,4 @@
li
a(href="https://twitter.com/codecombat") {{ $t("nav.twitter") }}

</template>
3 changes: 0 additions & 3 deletions app/templates/core/components/flat-layout.jade

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/admin/AdminClassroomLevelsComponent.vue
@@ -1,5 +1,5 @@
<template lang="jade">
div.admin-classroom-levels.container
#admin-classroom-levels-view.admin-classroom-levels.container
h3 Classroom Levels
div(v-if="loading") Loading...
div(v-else-if="!$store.getters['me/isAdmin']")
Expand Down
8 changes: 0 additions & 8 deletions app/views/admin/AdminClassroomLevelsView.coffee

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/admin/CLAsComponent.vue
Expand Up @@ -40,8 +40,6 @@ module.exports = Vue.extend({
@import "app/styles/bootstrap/variables"
#admin-clas-view
background-color: white
padding: 50px 0 200px
table
Expand Down
8 changes: 0 additions & 8 deletions app/views/admin/CLAsView.coffee

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/admin/FilesComponent.vue
@@ -1,5 +1,5 @@
<template lang="jade">
div.container
#files-view.container
h1 Files

select#folder-select(v-model="directory")
Expand Down
8 changes: 0 additions & 8 deletions app/views/admin/FilesView.coffee

This file was deleted.

6 changes: 2 additions & 4 deletions app/views/admin/OutcomesReportComponent.vue
@@ -1,6 +1,6 @@
<template lang="jade">

.container
#outcomes-report-view.container
form
label
| Teacher email:
Expand Down Expand Up @@ -98,7 +98,7 @@ co = require('co')
helper = require 'lib/coursesHelper'
utils = require 'core/utils'
OutcomesReportComponent = {
module.exports = Vue.extend {
data: ->
accountManager: me.toJSON()
teacherEmail: utils.getQueryVariable('email')
Expand Down Expand Up @@ -393,8 +393,6 @@ OutcomesReportComponent = {
}
`export default OutcomesReportComponent`
</script>

<style lang="sass">
Expand Down
16 changes: 0 additions & 16 deletions app/views/admin/OutcomesReportView.coffee

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/admin/SkippedContactsView.coffee
Expand Up @@ -3,7 +3,7 @@ RootComponent = require 'views/core/RootComponent'
template = require 'templates/base-flat'
co = require('co')
api = require 'core/api'
FlatLayout = require 'core/components/FlatLayout'
FlatLayout = require('core/components/FlatLayout.vue').default

SkippedContactInfo =
template: require('templates/admin/skipped-contacts/skipped-contact-info')()
Expand Down
2 changes: 1 addition & 1 deletion app/views/courses/ProjectGalleryView.coffee
@@ -1,6 +1,6 @@
require('app/styles/courses/project-gallery.sass')
RootComponent = require 'views/core/RootComponent'
FlatLayout = require 'core/components/FlatLayout'
FlatLayout = require('core/components/FlatLayout.vue').default
api = require 'core/api'
User = require 'models/User'
Level = require 'models/Level'
Expand Down
2 changes: 1 addition & 1 deletion app/views/courses/StudentAssessmentsView.coffee
@@ -1,6 +1,6 @@
require('app/styles/courses/student-assessments-view.sass')
RootComponent = require 'views/core/RootComponent'
FlatLayout = require 'core/components/FlatLayout'
FlatLayout = require('core/components/FlatLayout.vue').default
api = require 'core/api'
User = require 'models/User'
Level = require 'models/Level'
Expand Down
3 changes: 1 addition & 2 deletions test/app/views/admin/AdminClassroomLevelsView.spec.coffee
@@ -1,5 +1,4 @@
AdminClassroomLevelsView = require 'views/admin/AdminClassroomLevelsView'
AdminClassroomLevelsComponent = AdminClassroomLevelsView.prototype.VueComponent
AdminClassroomLevelsComponent = require('views/admin/AdminClassroomLevelsComponent.vue').default
factories = require 'test/app/factories'
Levels = require 'collections/Levels'

Expand Down

0 comments on commit b534493

Please sign in to comment.