Merge pull request #64 from SAEONData/dev

Merge 'dev' to 'master'
SAEONData · Mar 26, 2019 · fa68be5 · fa68be5
2 parents 6f3a609 + caad46f
commit fa68be5
Show file tree

Hide file tree

Showing 158 changed files with 1,452 additions and 1,118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -310,12 +310,8 @@ __pycache__/
 *.pyc
 
 # Custom
-/NCCRD.Services.DataV2/secrets.json
-/NCCRD_API/NCCRD.Services.DataV2/secrets.json
-NCCRD_Client/app/js/secrets.js
-/CCIS_API/CCIS_API/secrets.json
-/CCIS_API/CCIS_API/ccis-217116-0d169b4a4e6d.p12
-CCIS_Client/app/js/secrets.cfg
-/CCIS_API/CCIS_API/ccis-217116-ec8cd863506c.json
-/CCIS_API/CCIS_API/wwwroot/Uploads
-CCIS_Client/app/js/secrets.js
+**/secrets.*
+**/ccis-217116-0d169b4a4e6d.p12
+**/ccis-217116-ec8cd863506c.json
+/NDAO_API/NDAO_API/wwwroot/Uploads
+
diff --git a/CCIS_Client/App/JS/Components/Pages/Home/NCCRD_Preview/ProjectCard.jsx b/CCIS_Client/App/JS/Components/Pages/Home/NCCRD_Preview/ProjectCard.jsx
diff --git a/CCIS_Client/App/JS/Components/Pages/Home/NDMC_Preview/EventCard.jsx b/CCIS_Client/App/JS/Components/Pages/Home/NDMC_Preview/EventCard.jsx
diff --git a/CCIS_Client/app/js/components/authentication/Login.jsx b/CCIS_Client/app/js/components/authentication/Login.jsx
diff --git a/CCIS_API/CCIS_API.sln → NDAO_API/NDAO_API.sln b/CCIS_API/CCIS_API.sln → NDAO_API/NDAO_API.sln
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CCIS_API", "CCIS_API\CCIS_API.csproj", "{6F903DDC-F4C9-4F28-A176-EF6D8269390A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NDAO_API", "NDAO_API\NDAO_API.csproj", "{8CF6C9B9-AE00-4082-8F2E-6CE71FA02751}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6F903DDC-F4C9-4F28-A176-EF6D8269390A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F903DDC-F4C9-4F28-A176-EF6D8269390A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F903DDC-F4C9-4F28-A176-EF6D8269390A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F903DDC-F4C9-4F28-A176-EF6D8269390A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CF6C9B9-AE00-4082-8F2E-6CE71FA02751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CF6C9B9-AE00-4082-8F2E-6CE71FA02751}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CF6C9B9-AE00-4082-8F2E-6CE71FA02751}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CF6C9B9-AE00-4082-8F2E-6CE71FA02751}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...API/CCIS_API/Classes/GoogleFileManager.cs → ...API/NDAO_API/Classes/GoogleFileManager.cs b/...API/CCIS_API/Classes/GoogleFileManager.cs → ...API/NDAO_API/Classes/GoogleFileManager.cs
@@ -1,7 +1,7 @@
-using CCIS_API.Database.Contexts;
-using CCIS_API.Extensions;
-using CCIS_API.Interfaces;
-using CCIS_API.ViewModels;
+using NDAO_API.Database.Contexts;
+using NDAO_API.Extensions;
+using NDAO_API.Interfaces;
+using NDAO_API.ViewModels;
 using Google.Apis.Auth.OAuth2;
 using Google.Apis.Drive.v3;
 using Google.Apis.Drive.v3.Data;
@@ -13,7 +13,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace CCIS_API.Classes
+namespace NDAO_API.Classes
 {
     public class GoogleFileManager : IFileManager
     {

diff --git a/..._API/CCIS_API/Classes/LocalFileManager.cs → ..._API/NDAO_API/Classes/LocalFileManager.cs b/..._API/CCIS_API/Classes/LocalFileManager.cs → ..._API/NDAO_API/Classes/LocalFileManager.cs
@@ -1,13 +1,13 @@
-using CCIS_API.Extensions;
-using CCIS_API.Interfaces;
-using CCIS_API.ViewModels;
+using NDAO_API.Extensions;
+using NDAO_API.Interfaces;
+using NDAO_API.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace CCIS_API.Classes
+namespace NDAO_API.Classes
 {
     public class LocalFileManager : IFileManager
     {

diff --git a/...I/CCIS_API/Controllers/AdHocController.cs → ...I/NDAO_API/Controllers/AdHocController.cs b/...I/CCIS_API/Controllers/AdHocController.cs → ...I/NDAO_API/Controllers/AdHocController.cs
@@ -4,17 +4,17 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using CCIS_API.Database.Contexts;
-using CCIS_API.Database.Models;
-using CCIS_API.ViewModels;
+using NDAO_API.Database.Contexts;
+using NDAO_API.Database.Models;
+using NDAO_API.ViewModels;
 using Microsoft.AspNet.OData;
 using Microsoft.AspNet.OData.Routing;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace CCIS_API.Controllers
+namespace NDAO_API.Controllers
 {
     [Produces("application/json")]
     [EnableCors("CORSPolicy")]

diff --git a/..._API/Controllers/FileManagerController.cs → ..._API/Controllers/FileManagerController.cs b/..._API/Controllers/FileManagerController.cs → ..._API/Controllers/FileManagerController.cs
@@ -3,10 +3,10 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using CCIS_API.Classes;
-using CCIS_API.Database.Contexts;
-using CCIS_API.Interfaces;
-using CCIS_API.ViewModels;
+using NDAO_API.Classes;
+using NDAO_API.Database.Contexts;
+using NDAO_API.Interfaces;
+using NDAO_API.ViewModels;
 using Google.Apis.Auth.OAuth2;
 using Google.Apis.Drive.v3;
 using Google.Apis.Drive.v3.Data;
@@ -20,7 +20,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 
-namespace CCIS_API.Controllers
+namespace NDAO_API.Controllers
 {
     [Produces("application/json")]
     [EnableCors("CORSPolicy")]