From 4fefee073c84abc4b957a5733f0c29c9f99d3525 Mon Sep 17 00:00:00 2001 From: Kurt Hutten Date: Wed, 18 Nov 2020 07:56:09 +1100 Subject: [PATCH] Update logo around the website updated the favicon with a webpack plugin, as will as on the MainLayout Plus some other tweaks to the main layout while I was there resolves #107 --- .vscode/settings.json | 1 + web/config/webpack.config.js | 11 ++- web/package.json | 1 + web/public/favi2.jpg | Bin 1398 -> 0 bytes web/public/favicon.png | Bin 1877 -> 0 bytes web/src/components/Svg/Svg.js | 99 +++++++++++++++++++++++ web/src/favicon.svg | 34 ++++++++ web/src/index.html | 4 +- web/src/layouts/MainLayout/MainLayout.js | 46 +++++++---- yarn.lock | 41 +++++----- 10 files changed, 194 insertions(+), 43 deletions(-) delete mode 100644 web/public/favi2.jpg delete mode 100644 web/public/favicon.png create mode 100644 web/src/favicon.svg diff --git a/.vscode/settings.json b/.vscode/settings.json index 8f3288b..849ad83 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,6 +19,7 @@ "cSpell.words": [ "Initialised", "Uploader", + "describedby", "initialise", "redwoodjs" ] diff --git a/web/config/webpack.config.js b/web/config/webpack.config.js index 10c2846..d78b1f3 100644 --- a/web/config/webpack.config.js +++ b/web/config/webpack.config.js @@ -1,5 +1,12 @@ const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin') -module.exports = { - plugins: [new MonacoWebpackPlugin()], +module.exports = (config, { env }) => { + config.plugins.forEach((plugin) => { + if (plugin.constructor.name === 'HtmlWebpackPlugin') { + plugin.options.favicon = './src/favicon.svg' + } + }) + config.plugins.push(new MonacoWebpackPlugin()) + + return config } diff --git a/web/package.json b/web/package.json index e9ac1d7..7e6a2f3 100644 --- a/web/package.json +++ b/web/package.json @@ -38,6 +38,7 @@ }, "devDependencies": { "autoprefixer": "9.8.6", + "html-webpack-plugin": "^4.5.0", "postcss-loader": "4.0.2", "tailwindcss": "^1.9.1" } diff --git a/web/public/favi2.jpg b/web/public/favi2.jpg deleted file mode 100644 index 552b530a3d443a3b111ec537de095783798ea9e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmV-+1&R8JP)tGsB}&HkrJZ6)2FlgSPZRf!=$(=hRjn?d`4mB{%2ZbI$+#f9IV4>vBi~ zeUrqf6Y-uJILiS>LSUX<_9C#g3j*Th1WW;b`yzxjUC}?Pe+j*&q88wjMQ*Et|wBifP`W)e6oST335pqos=Wsm>tFAk*|;f z?a-=*uH107BOMaoTFG^(>4gm3t9Hzd|A=hC0f+5-q<~p^`mPMPyAlm@2?%sa2G2u^n!Exf{Yo8SMCMChHK*0%QZv2jHy$<(BSCOGB z0Ex`uot9?Y8d`$>*af77D4g$UE3zCSG4Ka5t2B6$O8)POyLj!i4!_=efKxS}vA$r? z3$k?wjU%pFhwdw3^U8*}5hO=vXeQXGH3pQX!Ebu*)U%%7(Y`$ZEk`txfFv(cLeYA=WovM7iXydQ%-#`a-OZ^`Tih zp<-7Mrso^sTAW5eT0B+c5Y@!XOZ9?1#XOvOF$Sice(E!l*_>4{&@K`gjP^rV)jpa`76^fD3x!EGfn zTEUBrkSghTMO_O^ZZW%%2eC`qEpZa94V*=C5R04$^^m%{I%o`KN$1cjSr2Ezpd@IC z=&g4%1*w*yd)VoB3_PNLqZZ17aO?lWJF>KtAa+#>}cNGa4t#&$`~14rh)aD zsv41uz_m{c4;9i$1NO~v(kZ1_T5&OLbmuX}dy(i5jK+z*rN6W(FGqy;_g2_@k@OFY zUX8GeS|UbcNFoBsu#W)5&$oAj70C!tDE=Yl3EHJRL(8#!Y!aOW-8ne1pW{jI!TbN; zBn}c{)tFR=NPp^v`Q=Uc0^1;*=#!M&c|vS*yH13E02Apf@MXYzZU6uP07*qoM6N<$ Ef@3s?i~s-t diff --git a/web/public/favicon.png b/web/public/favicon.png deleted file mode 100644 index f0cdd00c8655692cdd610e596b26d7ddb3708ddd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1877 zcmV-b2demqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$_zez+vR9Fd}R(nuXRTw|#?A--Q zz-&mTl*wHX3m-W+iYDxC>FlnrnR0L{1Cc4Um)7K?$!UhN(H{QeI5}ob8a9oI^#=&c zhRyB*0a@dt#AI18F~WRDA_9Bw>37h3y}K+AJ2SiIobP?U^ZUMgDES}5TWFI={ki9% zx{eakO$hzK>TWtnDdl%-4*J6%!ZAJ4n#&csiEwVwYr^>{c;9Tx%soI03l%+Yu=TJ4 z_+@2=v9tA`JkFI(a58=fgQuy1Y|fsMw|_W+3>g5=$uamkj{Zal<>cB##p6wRxJK zh@?mEStOy~K0Tcy%8q{Yp$L?>4J9J@g9cFLN=d3~@WfbW<<2FHt|ycNa6^txNW5gL zXvuAIrNq>`QW6H!7%%{z)BLQ$m9sq^7aFVUi|lrH^EM-=835bS0S!|6qlvMpc2CQ$ zDyR9$Hib9cRFtzmm&G-ZPQL)eo%@}Zk2xn_;}^#XAE$6q>33Lm#F`S%@XT>D31#o% zjzgMJWCnq4Km}ySNQv!2R_F*_fOaG*=8(^k^0p?gTZDnIHYa^lPe<2&D9zK!XiG{- zfK#^I?he*_=bNWfg?s_#O>UqC_Oj-aURO#cRd^8`r)o;!i*HFnT)w@y;krr=3&86z z*Ml)rWk#JTkr`)et)Ac~dcN0Xew}c#4L^gP9=XOLz6U-WDn0B9kjCFs#(*;%D3tfl z5T^@=axQFA&Q9rVhXr8G%w2^bcIX8n*Eqq>QAzhM6Ic2ZGx|5!0)oWiPCHLEwI?F?v@Y1S`MW53LzNyipR!J zww47B`<#|FA<}zHbuRd*mMl3WpMZ^(){0;WF-eo4bFfbrAZ5(3R5)wJ8on~wWkDFuC*0fyl8xXsftO$z{#Jw{~tm}ZiaMteoeM0GDZqM|4P z1UOQq4K^c)3$cu*X1aq~3m4f%rpBmx%w#lMOB>JhT>+K(Qz}D5M~Rdx_5xgDmPRC@ zZs{el9_F~vHFN9@A*&!)SMKw93j>sogyU=I_pezKGNzA6jz8{mST^|U z_g(WkEqhJ(^@JFsvvIFKs|E&|AyZ?J?#U*95D9qs#$Q)-+3zr~%^ESS=7IRQDU6Y~ zpxeoTN?`+j1&BC3wRDm(y||&r>zFW?lF$yMTe|`XRZ20&CGm+d%GC><#lS(--VXeH z$H$CYCSAN7C(E5BNckLLUkn8HE8)_sHcz0sAt&7=dmCJHGpEYhV9PJf!{eXj==p#Ao>bWFYzEPuhF66ME!bzwKK8j4&yZa6< z=(nx_i)$CJTak$zL5w!Qn?~iXTItAnv#p|e1!Z)LDu)KN3GMZjsv|||N;j#4?4v3# zat1HAO<{fgL-4c!9;ECC?Ej8b(C?9n@gcdlR(yzT?&eKsOgWUX#WqiHi`QwMqsXKh zM}0`I({D}5S!=@7T9vK^km?S0Q$}{GjDcrF5<8cc~|J=j3D zw$tKbS(VWO5CkqsJ8_p?Dl>8hubol)J~2uH$zg-D*fqG8kARPhVGP{{ybj4^_*_T2 za|MEEFAZGcgcj)qfEMv4tYnld;hD+F){5qL7@_fKEL-sTK96#3L&tlM8E+bKEgO^K zW5*)U=Ky=Z-i}xUh@YWD{;Q{JXjF;fL(@w_C&1`HUiTOY-Tk;b*xdIzzJ7EO9wDn> z$^krt>*AdNLOJ8))2vx}Zt*1dFGzg^9ds4tJP)N5Cz(jvoYIz7)t8vVjojwcFP=0y zK89aaYgK$ih@$Ko5@5IWVYHP=mTioLO+-1ChXQT4MYKuMR=P!I$;q&4 zz%y$y%4cwN>-3SGWD??OAoT?>ySPr^s-JVA5;X&Y5joJ3^C7$)feiZ0hRhW_T36dD zg2j { /> ), + favicon: ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ), fork: ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CahHub + + + diff --git a/web/src/index.html b/web/src/index.html index f9b4d50..47fb90f 100644 --- a/web/src/index.html +++ b/web/src/index.html @@ -4,9 +4,7 @@ - - <%= htmlWebpackPlugin.options.title %> - + CadHub