Skip to content

Commit

Permalink
Merge pull request #25 from pankrok/176
Browse files Browse the repository at this point in the history
[176] update js and php dependency
  • Loading branch information
pankrok authored Dec 1, 2023
2 parents 92e111f + 963eaf2 commit e59af8d
Show file tree
Hide file tree
Showing 11 changed files with 8,612 additions and 27,251 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/onebb-backend/var/
/onebb-backend/var/migrations/*
/onebb-backend/vendor/
/docs
###< symfony/framework-bundle ###

###> symfony/phpunit-bridge ###
Expand Down
16,560 changes: 3,472 additions & 13,088 deletions onebb-admin/package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions onebb-admin/src/services/onebb.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class OneBB {
let uri = API_URL;
uri += this.api ?? 'api/';
uri += this.resource + this.parseParams();

try {
const req = await fetch(uri, this.config);
if (this.config.method === 'DELETE') {
response = req;
Expand All @@ -63,9 +63,12 @@ class OneBB {
response = null;
}
}

this.setDefaults();
return {status: req.status, response: response};
} catch(error) {
console.error({error})
}
}
}

Expand Down
2,561 changes: 1,310 additions & 1,251 deletions onebb-backend/composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions onebb-backend/public/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/admin
1 change: 1 addition & 0 deletions onebb-backend/public/skins/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/standard
71 changes: 70 additions & 1 deletion onebb-backend/templates/admin_panel/index.html.twig
Original file line number Diff line number Diff line change
@@ -1 +1,70 @@
<!doctype html><html lang="{{ lang }}"><head><base href="{{ base_url }}"/><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="admin/standard/favicon.ico"><![endif]--><title>onebb-admin-new</title><script defer="defer" src="admin/standard/js/chunk-vendors-legacy.6b72e1ad.js"></script><script defer="defer" src="admin/standard/js/app-legacy.120171ef.js"></script><link href="admin/standard/css/app.d9c55ac6.css" rel="stylesheet"><link rel="icon" type="image/svg+xml" href="admin/standard/img/icons/favicon.svg"><link rel="icon" type="image/png" sizes="32x32" href="admin/standard/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="admin/standard/img/icons/favicon-16x16.png"><link rel="manifest" href="admin/standard/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="onebb-admin-new"><link rel="apple-touch-icon" href="admin/standard/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="admin/standard/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="admin/standard/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but onebb-admin-new doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app" data-locale="pl" data-obb="{{ base_url }}" data-acp="{{ acp_url }}" data-url="{{ app.request.schemeAndHttpHost }}"></div></body></html>
<!DOCTYPE html>
<html lang="{{ lang }}">
<head>
<base href="{{ base_url }}" />
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<!--[if IE
]><link rel="icon" href="admin/standard/favicon.ico"
/><![endif]-->
<title>onebb-admin-new</title>
<script
defer="defer"
src="admin/standard/js/chunk-vendors.7ea00a14.js"
></script>
<script defer="defer" src="admin/standard/js/app.bd093c74.js"></script>
<link href="admin/standard/css/app.90c60f3a.css" rel="stylesheet" />
<link
rel="icon"
type="image/svg+xml"
href="admin/standard/img/icons/favicon.svg"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="admin/standard/img/icons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="admin/standard/img/icons/favicon-16x16.png"
/>
<link rel="manifest" href="admin/standard/manifest.json" />
<meta name="theme-color" content="#4DBA87" />
<meta name="apple-mobile-web-app-capable" content="no" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="apple-mobile-web-app-title" content="onebb-admin-new" />
<link
rel="apple-touch-icon"
href="admin/standard/img/icons/apple-touch-icon-152x152.png"
/>
<link
rel="mask-icon"
href="admin/standard/img/icons/safari-pinned-tab.svg"
color="#4DBA87"
/>
<meta
name="msapplication-TileImage"
content="admin/standard/img/icons/msapplication-icon-144x144.png"
/>
<meta name="msapplication-TileColor" content="#000000" />
</head>
<body>
<noscript
><strong
>We're sorry but onebb-admin-new doesn't work properly without
JavaScript enabled. Please enable it to continue.</strong
></noscript
>
<div
id="app"
data-locale="pl"
data-obb="{{ base_url }}"
data-acp="{{ acp_url }}"
data-url="{{ app.request.schemeAndHttpHost }}"
></div>
</body>
</html>
127 changes: 126 additions & 1 deletion onebb-backend/templates/boards/index.html.twig
Original file line number Diff line number Diff line change
@@ -1 +1,126 @@
<!doctype html><html lang="{{ lang }}"><head><base href="{{ base_url }}"/><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="{{ meta_descripton }}"><!--[if IE]><link rel="icon" href="skins/standard/favicon.ico"><![endif]--><title>{{ board_name }}</title><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-aacc2dbb.37502239.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-01f6fbab.a7140cb3.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-c1d52a5c.fa3e4db6.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-16e6bfe5.121ab04a.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-22da2759.92767907.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-26f8b3aa.cde06f63.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-edbb3357.8c5e1ae6.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-6a70640a.bb9506f6.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-8cbd2506.cadd58d5.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-c3943e85.a49dee70.js"></script><script defer="defer" type="module" src="skins/standard/js/chunk-vendors-7d47fb9b.45c0d3fc.js"></script><script defer="defer" type="module" src="skins/standard/js/app.9678efea.js"></script><link href="skins/standard/css/app.8574a05e.css" rel="stylesheet"><link rel="icon" type="image/svg+xml" href="skins/standard/img/icons/favicon.svg"><link rel="icon" type="image/png" sizes="32x32" href="skins/standard/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="skins/standard/img/icons/favicon-16x16.png"><link rel="manifest" href="skins/standard/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="{{ board_name }}"><link rel="apple-touch-icon" href="skins/standard/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="skins/standard/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="skins/standard/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"><script defer="defer" src="skins/standard/js/chunk-vendors-aacc2dbb-legacy.96d64c94.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-ad6a2f20-legacy.dc20761d.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-01f6fbab-legacy.73681472.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-c1d52a5c-legacy.fa3e4db6.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-16e6bfe5-legacy.7b49f288.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-22da2759-legacy.92767907.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-26f8b3aa-legacy.cde06f63.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-edbb3357-legacy.8c5e1ae6.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-6a70640a-legacy.bb9506f6.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-e8d10d86-legacy.728bd1a4.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-1656f0b4-legacy.6c678f75.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-c3943e85-legacy.a49dee70.js" nomodule></script><script defer="defer" src="skins/standard/js/chunk-vendors-7d47fb9b-legacy.45c0d3fc.js" nomodule></script><script defer="defer" src="skins/standard/js/app-legacy.988e1358.js" nomodule></script></head><body><noscript><strong>We're sorry but OneBB doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app" data-obb="{{ base_url }}" data-url="{{ app.request.schemeAndHttpHost }}"></div>{% for snippet in snippets %}{{ snippet|raw }}{% endfor %}</body></html>
<!DOCTYPE html>
<html lang="{{ lang }}">
<head>
<base href="{{ base_url }}" />
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="description" content="{{ meta_descripton }}" />
<!--[if IE
]><link rel="icon" href="skins/standard/favicon.ico"
/><![endif]-->
<title>{{ board_name }}</title>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-aacc2dbb.4810fd19.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-01f6fbab.924a4bd5.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-c1d52a5c.f27ca4b9.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-16e6bfe5.0e855e48.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-22da2759.c2bb1d49.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-26f8b3aa.2a510b95.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-edbb3357.378b6bec.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-f945abb9.7fcfb8e4.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-ed1041e6.76d9ce96.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-1656f0b4.1c42b6ea.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-5338af6e.8f67cc8e.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-7d47fb9b.1835433c.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-b8bcc76a.c23d6b22.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-dac6cdf7.ef0282f4.js"
></script>
<script
defer="defer"
src="skins/standard/js/chunk-vendors-a73a0a1f.e2f68b61.js"
></script>
<script defer="defer" src="skins/standard/js/app.6d4285ef.js"></script>
<link href="skins/standard/css/app.5c6f5afa.css" rel="stylesheet" />
<link
rel="icon"
type="image/svg+xml"
href="skins/standard/img/icons/favicon.svg"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="skins/standard/img/icons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="skins/standard/img/icons/favicon-16x16.png"
/>
<link rel="manifest" href="skins/standard/manifest.json" />
<meta name="theme-color" content="#4DBA87" />
<meta name="apple-mobile-web-app-capable" content="no" />
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="apple-mobile-web-app-title" content="{{ board_name }}" />
<link
rel="apple-touch-icon"
href="skins/standard/img/icons/apple-touch-icon-152x152.png"
/>
<link
rel="mask-icon"
href="skins/standard/img/icons/safari-pinned-tab.svg"
color="#4DBA87"
/>
<meta
name="msapplication-TileImage"
content="skins/standard/img/icons/msapplication-icon-144x144.png"
/>
<meta name="msapplication-TileColor" content="#000000" />
</head>
<body>
<noscript
><strong
>We're sorry but OneBB doesn't work properly without JavaScript enabled.
Please enable it to continue.</strong
></noscript
>
<div
id="app"
data-obb="{{ base_url }}"
data-url="{{ app.request.schemeAndHttpHost }}"
></div>
{% for snippet in snippets %}{{ snippet|raw }}{% endfor %}
</body>
</html>
1 change: 1 addition & 0 deletions onebb-front/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
/node_modules
/dist
/dev-dist
/obb1


Expand Down
Loading

0 comments on commit e59af8d

Please sign in to comment.