Skip to content

Commit

Permalink
Admin UI and Docs Fixes (#886)
Browse files Browse the repository at this point in the history
* Update dependency prism-react-renderer to v2

* Update dependency clsx to v2

* Update dependency @mdx-js/react to v3

* Update docusaurus monorepo to v2.4.3

* Update react monorepo to v18

* Update docusaurus monorepo to v3

* fix callback for config

* updating xlsx library

* updating docs deps

* updating project docs metadata

* updating pipeline and more deps

* updating docusaurus config for latest prism library

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
dgershman and renovate[bot] authored Jan 6, 2024

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent c35904a commit cfaff71
Showing 8 changed files with 6,126 additions and 5,065 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-deploy.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
uses: actions/[email protected]
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: npm
cache-dependency-path: docs/package-lock.json

2 changes: 1 addition & 1 deletion .github/workflows/docs-test.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
uses: actions/[email protected]
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: npm
cache-dependency-path: docs/package-lock.json
- name: Install and Build 🔧
2 changes: 1 addition & 1 deletion app/Repositories/ConfigRepository.php
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ public function adminPersistDbConfig($service_body_id, $data, $data_type, $paren
"SELECT MAX(id) as id FROM `config` WHERE `service_body_id`=? AND `data_type`=?",
[$service_body_id, $data_type]
);
return $result[0]['id'];
return $result[0]->id;
} else {
if (isset($parent_id) && $parent_id > 0) {
DB::insert(
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ To install and run the website locally to view your changes while your making th
$ npm install
```

After installing you can then run.
After installing, you can then run.

```
$ npm run start
@@ -26,4 +26,4 @@ This command starts a local development server and opens up a browser window. Mo

## Deployment

The website is hosted as a github page and is deployed upon merges to `main`.
The website is hosted as a GitHub page and is deployed upon merges to `main`.
6 changes: 3 additions & 3 deletions docs/docusaurus.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const lightCodeTheme = require('prism-react-renderer/themes/github');
const darkCodeTheme = require('prism-react-renderer/themes/dracula');
const lightCodeTheme = require('prism-react-renderer').themes.oneLight;
const darkCodeTheme = require('prism-react-renderer').themes.nightOwl;

// With JSDoc @type annotations, IDEs can provide config autocompletion
/** @type {import('@docusaurus/types').DocusaurusConfig} */
@@ -11,7 +11,7 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula');
onBrokenLinks: 'throw',
onBrokenMarkdownLinks: 'warn',
favicon: 'img/favicon.ico',
organizationName: 'bmlt-enabled', // Usually your GitHub org/user name.
organizationName: 'bmlt-enabled', // Usually your GitHub org/username.
projectName: 'yap', // Usually your repo name.
plugins: [],
presets: [
11,155 changes: 6,108 additions & 5,047 deletions docs/package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yapdocs",
"version": "0.0.2",
"version": "1.0.0",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
@@ -16,16 +16,16 @@
"deploy-gh": "npm run build && touch ./build/.nojekyll && echo 'yap.bmlt.app' > ./build/CNAME && npx gh-pages -d build -t true"
},
"dependencies": {
"@docusaurus/core": "^2.1.0",
"@docusaurus/preset-classic": "^2.1.0",
"@docusaurus/theme-search-algolia": "^2.1.0",
"@mdx-js/react": "^1.6.22",
"@docusaurus/core": "^3.0.0",
"@docusaurus/preset-classic": "^3.0.0",
"@docusaurus/theme-search-algolia": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@svgr/webpack": "^5.5.0",
"clsx": "^1.2.1",
"clsx": "^2.0.0",
"file-loader": "^6.2.0",
"prism-react-renderer": "^1.3.5",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"prism-react-renderer": "^2.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-player": "^2.9.0",
"url-loader": "^4.1.1"
},
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"popper.js": "^1.15.0",
"react-router-dom": "^6.8.1",
"tabulator-tables": "4.5.3",
"xlsx": "0.17.1"
"xlsx": "^0.18.5"
},
"devDependencies": {
"@babel/preset-react": "^7.18.6",

0 comments on commit cfaff71

Please sign in to comment.