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 #215

Open
wants to merge 100 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
05d6ef4
Replaced alerts in ManageMyCourses/MyCourses for dialogs
dmols Jun 22, 2021
93b52a9
fix to issue
Michael-Dews Jul 2, 2021
4fd50a4
Merge branch 'dev' of https://github.com/nlyra/SystemsEngineeringTool…
Michael-Dews Jul 2, 2021
dafb4ed
Dockerizing Attempt
dmols Jul 3, 2021
00390f3
Merge branch 'dev' into 156-replace_alerts
dmols Jul 7, 2021
a206146
Renamed ManageCourses title & edited dialogs UI
dmols Jul 8, 2021
ed6e0d8
ManageMyCourses Dialog
dmols Jul 8, 2021
03ff717
Merge branches 'bug-fix,-quiz-question-viewer' and 'dev' of https://g…
Michael-Dews Jul 8, 2021
29ecfff
Merge branch '166-course_upgrades' of https://github.com/nlyra/System…
Michael-Dews Jul 8, 2021
7dbea5f
some small updates and bug fixes
Michael-Dews Jul 8, 2021
ba27f21
Fixed bug in module editor
Michael-Dews Jul 8, 2021
e048d8e
fixed bug in module editor
Michael-Dews Jul 8, 2021
7d061e3
finalProfileChanges / Scroll 4 more icon / Courses spacing fix for My…
dmols Jul 11, 2021
3b62c69
Removed numbers next to scroll Icon (used for testing)
dmols Jul 11, 2021
9e8f15f
Margin Issue fixed for Scroll Icon
dmols Jul 11, 2021
fd830a9
align items
collyntheshots Jul 11, 2021
e6c54a8
updating role description margin
dmols Jul 11, 2021
0212a38
enter delay for tooltip
collyntheshots Jul 11, 2021
06d1e78
Initial DialogComponent component creation, and integration to Manage…
nlyra Jul 12, 2021
fe82ee2
initial course editing set up
collyntheshots Jul 12, 2021
ae71ad9
Replaced rest of the alerts in the code with new styled dialogs. Aler…
nlyra Jul 12, 2021
2e52a90
Fixed a few things with alerts
Michael-Dews Jul 12, 2021
d7e860a
no idea why this is this way.
Michael-Dews Jul 12, 2021
a6f2ffd
Merge branch '156-replace_alerts' of https://github.com/nlyra/Systems…
Michael-Dews Jul 12, 2021
c8e5433
Merge branch 'dev' of https://github.com/nlyra/SystemsEngineeringTool…
Michael-Dews Jul 12, 2021
49c50ac
Finished fixing bugs.
Michael-Dews Jul 13, 2021
2b66cd8
should be functional
collyntheshots Jul 13, 2021
e9d0a92
Merge from dev + scrollForMore fix
dmols Jul 14, 2021
fc835b3
adds category editing and cover image fix
collyntheshots Jul 14, 2021
6f43afd
Merge branch 'dev' into 122-UpdateCourseInfoFrontend
collyntheshots Jul 14, 2021
a492762
cleaned up the code
collyntheshots Jul 15, 2021
5211c60
fixed course total on dashboard issue
collyntheshots Jul 15, 2021
46fa280
Fixed the issues that have been brought to my attention
Michael-Dews Jul 15, 2021
a58b261
Hot fix to fix the isEnabled tag for dashboard
collyntheshots Jul 15, 2021
2fd8e44
Merge branch 'dev' into 122-UpdateCourseInfoFrontend
collyntheshots Jul 15, 2021
e77078d
Merge pull request #207 from nlyra/122-UpdateCourseInfoFrontend
collyntheshots Jul 15, 2021
9891837
Merge branch 'dev' into 174-Dockerizing
collyntheshots Jul 15, 2021
a91b02a
updating branch
collyntheshots Jul 15, 2021
c2fd11f
Merge branch 'dev' of https://github.com/nlyra/SystemsEngineeringTool…
Michael-Dews Jul 15, 2021
eee4135
Merge pull request #204 from nlyra/bug-fix,-quiz-question-viewer
Michael-Dews Jul 15, 2021
d5f5f74
show/hide
mbrancato31 Jul 16, 2021
005b8dc
Scroll More Icon hidden in search
dmols Jul 16, 2021
c62aeae
Fixed quizzes allowing more required score to pass than is possible t…
Michael-Dews Jul 16, 2021
e8b1eb0
Merge branch 'dev' into 195-FinalProfileUpgrades
dmols Jul 16, 2021
75514d9
Merge branch 'dev' into 174-Dockerizing
mbrancato31 Jul 17, 2021
34cdb21
Merge branch 'dev' into 195-FinalProfileUpgrades
dmols Jul 18, 2021
2939247
Changed cardAmount to 15
dmols Jul 18, 2021
ea8bc9d
Merge pull request #201 from nlyra/195-FinalProfileUpgrades
dmols Jul 18, 2021
d7debb7
SaveChanges button hidden if no changes made
dmols Jul 18, 2021
f47daf7
hotfix, topbar asking isadmin on login page
mbrancato31 Jul 18, 2021
0d188b0
mistake on hotfix ===/!==
mbrancato31 Jul 18, 2021
578d89f
Fixed auth checks on api calls
dmols Jul 18, 2021
e645482
hot fix for categories
collyntheshots Jul 18, 2021
82be389
brought back needed field checks in course creation
dmols Jul 18, 2021
293b2e4
fixed dialogue for mycourses and managemycourses.
Michael-Dews Jul 19, 2021
7fa45cc
same
Michael-Dews Jul 19, 2021
68e0d61
dashboard now clears sessionStorage.
Michael-Dews Jul 19, 2021
b0022fb
Delete help.js
collyntheshots Jul 19, 2021
c8f37cd
admin now can edit any course
mbrancato31 Jul 19, 2021
b979abb
Merge branch 'dev' into 209-admin_super_creator
mbrancato31 Jul 19, 2021
7d3a9a9
Endless Scrolling Search fixed
dmols Jul 19, 2021
cd7e979
fix
mbrancato31 Jul 20, 2021
1936c94
Merge branch 'dev' into 174-Dockerizing
mbrancato31 Jul 20, 2021
81d1817
fix for url to localhost
mbrancato31 Jul 20, 2021
b09ed29
Update config.json
mbrancato31 Jul 20, 2021
da5cc2f
Merge pull request #211 from nlyra/209-admin_super_creator
mbrancato31 Jul 21, 2021
e384f90
Merge branch 'dev' into 174-Dockerizing
mbrancato31 Jul 21, 2021
f36101e
Merge branch 'dev' into 210-DevFixes
dmols Jul 21, 2021
5f9b263
Merge branch 'dev' into 210-DevFixes
dmols Jul 21, 2021
ebd20c7
Merge pull request #212 from nlyra/210-DevFixes
mbrancato31 Jul 21, 2021
9e754c2
Merge branch 'dev' into 174-Dockerizing
mbrancato31 Jul 21, 2021
0c6edc8
Merge pull request #213 from nlyra/174-Dockerizing
dmols Jul 21, 2021
08a69f9
cleaned the components
mbrancato31 Jul 21, 2021
b511a0a
cleaned styles
mbrancato31 Jul 21, 2021
466ceda
deleted unused images
mbrancato31 Jul 21, 2021
1d5759b
cleaned models
mbrancato31 Jul 21, 2021
d30926f
clean routes
mbrancato31 Jul 21, 2021
e799bca
Cleaned up warnings in pages
dmols Jul 21, 2021
77caa80
Update Course.js
mbrancato31 Jul 21, 2021
ef2b988
readme
mbrancato31 Jul 21, 2021
0c76c80
Update README.md
mbrancato31 Jul 21, 2021
5c8ee3e
cleaned pages
mbrancato31 Jul 21, 2021
742cab5
fix bug on edit course
mbrancato31 Jul 21, 2021
3c01402
fix but regarding uploading and updating files
mbrancato31 Jul 21, 2021
a77b8cd
Added comments to some pages
dmols Jul 22, 2021
64eb4c2
More Comments
dmols Jul 22, 2021
aaf8525
Comment fix
dmols Jul 22, 2021
7ae20be
added server url to forgot password
mbrancato31 Jul 22, 2021
adc3158
Fixed quiz Show Answers Issue
dmols Jul 22, 2021
1d91c2f
Forgot a change
dmols Jul 22, 2021
8ea94d6
Merge branch 'final_clean_code' of https://github.com/nlyra/SystemsEn…
dmols Jul 22, 2021
f608f47
fix forgot password
mbrancato31 Jul 22, 2021
f7e2b34
Merge branch 'final_clean_code' of https://github.com/nlyra/SystemsEn…
mbrancato31 Jul 22, 2021
e38ca55
Update README.md
mbrancato31 Jul 22, 2021
076d86c
Courses.js commenting and clean up
collyntheshots Jul 22, 2021
1eae27c
Merge branch 'final_clean_code' of https://github.com/nlyra/SystemsEn…
collyntheshots Jul 22, 2021
794ffda
Comments for auth
dmols Jul 22, 2021
8b383bb
Update README.md
mbrancato31 Jul 22, 2021
6910fd0
Merge pull request #214 from nlyra/final_clean_code
mbrancato31 Jul 22, 2021
45ae73e
Update README.md
mbrancato31 Jul 30, 2021
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
77 changes: 76 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,76 @@
### SystemsEngineeringToolkit
# SystemsEngineeringToolkit

## To run (regular way).

- Download Node.js.
- Set up a Mongo Database (Atlas or Local).

### Set up and run the server:

- In cmd inside folder (./server/), run ```npm install```.
- In the config.json add the fields:
{
"db_url": (insert mongo db url),
"server_url": (insert server url),
"key": (insert key, preferably a strong one, this if for encryption of passwords),
"emailInfo": { (this is for forgot password, so preferably an email dedicated to that)
"service": (mail provider like gmail, outlook, hotmail),
"emailUsername": (email),
"emailPassword": (password)
}
}
- run in CMD ```npm start```.

### Set up and run front end:

- in cmd inside folder (./frontend/toolkit-webapp/), run: ```npm install```.
- In the config.json add the fields:
"server_url": (server url)
- run in CMD ```npm start```.

### create an admin user.

- first create a regular student user on the website by registering.
- once created go to mongo and update the user field roleID to 2 (int).



## To run (docker way).

- Download and run docker.

### Server side changes:

- In the config.json add the fields:
{
"db_url": (insert mongo db url for docker: "mongodb://mongo:27017/se_toolkit"),
"server_url": (insert server url),
"frontend_url": (insert front end url),
"key": (insert key, preferably a strong one, this if for encryption of passwords),
"emailInfo": { (this is for forgot password, so preferably an email dedicated to that)
"service": (mail provider like gmail, outlook, hotmail),
"emailUsername": (email),
"emailPassword": (password)
}
}


### Front end side changes:
- In the config.json add the fields:
"server_url": (server url).

### Docker instructions:

- on cmd inside folder (./SystemsEngineeringToolkit/).
- run ```docker-compose build``` this is to build the website, once finished continue.
- run ```docker-compose up``` this is to run the website, the front end might take a minute or two.

### create an admin user:

- first create a regular student user on the website by registering.
- once created go to the docker command line and run mongo ```mongo```.
- check that se_toolkit db was created by running ```show dbs```.
- select the se_tollkit db by running: ```use se_toolkit```.
- to change the role of the created user run this command:
```db.users.update({ "email":(insert email of created user surrounded by "") }, { "roleID":2 })```.
- log in again and check if you have the creator and admin functionalities.
45 changes: 45 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
version: '3.7'

services:
client:
image: myapp-frontend
build: ./frontend/toolkit-webapp
stdin_open: true
ports:
- "3000:3000"
networks:
- app-network
command: npm start
volumes:
- ./frontend/toolkit-webapp/:/usr/src/app
- /usr/src/app/node_modules
depends_on:
- server
server:
image: myapp-server
build: ./server
ports:
- "4000:4000"
networks:
- app-network
depends_on:
- mongo
volumes:
- ./server/:/usr/src/app
- /usr/src/app/node_modules
mongo:
image: mongo:4.4-bionic
ports:
- 27017:27017
networks:
- app-network
volumes:
- mongo-data:/data/db

networks:
app-network:
driver: bridge

volumes:
mongo-data:
driver: local
239 changes: 1 addition & 238 deletions frontend/package-lock.json

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

1 change: 1 addition & 0 deletions frontend/toolkit-webapp/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
20 changes: 20 additions & 0 deletions frontend/toolkit-webapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dockerfile for React client

# Build react client
FROM node:14-slim

# Working directory be app
WORKDIR /usr/src/app

COPY package*.json ./

### Installing dependencies

RUN npm install --silent

# copy local files to app folder
COPY . .

EXPOSE 3000

CMD ["npm","start"]
Loading