diff options
| author | Hygna <hygna@proton.me> | 2022-09-26 18:32:32 +0100 |
|---|---|---|
| committer | Hygna <hygna@proton.me> | 2022-09-26 18:32:32 +0100 |
| commit | 378fab21c081735311f4b3dab9d3423d955b400b (patch) | |
| tree | 4d08f4cc4f366564f17c2c80aba5c09455d44b69 /src/pages | |
| parent | Finished instance fetching (diff) | |
| download | libredirect-378fab21c081735311f4b3dab9d3423d955b400b.zip | |
Changes
Changed some regex
Made ejs no longer need extra config member variable
Added url reversal
Diffstat (limited to '')
| -rw-r--r-- | src/pages/options/index.ejs | 6 | ||||
| -rw-r--r-- | src/pages/options/widgets/general.js | 3 | ||||
| -rw-r--r-- | src/pages/options/widgets/services.js | 3 | ||||
| -rw-r--r-- | src/pages/popup/popup.ejs | 4 | ||||
| -rw-r--r-- | src/pages/popup/popup.js | 3 | ||||
| -rw-r--r-- | src/pages/widgets/links.ejs | 8 |
6 files changed, 12 insertions, 15 deletions
diff --git a/src/pages/options/index.ejs b/src/pages/options/index.ejs index e0ce3c3c..7f09e6da 100644 --- a/src/pages/options/index.ejs +++ b/src/pages/options/index.ejs @@ -2,10 +2,10 @@ <html id="elementToShowWithJavaScript" lang="en"> <%- include('src/pages/widgets/head') -%> <body class="option" dir="auto"> - <%- include('src/pages/widgets/links', {config: config}) -%> + <%- include('src/pages/widgets/links', {services: services}) -%> <div id="pages"> - <%- include('src/pages/options/widgets/general', {config: config}) -%> - <%- include('src/pages/options/widgets/services', {config: config}) -%> + <%- include('src/pages/options/widgets/general', {config: {networks, services}}) -%> + <%- include('src/pages/options/widgets/services', {config: {networks, services}}) -%> <%- include('src/pages/options/widgets/about') -%> </div> </body> diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 2249f830..cfc95df2 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -22,8 +22,7 @@ async function getConfig() { fetch("/config/config.json") .then(response => response.text()) .then(data => { - const tmp = JSON.parse(data) - config = tmp.config + config = JSON.parse(data) resolve() }) }) diff --git a/src/pages/options/widgets/services.js b/src/pages/options/widgets/services.js index b595943e..dbb66dec 100644 --- a/src/pages/options/widgets/services.js +++ b/src/pages/options/widgets/services.js @@ -9,8 +9,7 @@ function getConfig() { fetch("/config/config.json") .then(response => response.text()) .then(data => { - const tmp = JSON.parse(data) - config = tmp.config + config = JSON.parse(data) resolve() }) }) diff --git a/src/pages/popup/popup.ejs b/src/pages/popup/popup.ejs index efb73e5c..5b3bb026 100644 --- a/src/pages/popup/popup.ejs +++ b/src/pages/popup/popup.ejs @@ -8,13 +8,13 @@ </head> <body dir="auto"> <div class="current_site"> - <%- include('src/pages/widgets/switches', {config: config}) -%> + <%- include('src/pages/widgets/switches', {config: {networks, services}}) -%> <div id="current_site_divider"> <hr> </div> </div> <div class="all_sites"> - <%- include('src/pages/widgets/switches', {config: config}) -%> + <%- include('src/pages/widgets/switches', {config: {networks, services}}) -%> </div> <hr> <div class="some-block" id="change_instance_div"><a class="title button prevent" id="change_instance"> diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index fce451cb..c28f2d94 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -27,8 +27,7 @@ async function getConfig() { fetch("/config/config.json") .then(response => response.text()) .then(data => { - const tmp = JSON.parse(data) - config = tmp.config + config = JSON.parse(data) resolve() }) }) diff --git a/src/pages/widgets/links.ejs b/src/pages/widgets/links.ejs index 24a02e90..6fa9514c 100644 --- a/src/pages/widgets/links.ejs +++ b/src/pages/widgets/links.ejs @@ -1,13 +1,13 @@ <section class="links" id="links"> <div class="title"><%- include ('src/assets/images/general-icon.svg') %><a href="#general" data-localise="__MSG_general__">General</a></div> - <% for (const service in config.services) { -%> + <% for (const service in services) { -%> <div class="title"> - <% if (config.services[service].imageType != "svgMono") { _%> - <img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>"> + <% if (services[service].imageType != "svgMono") { _%> + <img src="../../../assets/images/<%= service %>-icon.<%= services[service].imageType %>"> <% } else { _%> <%- include ('src/assets/images/' + service + '-icon.svg') %> <% } _%> - <a href="#<%= service %>" data-localise="__MSG_<%= service %>__"><%= config.services[service].name %></a></div> + <a href="#<%= service %>" data-localise="__MSG_<%= service %>__"><%= services[service].name %></a></div> <% }; -%> <div class="title"><%- include ('src/assets/images/about-icon.svg') %><a href="#about" data-localise="__MSG_about__">About</a></div> </section> |