From 1d47142eeea024fb3a131cd451e80ce3cec5f6fe Mon Sep 17 00:00:00 2001
From: peter_rabbit <pierrejarriges@gmail.com>
Date: Thu, 21 Jan 2021 17:59:30 +0100
Subject: [PATCH] fix:hopefully cors proof conf
---
Makefile | 2 +-
config.js | 14 +-----------
public/education/education.js | 14 +-----------
public/games/games.js | 22 +++----------------
public/main.js | 22 +++----------------
.../software-development.js | 14 +-----------
src/lib/fetch.js | 8 ++-----
7 files changed, 12 insertions(+), 84 deletions(-)
diff --git a/Makefile b/Makefile
index 59e95cb..bb39584 100644
--- a/Makefile
+++ b/Makefile
@@ -21,4 +21,4 @@ open:
firefox http://localhost/
push:
- git add public/ src/ && git commit -m "$(msg)" && git push origin HEAD
\ No newline at end of file
+ git add . && git commit -m "$(msg)" && git push origin HEAD
\ No newline at end of file
diff --git a/config.js b/config.js
index 2f677c6..9f0a7d9 100644
--- a/config.js
+++ b/config.js
@@ -1,13 +1 @@
-const ENV = "prod";
-
-let server_url;
-
-switch (ENV) {
- case "dev":
- server_url = "http://localhost";
- break;
- case "prod":
- server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
diff --git a/public/education/education.js b/public/education/education.js
index 7000373..138b287 100644
--- a/public/education/education.js
+++ b/public/education/education.js
@@ -1,17 +1,5 @@
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
- case "dev":
- server_url = "http://localhost";
- break;
- case "prod":
- server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
},{}],2:[function(require,module,exports){
const { server_url } = require("./config");
diff --git a/public/games/games.js b/public/games/games.js
index d919a2a..fb275c8 100644
--- a/public/games/games.js
+++ b/public/games/games.js
@@ -1,17 +1,5 @@
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
- case "dev":
- server_url = "http://localhost";
- break;
- case "prod":
- server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
},{}],2:[function(require,module,exports){
const { server_url } = require("./config");
@@ -166,9 +154,7 @@ module.exports = {
function fetchjson(url) {
return new Promise((resolve, reject) => {
- const headers = new Headers();
- headers.append("Accept", "application/json");
- fetch(url, { mode: "no-cors", headers })
+ fetch(url)
.then(r => r.json())
.then(r => resolve(r))
.catch(e => reject(e));
@@ -176,10 +162,8 @@ function fetchjson(url) {
}
function fetchtext(url) {
- const headers = new Headers();
- headers.append("Accept", "text/html");
return new Promise((resolve, reject) => {
- fetch(url, { mode: "no-cors", headers })
+ fetch(url)
.then(r => r.text())
.then(r => resolve(r))
.catch(e => reject(e));
diff --git a/public/main.js b/public/main.js
index 4db5922..29a2642 100644
--- a/public/main.js
+++ b/public/main.js
@@ -1,17 +1,5 @@
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
- case "dev":
- server_url = "http://localhost";
- break;
- case "prod":
- server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
},{}],2:[function(require,module,exports){
const { server_url } = require("./config");
@@ -435,9 +423,7 @@ module.exports = {
function fetchjson(url) {
return new Promise((resolve, reject) => {
- const headers = new Headers();
- headers.append("Accept", "application/json");
- fetch(url, { mode: "no-cors", headers })
+ fetch(url)
.then(r => r.json())
.then(r => resolve(r))
.catch(e => reject(e));
@@ -445,10 +431,8 @@ function fetchjson(url) {
}
function fetchtext(url) {
- const headers = new Headers();
- headers.append("Accept", "text/html");
return new Promise((resolve, reject) => {
- fetch(url, { mode: "no-cors", headers })
+ fetch(url)
.then(r => r.text())
.then(r => resolve(r))
.catch(e => reject(e));
diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js
index 277576e..642120b 100644
--- a/public/software-development/software-development.js
+++ b/public/software-development/software-development.js
@@ -1,17 +1,5 @@
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
- case "dev":
- server_url = "http://localhost";
- break;
- case "prod":
- server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
},{}],2:[function(require,module,exports){
const { server_url } = require("./config");
diff --git a/src/lib/fetch.js b/src/lib/fetch.js
index 4ad85bd..b734de1 100644
--- a/src/lib/fetch.js
+++ b/src/lib/fetch.js
@@ -2,9 +2,7 @@
function fetchjson(url) {
return new Promise((resolve, reject) => {
- const headers = new Headers();
- headers.append("Accept", "application/json");
- fetch(url, { mode: "no-cors", headers })
+ fetch(url)
.then(r => r.json())
.then(r => resolve(r))
.catch(e => reject(e));
@@ -12,10 +10,8 @@ function fetchjson(url) {
}
function fetchtext(url) {
- const headers = new Headers();
- headers.append("Accept", "text/html");
return new Promise((resolve, reject) => {
- fetch(url, { mode: "no-cors", headers })
+ fetch(url)
.then(r => r.text())
.then(r => resolve(r))
.catch(e => reject(e));
--
GitLab