Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main merge #105

Merged
merged 21 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
90d842a
feat: add query hook for self user details
satyam73 Feb 28, 2024
c0d32d8
tests: add initial tests for useGetSelfUser hook
satyam73 Mar 5, 2024
7f727c3
add axios and use with react-query
bhtibrewal Mar 5, 2024
0fe5358
tests: add for useGetSelfUser hook server error case
satyam73 Mar 6, 2024
2fb7a78
Merge branch 'develop' of https://github.com/Real-Dev-Squad/skill-tre…
satyam73 Mar 7, 2024
a0933ce
feat: add axios dependency
satyam73 Mar 7, 2024
1435dfe
merge: resolve merge conflicts in yarn lock file
satyam73 Mar 26, 2024
4541d2b
Merge branch 'develop' into setup/self-user-query-hook
satyam73 Mar 26, 2024
cc3fa67
chore: remove skip from test
satyam73 Mar 26, 2024
f622445
fix: eslint error
satyam73 Mar 26, 2024
6d8dd81
chore: remove console statement
satyam73 Mar 31, 2024
4f9d6c9
chore: add console statement
satyam73 Mar 31, 2024
e7a15a6
chore: add console statement
satyam73 Mar 31, 2024
8367060
chore: add console statement
satyam73 Mar 31, 2024
901e57b
chore: add log for triggering CI build of cloudflare
satyam73 Apr 4, 2024
c4da517
chore: remove unnecessary logs
satyam73 Apr 4, 2024
61f6969
Merge pull request #45 from Real-Dev-Squad/setup/self-user-query-hook
bhtibrewal Apr 4, 2024
bba1d0b
Create a resuable combo box component to choose and search a particul…
Abhay5855 Jul 29, 2024
95e04ce
develop release : V0.1 (#98)
yesyash Aug 15, 2024
ad89d7e
create a route to show all skill requests and pending skill requests …
yesyash Aug 30, 2024
4e9a68c
Merge branch 'main' into develop
prakashchoudhary07 Sep 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .env

This file was deleted.

12 changes: 12 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# dev | staging | prod
NEXT_PUBLIC_APP_ENV=dev

NEXT_PUBLIC_SKILL_TREE_BACKEND_BASE_URL = 'https://staging-skilltree-api.realdevsquad.com/v1'
NEXT_PUBLIC_RDS_BACKEND_BASE_URL='https://staging-api.realdevsquad.com'

NEXT_PUBLIC_SKILL_TREE_URL='https://staging-skilltree.realdevsquad.com'
NEXT_PUBLIC_STATUS_SITE_URL='https://staging-status.realdevsquad.com'
NEXT_PUBLIC_MEMBERS_SITE_URL='https://staging-members.realdevsquad.com'
NEXT_PUBLIC_WELCOME_SITE_URL='https://welcome.realdevsquad.com'
NEXT_PUBLIC_WWW_SITE_URL='https://staging-www.realdevsquad.com'
NEXT_PUBLIC_MY_SITE_URL='https://staging-my.realdevsquad.com'
54 changes: 43 additions & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,46 @@
{
"plugins": ["react", "react-hooks", "prettier", "@typescript-eslint"],
"extends": ["eslint:recommended", "next", "next/core-web-vitals", "prettier"],
"env": {
"jest": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"next/core-web-vitals"
],
"parser": "@typescript-eslint/parser",
"plugins": ["react", "@typescript-eslint", "import"],
"rules": {
"indent": ["error", 4],
"quotes": ["error", "double"],
"semi": ["error", "always"],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error"
}
"eol-last": ["error", "always"],
"linebreak-style": ["error", "unix"],
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-non-null-assertion": "warn",
"import/order": [
"error",
{
"alphabetize": {
"order": "asc",
"caseInsensitive": true
},
"newlines-between": "always",
"groups": ["builtin", "external", "internal", "parent", "sibling", "index"],
"pathGroups": [
{
"pattern": "react",
"group": "external",
"position": "before"
},
{
"pattern": "@/*",
"group": "internal"
}
],
"pathGroupsExcludedImportTypes": ["builtin", "@/*"]
}
]
},
"settings": {
"react": {
"version": "detect"
}
},
"ignorePatterns": ["node_modules/", ".next/", "out/"]
}
44 changes: 44 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Build and test checks
on:
pull_request:
branches: ["*"]
jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-

- if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
name: List the state of node modules
continue-on-error: true
run: npm list

- name: Install dependencies
run: npm ci

- name: Create sample env
run: cp .env.sample .env.local

- name: Check format
run: npm run check-format

- name: Build
run: npm run build

# TODO : Uncomment the following lines after adding tests
# - name: Test
# run: npm test
41 changes: 0 additions & 41 deletions .github/workflows/pre-commit-checks.yml

This file was deleted.

7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ lib-cov
coverage
*.lcov

#VS code
.vscode/

# nyc test coverage
.nyc_output

Expand Down Expand Up @@ -131,4 +128,6 @@ dist
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
.yarnrc.yml
.yarnrc.yml

.env
4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

7 changes: 0 additions & 7 deletions .prettierrc

This file was deleted.

8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"bradlc.vscode-tailwindcss",
"streetsidesoftware.code-spell-checker"
]
}
66 changes: 66 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
/**
Editor rules
------------
*/
"editor.formatOnSave": true,
"editor.tabSize": 4,
"editor.insertSpaces": false,
"prettier.tabWidth": 4,
"prettier.printWidth": 120,
"editor.rulers": [
{
"column": 120
}
],
/**
Formatters
------------
*/
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"prettier.requireConfig": true,
/**
New Lines
------------
*/
"files.eol": "\n",
"files.insertFinalNewline": true,
/**
Linting
------------
*/
"eslint.run": "onSave",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "always"
},
/**
Miscelaneous
------------
*/
"typescript.tsdk": "node_modules/typescript/lib",
/**
TailwindCSS
------------
*/
"tailwindCSS.experimental.classRegex": [
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
],
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.fontFamily": "Office Code Pro, Menlo, Monaco, 'Courier New', monospace",
"editor.fontSize": 13
}
52 changes: 0 additions & 52 deletions __mocks__/db/endorsementDetails.json

This file was deleted.

35 changes: 0 additions & 35 deletions __mocks__/endorsements.js

This file was deleted.

4 changes: 0 additions & 4 deletions __mocks__/handler.js

This file was deleted.

9 changes: 0 additions & 9 deletions __mocks__/handlers/endorsements.handler.js

This file was deleted.

Loading
Loading