Skip to content

Commit bb8afbf

Browse files
committed
Changed project format.
1 parent 20a7957 commit bb8afbf

File tree

1,210 files changed

+29369
-409358
lines changed

Some content is hidden

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

1,210 files changed

+29369
-409358
lines changed

.dockerignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.dockerignore
2+
.env
3+
.git
4+
.gitignore
5+
.vs
6+
.vscode
7+
*/bin
8+
*/obj
9+
**/.toolstarget

.gitignore

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66
*.user
77
*.userosscache
88
*.sln.docstates
9-
**/flowscript/**/*.js
10-
**/flowscript/**/*.map
11-
**/scripts/**/*.js
12-
**/scripts/**/*.map
13-
**/server/**/*.js
14-
**/server/**/*.map
15-
!Source/ide/scripts/*.js
16-
!Source/ide/scripts/ace/**/*.js
179

1810
# User-specific files (MonoDevelop/Xamarin Studio)
1911
*.userprefs
@@ -29,6 +21,15 @@ bld/
2921
[Bb]in/
3022
[Oo]bj/
3123
[Ll]og/
24+
**/Server/*.d.ts
25+
**/Server/*.js.map
26+
**/wwwroot/js/*.js.map
27+
**/wwwroot/js/*.d.ts
28+
**/wwwroot/js/*.js
29+
node-modules/
30+
monaco-editor/
31+
**/libs/V8.NET/
32+
*.git
3233

3334
# Visual Studio 2015 cache/options directory
3435
.vs/

.vscode/launch.json

Lines changed: 0 additions & 50 deletions
This file was deleted.

.vscode/tasks.json

Lines changed: 0 additions & 106 deletions
This file was deleted.

FlowScript.sln

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,90 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2046
4+
VisualStudioVersion = 15.0.28307.329
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowScript", "src\FlowScript\FlowScript.csproj", "{5735AE6B-6166-44D7-BCEC-34A27A6CA186}"
7+
EndProject
8+
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{7466F4F0-9A2C-438B-BAB7-476373A703D4}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "V8.Net-Standard", "..\..\V8.NET\Source\V8.Net\V8.Net-Standard.csproj", "{866DE625-BD8B-425E-AAC8-22DD2232FF44}"
11+
ProjectSection(ProjectDependencies) = postProject
12+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723} = {8BFB50C4-51E7-4DA4-873B-B79F123A9723}
13+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D} = {0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}
14+
EndProjectSection
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{57ABBF01-A357-4BBC-B75C-625CDF1D6D83}"
17+
EndProject
18+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8.Net-Proxy-x64", "..\..\V8.NET\Source\V8.NET-Proxy\V8.Net-Proxy-x64.vcxproj", "{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}"
19+
EndProject
20+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8.Net-Proxy-x86", "..\..\V8.NET\Source\V8.NET-Proxy\V8.Net-Proxy-x86.vcxproj", "{8BFB50C4-51E7-4DA4-873B-B79F123A9723}"
21+
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{615BA265-518A-47A7-A4AF-AAB23324D801}"
23+
ProjectSection(SolutionItems) = preProject
24+
README.md = README.md
25+
readme.txt = readme.txt
26+
EndProjectSection
27+
EndProject
628
Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "FlowScript", "FlowScript.njsproj", "{F559E79B-7B88-47D7-86A3-37969D001E8B}"
729
EndProject
830
Global
931
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1032
Debug|Any CPU = Debug|Any CPU
33+
Debug|x64 = Debug|x64
34+
Debug|x86 = Debug|x86
1135
Release|Any CPU = Release|Any CPU
36+
Release|x64 = Release|x64
37+
Release|x86 = Release|x86
1238
EndGlobalSection
1339
GlobalSection(ProjectConfigurationPlatforms) = postSolution
40+
{5735AE6B-6166-44D7-BCEC-34A27A6CA186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{5735AE6B-6166-44D7-BCEC-34A27A6CA186}.Debug|x64.ActiveCfg = Debug|Any CPU
42+
{5735AE6B-6166-44D7-BCEC-34A27A6CA186}.Debug|x86.ActiveCfg = Debug|Any CPU
43+
{5735AE6B-6166-44D7-BCEC-34A27A6CA186}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{5735AE6B-6166-44D7-BCEC-34A27A6CA186}.Release|x64.ActiveCfg = Release|Any CPU
45+
{5735AE6B-6166-44D7-BCEC-34A27A6CA186}.Release|x86.ActiveCfg = Release|Any CPU
46+
{7466F4F0-9A2C-438B-BAB7-476373A703D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{7466F4F0-9A2C-438B-BAB7-476373A703D4}.Debug|x64.ActiveCfg = Debug|Any CPU
48+
{7466F4F0-9A2C-438B-BAB7-476373A703D4}.Debug|x86.ActiveCfg = Debug|Any CPU
49+
{7466F4F0-9A2C-438B-BAB7-476373A703D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{7466F4F0-9A2C-438B-BAB7-476373A703D4}.Release|x64.ActiveCfg = Release|Any CPU
51+
{7466F4F0-9A2C-438B-BAB7-476373A703D4}.Release|x86.ActiveCfg = Release|Any CPU
52+
{866DE625-BD8B-425E-AAC8-22DD2232FF44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{866DE625-BD8B-425E-AAC8-22DD2232FF44}.Debug|x64.ActiveCfg = Debug|Any CPU
54+
{866DE625-BD8B-425E-AAC8-22DD2232FF44}.Debug|x86.ActiveCfg = Debug|Any CPU
55+
{866DE625-BD8B-425E-AAC8-22DD2232FF44}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{866DE625-BD8B-425E-AAC8-22DD2232FF44}.Release|x64.ActiveCfg = Release|Any CPU
57+
{866DE625-BD8B-425E-AAC8-22DD2232FF44}.Release|x86.ActiveCfg = Release|Any CPU
58+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}.Debug|Any CPU.ActiveCfg = Debug|x64
59+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}.Debug|x64.ActiveCfg = Debug|x64
60+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}.Debug|x86.ActiveCfg = Debug|Win32
61+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}.Release|Any CPU.ActiveCfg = Release|x64
62+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}.Release|x64.ActiveCfg = Release|x64
63+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D}.Release|x86.ActiveCfg = Release|Win32
64+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723}.Debug|Any CPU.ActiveCfg = Debug|Win32
65+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723}.Debug|x64.ActiveCfg = Debug|x64
66+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723}.Debug|x86.ActiveCfg = Debug|Win32
67+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723}.Release|Any CPU.ActiveCfg = Release|Win32
68+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723}.Release|x64.ActiveCfg = Release|x64
69+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723}.Release|x86.ActiveCfg = Release|Win32
1470
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1571
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Debug|x64.ActiveCfg = Debug|Any CPU
73+
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Debug|x86.ActiveCfg = Debug|Any CPU
1674
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
1775
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Release|Any CPU.Build.0 = Release|Any CPU
76+
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Release|x64.ActiveCfg = Release|Any CPU
77+
{F559E79B-7B88-47D7-86A3-37969D001E8B}.Release|x86.ActiveCfg = Release|Any CPU
1878
EndGlobalSection
1979
GlobalSection(SolutionProperties) = preSolution
2080
HideSolutionNode = FALSE
2181
EndGlobalSection
82+
GlobalSection(NestedProjects) = preSolution
83+
{7466F4F0-9A2C-438B-BAB7-476373A703D4} = {57ABBF01-A357-4BBC-B75C-625CDF1D6D83}
84+
{866DE625-BD8B-425E-AAC8-22DD2232FF44} = {57ABBF01-A357-4BBC-B75C-625CDF1D6D83}
85+
{0B7EC0CC-5AD6-47CA-9FE1-37E612FFE25D} = {57ABBF01-A357-4BBC-B75C-625CDF1D6D83}
86+
{8BFB50C4-51E7-4DA4-873B-B79F123A9723} = {57ABBF01-A357-4BBC-B75C-625CDF1D6D83}
87+
EndGlobalSection
2288
GlobalSection(ExtensibilityGlobals) = postSolution
2389
SolutionGuid = {D0323656-C564-4630-9F0D-F03AD74918DE}
2490
EndGlobalSection

README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,66 @@ FlowScript is a visual programming language (VPL) used for build client and serv
99

1010
### How do I get set up? ###
1111

12+
<<<<<<< HEAD
13+
* Visual Studio 2017 is used, along with TypeScript, and .Net Standard libraries via NuGet.
14+
* Database configuration: Will be a least MySQL v5.7+ or higher when the time comes.
15+
* How to run tests: At the moment, simple tests are being run by loading the browser path `tests/simple/index.html` in the browser. Example: `https://localhost:44370/tests/simple`.
16+
* Deployment instructions: Just click run! ;) A browser should open (make sure it supports ES6+ standards [i.e. NOT IE11-]).
17+
=======
1218
* Visual Studio Code is used as the IDE, and TypeScript as the "language" platform.
1319
* To setup a new VS Code environment you can run `install_extensions.cmd`.
1420
* Dependencies for development: NodeJS, NPM, nodemon (`install -g install nodemon`)
1521
* Don't forget to run `npm install` from the command line within the workspace path to restore the required node modules.
1622
* Database configuration: MySQL v(TBD)+
1723
* How to run tests: At the moment, simple tests are being run by loading the path at `Source\ide\scripts\tests\simple\index.html` in the browser. Since the `ide` folder is the web root, the page can be loaded at `http://localhost:8080/scripts/tests/simple`.
1824
* Deployment instructions: You run the NodeJS server project (the config called `Launch Server`) to serve the project's site and handle server side flow scripts. A simple browser is all that is needed to run the website on the client side (`http://localhost:8080/`).
25+
>>>>>>> 20a79577a5a7963be48507c6c36717d4172d9e7c
1926
2027
### Contribution guidelines ###
2128

2229
* Writing tests:
2330
* Code review: I will review all pull requests.
2431
* Other guidelines:
32+
<<<<<<< HEAD
33+
1. All code must be documented using JSDoc comments. That means all class, functions, properties, etc. The code within the function bodies should have blank lines and comments separating ideas. Since many other developers may have to work on your code/changes, it can be hard to understand the reasoning for any quirks that may be related on conditions not immediately apparent in the current context, or simply just because of a particular conviction.
34+
=======
2535
1. All code must be documented using JSDoc comments. That means all class, functions, properties, etc. The code within the function bodies should have blank lines and comments separating ideas. Since many other developers may have to work on your code/changes, it can be hard to understand the reasoning for any quirks that may be related on conditions not immediately apparent in the current context, or simply just because if a particular conviction.
36+
>>>>>>> 20a79577a5a7963be48507c6c36717d4172d9e7c
2637
2738
Make sure to document the parameters as well, such as `@param {string} value ...description...`.
2839

2940
If I cannot read the comments and immediately understand what is going on, I will most likely reject the pull request.
3041

3142
2. Naming conventions are strict, but simple:
43+
<<<<<<< HEAD
44+
1. All PUBLIC functions and properties must be in typical JS notation (camel case, such as "myPropOrFunc"), and without underscores (in most cases).
45+
2. All PRIVATE functions and properties on a class must be prefixed with an underscore (example: "_myPrivatePropOrFunc").
46+
=======
3247
1. All functions and properties must be in typical JS notation (camel case, such as "myPropOrFunc"), and without underscores (in most cases).
3348
2. All private properties or functions on a class must be prefixed with an underscore (example: "_myPrivatePropOrFunc").
49+
>>>>>>> 20a79577a5a7963be48507c6c36717d4172d9e7c
3450
3. All types are in Pascal case (example: "MyClassType").
3551
4. All interfaces are in Pascal case, and start with "I" (example: "IMyCoolInterface").
3652

3753
3. No jQuery or any other library in the VPL system or runtime. The system must be stand alone and without any dependency on other libraries. While the system is VPL, it still needs to be low level for maximum speed efficiency (especially where the runtime is involved). This also applies to code generated by core system components and FlowScript component libraries. 3rd party components and/or libraries are free to make whatever dependencies within their own code-component JS scriptlets.
3854

55+
<<<<<<< HEAD
56+
4. No modules (i.e. using ReactJS or other). Everything compiles into a single script and loads as such. This is to help support SPA apps in the future.
57+
=======
3958
4. No modules. Everything compiles into a single script and loads as such.
59+
>>>>>>> 20a79577a5a7963be48507c6c36717d4172d9e7c
4060
4161
### Examples: ###
4262

4363
Coming soon...
4464

4565
### Editor Screen Shots ###
4666

67+
<<<<<<< HEAD
68+
Note: These need to be updated, but you'll get the idea.
69+
=======
4770
Note: This is the old editor. A new one is being worked on.
71+
>>>>>>> 20a79577a5a7963be48507c6c36717d4172d9e7c
4872
4973
##### Editor: #####
5074
![Editor](https://github.com/rjamesnw/FlowScript/blob/master/Screenshots/Editor.png)

0 commit comments

Comments
 (0)