Skip to content

Commit 213ed15

Browse files
authored
Merge pull request #2 from joe-inz/develop
Merging develop into master
2 parents 552489a + f235a87 commit 213ed15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+21348
-706
lines changed

.env.example

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# the environment of the application
2+
NODE_ENV=development
3+
# port of the application
4+
PORT=3000
5+
6+
# leav it commented
7+
# BASE_URL=http://localhost:3000
8+
9+
# token secret value to generate tokens
10+
TOKEN_SECRET=
11+
12+
# database host, for local use 'localhost'
13+
DATABASE_HOST=localhost
14+
# name of the database
15+
DATABASE_NAME=cnc_iiot
16+
DATABASE_USERNAME=root
17+
DATABASE_PASSWORD=
18+
19+
# this is used for mysql docker container, leave it empty when using local database
20+
DATABASE_ROOT_PASSWORD=

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
node_modules
2-
client/
2+
client/
3+
client
4+
test/
5+
resources
6+
.jshintrc
7+
server/.eslintrc.js
8+
server/.env
9+
.env

README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Loudjein.cnc
2+
Back-end project that interacts with CNC machine through serial port, it generates a gcode file from an uploaded image.
3+
4+
## Structure
5+
1. Agnets Management:<br>
6+
Handles all operation on agnets, nad admins, the users of the system.
7+
1. Authentication:<br>
8+
Handles all the operations of authentication, including token refresh process.
9+
1. Config:<br>
10+
Holds all the files that take configurtion as a content, such as database, multer and the server configuration.
11+
1. Files Handler:<br>
12+
Handle all the operation on the files and directories in the system, the types of files in the system are:
13+
1. Images
14+
2. Gcode files
15+
3. log files
16+
1. Image Converter:<br>
17+
Take care of the full process of converting an image, from uploading it to creating gcode file.
18+
1. Middlwares
19+
Used middlewares in the system
20+
1. Public Folder:<br>
21+
The generated front-end assets by VueJs cli, [Project repo](https://github.com/joe-inz/cnc-controller-fe)
22+
1. Socket Manager:<br>
23+
Handles all the operations for real time updates to the client.
24+
1. Transmitter:<br>
25+
Handles the transmission process operations.

client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 3d48fba859ca105704978ce3b47f56396387d77c
1+
Subproject commit 4e91e6da96554ede4e7fb45a7fffec1782f3e2b4

0 commit comments

Comments
 (0)