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

Module 2 Team 4 Changes #5

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
7f431fd
Merge pull request #1 from AlexQChenSIT/main
Uygnis Feb 10, 2023
eeff2e1
add
Uygnis Feb 10, 2023
aeb5470
Create CustomerFeedbackForm.cs
LynxYufloria Mar 12, 2023
7cfdd06
Create Question.cs
LynxYufloria Mar 12, 2023
0032d18
Create Radio.cs
LynxYufloria Mar 12, 2023
9e218f3
still working
Uygnis Mar 14, 2023
7153cfd
delete
Uygnis Mar 14, 2023
0f8a1d6
sort function
Uygnis Mar 14, 2023
fd31f9c
Merge pull request #46 from LynxYufloria/dev
Uygnis Mar 14, 2023
8731195
undo feature
Uygnis Mar 14, 2023
94f6972
Merge branch 'dev' of https://github.com/LynxYufloria/ICT2106_P3_Proj…
Uygnis Mar 14, 2023
31de22e
Merge pull request #47 from LynxYufloria/dev
Uygnis Mar 14, 2023
79ed6c2
toast update
Uygnis Mar 15, 2023
00bd669
Merge pull request #48 from LynxYufloria/dev
Uygnis Mar 15, 2023
31969f3
Update Undo Function
timothxy Mar 15, 2023
13bbe88
Merge pull request #49 from timothxy/main
timothxy Mar 15, 2023
0327895
Merge pull request #50 from LynxYufloria/undo
timothxy Mar 15, 2023
c7e03be
updated
khansharkhamnida Mar 17, 2023
95ed57c
feedbackform functionality added
LynxYufloria Mar 20, 2023
6318dea
feedbackform
LynxYufloria Mar 20, 2023
cf12b61
ffedbackform
LynxYufloria Mar 20, 2023
f120cf2
git push
LynxYufloria Mar 20, 2023
71e5984
deletedDbContext
khansharkhamnida Mar 22, 2023
a085544
Delete YouthActionDotNet/Data directory
LynxYufloria Mar 22, 2023
d42af90
Merge pull request #53 from khansharkhamnida/main
khansharkhamnida Mar 22, 2023
714bf0a
Merge pull request #54 from LynxYufloria/dev
khansharkhamnida Mar 22, 2023
e1c0356
Revert "Dev"
khansharkhamnida Mar 22, 2023
954f353
Merge pull request #55 from LynxYufloria/revert-54-dev
khansharkhamnida Mar 22, 2023
15bd95a
Revert "deletedDbContext"
khansharkhamnida Mar 22, 2023
c82bd48
Merge pull request #56 from LynxYufloria/revert-53-main
khansharkhamnida Mar 22, 2023
1f6a85d
Merge pull request #57 from khansharkhamnida/main
khansharkhamnida Mar 22, 2023
a8abea6
Merge pull request #58 from LynxYufloria/dev
khansharkhamnida Mar 22, 2023
e3f1866
added Feedback (Lin)
khansharkhamnida Mar 22, 2023
725caaf
done
khansharkhamnida Mar 22, 2023
bf31815
Merge pull request #59 from khansharkhamnida/main
khansharkhamnida Mar 22, 2023
e93db36
addedBudgetnTimeline
khansharkhamnida Mar 22, 2023
9b543a2
Merge pull request #60 from khansharkhamnida/main
khansharkhamnida Mar 22, 2023
5a71a2e
delete the row in project
LynxYufloria Mar 22, 2023
7f4f332
Merge branch 'main' of https://github.com/LynxYufloria/ICT2106_P3_Pro…
Uygnis Mar 25, 2023
c79dd73
Update App.js for FeedbackForm
LynxYufloria Mar 25, 2023
a3fc4ed
Added Feedback Page
LynxYufloria Mar 25, 2023
e893b42
added repo
Uygnis Mar 25, 2023
1d70709
control
Uygnis Mar 25, 2023
c7de373
fixed a bug where project is not creating/deleting timeline and budge…
LynxYufloria Mar 25, 2023
922fcae
team3(merge)
Uygnis Mar 25, 2023
87b3270
Update YouthAction.db
Uygnis Mar 25, 2023
dcfb164
Merge branch 'main' of https://github.com/LynxYufloria/ICT2106_P3_Pro…
Uygnis Mar 25, 2023
a904cd8
added ProjectType
khansharkhamnida Mar 26, 2023
fd28718
update projectVolunteer
khansharkhamnida Mar 26, 2023
f97c803
fixed the update projects
Uygnis Mar 26, 2023
e58742c
updates
Uygnis Mar 26, 2023
cb0ff5a
Merge branch 'main' of https://github.com/LynxYufloria/ICT2106_P3_Pro…
Uygnis Mar 26, 2023
6097f61
Revert "Merge branch 'main' of https://github.com/LynxYufloria/ICT210…
Uygnis Mar 26, 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
35 changes: 35 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"version": "0.2.0",
"configurations": [
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/YouthActionDotNet/bin/Debug/net7.0/YouthActionDotNet.dll",
"args": [],
"cwd": "${workspaceFolder}/YouthActionDotNet",
"stopAtEntry": false,
// Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
}
]
}
41 changes: 41 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/YouthActionDotNet/YouthActionDotNet.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/YouthActionDotNet/YouthActionDotNet.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/YouthActionDotNet/YouthActionDotNet.csproj"
],
"problemMatcher": "$msCompile"
}
]
}
166 changes: 163 additions & 3 deletions YouthActionDotNet/ClientApp/package-lock.json

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

4 changes: 3 additions & 1 deletion YouthActionDotNet/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@types/react": "^18.0.26",
"bootstrap": "^4.1.3",
"bootstrap": "^4.6.2",
"chart.js": "^4.2.1",
"jquery": "^3.5.1",
"merge": "^2.1.1",
Expand All @@ -13,6 +13,7 @@
"oidc-client": "^1.9.0",
"qr-scanner": "^1.4.2",
"react": "^18.2.0",
"react-bootstrap": "^2.7.2",
"react-chartjs-2": "^5.2.0",
"react-csv": "^2.2.2",
"react-dom": "^18.1.0",
Expand All @@ -21,6 +22,7 @@
"react-qr-code": "^2.0.11",
"react-router-bootstrap": "^0.25.0",
"react-router-dom": "^6.3.0",
"react-toastify": "^9.1.1",
"reactstrap": "^9.1.5",
"readable-stream": "^4.3.0",
"resolve-url-loader": "^5.0.0",
Expand Down
Loading