diff --git a/@salix-services/account/server/application.json b/@salix-services/account/server/application.json
deleted file mode 100644
index 8f879e8105..0000000000
--- a/@salix-services/account/server/application.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "salix": "http://localhost:8080/salix/login"
-}
\ No newline at end of file
diff --git a/@salix-services/salix/client/layout.css b/@salix-services/salix/client/layout.css
deleted file mode 100644
index e93d58b8ed..0000000000
--- a/@salix-services/salix/client/layout.css
+++ /dev/null
@@ -1,110 +0,0 @@
-
-html, body {
- height: 100%;
- margin: 0px;
- padding: 0px;
-}
-
-html [full-height], .full-height {
- height: 100%;
-}
-html [self-scroll], .self-scroll {
- overflow: auto;
-}
-
-/* Horizontal & vertical */
-
-html [vn-horizontal], vn-horizontal, .vn-horizontal,
-html [vn-vertical], vn-vertical, .vn-vertical {
- display: flex;
-}
-html [vn-horizontal], vn-horizontal, .vn-horizontal {
- flex-direction: row;
-}
-vn-horizontal [reverse] {
- flex-direction: row-reverse;
-}
-html [vn-vertical], vn-vertical, .vn-vertical {
- flex-direction: column;
-}
-vn-vertical [reverse] {
- flex-direction: column-reverse;
-}
-html [wrap] {
- flex-wrap: wrap;
-}
-html [wrap-reverse] {
- flex-wrap: wrap-reverse;
-}
-html [scrollable] {
- min-height: 1px;
- flex: 1;
- flex-basis: 0.000000001px;
-}
-
-/* Horizontal & vertical childs */
-
-html [vn-auto],
-html [vn-none],
-html [vn-one],
-html [vn-two],
-html [vn-three],
-html [vn-four],
-html [vn-five],
-html [vn-six],
-html [vn-seven],
-html [vn-eight],
-html [vn-nine],
-html [vn-ten],
-html [vn-eleven],
-html [vn-twelve]{
- flex-basis: 0.000000001px;
-}
-html [vn-auto], vn-auto, .vn-auto {
- flex: 1;
- flex-basis: auto;
-}
-html [vn-empty], vn-empty, .vn-empty {
- display: block;
-}
-html [vn-none], vn-none, .vn-none {
- flex: 1;
- flex: none;
-}
-html [vn-one], vn-one, .vn-one {
- flex: 1;
-}
-html [vn-two], vn-two, .vn-two {
- flex: 2;
-}
-html [vn-three], vn-three, .vn-three {
- flex: 3;
-}
-html [vn-four], vn-four, .vn-four {
- flex: 4;
-}
-html [vn-five], vn-five, .vn-five {
- flex: 5;
-}
-html [vn-six], vn-six, .vn-six {
- flex: 6;
-}
-html [vn-seven], vn-seven, .vn-seven {
- flex: 7;
-}
-html [vn-eight], vn-eight, .vn-eight {
- flex: 8;
-}
-html [vn-nine], vn-nine, .vn-nine {
- flex: 9;
-}
-html [vn-ten], vn-ten, .vn-ten {
- flex: 10;
-}
-html [vn-eleven], vn-eleven, .vn-eleven {
- flex: 11;
-}
-html [vn-twelve], vn-twelve, .vn-twelve {
- flex: 12;
-}
-
diff --git a/@salix/.gitignore b/@salix/.gitignore
index b5f56d6034..12aeb23a62 100644
--- a/@salix/.gitignore
+++ b/@salix/.gitignore
@@ -1,3 +1,2 @@
node_modules
-build
spliting.js
diff --git a/@salix/gulpfile.js b/@salix/gulpfile.js
index 69a8f102f3..93746ce486 100644
--- a/@salix/gulpfile.js
+++ b/@salix/gulpfile.js
@@ -1,13 +1,24 @@
+var path = require ('path');
var gulp = require ('gulp');
var gutil = require('gulp-util');
var wrap = require('gulp-wrap');
var concat = require ('gulp-concat');
var babel = require ('gulp-babel');
var fs = require ('fs');
+var del = require ('del');
var webpack = require ('webpack-stream');
var webpackConfig = require ('./webpack.config.js');
+// Clean
+
+var buildDir = '../services/nginx/static'
+
+gulp.task ('clean', function ()
+{
+ return del (buildDir +'/*', {force: true});
+});
+
// Spliting
var splitingDir = './app/src/spliting';
@@ -42,11 +53,19 @@ gulp.task ('spliting', function ()
// Webpack
-gulp.task ('webpack', ['spliting'], function (callback)
+gulp.task ('webpack-watch', ['spliting'], function ()
+{
+ webpackConfig.watch = true;
+ return gulp.src (['app/index.js', 'login/index.js'])
+ .pipe (webpack (webpackConfig))
+ .pipe (gulp.dest (buildDir));
+});
+
+gulp.task ('webpack', ['spliting'], function ()
{
return gulp.src (['app/index.js', 'login/index.js'])
.pipe (webpack (webpackConfig))
- .pipe (gulp.dest ('build/public/'));
+ .pipe (gulp.dest (buildDir));
});
// Routes
@@ -63,7 +82,7 @@ gulp.task ('routes', function ()
.pipe (concat ('salix.routes.js', {newLine: ','}))
.pipe (wrap (globalTpl))
.pipe (babel ({presets: ['es2015']}))
- .pipe (gulp.dest ('./build/public'));
+ .pipe (gulp.dest (buildDir));
});
// Watch
@@ -76,6 +95,12 @@ gulp.task ('watch', function ()
// Default
-gulp.task ('build', ['routes', 'webpack']);
-gulp.task ('default', ['watch', 'build']);
+gulp.task ('build', ['clean'], function ()
+{
+ return gulp.start ('routes', 'webpack');
+});
+gulp.task ('default', ['clean'], function ()
+{
+ return gulp.start ('watch', 'routes', 'webpack-watch');
+});
diff --git a/@salix/nginx_docker.conf b/@salix/nginx_docker.conf
deleted file mode 100644
index 473a4bfd8b..0000000000
--- a/@salix/nginx_docker.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-
-worker_processes 1;
-
-error_log /var/log/nginx/error.log;
-pid /var/run/nginx.pid;
-
-events {
- worker_connections 1024;
-}
-
-http {
- sendfile on;
- gzip on;
- default_type application/octet-stream;
-
- access_log /var/log/nginx/access.log;
-
- server {
- listen 8080;
- server_name localhost;
- autoindex off;
-
- root /usr/share/nginx/html;
-
- location /static {
- alias public;
- autoindex on;
- }
-
- location ~ ^/account(?:/(.*))?$ {
- proxy_pass http://192.168.99.100:3000/$1$is_args$args;
- }
-
- location ~ ^/salix(?:/(.*))?$ {
- proxy_pass http://192.168.99.100:3001/$1$is_args$args;
- }
-
- location ~ ^/customer(?:/(.*))?$ {
- proxy_pass http://192.168.99.100:3002/$1$is_args$args;
- }
- }
-
- types {
- text/html html;
- application/json json;
- application/javascript js;
- text/css css scss;
- text/xml xml;
- image/x-icon ico;
- image/png png;
- image/svg+xml svg;
- image/gif gif;
- image/jpeg jpeg jpg;
- }
-}
\ No newline at end of file
diff --git a/@salix/package.json b/@salix/package.json
index 53c16492fd..d21e546f50 100644
--- a/@salix/package.json
+++ b/@salix/package.json
@@ -21,6 +21,7 @@
"babel-preset-es2015": "*",
"cors": "^2.8.1",
"css-loader": "^0.25.0",
+ "del": "^2.2.2",
"eslint": "^3.7.1",
"eslint-config-angular": "^0.5.0",
"eslint-config-google": "^0.6.0",
diff --git a/@salix/webpack.config.js b/@salix/webpack.config.js
index eb4c55cd8b..0471ae6ed8 100644
--- a/@salix/webpack.config.js
+++ b/@salix/webpack.config.js
@@ -2,14 +2,15 @@
var webpack = require ('webpack');
var path = require ('path');
-module.exports =
-{
+var devMode = process.env.NODE_ENV !== 'production';
+
+var config = {
entry: {
'salix.app': ['app'],
'salix.login': ['login']
},
output: {
- path: path.join (__dirname, 'build', 'public'),
+ path: path.join (__dirname, '../services/nginx/static'),
filename: '[name].js',
publicPath: '/static/',
chunkFilename: "chunk.[name].[chunkhash].js"
@@ -38,13 +39,7 @@ module.exports =
}
]
},
-/* plugins: [
- new webpack.optimize.UglifyJsPlugin ({
- minimize: true,
- compress: { warnings: false }
- })
- ],
-*/ resolve: {
+ resolve: {
modulesDirectories: [
__dirname,
'node_modules'
@@ -54,7 +49,16 @@ module.exports =
inline: true,
host: '0.0.0.0'
},
- devtool: 'source-map',
- watch: true
+ devtool: 'source-map'
};
+if (!devMode) {
+ config.plugins.push (
+ new webpack.optimize.UglifyJsPlugin ({
+ minimize: true,
+ compress: { warnings: false }
+ })
+ );
+}
+
+module.exports = config;
diff --git a/db.json b/db.json
new file mode 100644
index 0000000000..bb83415429
--- /dev/null
+++ b/db.json
@@ -0,0 +1,14 @@
+{
+ "ids": {
+ "User": 2,
+ "AccessToken": 2
+ },
+ "models": {
+ "User": {
+ "1": "{\"password\":\"$2a$10$Jm6EvaU2GoCGdQXw/JU62OZvDav6I6/s1E8EJdFF5.s2o8NDf.ZL6\",\"email\":\"admin@admin.com\",\"id\":1}"
+ },
+ "AccessToken": {
+ "acx1tuahwKkaE522cG1HJds5XKsdMlwRsUvm0IZSHhJYvWfoU8LGexOZrKoVDQgp": "{\"id\":\"acx1tuahwKkaE522cG1HJds5XKsdMlwRsUvm0IZSHhJYvWfoU8LGexOZrKoVDQgp\",\"ttl\":1209600,\"created\":\"2016-11-18T13:03:41.152Z\",\"userId\":1}"
+ }
+ }
+}
\ No newline at end of file
diff --git a/env.cmd b/env.cmd
new file mode 100644
index 0000000000..2a881b14a6
--- /dev/null
+++ b/env.cmd
@@ -0,0 +1,33 @@
+@echo off
+
+if "%1"=="" goto caseStart
+if "%1"=="start" goto caseStart
+if "%1"=="stop" goto caseStop
+goto caseUsage
+
+caseStart:
+ echo ######################
+ echo "Arrancando Servicios"
+ echo ######################
+ echo.
+ call "%0" stop
+ call forever start forever.json
+ call forever list
+ call nginx -c conf-dev.conf -p @salix
+ call cd @salix
+ call gulp
+ exit 0
+
+caseStop:
+ echo ######################
+ echo "Parando Servicios"
+ echo ######################
+ echo.
+ call forever stopall
+ call forever list
+ call nginx -c conf-dev.conf -p @salix -s stop
+ exit 0
+
+caseUsage:
+ echo "Usage: %0 [start|stop]"
+ exit 1
diff --git a/env.sh b/env.sh
new file mode 100755
index 0000000000..64c9d50bd6
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+nginxDir="${PWD}/services/nginx"
+
+case "$1" in
+ start|"")
+ $0 stop > /dev/null
+ forever start forever.json
+ forever list
+ /usr/sbin/nginx -c "$nginxDir/conf-dev.conf" -p "$nginxDir"
+ cd @salix && gulp
+ ;;
+ stop)
+ forever stopall
+ forever list
+ /usr/sbin/nginx -c "$nginxDir/conf-dev.conf" -p "$nginxDir" -s stop
+ cd @salix && gulp clean
+ ;;
+ *)
+ echo "Usage: `basename "$0"` [start|stop]"
+ exit 1
+esac
diff --git a/forever.json b/forever.json
index e41bce4245..770f764198 100644
--- a/forever.json
+++ b/forever.json
@@ -4,7 +4,7 @@
"append": true,
"watch": true,
"script": "server.js",
- "sourceDir": "./@salix-services/salix/server",
+ "sourceDir": "./services/salix/server",
"workingDir": "."
},
{
@@ -12,7 +12,7 @@
"append": true,
"watch": true,
"script": "server.js",
- "sourceDir": "./@salix-services/account/server",
+ "sourceDir": "./services/account/server",
"workingDir": "."
},
{
@@ -20,7 +20,7 @@
"append": true,
"watch": true,
"script": "server.js",
- "sourceDir": "./@salix-services/client/server",
+ "sourceDir": "./services/client/server",
"workingDir": "."
}
]
\ No newline at end of file
diff --git a/@salix-services/.foreverignore b/services/.foreverignore
similarity index 100%
rename from @salix-services/.foreverignore
rename to services/.foreverignore
diff --git a/@salix-services/account/.editorconfig b/services/account/.editorconfig
similarity index 100%
rename from @salix-services/account/.editorconfig
rename to services/account/.editorconfig
diff --git a/@salix-services/account/.eslintignore b/services/account/.eslintignore
similarity index 100%
rename from @salix-services/account/.eslintignore
rename to services/account/.eslintignore
diff --git a/@salix-services/account/.eslintrc b/services/account/.eslintrc
similarity index 100%
rename from @salix-services/account/.eslintrc
rename to services/account/.eslintrc
diff --git a/@salix-services/account/.gitignore b/services/account/.gitignore
similarity index 100%
rename from @salix-services/account/.gitignore
rename to services/account/.gitignore
diff --git a/@salix-services/account/.yo-rc.json b/services/account/.yo-rc.json
similarity index 100%
rename from @salix-services/account/.yo-rc.json
rename to services/account/.yo-rc.json
diff --git a/@salix-services/account/Dockerfile b/services/account/Dockerfile
similarity index 100%
rename from @salix-services/account/Dockerfile
rename to services/account/Dockerfile
diff --git a/@salix-services/account/client/index.ejs b/services/account/client/index.ejs
similarity index 100%
rename from @salix-services/account/client/index.ejs
rename to services/account/client/index.ejs
diff --git a/@salix-services/account/package.json b/services/account/package.json
similarity index 100%
rename from @salix-services/account/package.json
rename to services/account/package.json
diff --git a/services/account/server/application.json b/services/account/server/application.json
new file mode 100644
index 0000000000..cfdcfc7fd1
--- /dev/null
+++ b/services/account/server/application.json
@@ -0,0 +1,3 @@
+{
+ "salix": "/salix/login"
+}
\ No newline at end of file
diff --git a/@salix-services/account/server/boot/createmodel.js b/services/account/server/boot/createmodel.js
similarity index 100%
rename from @salix-services/account/server/boot/createmodel.js
rename to services/account/server/boot/createmodel.js
diff --git a/@salix-services/account/server/boot/root.js b/services/account/server/boot/root.js
similarity index 100%
rename from @salix-services/account/server/boot/root.js
rename to services/account/server/boot/root.js
diff --git a/@salix-services/account/server/boot/routes.js b/services/account/server/boot/routes.js
similarity index 100%
rename from @salix-services/account/server/boot/routes.js
rename to services/account/server/boot/routes.js
diff --git a/@salix-services/account/server/component-config.json b/services/account/server/component-config.json
similarity index 100%
rename from @salix-services/account/server/component-config.json
rename to services/account/server/component-config.json
diff --git a/@salix-services/account/server/config.json b/services/account/server/config.json
similarity index 100%
rename from @salix-services/account/server/config.json
rename to services/account/server/config.json
diff --git a/@salix-services/account/server/datasources.json b/services/account/server/datasources.json
similarity index 100%
rename from @salix-services/account/server/datasources.json
rename to services/account/server/datasources.json
diff --git a/@salix-services/account/server/middleware.development.json b/services/account/server/middleware.development.json
similarity index 100%
rename from @salix-services/account/server/middleware.development.json
rename to services/account/server/middleware.development.json
diff --git a/@salix-services/account/server/middleware.json b/services/account/server/middleware.json
similarity index 100%
rename from @salix-services/account/server/middleware.json
rename to services/account/server/middleware.json
diff --git a/@salix-services/account/server/model-config.json b/services/account/server/model-config.json
similarity index 100%
rename from @salix-services/account/server/model-config.json
rename to services/account/server/model-config.json
diff --git a/@salix-services/account/server/server.js b/services/account/server/server.js
similarity index 100%
rename from @salix-services/account/server/server.js
rename to services/account/server/server.js
diff --git a/@salix-services/client/.editorconfig b/services/client/.editorconfig
similarity index 100%
rename from @salix-services/client/.editorconfig
rename to services/client/.editorconfig
diff --git a/@salix-services/client/.eslintignore b/services/client/.eslintignore
similarity index 100%
rename from @salix-services/client/.eslintignore
rename to services/client/.eslintignore
diff --git a/@salix-services/client/.eslintrc b/services/client/.eslintrc
similarity index 100%
rename from @salix-services/client/.eslintrc
rename to services/client/.eslintrc
diff --git a/@salix-services/client/.gitignore b/services/client/.gitignore
similarity index 100%
rename from @salix-services/client/.gitignore
rename to services/client/.gitignore
diff --git a/@salix-services/client/.yo-rc.json b/services/client/.yo-rc.json
similarity index 100%
rename from @salix-services/client/.yo-rc.json
rename to services/client/.yo-rc.json
diff --git a/@salix-services/client/Dockerfile b/services/client/Dockerfile
similarity index 100%
rename from @salix-services/client/Dockerfile
rename to services/client/Dockerfile
diff --git a/@salix-services/client/common/models/Address.json b/services/client/common/models/Address.json
similarity index 100%
rename from @salix-services/client/common/models/Address.json
rename to services/client/common/models/Address.json
diff --git a/@salix-services/client/common/models/Client.json b/services/client/common/models/Client.json
similarity index 100%
rename from @salix-services/client/common/models/Client.json
rename to services/client/common/models/Client.json
diff --git a/@salix-services/client/package.json b/services/client/package.json
similarity index 100%
rename from @salix-services/client/package.json
rename to services/client/package.json
diff --git a/@salix-services/client/server/boot/authentication.js b/services/client/server/boot/authentication.js
similarity index 100%
rename from @salix-services/client/server/boot/authentication.js
rename to services/client/server/boot/authentication.js
diff --git a/@salix-services/client/server/boot/root.js b/services/client/server/boot/root.js
similarity index 100%
rename from @salix-services/client/server/boot/root.js
rename to services/client/server/boot/root.js
diff --git a/@salix-services/client/server/component-config.json b/services/client/server/component-config.json
similarity index 100%
rename from @salix-services/client/server/component-config.json
rename to services/client/server/component-config.json
diff --git a/@salix-services/client/server/config.json b/services/client/server/config.json
similarity index 100%
rename from @salix-services/client/server/config.json
rename to services/client/server/config.json
diff --git a/@salix-services/client/server/datasources.json b/services/client/server/datasources.json
similarity index 100%
rename from @salix-services/client/server/datasources.json
rename to services/client/server/datasources.json
diff --git a/@salix-services/client/server/middleware.development.json b/services/client/server/middleware.development.json
similarity index 100%
rename from @salix-services/client/server/middleware.development.json
rename to services/client/server/middleware.development.json
diff --git a/@salix-services/client/server/middleware.json b/services/client/server/middleware.json
similarity index 100%
rename from @salix-services/client/server/middleware.json
rename to services/client/server/middleware.json
diff --git a/@salix-services/client/server/middleware/cors.js b/services/client/server/middleware/cors.js
similarity index 100%
rename from @salix-services/client/server/middleware/cors.js
rename to services/client/server/middleware/cors.js
diff --git a/@salix-services/client/server/middleware/datetime.js b/services/client/server/middleware/datetime.js
similarity index 100%
rename from @salix-services/client/server/middleware/datetime.js
rename to services/client/server/middleware/datetime.js
diff --git a/@salix-services/client/server/model-config.json b/services/client/server/model-config.json
similarity index 100%
rename from @salix-services/client/server/model-config.json
rename to services/client/server/model-config.json
diff --git a/@salix-services/client/server/server.js b/services/client/server/server.js
similarity index 100%
rename from @salix-services/client/server/server.js
rename to services/client/server/server.js
diff --git a/services/nginx/.gitignore b/services/nginx/.gitignore
new file mode 100644
index 0000000000..185616dcda
--- /dev/null
+++ b/services/nginx/.gitignore
@@ -0,0 +1,2 @@
+static/*
+temp/*
\ No newline at end of file
diff --git a/@salix/Dockerfile b/services/nginx/Dockerfile
similarity index 55%
rename from @salix/Dockerfile
rename to services/nginx/Dockerfile
index 3fa0bdd346..ff059ad87f 100644
--- a/@salix/Dockerfile
+++ b/services/nginx/Dockerfile
@@ -4,6 +4,6 @@ RUN rm /etc/nginx/nginx.conf
RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx_docker.conf /etc/nginx/nginx.conf
+COPY conf-prod.conf /etc/nginx/nginx.conf
COPY build /etc/nginx
\ No newline at end of file
diff --git a/@salix/nginx.conf b/services/nginx/conf-dev.conf
similarity index 68%
rename from @salix/nginx.conf
rename to services/nginx/conf-dev.conf
index 6c4dc8c1e3..14e82fa8ee 100644
--- a/@salix/nginx.conf
+++ b/services/nginx/conf-dev.conf
@@ -1,24 +1,24 @@
worker_processes 1;
-error_log build/nginx/error.log;
-pid build/nginx/nginx.pid;
+error_log temp/error.log;
+pid temp/nginx.pid;
events {
worker_connections 1024;
}
http {
- sendfile on;
- gzip on;
- default_type application/octet-stream;
+ sendfile on;
+ gzip on;
+ default_type application/octet-stream;
- access_log build/nginx/access.log;
- client_body_temp_path build/nginx/client-body;
- proxy_temp_path build/nginx/proxy;
- fastcgi_temp_path build/nginx/fastcgi;
- uwsgi_temp_path build/nginx/uwsgi;
- scgi_temp_path build/nginx/scgi;
+ access_log temp/access.log;
+ client_body_temp_path temp/client-body;
+ proxy_temp_path temp/proxy;
+ fastcgi_temp_path temp/fastcgi;
+ uwsgi_temp_path temp/uwsgi;
+ scgi_temp_path temp/scgi;
server {
listen 8080;
@@ -26,7 +26,7 @@ http {
autoindex off;
location /static {
- alias build/public/;
+ alias static/;
autoindex on;
}
diff --git a/services/nginx/conf-prod.conf b/services/nginx/conf-prod.conf
new file mode 100644
index 0000000000..5e41d526ee
--- /dev/null
+++ b/services/nginx/conf-prod.conf
@@ -0,0 +1,39 @@
+
+worker_processes 1;
+
+events {
+ worker_connections 1024;
+}
+
+http {
+ sendfile on;
+ gzip on;
+ default_type application/octet-stream;
+
+ include /etc/nginx/mime.types;
+
+ server {
+ listen 8080;
+ server_name localhost;
+ autoindex off;
+
+ root /usr/share/nginx/html;
+
+ location /static {
+ alias public;
+ autoindex on;
+ }
+
+ location ~ ^/account(?:/(.*))?$ {
+ proxy_pass http://192.168.99.100:3000/$1$is_args$args;
+ }
+
+ location ~ ^/salix(?:/(.*))?$ {
+ proxy_pass http://192.168.99.100:3001/$1$is_args$args;
+ }
+
+ location ~ ^/customer(?:/(.*))?$ {
+ proxy_pass http://192.168.99.100:3002/$1$is_args$args;
+ }
+ }
+}
\ No newline at end of file
diff --git a/@salix-services/salix/.editorconfig b/services/salix/.editorconfig
similarity index 100%
rename from @salix-services/salix/.editorconfig
rename to services/salix/.editorconfig
diff --git a/@salix-services/salix/.eslintignore b/services/salix/.eslintignore
similarity index 100%
rename from @salix-services/salix/.eslintignore
rename to services/salix/.eslintignore
diff --git a/@salix-services/salix/.eslintrc b/services/salix/.eslintrc
similarity index 100%
rename from @salix-services/salix/.eslintrc
rename to services/salix/.eslintrc
diff --git a/@salix-services/salix/.gitignore b/services/salix/.gitignore
similarity index 100%
rename from @salix-services/salix/.gitignore
rename to services/salix/.gitignore
diff --git a/@salix-services/salix/.yo-rc.json b/services/salix/.yo-rc.json
similarity index 100%
rename from @salix-services/salix/.yo-rc.json
rename to services/salix/.yo-rc.json
diff --git a/@salix-services/salix/Dockerfile b/services/salix/Dockerfile
similarity index 100%
rename from @salix-services/salix/Dockerfile
rename to services/salix/Dockerfile
diff --git a/@salix-services/salix/client/index.ejs b/services/salix/client/index.ejs
similarity index 85%
rename from @salix-services/salix/client/index.ejs
rename to services/salix/client/index.ejs
index 5a7c56fb54..c8b29ead84 100644
--- a/@salix-services/salix/client/index.ejs
+++ b/services/salix/client/index.ejs
@@ -2,12 +2,10 @@
- Salix
-
+ Salix
-