Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
simcaq-node
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
simcaq
simcaq-node
Commits
0e2a2243
Commit
0e2a2243
authored
6 years ago
by
Glenda Train
Browse files
Options
Downloads
Plain Diff
Merge branch v1.6.0 into auxiliar-route
parents
d2a12c0c
3265b415
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!148
Auxiliar route
,
!145
v1.6.0
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
src/libs/routes/api.js
+3
-0
3 additions, 0 deletions
src/libs/routes/api.js
src/libs/routes/schoolInfrastructure.js
+691
-0
691 additions, 0 deletions
src/libs/routes/schoolInfrastructure.js
with
698 additions
and
0 deletions
CHANGELOG.md
+
4
−
0
View file @
0e2a2243
...
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
...
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
http://keepachangelog.com/
)
The format is based on
[
Keep a Changelog
](
http://keepachangelog.com/
)
and this project adheres to
[
Semantic Versioning
](
http://semver.org/
)
.
and this project adheres to
[
Semantic Versioning
](
http://semver.org/
)
.
## 1.6.0 - 2018-08-14
### Added
-
Add school infrastructure route
## 1.5.0 - 2018-07-30
## 1.5.0 - 2018-07-30
### Added
### Added
-
Add portaMec route
-
Add portaMec route
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes/api.js
+
3
−
0
View file @
0e2a2243
...
@@ -56,6 +56,8 @@ const downloads = require(`${libs}/routes/downloads`);
...
@@ -56,6 +56,8 @@ const downloads = require(`${libs}/routes/downloads`);
const
infrastructure
=
require
(
`
${
libs
}
/routes/infrastructure`
);
const
infrastructure
=
require
(
`
${
libs
}
/routes/infrastructure`
);
const
schoolInfrastructure
=
require
(
`
${
libs
}
/routes/schoolInfrastructure`
);
const
distributionFactor
=
require
(
`
${
libs
}
/routes/distributionFactor`
);
const
distributionFactor
=
require
(
`
${
libs
}
/routes/distributionFactor`
);
const
siope
=
require
(
`
${
libs
}
/routes/siope`
);
const
siope
=
require
(
`
${
libs
}
/routes/siope`
);
...
@@ -104,6 +106,7 @@ api.use('/reset', resetToken);
...
@@ -104,6 +106,7 @@ api.use('/reset', resetToken);
api
.
use
(
'
/education_years
'
,
educationYears
);
api
.
use
(
'
/education_years
'
,
educationYears
);
api
.
use
(
'
/downloads
'
,
downloads
);
api
.
use
(
'
/downloads
'
,
downloads
);
api
.
use
(
'
/infrastructure
'
,
infrastructure
);
api
.
use
(
'
/infrastructure
'
,
infrastructure
);
api
.
use
(
'
/school_infrastructure
'
,
schoolInfrastructure
);
api
.
use
(
'
/distribution_factor
'
,
distributionFactor
);
api
.
use
(
'
/distribution_factor
'
,
distributionFactor
);
api
.
use
(
'
/siope
'
,
siope
);
api
.
use
(
'
/siope
'
,
siope
);
api
.
use
(
'
/out_of_school
'
,
outOfSchool
);
api
.
use
(
'
/out_of_school
'
,
outOfSchool
);
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes/schoolInfrastructure.js
0 → 100644
+
691
−
0
View file @
0e2a2243
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment