ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Get logo and icon from env variables

This commit is contained in:
Ramon Wenger 2021-01-12 19:30:04 +01:00
parent cbf7c10aff
commit 3783bd4214
8 changed files with 29 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/build/webpack.dev.conf.js
View File

@ -55,7 +55,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
filename: 'index.html', filename: 'index.html',
template: 'index.html', template: 'index.html',
inject: true inject: true,
VUE_APP_FAVICON_32: require('../config/dev.env').VUE_APP_FAVICON_32,
VUE_APP_FAVICON_16: require('../config/dev.env').VUE_APP_FAVICON_16
}), }),
// copy custom static assets // copy custom static assets
new CopyWebpackPlugin([ new CopyWebpackPlugin([

3
client/config/dev.env.js
View File

@ -4,7 +4,4 @@ const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
HEP_URL: JSON.stringify(process.env.HEP_URL),
MATOMO_HOST: JSON.stringify(process.env.MATOMO_HOST),
MATOMO_SITE_ID: JSON.stringify(process.env.MATOMO_SITE_ID),
}); });

5
client/config/prod.env.js
View File

@ -4,4 +4,9 @@ module.exports = {
HEP_URL: JSON.stringify(process.env.HEP_URL), HEP_URL: JSON.stringify(process.env.HEP_URL),
MATOMO_HOST: JSON.stringify(process.env.MATOMO_HOST), MATOMO_HOST: JSON.stringify(process.env.MATOMO_HOST),
MATOMO_SITE_ID: JSON.stringify(process.env.MATOMO_SITE_ID), MATOMO_SITE_ID: JSON.stringify(process.env.MATOMO_SITE_ID),
VUE_APP_LOGO: JSON.stringify(process.env.VUE_APP_LOGO),
// vvvv HTML PROPERTIES FROM HERE, NOT STRINGIFIED vvvv
VUE_APP_FAVICON_32: process.env.VUE_APP_FAVICON_32,
VUE_APP_FAVICON_16: process.env.VUE_APP_FAVICON_16
// ^^^^ HTML PROPERTIES TO HERE, NOT STRINGIFIED ^^^^
} }

4
client/index.html
View File

@ -12,8 +12,8 @@
<link href="https://surveyjs.azureedge.net/1.0.87/survey.css" type="text/css" rel="stylesheet"/> <link href="https://surveyjs.azureedge.net/1.0.87/survey.css" type="text/css" rel="stylesheet"/>
<link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href=<%- htmlWebpackPlugin.options.VUE_APP_FAVICON_32 %>>
<link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href=<%- htmlWebpackPlugin.options.VUE_APP_FAVICON_16 %>>
<link rel="manifest" href="/static/site.webmanifest"> <link rel="manifest" href="/static/site.webmanifest">
<link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#5bbad5"> <link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c"> <meta name="msapplication-TileColor" content="#da532c">

4
client/package.json
View File

@ -1,8 +1,8 @@
{ {
"name": "frontend", "name": "frontend",
"version": "1.0.0", "version": "1.0.0",
"description": "skillBox vue client", "description": "skillbox vue client",
"author": "pawel / ramon", "author": "ramon / chrigu",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",

2
client/src/components/book-navigation/ContentNavigation.vue
View File

@ -153,7 +153,7 @@
} }
&__logo-icon { &__logo-icon {
width: 212px; width: auto;
height: 31px; height: 31px;
} }

65
client/src/components/icons/Logo.vue
View File

@ -1,55 +1,20 @@
<template> <template>
<svg <img
xmlns="http://www.w3.org/2000/svg" :src="img"
viewBox="0 0 965 159" class="logo"
class="logo"> alt="Logo" >
<path
class="cls-1"
d="M187.19877,158.76991a44.9261,44.9261,0,0,1-14.89082-2.35518,49.72607,49.72607,0,0,1-13.37134-7.29346l-2.20323-1.67142,16.1064-25.831,2.73505,2.43115a16.48614,16.48614,0,0,0,4.55841,3.03894,12.27557,12.27557,0,0,0,4.40646.83572c3.03894,0,4.93828-1.06363,6.15386-3.57076l.83571-1.67141L156.27756,39.94731H194.3403l15.57457,43.53283,13.21939-43.53283h37.07507l-36.08742,93.21951c-3.41881,8.585-8.28111,15.11873-14.435,19.29728h0C203.60906,156.64265,196.0117,158.76991,187.19877,158.76991Zm-22.26024-12.9155a42.27771,42.27771,0,0,0,9.42072,4.78634,41.3796,41.3796,0,0,0,12.9155,2.05128c7.59735,0,13.97912-1.74739,19.06936-5.24217h0c5.09023-3.49479,9.1928-9.04084,12.15576-16.48625l32.7446-84.86243h-23.5518l-17.246,56.98015L190.08578,46.10118H165.62229l32.66862,76.8852-2.20323,4.17854c-2.20323,4.48243-6.22984,6.9136-11.62394,6.9136a18.75655,18.75655,0,0,1-6.76164-1.29155,22.3379,22.3379,0,0,1-3.49479-1.89934Z"/>
<path
class="cls-1"
d="M142.0705,55.218a29.671,29.671,0,0,0-11.472-12.23174h0a35.49322,35.49322,0,0,0-35.09977.83571A30.81285,30.81285,0,0,0,86.23,53.09073a29.93237,29.93237,0,0,0-8.8889-9.11682A32.47292,32.47292,0,0,0,59.03143,38.8077a33.62833,33.62833,0,0,0-16.25834,3.95063,32.37806,32.37806,0,0,0-6.15385,4.40646V40.02328H0v88.20527H36.61924V84.54377c0-4.0266.91168-7.14151,2.887-9.57267a9.08143,9.08143,0,0,1,7.06555-3.41881,7.19568,7.19568,0,0,1,5.92593,2.58309c1.59545,1.82336,2.35519,4.40647,2.35519,7.67333v46.34386H91.47214V84.54377c0-4.0266.91168-7.21749,2.811-9.57267a8.59712,8.59712,0,0,1,6.9136-3.34284,7.1957,7.1957,0,0,1,5.92594,2.5831c1.59545,1.82336,2.35518,4.40647,2.35518,7.67333v46.34386h36.61924V73.14774A40.46686,40.46686,0,0,0,142.0705,55.218Zm-2.20323,66.85671H115.55574v-40.266c0-4.71036-1.29155-8.661-3.79867-11.624a13.29891,13.29891,0,0,0-10.6363-4.71035h0a14.71867,14.71867,0,0,0-11.69992,5.698c-2.73505,3.49479-4.10256,7.97722-4.10256,13.37135v37.53093H61.00676v-40.266c0-4.71036-1.29155-8.661-3.79868-11.62395a13.29886,13.29886,0,0,0-10.63629-4.71036h0a14.874,14.874,0,0,0-11.69993,5.622c-2.811,3.49478-4.25451,7.97722-4.25451,13.37134v37.53092H6.30582V46.0252H30.61735V59.85238H34.568l1.67141-2.65907a26.852,26.852,0,0,1,9.57267-9.11683A27.91925,27.91925,0,0,1,59.10742,44.8856a26.47638,26.47638,0,0,1,14.89082,4.17854A23.86631,23.86631,0,0,1,83.267,60.76407l.37987.91168h4.93828L88.889,60.916A27.95184,27.95184,0,0,1,126.0401,47.54467c.53181.22792.98766.53181,1.51947.75974a22.60065,22.60065,0,0,1,9.04085,9.64863,32.40876,32.40876,0,0,1,3.26686,15.04276Z"/>
<path
class="cls-1"
d="M360.27637,63.88867h-.00049c-8.79639-5.28613-20.01465-7.7207-29.91211-9.86816-12.25732-2.66016-22.84229-4.95606-22.84229-11.85254,0-4.76172,3.2959-10.4375,18.99707-10.4375,10.56348,0,21.68165,3.09668,33.04541,9.20215l.33692.18066,10.70361-25.7959-.2622-.15234c-11.499-6.666-27.40967-10.48926-43.65284-10.48926-16.82812,0-30.69433,3.96973-40.10058,11.48047a34.38057,34.38057,0,0,0-13.31055,27.72363c0,12.0918,4.93555,20.9834,15.08936,27.18262,8.73877,5.333,19.92431,7.832,29.793,10.03711,12.4795,2.78711,23.24659,5.19141,23.24659,12.42187,0,6.24414-6.44922,9.41016-19.168,9.41016a75.23455,75.23455,0,0,1-39.35205-11.75293l-.34033-.22559-11.40967,25.627.23437.16406c11.54395,8.04395,31.44336,13.24219,50.6958,13.24219,16.77,0,30.63672-4.00684,40.10108-11.58789A34.60313,34.60313,0,0,0,375.479,90.95312C375.479,78.88672,370.50635,70.03418,360.27637,63.88867Z"/>
<path
class="cls-1"
d="M452.96851,77.98757l37.01587-38.16839H451.21527L421.62593,68.64681V7.84824H389.22977V128.48585h32.39616V106.62707l7.86292-8.003,23.88936,29.86182H492.7151Z"/>
<rect
class="cls-1"
x="500.00637"
y="39.81918"
width="32.39617"
height="88.66666"/>
<rect
class="cls-1"
x="551.47678"
y="7.84824"
width="32.39617"
height="120.63761"/>
<rect
class="cls-1"
x="602.9472"
y="7.84824"
width="32.39617"
height="120.63761"/>
<path
class="cls-1"
d="M709.94,38.3811c-9.53615,0-17.30258,2.56053-23.12619,7.61709v-38.15H654.41762V128.48585h30.9576v-7.05418c5.79209,5.70967,13.85913,8.49275,24.56476,8.49275a42.82556,42.82556,0,0,0,30.79226-12.38954c8.33566-8.422,12.74155-20.02118,12.74155-33.54237,0-13.44264-4.40686-24.96622-12.74445-33.32515C732.82666,42.74481,721.89218,38.3811,709.94,38.3811Zm-6.39428,65.38143c-10.45545,0-17.211-7.76012-17.211-19.77,0-11.81546,6.7555-19.44953,17.211-19.44953,10.45593,0,17.21191,7.63407,17.21191,19.44953C720.75761,96.00241,714.00163,103.76253,703.5457,103.76253Z"/>
<path
class="cls-1"
d="M847.31484,51.174c-9.04355-8.24935-21.78266-12.79294-35.87065-12.79294-28.92944,0-49.92712,19.18237-49.92712,45.61141,0,26.61474,20.99768,45.93191,49.92712,45.93191,14.08605,0,26.82614-4.58,35.87307-12.89573,9.06342-8.3308,14.055-20.06336,14.055-33.03618C861.37228,71.09873,856.37971,59.44326,847.31484,51.174Zm-35.87065,52.58849c-10.45544,0-17.211-7.76012-17.211-19.77,0-11.81546,6.75551-19.44953,17.211-19.44953,10.45593,0,17.21192,7.63407,17.21192,19.44953C828.65611,96.00241,821.90012,103.76253,811.44419,103.76253Z"/>
<polygon
class="cls-1"
points="931.16 83.038 963.901 39.819 929.221 39.819 913.766 60.992 898.929 39.819 862.189 39.819 894.901 84.143 861.194 128.486 896.678 128.486 912.761 106.526 927.762 128.486 965 128.486 931.16 83.038"/>
<path
class="cls-1"
d="M527.91913,4.4834a15.80713,15.80713,0,0,1,4.4834,11.64237,15.92237,15.92237,0,0,1-4.4834,11.64238c-2.96486,3.03714-6.86973,4.4834-11.64236,4.4834a16.09319,16.09319,0,0,1-11.7147-4.4834,15.5782,15.5782,0,0,1-4.5557-11.64238,15.69049,15.69049,0,0,1,4.5557-11.64237A16.09313,16.09313,0,0,1,516.27677,0C521.1217,0,524.95427,1.44626,527.91913,4.4834Z"/>
</svg>
</template> </template>
<style scoped> <script>
.cls-1 { export default {
fill: #17a887; computed: {
img() {
return process.env.VUE_APP_LOGO;
} }
},
};
</script>
<style scoped>
</style> </style>

2
client/src/layouts/PublicLayout.vue
View File

@ -37,7 +37,7 @@
.logo { .logo {
position: relative; position: relative;
width: 260px; width: auto;
height: 43px; height: 43px;
} }