From a4db9cbe72b6563b83ce9908ae973c545d91a579 Mon Sep 17 00:00:00 2001
From: peter_rabbit <pierrejarriges@gmail.com>
Date: Mon, 18 Jan 2021 09:23:41 +0100
Subject: [PATCH] docker port 80
---
Makefile | 4 ++--
config.js | 2 +-
public/education/education.js | 4 ++--
public/games/games.js | 4 ++--
public/main.js | 4 ++--
public/software-development/software-development.js | 4 ++--
src/pages/education/education.scss | 4 ++--
src/style.scss | 1 +
src/template/components/navbar.js | 2 +-
style/style.css | 5 +++--
style/style.css.map | 2 +-
11 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
index 327de4a..45327c2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ build:
docker build -t kuadradoimg .
run:
- docker run -p 9000:80 \
+ docker run -p 80:80 \
-it \
--name kuadrado \
--mount type=bind,source="$(shell pwd)",target=/usr/share/nginx/html \
@@ -24,4 +24,4 @@ stylesheet:
docker exec -it kuadrado bash -c "npm run style"
open:
- firefox http://localhost:9000/public/
+ firefox http://localhost/public/
diff --git a/config.js b/config.js
index 34250bf..8c0ef58 100644
--- a/config.js
+++ b/config.js
@@ -4,7 +4,7 @@ let server_url;
switch (ENV) {
case "dev":
- server_url = "http://localhost:9000";
+ server_url = "http://localhost";
break;
case "prod":
server_url = "http://your_production_server_url:port";
diff --git a/public/education/education.js b/public/education/education.js
index 67312bc..cc605ac 100644
--- a/public/education/education.js
+++ b/public/education/education.js
@@ -5,7 +5,7 @@ let server_url;
switch (ENV) {
case "dev":
- server_url = "http://localhost:9000";
+ server_url = "http://localhost";
break;
case "prod":
server_url = "http://your_production_server_url:port";
@@ -645,7 +645,7 @@ const NAV_MENU_ITEMS = [
[
// submenu
["/public/education/#game-studio-club", "Game Studio Club"],
- ["/public/education/#popularization", "Animations vulgarisation"],
+ ["/public/education/#popularization", "Vulgarisation numérique"],
],
],
];
diff --git a/public/games/games.js b/public/games/games.js
index 3ffa751..5ce4965 100644
--- a/public/games/games.js
+++ b/public/games/games.js
@@ -5,7 +5,7 @@ let server_url;
switch (ENV) {
case "dev":
- server_url = "http://localhost:9000";
+ server_url = "http://localhost";
break;
case "prod":
server_url = "http://your_production_server_url:port";
@@ -164,7 +164,7 @@ const NAV_MENU_ITEMS = [
[
// submenu
["/public/education/#game-studio-club", "Game Studio Club"],
- ["/public/education/#popularization", "Animations vulgarisation"],
+ ["/public/education/#popularization", "Vulgarisation numérique"],
],
],
];
diff --git a/public/main.js b/public/main.js
index a166562..d3fe138 100644
--- a/public/main.js
+++ b/public/main.js
@@ -5,7 +5,7 @@ let server_url;
switch (ENV) {
case "dev":
- server_url = "http://localhost:9000";
+ server_url = "http://localhost";
break;
case "prod":
server_url = "http://your_production_server_url:port";
@@ -164,7 +164,7 @@ const NAV_MENU_ITEMS = [
[
// submenu
["/public/education/#game-studio-club", "Game Studio Club"],
- ["/public/education/#popularization", "Animations vulgarisation"],
+ ["/public/education/#popularization", "Vulgarisation numérique"],
],
],
];
diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js
index 8348e6d..f623e34 100644
--- a/public/software-development/software-development.js
+++ b/public/software-development/software-development.js
@@ -5,7 +5,7 @@ let server_url;
switch (ENV) {
case "dev":
- server_url = "http://localhost:9000";
+ server_url = "http://localhost";
break;
case "prod":
server_url = "http://your_production_server_url:port";
@@ -164,7 +164,7 @@ const NAV_MENU_ITEMS = [
[
// submenu
["/public/education/#game-studio-club", "Game Studio Club"],
- ["/public/education/#popularization", "Animations vulgarisation"],
+ ["/public/education/#popularization", "Vulgarisation numérique"],
],
],
];
diff --git a/src/pages/education/education.scss b/src/pages/education/education.scss
index 9584fbf..f72d505 100644
--- a/src/pages/education/education.scss
+++ b/src/pages/education/education.scss
@@ -92,8 +92,8 @@
.details {
background-color: #fffe;
position: absolute;
- top: 40px;
- left: 40px;
+ top: 25px;
+ left: 25px;
width: 300px;
height: auto;
max-height: 0;
diff --git a/src/style.scss b/src/style.scss
index b3679d0..a990823 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -37,6 +37,7 @@ main {
display: flex;
align-items: center;
height: $navbar_height;
+ background-color: #fffb;
.home {
margin: 0 10px;
img {
diff --git a/src/template/components/navbar.js b/src/template/components/navbar.js
index 0ee8bdf..d32ebdb 100644
--- a/src/template/components/navbar.js
+++ b/src/template/components/navbar.js
@@ -12,7 +12,7 @@ const NAV_MENU_ITEMS = [
[
// submenu
["/public/education/#game-studio-club", "Game Studio Club"],
- ["/public/education/#popularization", "Animations vulgarisation"],
+ ["/public/education/#popularization", "Vulgarisation numérique"],
],
],
];
diff --git a/style/style.css b/style/style.css
index 4231ecc..d037bbe 100644
--- a/style/style.css
+++ b/style/style.css
@@ -36,6 +36,7 @@ main header nav {
display: flex;
align-items: center;
height: 40px;
+ background-color: #fffb;
}
main header nav .home {
margin: 0 10px;
@@ -248,8 +249,8 @@ main #page-container #education-page .section-contents ul.learning-themes li.lea
main #page-container #education-page .section-contents ul.learning-themes li.learning-theme .details {
background-color: #fffe;
position: absolute;
- top: 40px;
- left: 40px;
+ top: 25px;
+ left: 25px;
width: 300px;
height: auto;
max-height: 0;
diff --git a/style/style.css.map b/style/style.css.map
index 9733d70..8b7c7d0 100644
--- a/style/style.css.map
+++ b/style/style.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../src/style.scss","../src/theme.scss","../src/pages/education/education.scss"],"names":[],"mappings":"AAEA;EAKI;EACA;;AALA;EACI;EACA,OCLC;;ADSL;EACI;EACA;EACA;;AAEJ;EACI,OCJC;EDKD;;AACA;EACI,OCNH;;ADUL;EACI,OCZC;;;ADgBT;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA,QCXI;;ADYJ;EACI;;AACA;EACI;;AAGR;EACI;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA;EACA;EACA,OCrDd;EDsDc;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACI,OC5EnB;ED6EmB;;AAIJ;EACI,OClFnB;;ADqFe;EACI;EACA;;AACA;EACI,OCtFtB;EDuFsB;;AAII;EACI,OC/F/B;;ADuGG;EACI;;AAEJ;EAxEJ;IAyEQ;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,OCvHX;IDwHW;;EAEJ;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA,KCzGR;ID0GQ;IACA;IACA;;EAGQ;IACI;;EAGR;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAQA;;EANI;IACI;IACA;IACA,OCvJ9B;;;ADkKN;EACI;EACA;EACA;EACA;;AEzKJ;EACI;EACA;;AAGA;EACI;;AAGR;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EAOA;EACA;EACA;;AARA;EACI;;AAEJ;EACI;;AAKJ;EACI;EACA;EACA;EACA;;AAGR;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA,kBDjDF;ECkDE;;AACA;EACI;EACA;EACA;EACA;;AACA;EACI;;AAEJ;AAAA;EAEI;;AAIZ;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;EACA;EACA;EACA;;AACA;EACI,ODhFX;ECiFW;EACA;EACA;EACA;;AAEJ;EACI;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;;AAIJ;EACI;EACA;;AAMhB;EACI;EACA;EACA,kBD/HF;ECgIE;;AACA;AAAA;EAEI;EACA;EACA;EACA;;AACA;AAAA;EACI;;AAGA;AAAA;EACI;EACA;;AACA;AAAA;EACI;EACA;;AAOxB;EAEQ;IACI;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;;EACA;IACI,ODhLvB;;;ACyLL;EACI;IACI;IACA;;EAGA;IACI;;EAGR;IACI;IACA;;EAEJ;IACI;IACA;;EACA;IACI;IACA;IACA;;EAGR;IACI;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;IACA;;EAEJ;IACI;IACA;IACA;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEI;IACI,OD9OvB;;ECqPG;IACI;IACA;IACA;IACA;;EACA;AAAA;IAEI;IACA;IACA;IACA;;EAEI;AAAA;IACI;;EACA;AAAA;IACI;IACA;;;AF1F5B;EACI;EACA;EACA","file":"style.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../src/style.scss","../src/theme.scss","../src/pages/education/education.scss"],"names":[],"mappings":"AAEA;EAKI;EACA;;AALA;EACI;EACA,OCLC;;ADSL;EACI;EACA;EACA;;AAEJ;EACI,OCJC;EDKD;;AACA;EACI,OCNH;;ADUL;EACI,OCZC;;;ADgBT;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA,QCXI;EDYJ;;AACA;EACI;;AACA;EACI;;AAGR;EACI;EACA;EACA;EACA;;AACA;EACI;;AACA;EACI;EACA;EACA;EACA;EACA,OCtDd;EDuDc;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACI,OC7EnB;ED8EmB;;AAIJ;EACI,OCnFnB;;ADsFe;EACI;EACA;;AACA;EACI,OCvFtB;EDwFsB;;AAII;EACI,OChG/B;;ADwGG;EACI;;AAEJ;EAzEJ;IA0EQ;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA,OCxHX;IDyHW;;EAEJ;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA,KC1GR;ID2GQ;IACA;IACA;;EAGQ;IACI;;EAGR;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAQA;;EANI;IACI;IACA;IACA,OCxJ9B;;;ADmKN;EACI;EACA;EACA;EACA;;AE1KJ;EACI;EACA;;AAGA;EACI;;AAGR;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EAOA;EACA;EACA;;AARA;EACI;;AAEJ;EACI;;AAKJ;EACI;EACA;EACA;EACA;;AAGR;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA,kBDjDF;ECkDE;;AACA;EACI;EACA;EACA;EACA;;AACA;EACI;;AAEJ;AAAA;EAEI;;AAIZ;EACI;EACA;EACA;EACA;EACA;;AACA;EACI;EACA;EACA;EACA;EACA;;AACA;EACI,ODhFX;ECiFW;EACA;EACA;EACA;;AAEJ;EACI;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;EACA;;AAIJ;EACI;EACA;;AAMhB;EACI;EACA;EACA,kBD/HF;ECgIE;;AACA;AAAA;EAEI;EACA;EACA;EACA;;AACA;AAAA;EACI;;AAGA;AAAA;EACI;EACA;;AACA;AAAA;EACI;EACA;;AAOxB;EAEQ;IACI;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;;EACA;IACI,ODhLvB;;;ACyLL;EACI;IACI;IACA;;EAGA;IACI;;EAGR;IACI;IACA;;EAEJ;IACI;IACA;;EACA;IACI;IACA;IACA;;EAGR;IACI;IACA;;EACA;IACI;;EAEJ;IACI;IACA;IACA;IACA;;EAEJ;IACI;IACA;IACA;;EACA;IACI;;EACA;IACI;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEI;IACI,OD9OvB;;ECqPG;IACI;IACA;IACA;IACA;;EACA;AAAA;IAEI;IACA;IACA;IACA;;EAEI;AAAA;IACI;;EACA;AAAA;IACI;IACA;;;AFzF5B;EACI;EACA;EACA","file":"style.css"}
\ No newline at end of file
--
GitLab