Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
E
ESDP_froot.kz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
10
Issues
10
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ESDP_froot.kz
ESDP_froot.kz
Commits
efa2cd8a
Commit
efa2cd8a
authored
May 18, 2021
by
Pavel Mishakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Поменял пути с локальных на нормальные
parent
07a9a86a
Pipeline
#335
passed with stages
in 2 minutes and 10 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
config.js
api/app/config.js
+4
-4
config.js
front/src/config.js
+2
-2
No files found.
api/app/config.js
View file @
efa2cd8a
...
...
@@ -15,14 +15,14 @@ module.exports = {
rootPath
,
uploadPath
:
path
.
join
(
rootPath
,
'../public/uploads'
),
db
:
{
name
:
'froot'
,
//
name: 'froot',
// name: 'test',
// name:`${dbMongo}?authSource=${initDb}`, //docker
//
name: process.env.MONGO_DB ? `${dbMongo}?authSource=${initDb}` : 'froot',
name
:
process
.
env
.
MONGO_DB
?
`
${
dbMongo
}
?authSource=
${
initDb
}
`
:
'froot'
,
// url: 'mongodb://localhost',
url
:
'mongodb+srv://QWE123:QWE123@cluster0.rrd3k.mongodb.net'
,
// Pasha's mongo address !!
//
url: 'mongodb+srv://QWE123:QWE123@cluster0.rrd3k.mongodb.net', // Pasha's mongo address !!
// url:`mongodb://${user}:${password}@${host}:${port}`, //docker
//
url:process.env.MONGO_USER ? `mongodb://${user}:${password}@${host}:${port}` : 'mongodb://localhost',
url
:
process
.
env
.
MONGO_USER
?
`mongodb://
${
user
}
:
${
password
}
@
${
host
}
:
${
port
}
`
:
'mongodb://localhost'
,
// url: 'mongodb://104.248.198.29',
},
//11 baseUrlForTelegram: 'http://'+process.env.BOT_HOST, //docker
...
...
front/src/config.js
View file @
efa2cd8a
export
const
apiURL
=
"http://localhost:8000"
;
//
export const apiURL = "http://162.55.54.115:8000";
//
export const apiURL = "http://localhost:8000";
export
const
apiURL
=
"http://162.55.54.115:8000"
;
const
allDayLocalizationMessages
=
{
"ru-RU"
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment