diff --git a/package.json b/package.json index 7e9bac7..275e1aa 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "license": "MIT", "dependencies": { "ace-css": "^1.1.0", + "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.26.1", "elm-webpack-loader": "^4.1.1", "file-loader": "^0.9.0", diff --git a/src/ACCUSchedule/View.elm b/src/ACCUSchedule/View.elm index 2c28b9e..303df77 100644 --- a/src/ACCUSchedule/View.elm +++ b/src/ACCUSchedule/View.elm @@ -7,14 +7,14 @@ import ACCUSchedule.Routing as Routing import ACCUSchedule.Search as Search import ACCUSchedule.Sessions as Sessions import ACCUSchedule.Types as Types -import Html exposing (a, br, div, h1, Html, p, text) +import Html exposing (a, br, div, h1, Html, img, p, text) +import Html.Attributes exposing (src) import Material.Button as Button import Material.Card as Card import Material.Chip as Chip import Material.Color as Color import Material.Elevation as Elevation import Material.Footer as Footer -import Material.Grid as Grid import Material.Icon as Icon import Material.Layout as Layout import Material.Options as Options @@ -303,6 +303,24 @@ agendaLink = drawerLink Routing.agendaUrl "Agenda" +footer = + Footer.mini [] + { left = + Footer.left [] + [ Footer.logo [] [ Footer.html <| text "ACCU 2017 Schedule" ] + , Footer.links [] + [ Footer.linkItem [ Footer.href "https://conference.accu.org/site" ] [ Footer.html <| text "Conference" ] + , Footer.linkItem [ Footer.href "https://github.com/abingham/accu-2017-elm-app" ] [ Footer.html <| img [ src "/static/img/GitHub-Mark-Light-32px.png" ] [] ] + ] + ] + , right = + Footer.right [] + [ Footer.links [] + [ Footer.linkItem [ Footer.href "https://sixty-north.com" ] [ Footer.html <| text "© 2017 Sixty North AS" ] ] + ] + } + + view : Model.Model -> Html Msg.Msg view model = let @@ -406,21 +424,7 @@ view model = , Options.css "margin-bottom" "10px" ] main - , Footer.mini [] - { left = - Footer.left [] - [ Footer.logo [] [ Footer.html <| text "ACCU 2017 Schedule" ] - , Footer.links [] - [ Footer.linkItem [ Footer.href "https://conference.accu.org/site" ] [ Footer.html <| text "Conference" ] - , Footer.linkItem [ Footer.href "https://github.com/abingham/accu-2017-elm-app" ] [ Footer.html <| text "Github" ] - ] - ] - , right = - Footer.right [] - [ Footer.links [] - [ Footer.linkItem [ Footer.href "https://sixty-north.com" ] [ Footer.html <| text "© 2017 Sixty North AS" ] ] - ] - } + , footer ] } ] diff --git a/src/static/img/GitHub-Mark-Light-32px.png b/src/static/img/GitHub-Mark-Light-32px.png new file mode 100644 index 0000000..628da97 Binary files /dev/null and b/src/static/img/GitHub-Mark-Light-32px.png differ diff --git a/webpack.config.js b/webpack.config.js index 9c7c360..a96d8d3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,4 @@ +var CopyWebpackPlugin = require( 'copy-webpack-plugin' ); var path = require("path"); module.exports = { @@ -24,29 +25,37 @@ module.exports = { { test: /\.html$/, exclude: /node_modules/, - loader: 'file?name=[name].[ext]', + loader: 'file?name=[name].[ext]' }, { test: /\.elm$/, exclude: [/elm-stuff/, /node_modules/], - loader: 'elm-webpack?verbose=true&warn=true', + loader: 'elm-webpack?verbose=true&warn=true' }, { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, - loader: 'url-loader?limit=10000&mimetype=application/font-woff', + loader: 'url-loader?limit=10000&mimetype=application/font-woff' }, { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, - loader: 'file-loader', + loader: 'file-loader' }, ], - noParse: /\.elm$/, + noParse: /\.elm$/ }, + plugins: [ + new CopyWebpackPlugin([ + { + from: 'src/static/img/', + to: 'static/img/' + }, + ]) + ], devServer: { inline: true, - stats: { colors: true }, + stats: { colors: true } }, };