From 5ca4234dcfc974825d497e605ee2801aba71c42e Mon Sep 17 00:00:00 2001 From: jfucci Date: Wed, 7 Oct 2015 21:09:56 -0400 Subject: [PATCH 1/4] Multiple repository support --- client/app/projects/profile/profile.html | 8 ++- client/app/projects/profile/profile.scss | 6 ++- client/app/projects/projects.controller.js | 17 +++++-- client/app/projects/projects.html | 59 +++++++++++++--------- client/app/projects/projects.scss | 39 +++++++++++--- server/api/project/project.model.js | 2 +- 6 files changed, 91 insertions(+), 40 deletions(-) diff --git a/client/app/projects/profile/profile.html b/client/app/projects/profile/profile.html index d8f12909..b3419699 100644 --- a/client/app/projects/profile/profile.html +++ b/client/app/projects/profile/profile.html @@ -16,7 +16,13 @@

{{project.name}}

Join Project
Leave Project
Website - Repository + Repository +
+
+ Repositories + {{$index+1}} +
+
Blog diff --git a/client/app/projects/profile/profile.scss b/client/app/projects/profile/profile.scss index 1ee1a16b..7f7cbbbe 100644 --- a/client/app/projects/profile/profile.scss +++ b/client/app/projects/profile/profile.scss @@ -148,4 +148,8 @@ desc textarea{ #nameDiv { margin-top: 30px -} \ No newline at end of file +} + +#repos { + display: block; +} diff --git a/client/app/projects/projects.controller.js b/client/app/projects/projects.controller.js index 1d709304..7e973d3b 100644 --- a/client/app/projects/projects.controller.js +++ b/client/app/projects/projects.controller.js @@ -3,7 +3,7 @@ angular.module('observatory3App') .controller('ProjectsCtrl', function ($scope, $location, $http) { $scope.projects = []; - $scope.projectToAdd = {active: true}; + $scope.projectToAdd = {active: true, repositories: [""]}; $scope.getCurrentProjects = function() { $http.get('/api/projects').success(function(projects) { @@ -20,10 +20,8 @@ angular.module('observatory3App') }; $scope.getInfo = function() { - if($scope.projectToAdd.repositoryUrl) { - var splitUrl = $scope.projectToAdd.repositoryUrl.split('/'); - $scope.projectToAdd.githubUsername = splitUrl[splitUrl.length - 2]; - $scope.projectToAdd.githubProjectName = $scope.projectToAdd.name = splitUrl[splitUrl.length - 1]; + if($scope.projectToAdd.githubUsername && $scope.projectToAdd.githubProjectName) { + $scope.projectToAdd.name = $scope.projectToAdd.githubProjectName; $.getJSON('https://api.github.com/repos/' + $scope.projectToAdd.githubUsername + '/' + $scope.projectToAdd.githubProjectName, function(response) { $scope.projectToAdd.websiteURL = response.homepage; $scope.projectToAdd.description = response.description; @@ -32,11 +30,20 @@ angular.module('observatory3App') } }; + $scope.addRepository = function() { + $scope.projectToAdd.repositories[$scope.projectToAdd.repositories.length] = ""; + } + + $scope.removeRepository = function(index) { + $scope.projectToAdd.repositories.splice(index, 1); + } + $scope.submit = function(form) { $scope.submitted = true; if(form.$valid) { $scope.submitted = false; + $scope.projectToAdd.repositories[0] = "https://github.com/" + $scope.projectToAdd.githubUsername + "/" + $scope.projectToAdd.githubProjectName; $('#addProject').modal('hide'); // use setTimeout because hiding the modal takes longer than the post request // and results in the modal disappearing but the overlay staying if not used diff --git a/client/app/projects/projects.html b/client/app/projects/projects.html index 45fd47cb..50df074d 100644 --- a/client/app/projects/projects.html +++ b/client/app/projects/projects.html @@ -26,13 +26,32 @@

{{ past ? "Past" : "Current" }} RCOS Projects

- -
- - -
-
+ +
+
https://github.com/
+
+ + +

+ The project owner's github username is required +

+
+ +
/
+
+ + +

+ The project's github name is required +

+
+ +
+ +
@@ -57,24 +76,14 @@

-
- - - -

- The project owner's github username is required -

-
- -
- +
+ + - -

- The project's github name is required -

+
+ + +
Add a Project
- +
@@ -108,7 +117,7 @@

  • Website
  • Blog
    • -
  • Repository
    • +
  • Repository
    • diff --git a/client/app/projects/projects.scss b/client/app/projects/projects.scss index ccae7699..2ce4fc7b 100644 --- a/client/app/projects/projects.scss +++ b/client/app/projects/projects.scss @@ -121,15 +121,13 @@ h2 { color: black; } -#repositoryUrl { - width: 78%; - display: inline; - margin-bottom: 15px; +#getInfo { + margin-bottom: 10px; + border-bottom: 1px solid #E5E5E5; } -#getInfo { - width: 20%; - float: right; +#getInfo .btn { + margin-bottom: 15px; } #active { @@ -139,3 +137,30 @@ h2 { margin-left: 10px; margin-top: -7px; } + +.repo { + width: 93%; + float: left; + padding-bottom: 10px; + margin-bottom: 10px; +} + +.repoButton { + float: right; + width: 6%; +} + +#githubUsername { + float: left; + width: 150px; +} + +#githubProjectName { + float: left; + width: 200px; +} + +.url { + float: left; + margin: 7px; +} diff --git a/server/api/project/project.model.js b/server/api/project/project.model.js index 90b2ebad..13df1772 100644 --- a/server/api/project/project.model.js +++ b/server/api/project/project.model.js @@ -8,7 +8,7 @@ var ProjectSchema = new Schema({ description: String, // Where is the project hosted? Github, Google Code, etc. repositoryType: {type: String, default: 'github'}, - repositoryUrl: String, + repositories: [String], websiteUrl: String, githubUsername: {type: String, index: true}, githubProjectName: {type: String, index: true}, From 477e4470dd4e7a5955c3a6461a3818c4944dcaff Mon Sep 17 00:00:00 2001 From: jfucci Date: Thu, 8 Oct 2015 18:43:06 -0400 Subject: [PATCH 2/4] fixed github url styling on project add modal --- client/app/projects/projects.html | 27 +++++++++++++++++---------- client/app/projects/projects.scss | 14 ++------------ 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/client/app/projects/projects.html b/client/app/projects/projects.html index 50df074d..3bcb4401 100644 --- a/client/app/projects/projects.html +++ b/client/app/projects/projects.html @@ -28,22 +28,29 @@
    -
    -
    https://github.com/
    -
    +
    + https://github.com/ + +
    + +
    + / - +
    + +
    +
    + +

    The project owner's github username is required

    - -
    /
    -
    - -

    The project's github name is required

    diff --git a/client/app/projects/projects.scss b/client/app/projects/projects.scss index 2ce4fc7b..e2420011 100644 --- a/client/app/projects/projects.scss +++ b/client/app/projects/projects.scss @@ -150,17 +150,7 @@ h2 { width: 6%; } -#githubUsername { - float: left; - width: 150px; -} - #githubProjectName { - float: left; - width: 200px; -} - -.url { - float: left; - margin: 7px; + border-bottom-right-radius: 4px; + border-top-right-radius: 4px; } From df2f7f232d6d403dd670b4ce55392068747c0c7c Mon Sep 17 00:00:00 2001 From: jfucci Date: Tue, 13 Oct 2015 14:58:41 -0400 Subject: [PATCH 3/4] Fixed repositories button to be a dropdown --- client/app/projects/profile/profile.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/client/app/projects/profile/profile.html b/client/app/projects/profile/profile.html index b3419699..66cf017c 100644 --- a/client/app/projects/profile/profile.html +++ b/client/app/projects/profile/profile.html @@ -16,12 +16,14 @@

    {{project.name}}

    Join Project
    Leave Project
    Website - Repository -
    -
    - Repositories - {{$index+1}} -
    + Repository +
    + +
    Blog From 36dd2ae0b83c9afe1c5d4aecd8b60e6bdc54a573 Mon Sep 17 00:00:00 2001 From: jfucci Date: Tue, 20 Oct 2015 22:23:44 -0400 Subject: [PATCH 4/4] Added database migration script. --- scripts/migrateRepositoryUrlToRepositories.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 scripts/migrateRepositoryUrlToRepositories.js diff --git a/scripts/migrateRepositoryUrlToRepositories.js b/scripts/migrateRepositoryUrlToRepositories.js new file mode 100644 index 00000000..3786d51a --- /dev/null +++ b/scripts/migrateRepositoryUrlToRepositories.js @@ -0,0 +1,16 @@ +// This file is to help migrate the old database which had projects with a single +// "repositoryUrl" property to a new database in which projects have a "repositories" array +// holding the old repositoryUrl as the first repository and having the ability to add more + +var projectsWithRepoUrl = db.projects.find({ "repositoryUrl": { $exists: true } }); + +while(projectsWithRepoUrl.hasNext()) { + db.projects.update( + { "repositoryUrl": { $exists: true } }, + { + $set: { repositories: [ projectsWithRepoUrl.next().repositoryUrl ] }, + $unset: { repositoryUrl: 1 } + } + ); +} +