Merge pull request #363 from isaacabraham/fix-full

Update full option

Content/.config/dotnet-tools.json

@@ -2,12 +2,6 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "safe.tool": {
-      "version": "0.0.6",
-      "commands": [
-        "safe"
-      ]
-    },
     "paket": {
       "version": "6.0.0-alpha014",
       "commands": [

Content/.gitignore

@@ -1,16 +1,15 @@
 .fable/
 .fake/
+.idea/
+.ionide/
 .vs/
+deploy/
 obj/
 bin/
 packages/
 paket-files/
 node_modules/
-src/Client/public/js/
 release.cmd
 release.sh
-.idea/
 *.orig
-*.DotSettings.user
-deploy
-.ionide/
+*.DotSettings.user

Content/.template.config/template.json

@@ -15,16 +15,8 @@
     },
     "identity": "SAFE.Template",
     "shortName": "SAFE",
-    "sourceName": "SAFE.Template",
+    "sourceName": "SAFE.App",
     "symbols": {
-        "createdate": {
-            "type": "generated",
-            "generator": "now",
-            "parameters": {
-                "format": "yyyy-MM-dd"
-            },
-            "replaces": "1970-01-01"
-        },
         "minimal": {
             "type": "parameter",
             "dataType": "bool",
@@ -46,19 +38,20 @@
                         ".paket/**",
                         ".vscode/**",
                         ".editorconfig",
-                        "RELEASE_NOTES.md",
                         "**/paket.*",
                         "*.fsx",
-                        "src/Client/Version.fs",
+                        "src/Client/package.default.json",
+                        "src/Client/package-lock.default.json",
                         "src/Client/webpack.default.config.js",
                         "README.md"
                     ],
                     "condition": "(minimal)"
                 },
                 {
                     "exclude": [
+                        "src/Client/package.minimal.json",
+                        "src/Client/package-lock.minimal.json",
                         "src/Client/webpack.minimal.config.js",
-                        "src/Client/client-minimal.fs",
                         "README-minimal.md"
                     ],
                     "condition": "(!minimal)"
@@ -67,6 +60,10 @@
                     "rename": {
                         "src/Client/webpack.default.config.js": "src/Client/webpack.config.js",
                         "src/Client/webpack.minimal.config.js": "src/Client/webpack.config.js",
+                        "src/Client/package.minimal.json": "src/Client/package.json",
+                        "src/Client/package.default.json": "src/Client/package.json",
+                        "src/Client/package-lock.minimal.json": "src/Client/package-lock.json",
+                        "src/Client/package-lock.default.json": "src/Client/package-lock.json",
                         "README-minimal.md": "README.md"
                     }
                 }

Content/.vscode/extensions.json

@@ -7,8 +7,7 @@
         "ionide.ionide-fsharp",
         "ms-dotnettools.csharp",
         "editorconfig.editorconfig",
-        "msjsdiag.debugger-for-chrome",
-        "ms-vscode-remote.remote-containers"
+        "msjsdiag.debugger-for-chrome"
     ],
     // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
     "unwantedRecommendations": [

Content/README-minimal.md

@@ -11,13 +11,13 @@ You'll need to install the following pre-requisites in order to build SAFE appli
 ## Starting the application
 Start the server:
 ```bash
-cd src\server
+cd src\Server\
 dotnet run
 ```
 
 Start the client:
 ```bash
-cd src\client
+cd src\Client\
 npm install
 npm run start
 ```

Content/README.md

@@ -9,7 +9,6 @@ You'll need to install the following pre-requisites in order to build SAFE appli
 * The [.NET Core SDK](https://www.microsoft.com/net/download)
 * The [Yarn](https://yarnpkg.com/lang/en/docs/install/) package manager (you can also use `npm` but the usage of `yarn` is encouraged).
 * [Node LTS](https://nodejs.org/en/download/) installed for the front end components.
-* If you're running on OSX or Linux, you'll also need to install [Mono](https://www.mono-project.com/docs/getting-started/install/).
 
 ## Work with the application
 
@@ -19,7 +18,6 @@ Before you run the project **for the first time only** you should install its lo
 dotnet tool restore
 ```
 
-
 To concurrently run the server and the client components in watch mode use the following command:
 
 ```bash

Content/SAFE.Template.sln → Content/SAFE.App.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2005
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Client", "src\Client\Client.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SAFE.App.Shared", "src\Shared\SAFE.App.Shared.fsproj", "{28F090FB-E75F-4BE9-9E09-A70B1DA02C88}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Server", "src\Server\Server.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SAFE.App.Server", "src\Server\SAFE.App.Server.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B856}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Shared", "src\Shared\Shared.fsproj", "{28F090FB-E75F-4BE9-9E09-A70B1DA02C88}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SAFE.App.Client", "src\Client\SAFE.App.Client.fsproj", "{73E8E820-C8AA-47CC-BB2B-152CA4D0B855}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{08CCFCF6-2248-43ED-A6EF-E972A2DA0E6A}"
 	ProjectSection(SolutionItems) = preProject