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

Integrate Login API and Add Validation Checker Utility #2

Open
wants to merge 87 commits into
base: dev-test
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
a98cbcb
config: reinstalled package.json file in the parent folder as well as…
powei55 Nov 29, 2023
ef897a1
refactor: switched package manager to NPM from PNPM - then installations
Okpainmo Nov 29, 2023
8abd896
refactor: updated next.config.js file to remove a deprecated images.d…
Okpainmo Nov 29, 2023
ebd4608
Merge branch 'dev-test' into powel_dev-flow
powei55 Nov 29, 2023
7a26752
config:reinstalled package.json file
powei55 Nov 29, 2023
f96733a
build: static testing updates
Okpainmo Nov 29, 2023
e01e8ec
chore: more static testing updates
Okpainmo Nov 29, 2023
a597753
fix: eslint rules updated to silent rule causing a push hitch
Okpainmo Nov 29, 2023
0a0d90f
assets: added the imgs needed for login
Opeyemi-Omotayo Nov 29, 2023
2bb0375
feat: completed the login page
Opeyemi-Omotayo Nov 29, 2023
9991c3f
refactor: added the sharp package for image optimization in nextjs
Okpainmo Nov 30, 2023
dbbb8be
chore: component based updates + project re-structuring
Okpainmo Nov 30, 2023
e96b976
bulk(init): first BE deployment: login and register endpoints completed
Okpainmo Nov 30, 2023
dc9bf51
chore: some static testing updates, backend build created and more
Okpainmo Nov 30, 2023
9bff88e
refactor: update in lint-staged file
Okpainmo Nov 30, 2023
4a1414c
refactor: eslint update to support client sub-folder eslint configs
Okpainmo Nov 30, 2023
313fb58
asset: added goggle image to the project
powei55 Nov 30, 2023
f8b5416
docs: succefully created the header components
powei55 Nov 30, 2023
1be51aa
docs: created sign-up page
powei55 Nov 30, 2023
4c04336
config: reinstalled some file using npm install command
powei55 Nov 30, 2023
94869f3
Merge branch 'dev-test' into powel_dev-flow
powei55 Nov 30, 2023
7bb4c5b
refactor: copied all code sign-up page to another page created
powei55 Nov 30, 2023
fe424df
refactor: moved the sign-up page to the trash folder
powei55 Nov 30, 2023
0236bfb
Merge pull request #1 from Deeco-Commerce/OpeyemiOmotayo_dev-flow
Okpainmo Nov 30, 2023
7da480c
refactor: server code updates
Okpainmo Nov 30, 2023
07ddc71
refactor: server code updates
Okpainmo Nov 30, 2023
a23e691
feat: integrate login API and add validation checker utils
AdekeyeAdeniyi Nov 30, 2023
801e88d
refactor: updated pre-commit husky hook
Okpainmo Nov 30, 2023
43c09e6
refactor: client update
Okpainmo Nov 30, 2023
1886c19
refactor: more server updates
Okpainmo Nov 30, 2023
69181bb
chore: mainly static testing updates
Okpainmo Nov 30, 2023
009bea1
chore: update MainAppLayout, Navbar, Footer, Social components
AdekeyeAdeniyi Nov 30, 2023
d644972
feat: create store-creation-success page
AdekeyeAdeniyi Nov 30, 2023
8cd0d34
chore: trashed version of sign-up page
powei55 Nov 30, 2023
bedf516
Merge branch 'dev-test' into powel_dev-flow
powei55 Nov 30, 2023
db7a80e
refactor: updated server eslint file to avoid build folder
Okpainmo Nov 30, 2023
393b7ad
refactor: update store-creation-success page for improved responsiveness
AdekeyeAdeniyi Nov 30, 2023
5a2ce04
chore(deps): install commitlint and @commitlint/conventional packages
AdekeyeAdeniyi Nov 30, 2023
fe1ef92
refactor: replace <img> tag with Next Image in Store creation sucess …
AdekeyeAdeniyi Nov 30, 2023
8e488e2
style: improve store creation sucess page responsiveness and replace …
AdekeyeAdeniyi Nov 30, 2023
4dee0a1
refactor: merge branch 'adeniyi_dev-flow' into dev-test
Okpainmo Dec 1, 2023
9928901
refactor: client updates + silenced eslint error
Okpainmo Dec 1, 2023
ac8ce30
fix: minor bug fixes
Okpainmo Dec 1, 2023
60d03d4
refactor: buffered to ignore strange eslint error
Okpainmo Dec 1, 2023
737080c
refactor: general project updates - mainly fresh package installations
Okpainmo Dec 1, 2023
fd94ee8
refactor: update to all lintstagedre.json files
Okpainmo Dec 1, 2023
d6ef3b2
Merge remote-tracking branch 'origin/powel_dev-flow' into dev-test
Okpainmo Dec 1, 2023
2435ae8
chore: client updates
Okpainmo Dec 1, 2023
48c774f
refactor: quick client update
Okpainmo Dec 1, 2023
2be712f
chore: merging dev test into powel dev-flow
powei55 Dec 1, 2023
18ff885
chore(merge): merge dev-test into Adeniyi_dev-flow branch
AdekeyeAdeniyi Dec 1, 2023
80e3028
feat: completed dashboard layout components with responsiveness
AdekeyeAdeniyi Dec 1, 2023
50e8536
config: reinstalled commitlint packages into my branch
powei55 Dec 2, 2023
5155d5c
assets: added images to the assets folder
powei55 Dec 2, 2023
cc52fe8
config: reinstalled package.json file using npm install
powei55 Dec 2, 2023
b0ff78f
assets: added some image to the asset folder
powei55 Dec 2, 2023
0945c64
docs: created store-home page
powei55 Dec 2, 2023
076e511
feat: completed integrated the registration API into the sign-up comp…
AdekeyeAdeniyi Dec 2, 2023
f967a66
feat: notification components created
AdekeyeAdeniyi Dec 2, 2023
22aedcd
chore: install react-hot-toast package
AdekeyeAdeniyi Dec 2, 2023
67932f4
feat: implement notification toast on sign-up page and _app page
AdekeyeAdeniyi Dec 2, 2023
980281f
Merge pull request #5 from Deeco-Commerce/Adeniyi_dev-flow
Okpainmo Dec 2, 2023
e7cbb87
Merge pull request #6 from Deeco-Commerce/powel_dev-flow
Okpainmo Dec 2, 2023
06a866b
refactor: added commitlint to project scope
Okpainmo Dec 2, 2023
969d586
chore: server updates: 5 more end-points added successfully
Okpainmo Dec 2, 2023
4b400be
refactor: docker updates
Okpainmo Dec 2, 2023
b07180a
refactor: docker related updates
Okpainmo Dec 2, 2023
4469f77
chore: merge branch 'dev-test' of https://github.com/Deeco-Commerce/d…
Okpainmo Dec 2, 2023
1e80a4d
feat: completed account-payout page development
AdekeyeAdeniyi Dec 2, 2023
537f803
style: update css style class
AdekeyeAdeniyi Dec 2, 2023
734cde1
refactor: move store-creation-success into a new folder
AdekeyeAdeniyi Dec 2, 2023
fbeb579
refactor: move account-payout page into dashboard folder
AdekeyeAdeniyi Dec 2, 2023
ab21b78
feat: completed conversion of dashboard purchases page
AdekeyeAdeniyi Dec 2, 2023
f9c011f
refactor: move account-payout page into dashboard folder
AdekeyeAdeniyi Dec 2, 2023
cc3520e
style: update navbar padding right/left
AdekeyeAdeniyi Dec 2, 2023
bb2f4f2
refactor: edit navbar list items content
AdekeyeAdeniyi Dec 3, 2023
6c1cd22
feat: completed development of theme landing page
AdekeyeAdeniyi Dec 3, 2023
10d8bdf
fix: route start your journey link to sign-up page
AdekeyeAdeniyi Dec 3, 2023
85bcd41
bulk: wrapping up
Okpainmo Dec 3, 2023
3d7c56d
refactor: reverted to initial store-front-state
Okpainmo Dec 3, 2023
f698c55
refactor: wrapping up
Okpainmo Dec 3, 2023
e5cf853
refactor: wrapping up
Okpainmo Dec 3, 2023
eca2518
feat: merge with dev-test branch
AdekeyeAdeniyi Dec 3, 2023
ffbda70
fix: merge
AdekeyeAdeniyi Dec 3, 2023
162ff5a
bulk: merge dev-test into Adeniyi_dev-flow branch
AdekeyeAdeniyi Dec 3, 2023
184c050
fix: theme-card component items mapping
AdekeyeAdeniyi Dec 3, 2023
577dcb9
fix: delete components folder in theme-store and purchases page
AdekeyeAdeniyi Dec 3, 2023
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
11 changes: 11 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules

# blockchain folder
/blockchain

# nextjs build folder
/.next

29 changes: 29 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": ["prettier"],
// "extends": ["prettier", "plugin:@typescript-eslint/recommended", "eslint:recommended"],

"parserOptions": {
"ecmaVersion": 13,
"sourceType": "module"
},
// "plugins": ["prettier"],
"rules": {
"prettier/prettier": [
"error",
{
"singleQuote": true,
"endOfLine": "auto"
}
],
"no-console": "off",
"no-alert": "off",
"no-unused-vars": "off",
"camelcase": "off",
"no-html-link-for-pages": "off",
"import/prefer-default-export": "off"
}
}
6 changes: 3 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd ./client && npx --no -- commitlint --edit $1
npx --no -- commitlint --edit
23 changes: 22 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
#!/usr/bin/env sh
# . "$(dirname -- "$0")/_/husky.sh"

# npm run lint-staged

#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd ./client && pnpm lint && pnpm prettier
npm run pre-commit
# # Get the current directory
# current_dir=$(pwd)

# # Run actions based on the current directory
# case "$current_dir" in
# *client*)
# cd ./client && npm run lint-staged
# ;;
# *server*)
# cd ./server && npm run lint-staged
# ;;
# # Add more cases for other directories as needed
# *)
# echo "No actions defined for the current directory: $current_dir"
# ;;
# esac
3 changes: 2 additions & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd ./client && pnpm build
cd ./client && npm run build
# npm run test && npm run build
5 changes: 5 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"**/*.html": ["eslint", "prettier --write"],
"**/*.{ts,tsx,js,jsx}": "eslint",
"**/*.{ts,tsx,js,jsx,css,scss}": "prettier --write"
}
11 changes: 11 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules

# blockchain folder
/blockchain

# nextjs build folder
/.next

15 changes: 15 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"printWidth": 100,

"semi": true,

"singleQuote": true,

"tabWidth": 2,

"useTabs": false,

"trailingComma": "none",

"endOfLine": "auto"
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"eslint.workingDirectories": ["./client", "./blockchain"]
"eslint.workingDirectories": ["./client", "./blockchain", "./server"]
}
Loading