From 610de27353fed4f70aecb301c01a0c1608656510 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:44:41 -0800 Subject: [PATCH 1/3] Updated operation documentation --- .../docs/docs/getting-started/installation.md | 100 ------------------ docs/sidebars.ts | 11 +- 2 files changed, 9 insertions(+), 102 deletions(-) diff --git a/docs/docs/docs/getting-started/installation.md b/docs/docs/docs/getting-started/installation.md index ab06267c9c..fc14fd7320 100644 --- a/docs/docs/docs/getting-started/installation.md +++ b/docs/docs/docs/getting-started/installation.md @@ -267,103 +267,3 @@ REACT_APP_RECAPTCHA_SITE_KEY="this_is_the_recaptcha_key" #### Setting up Compiletime and Runtime logs Set the `ALLOW_LOGS` to "YES" if you want warnings , info and error messages in your console or leave it blank if you dont need them or want to keep the console clean - -## Post Configuration Steps - -It's now time to start Talawa-Admin and get it running - -### Running Talawa-Admin - -Run the following command to start `talawa-admin` development server: - -```bash -npm run serve - -``` - -### Accessing Talawa-Admin - -By default `talawa-admin` runs on port `4321` on your system's localhost. It is available on the following endpoint: - -``` - -http://localhost:4321/ - -``` - -If you have specified a custom port number in your `.env` file, Talawa-Admin will run on the following endpoint: - -``` - -http://localhost:\$\{\{customPort\}\}/ - -``` - -Replace `${{customPort}}` with the actual custom port number you have configured in your `.env` file. - -### Talawa-Admin Registration - -The first time you navigate to the running talawa-admin's website you'll land at talawa-admin registration page. Sign up using whatever credentials you want and create the account. Make sure to remember the email and password you entered because they'll be used to sign you in later on. - -### Talawa-Admin Login - -Now sign in to talawa-admin using the `email` and `password` you used to sign up. - -## Testing - -It is important to test our code. If you are a contributor, please follow these steps. - -### Running tests - -You can run the tests for `talawa-admin` using this command: - -```bash -npm run test - -``` - -### Debugging tests - -You can see the output of failing tests in broswer by running `jest-preview` package before running your tests - -```bash -npm run jest-preview -npm run test - -``` - -You don't need to re-run the `npm run jest-preview` command each time, simply run the `npm run test` command if the Jest Preview server is already running in the background, it'll automatically detect any failing tests and show the preview at `http://localhost:3336` as shown in this screenshot - - -![Debugging Test Demo](../../../static/img/markdown/installation/jest-preview.webp) - -### Linting code files - -You can lint your code files using this command: - -```bash -npm run lint:fix -``` - -### Husky for Git Hooks - -We are using the package `Husky` to run git hooks that run according to different git workflows. - -##### pre-commit hook - -We run a pre-commit hook which automatically runs code quality checks each time you make a commit and also fixes some of the issues. This way you don't have to run them manually each time. - -If you don't want these pre-commit checks running on each commit, you can manually opt out of it using the `--no-verify` flag with your commit message as shown:- - -```bash -git commit -m "commit message" --no-verify -``` - -##### post-merge hook - -We are also running a post-merge(post-pull) hook which will automatically run "npm install" only if there is any change made to pakage.json file so that the developer has all the required dependencies when pulling files from remote. - -If you don't want this hook to run, you can manually opt out of this using the `--no-verify` flag while using the merge command `git pull`: - -```bash -git pull --no-verify -``` diff --git a/docs/sidebars.ts b/docs/sidebars.ts index f41708e690..3e41df11db 100644 --- a/docs/sidebars.ts +++ b/docs/sidebars.ts @@ -25,8 +25,15 @@ const sidebars: SidebarsConfig = { { type: 'category', - label: 'Plugins', - items: [{ type: 'autogenerated', dirName: 'docs/plugins' }], + label: 'Developer Resources', + items: [ + { type: 'autogenerated', dirName: 'docs/developer-resources' }, + { + type: 'category', + label: 'Plugins', + items: [{ type: 'autogenerated', dirName: 'docs/plugins' }], + }, + ], }, { From 4478b20e7d63c8f7d8dde20cdee7ab5a256ffadd Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:45:10 -0800 Subject: [PATCH 2/3] Updated operation documentation --- .../docs/developer-resources/introduction.md | 8 +++ .../docs/developer-resources/operation.md | 12 ++++ docs/docs/docs/developer-resources/testing.md | 65 ++++++++++++++++++ .../developer-resources/troubleshooting.md | 10 +++ docs/docs/docs/getting-started/operation.md | 67 +++++++++++++++++++ 5 files changed, 162 insertions(+) create mode 100644 docs/docs/docs/developer-resources/introduction.md create mode 100644 docs/docs/docs/developer-resources/operation.md create mode 100644 docs/docs/docs/developer-resources/testing.md create mode 100644 docs/docs/docs/developer-resources/troubleshooting.md create mode 100644 docs/docs/docs/getting-started/operation.md diff --git a/docs/docs/docs/developer-resources/introduction.md b/docs/docs/docs/developer-resources/introduction.md new file mode 100644 index 0000000000..3aaac5ae82 --- /dev/null +++ b/docs/docs/docs/developer-resources/introduction.md @@ -0,0 +1,8 @@ +--- +id: introduction +title: Introduction +slug: /developer-resources/introduction +sidebar_position: 1 +--- + +Welcome to the Talawa-Admin diff --git a/docs/docs/docs/developer-resources/operation.md b/docs/docs/docs/developer-resources/operation.md new file mode 100644 index 0000000000..7ff1b98e72 --- /dev/null +++ b/docs/docs/docs/developer-resources/operation.md @@ -0,0 +1,12 @@ +--- +id: operation +title: Operation +slug: /developer-resources/operation +sidebar_position: 3 +--- + +## Introduction + +This section covers how Talawa Admin operates + +Coming soon. diff --git a/docs/docs/docs/developer-resources/testing.md b/docs/docs/docs/developer-resources/testing.md new file mode 100644 index 0000000000..0143e49fe4 --- /dev/null +++ b/docs/docs/docs/developer-resources/testing.md @@ -0,0 +1,65 @@ +--- +id: testing +title: Testing +slug: /developer-resources/testing +sidebar_position: 4 +--- + +## Introduction + +It is important to test our code. If you are a contributor, please follow these steps. + +### Running tests + +You can run the tests for `talawa-admin` using this command: + +```bash +npm run test + +``` + +### Debugging tests + +You can see the output of failing tests in broswer by running `jest-preview` package before running your tests + +```bash +npm run jest-preview +npm run test + +``` + +You don't need to re-run the `npm run jest-preview` command each time, simply run the `npm run test` command if the Jest Preview server is already running in the background, it'll automatically detect any failing tests and show the preview at `http://localhost:3336` as shown in this screenshot - + +![Debugging Test Demo](../../../static/img/markdown/installation/jest-preview.webp) + +### Linting code files + +You can lint your code files using this command: + +```bash +npm run lint:fix +``` + +### Husky for Git Hooks + +We are using the package `Husky` to run git hooks that run according to different git workflows. + +##### pre-commit hook + +We run a pre-commit hook which automatically runs code quality checks each time you make a commit and also fixes some of the issues. This way you don't have to run them manually each time. + +If you don't want these pre-commit checks running on each commit, you can manually opt out of it using the `--no-verify` flag with your commit message as shown:- + +```bash +git commit -m "commit message" --no-verify +``` + +##### post-merge hook + +We are also running a post-merge(post-pull) hook which will automatically run "npm install" only if there is any change made to pakage.json file so that the developer has all the required dependencies when pulling files from remote. + +If you don't want this hook to run, you can manually opt out of this using the `--no-verify` flag while using the merge command `git pull`: + +```bash +git pull --no-verify +``` diff --git a/docs/docs/docs/developer-resources/troubleshooting.md b/docs/docs/docs/developer-resources/troubleshooting.md new file mode 100644 index 0000000000..d3939f4117 --- /dev/null +++ b/docs/docs/docs/developer-resources/troubleshooting.md @@ -0,0 +1,10 @@ +--- +id: troubleshooting +title: Operation +slug: /developer-resources/troubleshooting +sidebar_position: 5 +--- + +## Introduction + +Coming soon. diff --git a/docs/docs/docs/getting-started/operation.md b/docs/docs/docs/getting-started/operation.md new file mode 100644 index 0000000000..406de8c280 --- /dev/null +++ b/docs/docs/docs/getting-started/operation.md @@ -0,0 +1,67 @@ +--- +id: operation +title: Operation, Registration & Login +slug: /operation +sidebar_position: 2 +--- + +This page outlines how to successfully operate the application + +## Operation + +Operation of the application requires these steps. + +### Running Talawa-Admin + +Run the following command to start `talawa-admin` development server: + +```bash +npm run serve + +``` + +### Accessing Talawa-Admin + +By default `talawa-admin` runs on port `4321` on your system's localhost. It is available on the following endpoint: + +``` + +http://localhost:4321/ + +``` + +If you have specified a custom port number in your `.env` file, Talawa-Admin will run on the following endpoint: + +``` + +http://localhost:{{customPort}}/ + +``` + +Replace `{{customPort}}` with the actual custom port number you have configured in your `.env` file. + +## Registration + +The first time you navigate to the running talawa-admin's website you'll land at talawa-admin registration page. Sign up using whatever credentials you want and create the account. Make sure to remember the email and password you entered because they'll be used to sign you in later on. + +## Login + +The login process is different depending on the scenario + +### Normal Login + +Now sign in to talawa-admin using the `email` and `password` you used to sign up. + +### First Time API Administrator Login + +The email address and password are defined these API environment variables: + +1. `API_ADMINISTRATOR_USER_EMAIL_ADDRESS` +1. `API_ADMINISTRATOR_USER_NAME` +1. `API_ADMINISTRATOR_USER_PASSWORD` + +In a development environment, the defaults are: + +1. `API_ADMINISTRATOR_USER_EMAIL_ADDRESS`=administrator@email.com +1. `API_ADMINISTRATOR_USER_NAME`=administrator +1. `API_ADMINISTRATOR_USER_PASSWORD`=password From e139a62f37af75ec2767a5790e0b002f95a95c67 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Tue, 28 Jan 2025 14:43:17 -0800 Subject: [PATCH 3/3] Upgraded docusaurus --- docs/docs/docs/developer-resources/introduction.md | 2 +- docs/docs/docs/developer-resources/troubleshooting.md | 2 +- docs/package.json | 10 +++++----- package.json | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/docs/docs/developer-resources/introduction.md b/docs/docs/docs/developer-resources/introduction.md index 3aaac5ae82..7411212614 100644 --- a/docs/docs/docs/developer-resources/introduction.md +++ b/docs/docs/docs/developer-resources/introduction.md @@ -5,4 +5,4 @@ slug: /developer-resources/introduction sidebar_position: 1 --- -Welcome to the Talawa-Admin +Welcome to Talawa-Admin diff --git a/docs/docs/docs/developer-resources/troubleshooting.md b/docs/docs/docs/developer-resources/troubleshooting.md index d3939f4117..230e745ce7 100644 --- a/docs/docs/docs/developer-resources/troubleshooting.md +++ b/docs/docs/docs/developer-resources/troubleshooting.md @@ -1,6 +1,6 @@ --- id: troubleshooting -title: Operation +title: Troubleshooting slug: /developer-resources/troubleshooting sidebar_position: 5 --- diff --git a/docs/package.json b/docs/package.json index 65e9e455b5..feb5b9fb7c 100644 --- a/docs/package.json +++ b/docs/package.json @@ -15,8 +15,8 @@ "typecheck": "tsc" }, "dependencies": { - "@docusaurus/core": "3.6.3", - "@docusaurus/preset-classic": "3.6.3", + "@docusaurus/core": "^3.7.0", + "@docusaurus/preset-classic": "^3.7.0", "@mdx-js/react": "^3.0.0", "clsx": "^2.0.0", "docusaurus": "^1.14.7", @@ -25,9 +25,9 @@ "react-dom": "^18.0.0" }, "devDependencies": { - "@docusaurus/module-type-aliases": "3.6.3", - "@docusaurus/tsconfig": "3.6.3", - "@docusaurus/types": "3.6.3", + "@docusaurus/module-type-aliases": "^3.7.0", + "@docusaurus/tsconfig": "^3.7.0", + "@docusaurus/types": "^3.7.0", "typescript": "~5.6.2" }, "browserslist": { diff --git a/package.json b/package.json index b8d97c8d67..1fbb9eeb6e 100644 --- a/package.json +++ b/package.json @@ -184,5 +184,6 @@ "prettier --write" ], "**/*.{ts, tsx, json}": "eslint --fix" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" }