about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-08-30 17:26:18 +0200
committerThibaut Girka <thib@sitedethib.com>2020-08-30 17:26:18 +0200
commita68ec50e4e38898e88a7dcc33bd0032adc946dda (patch)
tree8137b48a716e05424ca544210d86e91818085ba7 /app/javascript
parenta340e653df30a90910675f09284059055a598d46 (diff)
Adapt 2FA changes to glitch-soc's theming system
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/core/auth.js2
-rw-r--r--app/javascript/core/theme.yml2
-rw-r--r--app/javascript/core/two_factor_authentication.js (renamed from app/javascript/packs/two_factor_authentication.js)0
3 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/core/auth.js b/app/javascript/core/auth.js
new file mode 100644
index 000000000..ca04730a3
--- /dev/null
+++ b/app/javascript/core/auth.js
@@ -0,0 +1,2 @@
+import './settings';
+import './two_factor_authentication';
diff --git a/app/javascript/core/theme.yml b/app/javascript/core/theme.yml
index dc641772c..b9144e43a 100644
--- a/app/javascript/core/theme.yml
+++ b/app/javascript/core/theme.yml
@@ -3,7 +3,7 @@
 pack:
   about:
   admin: admin.js
-  auth: settings.js
+  auth: auth.js
   common:
     filename: common.js
     stylesheet: true
diff --git a/app/javascript/packs/two_factor_authentication.js b/app/javascript/core/two_factor_authentication.js
index dde06be8c..dde06be8c 100644
--- a/app/javascript/packs/two_factor_authentication.js
+++ b/app/javascript/core/two_factor_authentication.js