From f7a2e027928d8bf603e4e6ae2a047898047795ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Tue, 10 Oct 2017 17:35:46 +0200
Subject: [PATCH] cleanup things a bit

---
 .gitignore        |  1 +
 beer.js           | 15 ++++++++-------
 config.js.example | 17 +++++++++++++++++
 flags.js          | 33 +++++++++++++++++++++++++++++++++
 index.html        |  8 +++++---
 5 files changed, 64 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 config.js.example
 create mode 100644 flags.js

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1bf4259
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+config.js
diff --git a/beer.js b/beer.js
index 9ae4fe2..bf0c5df 100644
--- a/beer.js
+++ b/beer.js
@@ -1,9 +1,9 @@
-var flags = { "Belgium": "🇧🇪", "Germany": "🇩🇪" };
-var baseURL = "http://beer-catalog.staging.app.itix.fr/rest/Beer%20Catalog%20API/0.9"
-
-function initBeerUI(baseURL, headers) {
+define(function(require, exports, module) {
+module.exports = function () {
+  var flags = require("flags.js");
+  var config = require("config.js");
   $.ajax({
-    "url": baseURL + "/beer?page=0",
+    "url": config.baseURL + "/beer?page=0" + (config.extraQueryStringSuffix != null ? "&" + config.extraQueryStringSuffix : ""),
     "success": function (data, status, xhr) {
       try {
         var count = data.length;
@@ -24,6 +24,7 @@ function initBeerUI(baseURL, headers) {
         console.log(e);
       }
     },
-    "headers": headers
+    "headers": config.additionalHeaders != null ? config.additionalHeaders : {}
   });
-}
+};
+});
diff --git a/config.js.example b/config.js.example
new file mode 100644
index 0000000..b8a9aec
--- /dev/null
+++ b/config.js.example
@@ -0,0 +1,17 @@
+/*
+ * Sample config file for the Beer UI
+ *
+ * Usage: edit this file and save it as "config.js"
+ */
+define(function(require, exports, module) {
+  module.exports = {
+    // The base URL of the Beer API
+    baseURL: "http://microcks/rest/Beer%20Catalog%20API/0.9",
+
+    // If a user-key is required, you can pass it as HTTP Header:
+    additionalHeaders: { "user-key": "<YOUR USER KEY HERE>" },
+
+    // Or in the Query String
+    extraQueryStringSuffix: "user_key=<YOUR USER KEY HERE>"
+  };
+});
diff --git a/flags.js b/flags.js
new file mode 100644
index 0000000..063b0a2
--- /dev/null
+++ b/flags.js
@@ -0,0 +1,33 @@
+define(function(require, exports, module) {
+  module.exports = {
+    "Austria": "🇦🇹",
+    "Belgium": "🇧🇪",
+    "Bulgaria": "🇧🇬",
+    "Croatia": "🇭🇷",
+    "Cyprus": "🇨🇾",
+    "The Czech Republic": "🇨🇿",
+    "Denmark": "🇩🇰",
+    "Estonia": "🇪🇪",
+    "Finland": "🇫🇮",
+    "France": "🇫🇷",
+    "Germany": "🇩🇪",
+    "Gibraltar": "🇬🇮",
+    "Greece": "🇬🇷",
+    "Hungary": "🇭🇺",
+    "Ireland": "🇮🇪",
+    "Italy": "🇮🇹",
+    "Latvia": "🇱🇻",
+    "Lithuania": "🇱🇹",
+    "Luxembourg": "🇱🇺",
+    "Malta": "🇲🇹",
+    "The Netherlands": "🇳🇱",
+    "Poland": "🇵🇱",
+    "Portugal": "🇵🇹",
+    "România": "🇷🇴",
+    "Slovakia": "🇸🇰",
+    "Slovenia": "🇸🇮",
+    "Spain": "🇪🇸",
+    "Sweden": "🇸🇪",
+    "United Kingdom": "🇬🇧"
+  };
+});
diff --git a/index.html b/index.html
index 4db243e..83be6e0 100644
--- a/index.html
+++ b/index.html
@@ -4,10 +4,12 @@
     <meta charset="UTF-8">
     <title>Beer Catalog</title>
     <script type='text/javascript' src='https://code.jquery.com/jquery-3.1.1.js'></script>
-    <script type='text/javascript' src='beer.js'></script>
+    <script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.js'></script>
     <script type='text/javascript'>
-    $(document).ready(function() {
-      initBeerUI("http://microcks/rest/Beer%20Catalog%20API/0.9", { "user-key": "<YOUR USER KEY HERE>" });
+    require(['beer'], function (initBeerUI) {
+      $(document).ready(function() {
+        initBeerUI();
+      });
     });
     </script>
     <link rel="stylesheet" type="text/css" href="beer.css">