To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 171c4d2a authored by Sandro Lutz's avatar Sandro Lutz
Browse files

Add favicon (Resolves #42)

parent 214768fa
......@@ -28,10 +28,9 @@ USER server
WORKDIR /public
# Copy files from first stage
COPY --from=build /index.html /public/
COPY --from=build /dist /public/dist
COPY --from=build /dist /public
# Serve index.html for every file which is not found on the server
RUN ln index.html 404.html
RUN cp ./index.html ./404.html
# Run server (-g will automatically serve the gzipped files if possible)
CMD ["/usr/local/bin/http-server", "-g", "/public"]
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>AMIV website</title>
</head>
<body>
<script src="/dist/bundle.js"></script>
</body>
</html>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="81.059502px"
height="80.056625px"
viewBox="0 0 81.059502 80.056625"
id="svg2"
xml:space="preserve"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs6"><clipPath
id="clipPath18"><path
d="m 0,849.563 1960.52,0 L 1960.52,0 0,0 0,849.563 z"
id="path20" /></clipPath></defs><g
transform="matrix(1.25,0,0,-1.25,-16.34525,92.96925)"
id="g10"><g
transform="scale(0.1,0.1)"
id="g12"><g
clip-path="url(#clipPath18)"
id="g16"><path
d="m 566.012,342.883 c -44.453,-61.184 -130.383,-74.797 -191.563,-30.344 -3.969,2.891 -7.719,5.957 -11.289,9.18 l 41.192,29.922 40.945,-56.375 51.351,117.707 37.684,-51.848 44.727,32.5 -40.387,55.598 41.469,30.132 c 19.257,-43.32 15.679,-95.437 -14.129,-136.472 m -235.504,23.465 c -19.887,43.554 -16.5,96.32 13.601,137.75 44.45,61.179 130.383,74.789 191.559,30.336 4.352,-3.161 8.391,-6.579 12.254,-10.125 l -41.762,-30.344 -40.558,55.82 -44.735,-32.5 40.563,-55.828 -0.067,-0.051 -127.726,-12.449 38.203,-52.578 -41.332,-30.031 z m 366.523,24.668 c 1.41,10.644 2.207,21.48 2.207,32.511 0,11.028 -0.797,21.86 -2.207,32.508 l -57.468,8.922 c -2.571,11.469 -6.196,22.711 -10.864,33.57 l 41.211,40.961 c -5.109,9.438 -10.828,18.676 -17.312,27.598 -6.481,8.922 -13.496,17.223 -20.899,25 l -51.679,-26.52 c -4.372,3.84 -8.93,7.532 -13.731,11.02 -4.84,3.512 -9.801,6.73 -14.84,9.719 l 9.258,57.351 c -9.676,4.641 -19.734,8.75 -30.238,12.16 -10.481,3.407 -21.039,5.993 -31.586,7.938 l -26.262,-51.918 c -11.742,1.07 -23.519,1.031 -35.199,-0.066 l -26.293,51.984 c -10.559,-1.945 -21.109,-4.531 -31.598,-7.938 -10.492,-3.41 -20.551,-7.519 -30.23,-12.148 l 9.269,-57.434 c -10.039,-5.925 -19.582,-12.859 -28.511,-20.707 l -51.746,26.559 c -7.407,-7.777 -14.422,-16.07 -20.903,-25 -6.492,-8.922 -12.211,-18.16 -17.32,-27.598 l 41.258,-41.011 c -4.715,-10.922 -8.36,-22.137 -10.887,-33.512 l -57.481,-8.93 c -1.421,-10.64 -2.218,-21.48 -2.218,-32.508 0,-11.031 0.797,-21.855 2.218,-32.511 l 57.563,-8.934 c 2.559,-11.445 6.168,-22.668 10.82,-33.496 L 240.09,307.57 c 5.109,-9.445 10.828,-18.683 17.32,-27.597 6.481,-8.926 13.488,-17.227 20.903,-25 l 51.675,26.523 c 4.41,-3.867 9,-7.59 13.84,-11.105 4.801,-3.485 9.723,-6.688 14.723,-9.657 l -9.258,-57.336 c 9.687,-4.636 19.746,-8.75 30.238,-12.156 10.489,-3.418 21.039,-5.996 31.598,-7.929 l 26.219,51.843 c 11.773,-1.093 23.57,-1.062 35.285,0.039 l 26.238,-51.894 c 10.559,1.945 21.117,4.523 31.598,7.941 10.504,3.406 20.551,7.52 30.238,12.149 l -9.246,57.285 c 10.078,5.957 19.648,12.898 28.617,20.789 l 51.621,-26.492 c 7.403,7.773 14.41,16.074 20.899,25 6.484,8.914 12.203,18.152 17.312,27.597 l -41.148,40.907 c 4.73,10.957 8.379,22.207 10.929,33.644 l 57.34,8.895"
id="path30"
style="fill:#f03d30;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></svg>
\ No newline at end of file
......@@ -32,7 +32,7 @@ Raven.context(() => {
checkLogin();
loadLanguage();
// set to pathname strategy (Please note that the production server needs to support this)
// set to pathname strategy (Please note that the server needs to support this)
m.route.prefix('');
// routes which require authentication
......
......@@ -13,7 +13,7 @@ require.context('../content/companies/markdown');
export default function load(companyId) {
// dynamically load compiled html files
return m.request({
url: `/dist/companies/${companyId}.${currentLanguage()}.html`,
url: `/companies/${companyId}.${currentLanguage()}.html`,
method: 'GET',
deserialize: response => response,
});
......
......@@ -18,7 +18,7 @@ export default class AMIV {
if (this.content) return;
this.content = await m.request({
url: `/dist/amiv/about.${currentLanguage()}.html`,
url: `/amiv/about.${currentLanguage()}.html`,
method: 'GET',
deserialize: response => response,
});
......
const HtmlWebpackPlugin = require('html-webpack-plugin');
const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
const config = {
context: `${__dirname}/src`, // `__dirname` is root of project and `src` is source
......@@ -5,13 +8,14 @@ const config = {
output: {
path: `${__dirname}/dist`, // `dist` is the destination
publicPath: '/',
filename: 'bundle.js',
},
// To run development server
devServer: {
contentBase: __dirname,
publicPath: '/dist/',
contentBase: `${__dirname}/dist`,
publicPath: '/',
compress: true,
port: 9000,
hot: true,
......@@ -41,7 +45,7 @@ const config = {
options: {
name: '[name].html',
outputPath: 'companies/',
publicPath: 'dist/companies/',
publicPath: 'companies/',
},
},
{
......@@ -57,7 +61,7 @@ const config = {
options: {
name: '[name].[ext]',
outputPath: 'companies/',
publicPath: 'dist/companies/',
publicPath: 'companies/',
},
},
],
......@@ -70,7 +74,7 @@ const config = {
options: {
name: '[name].html',
outputPath: 'amiv/',
publicPath: 'dist/amiv/',
publicPath: 'amiv/',
},
},
{
......@@ -86,7 +90,7 @@ const config = {
options: {
name: '[name].html',
outputPath: 'amiv/',
publicPath: 'dist/amiv/',
publicPath: 'amiv/',
},
},
],
......@@ -100,21 +104,21 @@ const config = {
limit: 8000, // Convert images < 8kb to base64 strings
name: '[name].[ext]',
outputPath: 'amiv/',
publicPath: 'dist/amiv/',
publicPath: 'amiv/',
},
},
],
},
{
test: /src\/images\/[a-zA-Z\d\/]+\.(png|jp(e*)g|svg)$/,
test: /src\/images\/[a-zA-Z\d\/\-_]+\.(png|jp(e*)g|svg)$/,
use: [
{
loader: 'url-loader',
options: {
limit: 8000, // Convert images < 8kb to base64 strings
name: '[name].[ext]',
outputPath: '/',
publicPath: 'dist/',
outputPath: 'images',
publicPath: 'images/',
},
},
],
......@@ -144,6 +148,19 @@ const config = {
},
devtool: 'eval-source-map', // Default development sourcemap
plugins: [
new FaviconsWebpackPlugin({
logo: './images/logoNoText.svg',
prefix: 'favicon/',
title: 'AMIV an der ETH',
}),
new HtmlWebpackPlugin({
title: 'AMIV an der ETH',
filename: 'index.html',
hash: true,
}),
],
};
module.exports = config;
......@@ -9,15 +9,15 @@ config.devServer = undefined;
config.devtool = '';
// Add optimization plugins
config.plugins = [
config.plugins.push(
new CompressionPlugin({
asset: '[path].gz[query]',
algorithm: 'gzip',
test: /\.js$|\.css$|\.html$/,
threshold: 10240,
minRatio: 0.8,
}),
];
})
);
// Replace development with production config
config.resolve.alias.config = `${__dirname}/config.prod.js`;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment