Skip to content
Snippets Groups Projects
Commit af10a98a authored by Hermann's avatar Hermann
Browse files

add announcetool as node-submodule

parent 23208577
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"author": "Hermann Blum et al", "author": "Hermann Blum et al",
"dependencies": { "dependencies": {
"ajv": "^5.5.0", "ajv": "^5.5.0",
"announcetool": "git+ssh://git@gitlab.ethz.ch:amiv/amivapi-announce-tool.git#webpack-version",
"axios": "^0.17.1", "axios": "^0.17.1",
"babel": "^6.23.0", "babel": "^6.23.0",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
......
import renderAnnounce from 'announcetool';
const m = require('mithril');
export default class AnnounceTool {
oninit() {
console.log(renderAnnounce);
}
view() {
return m('div', [
m('div#tableset', [
m('p#events'),
m('div#buttonrow', [
m('button#preview.btn.btn-default', 'Preview'),
m('button#reset.btn.btn-default', 'Reset'),
m('button#send.btn.btn-default', 'Send'),
]),
]),
m('br'),
m('hr'),
m('textarea#target'),
]);
}
}
...@@ -2,6 +2,7 @@ import LoginScreen from './login'; ...@@ -2,6 +2,7 @@ import LoginScreen from './login';
import TableView from './views/tableView'; import TableView from './views/tableView';
import { UserModal, UserTable, NewUser } from './userTool'; import { UserModal, UserTable, NewUser } from './userTool';
import Sidebar from './sidebar'; import Sidebar from './sidebar';
import AnnounceTool from './announceTool';
const m = require('mithril'); const m = require('mithril');
...@@ -49,4 +50,5 @@ m.route(root, '/users', { ...@@ -49,4 +50,5 @@ m.route(root, '/users', {
}, },
}), }),
'/login': LoginScreen, '/login': LoginScreen,
'/announce': layoutWith(AnnounceTool),
}); });
const publicPath = '/dist'; const publicPath = '/dist';
const webpack = require('webpack');
const config = { const config = {
context: `${__dirname}/src`, // `__dirname` is root of project context: `${__dirname}/src`, // `__dirname` is root of project
...@@ -20,6 +22,14 @@ const config = { ...@@ -20,6 +22,14 @@ const config = {
index: 'index.html', index: 'index.html',
}, },
plugins: [
new webpack.ProvidePlugin({
$: 'jquery',
jQuery: 'jquery',
'windows.jQuery': 'jquery',
}),
],
module: { module: {
rules: [ rules: [
{ {
...@@ -50,6 +60,17 @@ const config = { ...@@ -50,6 +60,17 @@ const config = {
}, },
], ],
}, },
{
test: /node_modules\/announcetool.*\.(html|css)$/,
use: [
{
loader: 'file-loader',
options: {
publicPath,
},
},
],
},
], ],
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment