Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Merge from kiet/dev to dev 2.0 (#87) * added default filter to be accepted only * feat: Modified the pagination footer to work with 2 search form * feat: added loading screen for all possible links * feat: added fix for request that has been accepted * Merge to dev 2.0 (#88) * added default filter to be accepted only * feat: Modified the pagination footer to work with 2 search form * feat: added loading screen for all possible links * feat: added fix for request that has been accepted * feat: added a seperate table for organization transaction allocation resource to project * fix: fix the pagination of project resource: * Add sweet alert (#89) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * Nothing change * Add status * Add change status function * Add comment * DB? (Move to .gitignore soon) * Add display status in index, add confirmwithdraw * Update MVVM (Add status) * Add id to confirm button, add ajax to change status * Change project badge to pending/success * Fix link to user profile * add to gitignore * Update output.css * Smaller QR * Change some text in modals and notes * Change year * Add email sender * Change title * Fix payment approved can confirm again * update gitignore * Fix button not working, make code shorter * Make year to dynamic (auto get year) * Remove js, use c# be * Revert to defaul * Fix user role not update * add db entry * Rename title * space? * remove duplicate code * change github icon * change admin logo * updaate new icon * remove try-catch * update * add loading * Add sweetalert * Remove unused function * Add message for sweetalert * add sweetalert cdn * Add sweetalert script * Fix end date not displayed (estimated) * add sweetalert cdn * Add sweetalert * Auto login with google account now will not redirected to admin page (#90) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * Nothing change * Add status * Add change status function * Add comment * DB? (Move to .gitignore soon) * Add display status in index, add confirmwithdraw * Update MVVM (Add status) * Add id to confirm button, add ajax to change status * Change project badge to pending/success * Fix link to user profile * add to gitignore * Update output.css * Smaller QR * Change some text in modals and notes * Change year * Add email sender * Change title * Fix payment approved can confirm again * update gitignore * Fix button not working, make code shorter * Make year to dynamic (auto get year) * Remove js, use c# be * Revert to defaul * Fix user role not update * add db entry * Rename title * space? * remove duplicate code * change github icon * change admin logo * updaate new icon * remove try-catch * update * add loading * Add sweetalert * Remove unused function * Add message for sweetalert * add sweetalert cdn * Add sweetalert script * Fix end date not displayed (estimated) * add sweetalert cdn * Add sweetalert * remove auto go to admin page when logged with google account * Kiet/dev2.0 (#91) * added default filter to be accepted only * feat: Modified the pagination footer to work with 2 search form * feat: added loading screen for all possible links * feat: added fix for request that has been accepted * feat: added a seperate table for organization transaction allocation resource to project * fix: fix the pagination of project resource: * fix: fix the loading in Huyen review project * fix wallet bug * fix download resource excel file loading screen bug * fix transfer role * fix joining a finished project * rmv GPT key * desNewdb (#93) * Tuan merge 11/13 (#92) * Delete .vs directory * Prepare to deploy (#83) * delete some leftovers * update db * feat: Combined both the index and homepage into one * Added readme for guide * create project * fixed the stupoid carousel * uodate db * Update table and migrations * before update db * Add overview and user view (organization is pending on fix) * update db ngay 1/10/24 * function base Organization * feat: Added history screen for user * Update migrations * basic-manage-project * feat: added history functions for user as well as cancel functions * CRUD Request * pre request detail page * feat: added confirmation screen for request status * Some image ? * del readme * updateModal * Update db * update models * Remove unused * oke complete * editedProject * smallchange * complete Organization 5/10 * huhuh * fix: Hot fix user not being able to update * complete merge * fix: Added text when the home page is empty * Removed the pending badge from pending resources * fix: Fix a critical bug that makes login redirect fail * Complete search and pagination * FixSomeFunction * merge complete * fixUpdateResourceAndAddCEOFunction * Add admin web page and its controller * feat: Added roles management in UserRepository * complete merge 2nd * hot fix: User not updated in user role * code after merge dev * update unit (#19) * update unit (#20) * somechangeinorganizationresource * fix some minor visual in homepage * feat: Global search for navbar hurray * Detail request page and My Project pagination * Fix request detail * authorize review org donate * update gitignore * assets * Update & remove migrations * update snapshot (to convert from old to new db) * Update VM and Models * Update from dev -> my branch * feat: added advance user address in change user profile * Delete unused file * Add authorization * Update controller * Add logout button * Kiet/dev merge with Nhan into dev (#22) * Merge (move) to my project to develop (#9) * Added basic login /register screen, email confirm and forget password included. * mat css r huhuuhuhuhu * Fixed CSS hurray, and log out also * update anh * Added login with google * fix secrets key * Added back the secrets key (just for testing) * update pwd * pwd * send email when register and fix register page * change to readonly input in external register * up cho nhân * Add table (database) * Add primary key and foreign key * Update properties * rename properties * rename some properties * id -> ID * Update DB * Fix properties from lowercase -> uppercase * feat: Added basic login, authentication, edit user profile and stuff, along with a working navbar * added more stuff * Just update (don't touch) * ver base * remove unused file * Merge kiet/dev -> dev (#7) * Fix some more stuff related to google login * feat: Added readme, fix some app session in when clicking on confirming email * Update README.md * Rename file and convert from int to Guid * Fixed Guid to string * missing guid update * userID from Guid -> string --------- Co-authored-by: Aimkey <phamminhkiet24@gmail.com> Co-authored-by: Trương Anh Tuấn <134388467+tuantadev2664@users.noreply.github.com> Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> Co-authored-by: Phạm Minh Kiệt <129891024+AimKey@users.noreply.github.com> * Admin update * Fix * "Initial DB" added some stuff * css * int -> GUID * int -> string, remove "Initial", Add design * Update table and migrations * Add overview and user view (organization is pending on fix) * Update migrations * Update db * update models * Remove unused * Add admin web page and its controller * hot fix: User not updated in user role * fix some minor visual in homepage * feat: Global search for navbar hurray * update gitignore * assets * Update & remove migrations * update snapshot (to convert from old to new db) * Update VM and Models * Update from dev -> my branch * feat: added advance user address in change user profile * Delete unused file * Add authorization * Update controller * Add logout button --------- Co-authored-by: Pham Khanh Nhan <78801337+kleqing@users.noreply.github.com> Co-authored-by: Trương Anh Tuấn <134388467+tuantadev2664@users.noreply.github.com> Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> * update js, css * before merge * fix: Fix area not working * fix: added new role banned * switch to using Service and split into multiple repos * after merge with dev 10/10/2024 * complete merge with kiet/dev * update unit (#23) * nothing * Implement testing for project * Implement pagination for project * add logger * code after merge dev 11/10/2024 * fix: added new role banned, and a system to lock user out * fix: added banned user for google auth * Kiet/dev (#24) * Merge (move) to my project to develop (#9) * Added basic login /register screen, email confirm and forget password included. * mat css r huhuuhuhuhu * Fixed CSS hurray, and log out also * update anh * Added login with google * fix secrets key * Added back the secrets key (just for testing) * update pwd * pwd * send email when register and fix register page * change to readonly input in external register * up cho nhân * Add table (database) * Add primary key and foreign key * Update properties * rename properties * rename some properties * id -> ID * Update DB * Fix properties from lowercase -> uppercase * feat: Added basic login, authentication, edit user profile and stuff, along with a working navbar * added more stuff * Just update (don't touch) * ver base * remove unused file * Merge kiet/dev -> dev (#7) * Fix some more stuff related to google login * feat: Added readme, fix some app session in when clicking on confirming email * Update README.md * Rename file and convert from int to Guid * Fixed Guid to string * missing guid update * userID from Guid -> string --------- Co-authored-by: Aimkey <phamminhkiet24@gmail.com> Co-authored-by: Trương Anh Tuấn <134388467+tuantadev2664@users.noreply.github.com> Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> Co-authored-by: Phạm Minh Kiệt <129891024+AimKey@users.noreply.github.com> * Admin update * Fix * "Initial DB" added some stuff * css * int -> GUID * int -> string, remove "Initial", Add design * Update table and migrations * Add overview and user view (organization is pending on fix) * Update migrations * Update db * update models * Remove unused * Add admin web page and its controller * hot fix: User not updated in user role * somechangeinorganizationresource * fix some minor visual in homepage * feat: Global search for navbar hurray * authorize review org donate * update gitignore * assets * Update & remove migrations * update snapshot (to convert from old to new db) * Update VM and Models * Update from dev -> my branch * feat: added advance user address in change user profile * Delete unused file * Add authorization * Update controller * Add logout button * update js, css * before merge * fix: Fix area not working * fix: added new role banned * switch to using Service and split into multiple repos * after merge with dev 10/10/2024 * complete merge with kiet/dev * nothing * add logger * code after merge dev 11/10/2024 * fix: added new role banned, and a system to lock user out * fix: added banned user for google auth --------- Co-authored-by: Pham Khanh Nhan <78801337+kleqing@users.noreply.github.com> Co-authored-by: Trương Anh Tuấn <134388467+tuantadev2664@users.noreply.github.com> Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> * feat: added better payment PAGE * feat: added timeout system, resend email confirmation link * minor fix: added message if user enter email but not exist in forget password * fix: Fix google register not working, also Vietnamese characters is now allowed, also, confirmation email no longer redirect straight to homepage * feat: added sweetalert toast * date filter for MyRequest and request Index * Request validation * New login and sign up screen * preparing for merge * Ghost files ?? * Kiet/dev (#28) * Merge (move) to my project to develop (#9) * Added basic login /register screen, email confirm and forget password included. * mat css r huhuuhuhuhu * Fixed CSS hurray, and log out also * update anh * Added login with google * fix secrets key * Added back the secrets key (just for testing) * update pwd * pwd * send email when register and fix register page * change to readonly input in external register * up cho nhân * Add table (database) * Add primary key and foreign key * Update properties * rename properties * rename some properties * id -> ID * Update DB * Fix properties from lowercase -> uppercase * feat: Added basic login, authentication, edit user profile and stuff, along with a working navbar * added more stuff * Just update (don't touch) * ver base * remove unused file * Merge kiet/dev -> dev (#7) * Fix some more stuff related to google login * feat: Added readme, fix some app session in when clicking on confirming email * Update README.md * Rename file and convert from int to Guid * Fixed Guid to string * missing guid update * userID from Guid -> string --------- Co-authored-by: Aimkey <phamminhkiet24@gmail.com> Co-authored-by: Trương Anh Tuấn <134388467+tuantadev2664@users.noreply.github.com> Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> Co-authored-by: Phạm Minh Kiệt <129891024+AimKey@users.noreply.github.com> * Admin update * Fix * "Initial DB" added some stuff * css * int -> GUID * int -> string, remove "Initial", Add design * Update table and migrations * Add overview and user view (organization is pending on fix) * Update migrations * Update db * update models * Remove unused * Complete search and pagination * Add admin web page and its controller * hot fix: User not updated in user role * somechangeinorganizationresource * fix some minor visual in homepage * feat: Global search for navbar hurray * Detail request page and My Project pagination * Fix request detail * authorize review org donate * update gitignore * assets * Update & remove migrations * update snapshot (to convert from old to new db) * Update VM and Models * Update from dev -> my branch * feat: added advance user address in change user profile * Delete unused file * Add authorization * Update controller * Add logout button * update js, css * before merge * fix: Fix area not working * fix: added new role banned * switch to using Service and split into multiple repos * after merge with dev 10/10/2024 * complete merge with kiet/dev * nothing * Implement testing for project * add logger * code after merge dev 11/10/2024 * fix: added new role banned, and a system to lock user out * fix: added banned user for google auth * feat: added better payment PAGE * feat: added timeout system, resend email confirmation link * minor fix: added message if user enter email but not exist in forget password * fix: Fix google register not working, also Vietnamese characters is now allowed, also, confirmation email no longer redirect straight to homepage * feat: added sweetalert toast * New login and sign up screen * preparing for merge * Ghost files ?? --------- Co-authored-by: Pham Khanh Nhan <78801337+kleqing@users.noreply.github.com> Co-authored-by: Trương Anh Tuấn <134388467+tuantadev2664@users.noreply.github.com> Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> * Join project notification SignalR * validate 1/2 * hotfix: Notification finally working yay * Bye bye dumb shit DTO * Added back dto yaya * prepare to merge dev * prepare to merge dev * delete some leftovers * delete some leftovers * fix validate * delete 3 redundant files * feat: Added Role Service for later uses * Implement notification for project * Implement notification for project * add noti table * fine-tune request validation * remove index * remove index * Remove admin * Move from kleqing to dev * Delete Dynamics/wwwroot/css/output.css * Kleqing/dev (#35) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Tuan merge 24 10 (#37) * update unit * huh * Organization notification draft * invite member project * Des (#38) * Implement notification for project * Implement notification for project * fine-tune request validation * Organization notification draft * commitsth * fix invite * Implement organization notification * feat: Added pagination for user history and transaction page in project * fix authorize guest * add button review donate org * fix bugs * Fix finish project and project update page * feat: Merged db, bugs not tested. * feat: Added an init Db folder for use * Tuan merge 27/10 (#53) * feat: Merged db, bugs not tested. * feat: Added an init Db folder for use * Fix bug * fix bug * haha --------- Co-authored-by: Aimkey <phamminhkiet24@gmail.com> * feat: Revamped user donate to project * feat: Revamped user donate to organization, organization allocate to project still the same though * re-css notification * re-css project detail page, other page not re-css yet * fix project * merged with huyen.1.2 * changed appsettings * change: change create organization msg, prepare to merge to dev 2.0 * fix: Hot fix organization notification wrong params * add loading donate to pr * fix: fix bugs, deleted award model, excluded migrations? * Kleqing/dev (#54) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * minor notification fix * remove excess files * Kleqing/dev (#55) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Kleqing/dev (#56) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * fix: fix critical bug when register using Google * fix: fix critical bug when register using Google (#58) * rework: Reworked allocate money from org to prj * Kiet/dev2.0 merge to dev2.0 (#59) * fix: fix critical bug when register using Google * rework: Reworked allocate money from org to prj * Kleqing/dev (#61) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * added validation for create project * modify font size * fixed remove role * Merge with kleqing/dev (#64) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Update some stuff (#65) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * refund when prj/org shutdown * added default image fallback, fix some stuff * fix request bugs * Kiet/dev2.0 (#66) * add loading donate to pr * fix: fix critical bug when register using Google * rework: Reworked allocate money from org to prj * added validation for create project * modify font size * fixed remove role * added default image fallback, fix some stuff * fix request bugs --------- Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> * Merge from kleqing/dev (#67) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * HOTFIX: Fix my organization unaccessible * project payment qr generate * preparing to merge with Thanh from dev * re-added bank popup * Merge refund function (#71) * add loading donate to pr * fix: fix critical bug when register using Google * rework: Reworked allocate money from org to prj * added validation for create project * modify font size * fixed remove role * added default image fallback, fix some stuff * fix request bugs * HOTFIX: Fix my organization unaccessible * preparing to merge with Thanh from dev * re-added bank popup --------- Co-authored-by: aurora-mei <huyencttde180614@fpt.edu.vn> Co-authored-by: desamma <lennaqb4@gmail.com> * Fix & add some function (#72) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * Nothing change * Add status * Add change status function * Add comment * DB? (Move to .gitignore soon) * Add display status in index, add confirmwithdraw * Update MVVM (Add status) * Add id to confirm button, add ajax to change status * Change project badge to pending/success * Fix link to user profile * add to gitignore * Update output.css * Smaller QR * Change some text in modals and notes * Change year * Add email sender * Kleqing/dev (#73) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * Nothing change * Add status * Add change status function * Add comment * DB? (Move to .gitignore soon) * Add display status in index, add confirmwithdraw * Update MVVM (Add status) * Add id to confirm button, add ajax to change status * Change project badge to pending/success * Fix link to user profile * add to gitignore * Update output.css * Smaller QR * Change some text in modals and notes * Change year * Add email sender * Change title * Kleqing/dev (#74) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * Nothing change * Add status * Add change status function * Add comment * DB? (Move to .gitignore soon) * Add display status in index, add confirmwithdraw * Update MVVM (Add status) * Add id to confirm button, add ajax to change status * Change project badge to pending/success * Fix link to user profile * add to gitignore * Update output.css * Smaller QR * Change some text in modals and notes * Change year * Add email sender * Change title * Fix payment approved can confirm again * update gitignore * fix: Fix the choosing member to lead a project in organization * Kleqing/dev (#75) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from transaction table * rename properties * Add include to new table * should be in .gitignore soon * Change sender name -> project name * Change 1 -> 0 (On-going -> preparing) * Update ajax (Change badge, status) * Fix ban project can't unban. Change status display * Add admin menu * Remove auto login to admin if user role already admin * update * Nothing change * Add status * Add change status function * Add comment * DB? (Move to .gitignore soon) * Add display status in index, add confirmwithdraw * Update MVVM (Add status) * Add id to confirm button, add ajax to change status * Change project badge to pending/success * Fix link to user profile * add to gitignore * Update output.css * Smaller QR * Change some text in modals and notes * Change year * Add email sender * Change title * Fix payment approved can confirm again * update gitignore * Fix button not working, make code shorter * Make year to dynamic (#76) * update from dev to my-dev branch * Move to postgreSQL * Revert to mssql * remove unused compoments * context * Add logout button * Add view detail button * remove folder * update js * remove & update js * update css * update migrations * change boolean -> int * Update js (ajax) * Add get org information, count member, rename int -> ban * Update OrganizationsController.cs * Update index * Update ExternalLogin.cshtml.cs * change bg color * Add export function * Add export button, redirected request to /Admin/Requests * Update button to working with export in controller * Add more detail about project * Add some case that end-date not set. Remove unused loc, add export button * Add request detail in canvas (and its ajax b*lly sh*t) * Delete unused * move canvas title to center * Add request information * Add "GetRequestInfo" function * Add interface * add space * Add comment to each file * Update from dev to kleqing/dev * remove mirgrations * (temp), remove output.css * Restore * Create output.1css * Delete output.1css * Test with Rider * Move to new db * Update Index.cshtml * update gitignore * Remove view detail * Add payment to nav bar * Update * Login now check both role in identity and userRole * Add payment nav bar, remove off canvas, now view more will redirected to org detail in user page * Remove unused tag * fix typo error * Update new card-body for project * Update Details.cshtml * Add view transaction * Add view payment * Add payment.js (for payment page) * Update Index.cshtml * remove icon * Add new model (to display transaction information) * Shorter index, now the card will display by date (sorted) * Add 'listUserToProject', 'listUserToOrganization' and 'listOrganizationToProject' * Update model * Update controller * #52 fixed * Delete VAT * update adminrepository * huh * Revert to kleqing/dev * Revert to kleqing/dev * Fix logo * Add logo (2) * Add logo (3) * #57 fixed * Update dbcontext * Add new model (withdraw) * change appsetting (connectionstring) * add relationship * Remove & add new function * basic update * Update payment model (mvvm) * Rename properties * Remove organizationToProject & userToOrganization * remove unused function/properties * Remove sql * Update output.css * Id -> ID * Fix relationship from 1-1 to 1-many * Nothing to update * Print message, display money only * Print message * Count project report * Add LINQ to display only 1 project * Change dynamic to List * add properties * update link to user profile * Add absolute path, update list project card from transaction * Update detail resource table, add modals * Update MVVM from transaction to withdraw * Display value from withdraw table, not from tran…
- Loading branch information
7 people
authored
Nov 13, 2024
1 parent
dd061ad
commit 4614c46