Skip to content
Snippets Groups Projects
Commit 8d8bcb80 authored by Alexandre Bourlier's avatar Alexandre Bourlier
Browse files

Preprod setup

parent e3297980
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<?php <?php
// Prod/Dev setup // 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"); require_once("src/html/dependencies-prod.php");
} else { } else {
require_once("src/html/dependencies-dev.php"); require_once("src/html/dependencies-dev.php");
......
#!/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/
...@@ -8,3 +8,4 @@ scp index.html hd-app@ssh-hd-app.alwaysdata.net:~/hd-app/ ...@@ -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 .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 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/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/
...@@ -10,7 +10,7 @@ ...@@ -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://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://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 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 --> <!-- Web components -->
<link rel="import" href="https://cdn.happy-dev.fr/ldp-display/ldp-display.html?v=<?php echo $v ?>" /> <link rel="import" href="https://cdn.happy-dev.fr/ldp-display/ldp-display.html?v=<?php echo $v ?>" />
......
...@@ -8,8 +8,8 @@ class Member(models.Model): ...@@ -8,8 +8,8 @@ class Member(models.Model):
email = models.CharField(max_length=255, default='') email = models.CharField(max_length=255, default='')
number = models.CharField(max_length=255, default='') number = models.CharField(max_length=255, default='')
cell = models.ForeignKey("Cell") cell = models.ForeignKey("Cell")
skills = models.ManyToManyField("Skill") skills = models.ManyToManyField("Skill", blank=True)
projects = models.ManyToManyField("Project") projects = models.ManyToManyField("Project", blank=True)
def __str__(self): def __str__(self):
return self.firstname +' '+ self.lastname return self.firstname +' '+ self.lastname
...@@ -26,7 +26,7 @@ class Project(models.Model): ...@@ -26,7 +26,7 @@ class Project(models.Model):
name = models.CharField(max_length=255, default='') name = models.CharField(max_length=255, default='')
number = models.PositiveIntegerField(default='0') number = models.PositiveIntegerField(default='0')
client = models.OneToOneField("Client") client = models.OneToOneField("Client")
team = models.ManyToManyField("Member") team = models.ManyToManyField("Member", blank=True)
def __str__(self): def __str__(self):
return self.name return self.name
...@@ -53,7 +53,7 @@ class Cell(models.Model): ...@@ -53,7 +53,7 @@ class Cell(models.Model):
class Channel(models.Model): class Channel(models.Model):
name = models.CharField(max_length=255, default='') name = models.CharField(max_length=255, default='')
description = 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") owner = models.ForeignKey("Member", related_name="owned_chatrooms")
def __str__(self): def __str__(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment