Commit d4cb9f13 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Prepara rutas a nuevas ubicaciones de código

parent 8318acda

.gitlab-ci/build.yml

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  cache:

    paths:

      - node_modules/

      - client-app/javascript/templates/node_modules/

      - client-app/deps/templates/node_modules/

      - client-app/stylesheets/node_modules/



prepare-unbuilt-version:
@@ -26,7 +26,7 @@ prepare-unbuilt-version: 
    expire_in: 1 week

    paths:

      - node_modules/

      - client-app/javascript/templates/dist/

      - client-app/deps/templates/dist/

      - client-app/stylesheets/style.styl

      - client-app/stylesheets/src/

      - client-app/stylesheets/submodules/

.gitmodules

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
	url = ../style.git

	branch = master

	ignore = dirty

[submodule "client-app/javascript/templates"]

	path = client-app/javascript/templates

[submodule "client-app/deps/templates"]

	path = client-app/deps/templates

	url = ../templates.git

	branch = master

	ignore = dirty

Gruntfile.js

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ module.exports = function(grunt) { 
	grunt.initConfig({

		redmicConfig: {

			rootPath: __dirname,

			srcPath: 'client-app/javascript',

			srcPath: 'client-app/src',

			depsPath: 'client-app/deps',

			distPath: 'dist',

			destDir: 'javascript'

		},

client-app/app.profile.js

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ var declarativeTagger = function(filename) { 
};



var profileObj = {

	basePath: './javascript',

	basePath: './src',

	releaseDir: '../../dist',

	releaseName: 'javascript',

	releaseName: 'src',

	action: 'release',

	layerOptimize: 'closure',

	optimize: 'closure',

client-app/tests/support/pages/test.html

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ 
	</head>



	<body class="db">

		<script src="/client-app/javascript/dojoConfig.js"></script>

		<script src="/client-app/src/dojoConfig.js"></script>

		<script>

			dojoConfig.packages.push({

				name: 'tests',

				location: '../../../tests'

			});

		</script>

		<script src="/client-app/javascript/dojo/dojo.js"></script>

		<script src="/client-app/deps/dojo/dojo.js"></script>



		<div style="margin: 20px; height: calc(100% - 40px)">

			<div id="container"></div>