autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preprod setup

This commit is contained in:
Alexandre Bourlier 2018-05-16 08:08:38 +02:00
parent e329798014
commit 8d8bcb8097
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -14,7 +14,7 @@
<?php
// Prod/Dev setup
if ($dn == 'http://app.happy-dev.fr') {
if (in_array($dn, array('https://app.happy-dev.fr', 'https://staging-app.happy-dev.fr'))) {
require_once("src/html/dependencies-prod.php");
} else {
require_once("src/html/dependencies-dev.php");

11
preprod.sh Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
export DN="https://staging-app.happy-dev.fr"
export SDN="https://staging-hd-app-server.happy-dev.fr"
php index.php > 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/

1
deploy.sh → prod.sh
View File

@ -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/

2
src/html/dependencies-prod.php
View File

@ -10,7 +10,7 @@
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
<script src="https://cdn.bootcss.com/cropper/4.0.0/cropper.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.2.0/webcomponents-loader.js" integrity="sha256-fUVqCtpScUF69qkFkeuHmcShr2N2UleRQJhRG4etHds=" crossorigin="anonymous"></script>
<script type="text/javascript" src="<?php echo $dn; ?>/dist/js/hd-app.js?v=<?php echo $v ?>"></script>
<script type="text/javascript" src="<?php echo $dn; ?>/src/js/hd-app.js?v=<?php echo $v ?>"></script>
<!-- Web components -->
<link rel="import" href="https://cdn.happy-dev.fr/ldp-display/ldp-display.html?v=<?php echo $v ?>" />

8
src/server/models.py
View File

@ -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):