diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml new file mode 100644 index 0000000..1bde108 --- /dev/null +++ b/.github/workflows/workflow.yml @@ -0,0 +1,21 @@ +name: CI/CD Pipeline +on: + push: + branches: [ staging ] + +jobs: + continuous-deployment: + runs-on: ubuntu-latest + steps: + - name: Executing remote ssh commands using ssh key + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST_DNS }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + script: | + cd /home/ubuntu/dist + git pull origin staging + yarn + yarn build + sudo pm2 restart all diff --git a/patches/@strapi+admin+4.12.5.patch b/patches/@strapi+admin+4.12.5.patch index 66e58ea..8f0256c 100644 --- a/patches/@strapi+admin+4.12.5.patch +++ b/patches/@strapi+admin+4.12.5.patch @@ -105,7 +105,7 @@ index c259beb..db90060 100644 return ( diff --git a/node_modules/@strapi/admin/admin/src/content-manager/pages/App/index.js b/node_modules/@strapi/admin/admin/src/content-manager/pages/App/index.js -index cfbc1cd..34ec16c 100644 +index cfbc1cd..59ee539 100644 --- a/node_modules/@strapi/admin/admin/src/content-manager/pages/App/index.js +++ b/node_modules/@strapi/admin/admin/src/content-manager/pages/App/index.js @@ -122,7 +122,9 @@ const App = () => { @@ -114,7 +114,7 @@ index cfbc1cd..34ec16c 100644 return ( - }> + } ++ //sideNav={} + > diff --git a/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/src/extensions/documentation/documentation/1.0.0/full_documentation.json index 55ce86f..2e5ee4b 100644 --- a/src/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/src/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -14,7 +14,7 @@ "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "x-generation-date": "2023-09-13T12:38:57.633Z" + "x-generation-date": "2023-09-19T15:23:32.163Z" }, "x-strapi-config": { "path": "/documentation", @@ -25,7 +25,7 @@ }, "servers": [ { - "url": "http://localhost:1337/api", + "url": "http://localhost:80/api", "description": "Development server" } ], diff --git a/src/plugins/cloudfront-metrics/admin/src/index.tsx b/src/plugins/cloudfront-metrics/admin/src/index.tsx index 2bc4d30..be4053c 100644 --- a/src/plugins/cloudfront-metrics/admin/src/index.tsx +++ b/src/plugins/cloudfront-metrics/admin/src/index.tsx @@ -8,6 +8,7 @@ import { RiClapperboardFill } from 'react-icons/ri'; import { VscGraph } from 'react-icons/vsc' import {BsBroadcastPin} from 'react-icons/bs' import {CgWebsite} from 'react-icons/cg' +import {HiMiniUsers} from 'react-icons/hi2' const name = pluginPkg.strapi.name; @@ -110,6 +111,24 @@ export default { permissions: [], }); + app.addMenuLink({ + to: `/content-manager/collectionType/plugin::users-permissions.user?page=1&pageSize=10&sort=username:ASC`, + icon: HiMiniUsers, + category: "Admin", + intlLabel: { + id: `${pluginId}.plugin.name`, + defaultMessage: "Users", + }, + Component: async () => { + const component = await import(/* webpackChunkName: "[request]" */ './pages/App'); + + return component; + }, + permissions: [], + }); + + + const plugin = { id: pluginId,