Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dev.biuro
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Biuro
dev.biuro
Commits
6547bc10
Commit
6547bc10
authored
Apr 17, 2019
by
Simonas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
api adjustments
parent
2e71ca26
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
8 deletions
+10
-8
docker-compose.yml
docker-compose.yml
+2
-1
.htpasswd
nginx/.htpasswd
+1
-1
server-shared.conf
nginx/conf.d/server-shared.conf
+3
-2
footer.php
wp-content/themes/biuro/footer.php
+1
-1
functions.php
wp-content/themes/biuro/functions.php
+1
-1
main-19c9eea4.min.js
wp-content/themes/biuro/js/main-19c9eea4.min.js
+1
-1
main.js
wp-content/themes/biuro/js/main.js
+1
-1
No files found.
docker-compose.yml
View file @
6547bc10
...
@@ -26,6 +26,7 @@ services:
...
@@ -26,6 +26,7 @@ services:
-
"
front"
-
"
front"
-
"
back"
-
"
back"
volumes
:
volumes
:
-
./nginx/.htpasswd:/etc/nginx/.htpasswd
-
./nginx/php.ini:/usr/local/etc/php/conf.d/php.ini
-
./nginx/php.ini:/usr/local/etc/php/conf.d/php.ini
-
./wp-content/plugins/biuro-contacts:/var/www/html/wp-content/plugins/biuro-contacts
-
./wp-content/plugins/biuro-contacts:/var/www/html/wp-content/plugins/biuro-contacts
...
@@ -75,7 +76,7 @@ services:
...
@@ -75,7 +76,7 @@ services:
-
'
80:80'
-
'
80:80'
-
'
443:443'
-
'
443:443'
volumes
:
volumes
:
#
- ./nginx/.htpasswd:/etc/nginx/.htpasswd
-
./nginx/.htpasswd:/etc/nginx/.htpasswd
-
./nginx/conf.d:/etc/nginx/conf.d
-
./nginx/conf.d:/etc/nginx/conf.d
-
./nginx/h5bp:/etc/nginx/h5bp
-
./nginx/h5bp:/etc/nginx/h5bp
-
./nginx/nginx.conf:/etc/nginx/nginx.conf
-
./nginx/nginx.conf:/etc/nginx/nginx.conf
...
...
nginx/.htpasswd
View file @
6547bc10
BiuroPowerBI:$apr1$5nxZLxY0$egUbQUHmxcSfqzIiSsLgx
.
biuro_wp_api:$apr1$vvI07kKw$MysnayQWamZReKludVojG
.
nginx/conf.d/server-shared.conf
View file @
6547bc10
...
@@ -19,10 +19,11 @@ location / {
...
@@ -19,10 +19,11 @@ location / {
# auth_basic_user_file /etc/nginx/.htpasswd;
# auth_basic_user_file /etc/nginx/.htpasswd;
}
}
location
/
wp
-
json
/
api
/ {
location
/
wp
-
json
/
api
/
v1
/
contacts
{
try_files
$
uri
$
uri
/ /
index
.
php
?$
args
;
try_files
$
uri
$
uri
/ /
index
.
php
?$
args
;
auth_basic
"Basic auth"
;
auth_basic
"Basic auth"
;
auth_basic_user_file
/
var
/
www
/
html
/.
htpasswd
;
auth_basic_user_file
/
etc
/
nginx
/.
htpasswd
;
# auth_basic_user_file /var/www/html/.htpasswd;
}
}
location
~ \.
php
$ {
location
~ \.
php
$ {
...
...
wp-content/themes/biuro/footer.php
View file @
6547bc10
...
@@ -123,7 +123,7 @@ document.querySelectorAll('.js-job-action').forEach(function (node) {
...
@@ -123,7 +123,7 @@ document.querySelectorAll('.js-job-action').forEach(function (node) {
});
});
</script>
</script>
<script
src=
"/wp-content/themes/biuro/js/main-
a9a206ea
.min.js"
async
></script>
<script
src=
"/wp-content/themes/biuro/js/main-
19c9eea4
.min.js"
async
></script>
<?php
wp_footer
();
?>
<?php
wp_footer
();
?>
</body>
</body>
</html>
</html>
wp-content/themes/biuro/functions.php
View file @
6547bc10
...
@@ -495,7 +495,7 @@ function getDivisions ( $request ) {
...
@@ -495,7 +495,7 @@ function getDivisions ( $request ) {
add_action
(
'rest_api_init'
,
function
()
{
add_action
(
'rest_api_init'
,
function
()
{
register_rest_route
(
'
biuro-
api/v1'
,
'/divisions'
,
array
(
register_rest_route
(
'api/v1'
,
'/divisions'
,
array
(
'methods'
=>
WP_REST_Server
::
READABLE
,
'methods'
=>
WP_REST_Server
::
READABLE
,
'callback'
=>
'getDivisions'
,
'callback'
=>
'getDivisions'
,
'args'
=>
array
(
'args'
=>
array
(
...
...
wp-content/themes/biuro/js/main-
a9a206ea
.min.js
→
wp-content/themes/biuro/js/main-
19c9eea4
.min.js
View file @
6547bc10
This diff is collapsed.
Click to expand it.
wp-content/themes/biuro/js/main.js
View file @
6547bc10
...
@@ -46,7 +46,7 @@ if (module.hot) {
...
@@ -46,7 +46,7 @@ if (module.hot) {
return
;
return
;
}
}
fetch
(
'/wp-json/
biuro-
api/v1/divisions?lang='
+
node
.
dataset
.
lang
)
fetch
(
'/wp-json/api/v1/divisions?lang='
+
node
.
dataset
.
lang
)
.
then
((
t
)
=>
t
.
json
())
.
then
((
t
)
=>
t
.
json
())
.
then
((
data
)
=>
{
.
then
((
data
)
=>
{
initDivisionsMap
(
node
,
data
);
initDivisionsMap
(
node
,
data
);
...
...
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