Merge pull request #615 from MetaCell/feature/553

ddelpiano · web-flow · commit 60f825a5c67d · 2022-12-08T14:26:11.000Z
Feature/553
diff --git a/Dockerfile b/Dockerfile
@@ -12,9 +12,7 @@ COPY webapp/ .
 RUN yarn build-dev
 
 
-RUN mv node_modules/@metacell .
 RUN rm -Rf node_modules/*
-RUN mv @metacell node_modules
 
 ###
 FROM jupyter/base-notebook:hub-1.5.0
diff --git a/webapp/geppetto.ejs b/webapp/geppetto.ejs
@@ -18,17 +18,15 @@
 	<% } %>
 
     <!-- CSS -->
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@metacell/geppetto-meta-client/style/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@metacell/geppetto-meta-client/style/css/codemirror.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@metacell/geppetto-meta-client/style/css/lesser-dark.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@metacell/geppetto-meta-client/style/css/gpt-icons.css"/>
-	
+	<link rel="stylesheet" href="geppetto/build/static/css/font-awesome.min.css"/>
+	<link rel="stylesheet" href="geppetto/build/static/css/gpt-icons.css"/>
+
 	<% if(htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.properties.icon.indexOf("http") !== -1){ %>
 		<link rel="icon" type="image/png" href="<%=htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.properties.icon%>"/>
 	<% } else{ %>
 	    <link rel="icon" type="image/png" href="<%= cssPaths%><%=htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.properties.icon%>"/>
 	<% } %>
-	    
+
 </head>
 <body style="margin: 0px">
 
diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js
@@ -34,6 +34,14 @@ if (isWin) {
 }
 
 const availableExtensions = [
+  {
+    from: path.resolve(__dirname, geppettoClientPath, 'style/css/font-awesome.min.css'),
+    to: 'static/css',
+  },
+  {
+    from: path.resolve(__dirname, geppettoClientPath, 'style/css/gpt-icons.css'),
+    to: 'static/css',
+  },
   {
     from: path.resolve(__dirname, geppettoClientPath, 'static/*'),
     to: 'static',
@@ -58,6 +66,7 @@ const availableExtensions = [
     from: path.resolve(__dirname, 'static'),
     to: 'static',
   },
+
 ];
 
 module.exports = function (env) {
