diff --git a/index.php b/index.php index 17b7881..532321d 100644 --- a/index.php +++ b/index.php @@ -14,7 +14,7 @@ index.html +grunt +ssh hd-app@ssh-hd-app.alwaysdata.net "rm -R staging-hd-app; mkdir staging-hd-app; cd staging-hd-app; mkdir -p src/fonts; mkdir -p dist/css;" +scp index.html hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/ +scp .htaccess hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/ +scp -r dist/css/ hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/dist/ +scp -r src/fonts/ hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/src/ +scp -r src/js/ hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/src/ diff --git a/deploy.sh b/prod.sh similarity index 88% rename from deploy.sh rename to prod.sh index 7df7225..42dd04b 100755 --- a/deploy.sh +++ b/prod.sh @@ -8,3 +8,4 @@ scp index.html hd-app@ssh-hd-app.alwaysdata.net:~/hd-app/ scp .htaccess hd-app@ssh-hd-app.alwaysdata.net:~/hd-app/ scp -r dist/css/ hd-app@ssh-hd-app.alwaysdata.net:~/hd-app/dist/ scp -r src/fonts/ hd-app@ssh-hd-app.alwaysdata.net:~/hd-app/src/ +scp -r src/js/ hd-app@ssh-hd-app.alwaysdata.net:~/hd-app/src/ diff --git a/src/html/dependencies-prod.php b/src/html/dependencies-prod.php index f21882e..762f4bb 100644 --- a/src/html/dependencies-prod.php +++ b/src/html/dependencies-prod.php @@ -10,7 +10,7 @@ - + diff --git a/src/server/models.py b/src/server/models.py index 2988ef3..0d9362e 100644 --- a/src/server/models.py +++ b/src/server/models.py @@ -8,8 +8,8 @@ class Member(models.Model): email = models.CharField(max_length=255, default='') number = models.CharField(max_length=255, default='') cell = models.ForeignKey("Cell") - skills = models.ManyToManyField("Skill") - projects = models.ManyToManyField("Project") + skills = models.ManyToManyField("Skill", blank=True) + projects = models.ManyToManyField("Project", blank=True) def __str__(self): return self.firstname +' '+ self.lastname @@ -26,7 +26,7 @@ class Project(models.Model): name = models.CharField(max_length=255, default='') number = models.PositiveIntegerField(default='0') client = models.OneToOneField("Client") - team = models.ManyToManyField("Member") + team = models.ManyToManyField("Member", blank=True) def __str__(self): return self.name @@ -53,7 +53,7 @@ class Cell(models.Model): class Channel(models.Model): name = models.CharField(max_length=255, default='') description = models.CharField(max_length=255, default='') - members = models.ManyToManyField("Member") + members = models.ManyToManyField("Member", blank=True) owner = models.ForeignKey("Member", related_name="owned_chatrooms") def __str__(self):