Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Orbit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Applications
Orbit
Commits
8d8bcb80
Commit
8d8bcb80
authored
6 years ago
by
Alexandre Bourlier
Browse files
Options
Downloads
Patches
Plain Diff
Preprod setup
parent
e3297980
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
index.php
+1
-1
1 addition, 1 deletion
index.php
preprod.sh
+11
-0
11 additions, 0 deletions
preprod.sh
prod.sh
+1
-0
1 addition, 0 deletions
prod.sh
src/html/dependencies-prod.php
+1
-1
1 addition, 1 deletion
src/html/dependencies-prod.php
src/server/models.py
+4
-4
4 additions, 4 deletions
src/server/models.py
with
18 additions
and
6 deletions
index.php
+
1
−
1
View file @
8d8bcb80
...
@@ -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'
,
'http
s
://
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"
);
...
...
This diff is collapsed.
Click to expand it.
preprod.sh
0 → 100755
+
11
−
0
View file @
8d8bcb80
#!/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/
This diff is collapsed.
Click to expand it.
deploy
.sh
→
prod
.sh
+
1
−
0
View file @
8d8bcb80
...
@@ -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/
This diff is collapsed.
Click to expand it.
src/html/dependencies-prod.php
+
1
−
1
View file @
8d8bcb80
...
@@ -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
?>
"
/>
...
...
This diff is collapsed.
Click to expand it.
src/server/models.py
+
4
−
4
View file @
8d8bcb80
...
@@ -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
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment