Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/design/hooks/api.ts
#	src/pages/blog/[slug].tsx
#	src/pages/chord/[slug].tsx
#	src/pages/news/[...slug].tsx
  • Loading branch information
@putuadityabayu
putuadityabayu committed Feb 2, 2025
2 parents dd9cd1f + 5e384fa commit 7b8ff89
Show file tree
Hide file tree
Showing 38 changed files with 2,629 additions and 1,958 deletions.
10 changes: 7 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@ yarn-error.log*

# typescript
*.tsbuildinfo
next-env.d.ts
server.js
#next-env.d.ts
#server.js

public/sw.js
public/workbox*.js
public/worker-*
public/fallback-*

src/mui-comp.json
src/build-id.ts
src/build-id.ts
src/version.ts

.idea/*
!.idea/copyright
7 changes: 7 additions & 0 deletions .idea/copyright/profiles_settings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"datas": "https://datas.portalnesia.com"
},
"recaptcha": "6LdeqPYUAAAAAL-nPJZjgAE0gYD5DeyH7-i-_Hee",
"recaptcha_appcheck": "6Le7oPcpAAAAANnswC3KLahPZfD4g486-0XYdyr6",
"firebase": {
"apiKey": "AIzaSyAQ7u4UWLyPZ9dgL9cwtBbXs4GX3th00Bg",
"authDomain": "portalnesia.firebaseapp.com",
Expand Down
2 changes: 1 addition & 1 deletion next.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const withPWA = require('next-pwa')({
},
{
urlPattern: /\.(?:json|xml|csv)$/i,
handler: 'NetworkFirst',
handler: 'StaleWhileRevalidate',
options: {
cacheName: 'static-data-assets',
expiration: {
Expand Down
35 changes: 26 additions & 9 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

232 changes: 117 additions & 115 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,117 +1,119 @@
{
"name": "portalnesia",
"version": "5.0.2",
"private": true,
"repository": {
"type": "git",
"url": "git+https://github.com/portalnesia/portalnesia-web.git"
},
"homepage": "https://portalnesia.com",
"author": "Putu Aditya <aditya@portalnesia.com>",
"license": "MIT",
"scripts": {
"patch": "patch-package",
"dev": "node server.js",
"start": "node server.js",
"lint": "next lint",
"version": "genversion --es6 src/version.ts",
"build:pack": "node bin/build.js",
"build:webpack": "npx genversion --es6 src/version.ts && node bin/mui-class.js && next build",
"build": "npm run build:webpack && npm run build:pack",
"tsc": "tsc ./server.ts --module commonjs --esModuleInterop --resolveJsonModule",
"reload": "rm -rf ./.next && node bin/reload.js && unzip -q -o portalnesia && pm2 reload pm2.config.json"
},
"dependencies": {
"cors": "^2.8.5",
"express": "^4.18.2",
"helmet": "^6.0.0",
"html2canvas-proxy": "^1.0.1",
"http-proxy-middleware": "^2.0.6"
},
"devDependencies": {
"@ckeditor/ckeditor5-react": "^5.0.3",
"@emotion/react": "^11.10.5",
"@emotion/server": "^11.10.0",
"@emotion/styled": "^11.10.5",
"@fancyapps/ui": "^4.0.31",
"@iconify/react": "^4.0.0",
"@mui/icons-material": "^5.10.9",
"@mui/lab": "^5.0.0-alpha.107",
"@mui/material": "^5.10.13",
"@mui/styles": "^5.10.10",
"@mui/system": "^5.10.13",
"@mui/x-date-pickers": "^5.0.8",
"@portalnesia/custom-ckeditor5": "^2.1.1",
"@portalnesia/dayjs-plugins": "^1.0.1",
"@portalnesia/utils": "^1.1.10",
"@reduxjs/toolkit": "^1.9.0",
"@types/ckeditor__ckeditor5-core": "^28.0.10",
"@types/ckeditor__ckeditor5-editor-classic": "^27.1.2",
"@types/ckeditor__ckeditor5-utils": "^28.0.9",
"@types/croppie": "^2.6.1",
"@types/dompurify": "^2.4.0",
"@types/express": "^4.17.14",
"@types/js-yaml": "^4.0.5",
"@types/lodash.merge": "^4.6.7",
"@types/node": "18.11.9",
"@types/react": "18.0.25",
"@types/react-dom": "18.0.8",
"@types/simplebar": "^5.3.3",
"axios": "^1.1.3",
"base64-arraybuffer": "^1.0.2",
"classnames": "^2.3.2",
"cookies-next": "^2.1.1",
"croppie": "^2.6.5",
"dayjs": "^1.11.6",
"dompurify": "^2.4.1",
"easymde": "^2.18.0",
"eslint": "8.27.0",
"eslint-config-next": "13.0.3",
"file-loader": "^6.2.0",
"firebase": "^10.1.0",
"fs-extra": "^10.1.0",
"genversion": "^3.1.1",
"highlight.js": "^11.7.0",
"html-react-parser": "^3.0.4",
"html2canvas": "^1.4.1",
"js-yaml": "^4.1.0",
"lodash.merge": "^4.6.2",
"mariadb": "^3.0.2",
"marked": "^4.2.3",
"marked-plaintext": "^0.0.2",
"mousetrap": "^1.6.5",
"next": "13.0.3",
"next-pwa": "^5.6.0",
"next-redux-wrapper": "^8.0.0",
"next-seo": "^5.14.1",
"next-superjson": "^0.0.4",
"notistack": "^2.0.8",
"nprogress": "^0.2.0",
"patch-package": "^6.5.0",
"react": "18.2.0",
"react-auth-code-input": "^3.2.1",
"react-device-detect": "^2.2.2",
"react-dom": "18.2.0",
"react-html-props": "^1.0.33",
"react-lazy-load-image-component": "^1.5.6",
"react-multi-carousel": "^2.8.2",
"react-redux": "^8.0.5",
"react-simplemde-editor": "^5.2.0",
"react-social-media-embed": "^2.3.5",
"react-sortable-hoc": "^2.0.0",
"react-spotify-embed": "^2.0.3",
"react-telegram-auth": "^1.0.3",
"redux": "^4.2.0",
"redux-thunk": "^2.4.2",
"rimraf": "^3.0.2",
"sequelize": "^6.25.5",
"simplebar": "^5.3.9",
"simplebar-react": "^2.4.3",
"socket.io-client": "^4.5.4",
"superjson": "^1.11.0",
"swr": "^2.0.0",
"typescript": "4.8.4",
"url-metadata": "^2.5.0",
"zip-lib": "^0.7.3"
}
"name": "portalnesia",
"version": "5.1.0",
"private": true,
"repository": {
"type": "git",
"url": "git+https://github.com/portalnesia/portalnesia-web.git"
},
"homepage": "https://portalnesia.com",
"author": "Putu Aditya <aditya@portalnesia.com>",
"license": "MIT",
"scripts": {
"patch": "patch-package",
"dev": "node server.js",
"start": "node server.js",
"lint": "next lint",
"version": "genversion --es6 src/version.ts",
"build:pack": "node bin/build.js",
"build:webpack": "npx genversion --es6 src/version.ts && node bin/mui-class.js && next build",
"build": "npx --yes update-browserslist-db@latest && npm run build:webpack && npm run build:pack",
"tsc": "tsc ./server.ts --module commonjs --esModuleInterop --resolveJsonModule",
"reload": "rm -rf ./.next && node bin/reload.js && unzip -q -o portalnesia && pm2 reload pm2.config.json",
"version_patch": "npm version patch --no-git-tag-version"
},
"dependencies": {
"cors": "^2.8.5",
"express": "^4.18.2",
"helmet": "^6.0.0",
"html2canvas-proxy": "^1.0.1",
"http-proxy-middleware": "^2.0.6"
},
"devDependencies": {
"@ckeditor/ckeditor5-react": "^5.0.3",
"@emotion/react": "^11.10.5",
"@emotion/server": "^11.10.0",
"@emotion/styled": "^11.10.5",
"@fancyapps/ui": "^4.0.31",
"@iconify/react": "^4.0.0",
"@mui/icons-material": "^5.10.9",
"@mui/lab": "^5.0.0-alpha.107",
"@mui/material": "^5.10.13",
"@mui/styles": "^5.10.10",
"@mui/system": "^5.10.13",
"@mui/x-date-pickers": "^5.0.8",
"@portalnesia/custom-ckeditor5": "^2.1.1",
"@portalnesia/dayjs-plugins": "^1.0.1",
"@portalnesia/utils": "^1.1.10",
"@reduxjs/toolkit": "^1.9.0",
"@types/ckeditor__ckeditor5-core": "^28.0.10",
"@types/ckeditor__ckeditor5-editor-classic": "^27.1.2",
"@types/ckeditor__ckeditor5-utils": "^28.0.9",
"@types/croppie": "^2.6.1",
"@types/dompurify": "^2.4.0",
"@types/express": "^4.17.14",
"@types/js-yaml": "^4.0.5",
"@types/lodash.merge": "^4.6.7",
"@types/node": "18.11.9",
"@types/react": "18.0.25",
"@types/react-dom": "18.0.8",
"@types/simplebar": "^5.3.3",
"axios": "^1.1.3",
"base64-arraybuffer": "^1.0.2",
"classnames": "^2.3.2",
"cookies-next": "^2.1.1",
"croppie": "^2.6.5",
"dayjs": "^1.11.6",
"dompurify": "^2.4.1",
"easymde": "^2.18.0",
"eslint": "8.27.0",
"eslint-config-next": "13.0.3",
"events": "^3.3.0",
"file-loader": "^6.2.0",
"firebase": "^10.1.0",
"fs-extra": "^10.1.0",
"genversion": "^3.1.1",
"highlight.js": "^11.7.0",
"html-react-parser": "^3.0.4",
"html2canvas": "^1.4.1",
"js-yaml": "^4.1.0",
"lodash.merge": "^4.6.2",
"mariadb": "^3.0.2",
"marked": "^4.2.3",
"marked-plaintext": "^0.0.2",
"mousetrap": "^1.6.5",
"next": "13.0.3",
"next-pwa": "^5.6.0",
"next-redux-wrapper": "^8.0.0",
"next-seo": "^5.14.1",
"next-superjson": "^0.0.4",
"notistack": "^2.0.8",
"nprogress": "^0.2.0",
"patch-package": "^6.5.0",
"react": "18.2.0",
"react-auth-code-input": "^3.2.1",
"react-device-detect": "^2.2.2",
"react-dom": "18.2.0",
"react-html-props": "^1.0.33",
"react-lazy-load-image-component": "^1.5.6",
"react-multi-carousel": "^2.8.2",
"react-redux": "^8.0.5",
"react-simplemde-editor": "^5.2.0",
"react-social-media-embed": "^2.3.5",
"react-sortable-hoc": "^2.0.0",
"react-spotify-embed": "^2.0.3",
"react-telegram-auth": "^1.0.3",
"redux": "^4.2.0",
"redux-thunk": "^2.4.2",
"rimraf": "^3.0.2",
"sequelize": "^6.25.5",
"simplebar": "^5.3.9",
"simplebar-react": "^2.4.3",
"socket.io-client": "^4.5.4",
"superjson": "^1.11.0",
"swr": "^2.0.0",
"typescript": "4.8.4",
"url-metadata": "^2.5.0",
"zip-lib": "^0.7.3"
}
}
Binary file added public/icon/favicon-16x16.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/icon/favicon-32x32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7b8ff89

Please sign in to comment.