From 591007d356e63f15e1892f8433b27145fb1d11af Mon Sep 17 00:00:00 2001
From: Mathis Dedial <mathis@dedial.net>
Date: Sat, 10 Mar 2018 19:11:05 +0100
Subject: [PATCH] Fix issues discussed in !34
---
src/models/companies.js | 2 +-
src/views/companies/companyDetail.js | 6 +++---
src/views/companies/companyList.js | 4 ++--
src/views/companies/markdown/{1.md => abb.md} | 0
src/views/companies/markdown/list.md | 4 ++--
src/views/companies/markdown/{2.md => sensirion.md} | 0
webpack.config.js | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
rename src/views/companies/markdown/{1.md => abb.md} (100%)
rename src/views/companies/markdown/{2.md => sensirion.md} (100%)
diff --git a/src/models/companies.js b/src/models/companies.js
index d3048136..23c06432 100644
--- a/src/models/companies.js
+++ b/src/models/companies.js
@@ -3,7 +3,7 @@ import m from 'mithril';
// ensure that all markdown files are compiled
require.context('../views/companies/markdown');
-export default function loadMarkdown(companyId) {
+export default function load(companyId) {
// dynamically load markdown
return m.request({
url: `/dist/companies/${companyId}.html`,
diff --git a/src/views/companies/companyDetail.js b/src/views/companies/companyDetail.js
index c946e2c4..e6bf21b6 100644
--- a/src/views/companies/companyDetail.js
+++ b/src/views/companies/companyDetail.js
@@ -1,17 +1,17 @@
import m from 'mithril';
-import loadMarkdown from '../../models/companies';
+import load from '../../models/companies';
export default class companyDetail {
static oninit(vnode) {
this.content = '';
- loadMarkdown(vnode.attrs.companyId).then((response) => {
+ load(vnode.attrs.companyId).then((response) => {
this.content = response;
});
}
static onbeforeupdate(vnode) {
// load markdown whenever component is reloaded
- loadMarkdown(vnode.attrs.companyId).then((response) => {
+ load(vnode.attrs.companyId).then((response) => {
this.content = response;
});
}
diff --git a/src/views/companies/companyList.js b/src/views/companies/companyList.js
index 080adcb9..c0468005 100644
--- a/src/views/companies/companyList.js
+++ b/src/views/companies/companyList.js
@@ -1,10 +1,10 @@
import m from 'mithril';
-import loadMarkdown from '../../models/companies';
+import load from '../../models/companies';
export default class companyList {
static oninit() {
this.content = '';
- loadMarkdown('list').then((response) => {
+ load('list').then((response) => {
this.content = response;
});
}
diff --git a/src/views/companies/markdown/1.md b/src/views/companies/markdown/abb.md
similarity index 100%
rename from src/views/companies/markdown/1.md
rename to src/views/companies/markdown/abb.md
diff --git a/src/views/companies/markdown/list.md b/src/views/companies/markdown/list.md
index 648392fb..7e41cd54 100644
--- a/src/views/companies/markdown/list.md
+++ b/src/views/companies/markdown/list.md
@@ -1,3 +1,3 @@
# Our partner companies
-* [ABB](/#!/companies/1)
-* [Sensirion](/#!/companies/2)
+* [ABB](/#!/companies/abb)
+* [Sensirion](/#!/companies/sensirion)
diff --git a/src/views/companies/markdown/2.md b/src/views/companies/markdown/sensirion.md
similarity index 100%
rename from src/views/companies/markdown/2.md
rename to src/views/companies/markdown/sensirion.md
diff --git a/webpack.config.js b/webpack.config.js
index 5ebdfd85..1267db94 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -29,7 +29,7 @@ const config = {
}],
},
{
- test: /\.md$/, // Check for all md files
+ test: /src\/views\/companies\/markdown\/[a-zA-Z\d-]{3,}\.md$/, // Check for all .md files in /companies/markdown
use: [
{
loader: 'file-loader', // Writes the generated HTML to a file
--
GitLab