diff --git a/main.js b/main.js index 5085b0d..ce20907 100644 --- a/main.js +++ b/main.js @@ -3,8 +3,10 @@ const { exec } = require('child_process') const path = require('path') const { stringify } = require('querystring') +let win = null; + const createWindow = () => { - const win = new BrowserWindow({ + win = new BrowserWindow({ width: 1100, height: 700, webPreferences: { @@ -30,7 +32,12 @@ function getCertDetails(){ } function activateWindows(){ - exec("powershell start-process powershell -verb runas {slmgr /skms " + kmsServer + " ; slmgr /ipk " + windowsProductKey + " ; sleep 3 ; slmgr /ato ; sleep 1 ; start ms-settings:activation}") + var activatePROC = exec("powershell start-process powershell -verb runas {cscript C:\\Windows\\System32\\slmgr.vbs /skms " + kmsServer + " > $null ; cscript C:\\Windows\\System32\\slmgr.vbs /ipk " + windowsProductKey + " > $null ; sleep 3 ; cscript C:\\Windows\\System32\\slmgr.vbs /ato ; sleep 1 ; start ms-settings:activation}") + + activatePROC.on('close', _ => { + win.webContents.send('winkmsdone') + }) + //dialog.showErrorBox('Transparency Mode Command:', 'RUN THIS: powershell start-process powershell -verb runas {slmgr /skms ' + kmsServer + ' ; slmgr /ipk ' + productKey + ' ; sleep 3 ; slmgr /ato}') } diff --git a/package.json b/package.json index afb3e6b..f0dfbc4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "univator", - "version": "1.1.4", + "version": "1.1.5", "description": "Microsoft Product Activator", "main": "main.js", "scripts": { diff --git a/webPage/css/dist.css b/webPage/css/dist.css index ca5bac6..da086d0 100644 --- a/webPage/css/dist.css +++ b/webPage/css/dist.css @@ -549,6 +549,10 @@ Ensure the default browser behavior of the `hidden` attribute. margin-right: auto; } +.block { + display: block; +} + .inline { display: inline; } @@ -634,6 +638,11 @@ Ensure the default browser behavior of the `hidden` attribute. background-color: rgb(22 21 36 / var(--tw-bg-opacity)); } +.bg-indigo-900 { + --tw-bg-opacity: 1; + background-color: rgb(49 46 129 / var(--tw-bg-opacity)); +} + .bg-\[\#D0E7A6\] { --tw-bg-opacity: 1; background-color: rgb(208 231 166 / var(--tw-bg-opacity)); @@ -649,11 +658,6 @@ Ensure the default browser behavior of the `hidden` attribute. background-color: rgb(233 79 55 / var(--tw-bg-opacity)); } -.bg-indigo-900 { - --tw-bg-opacity: 1; - background-color: rgb(49 46 129 / var(--tw-bg-opacity)); -} - .bg-\[url\(\'\.\.\/img\/bground1\.jpg\'\)\] { background-image: url('../img/bground1.jpg'); } @@ -701,6 +705,11 @@ Ensure the default browser behavior of the `hidden` attribute. padding-right: 1.25rem; } +.px-10 { + padding-left: 2.5rem; + padding-right: 2.5rem; +} + .py-3 { padding-top: 0.75rem; padding-bottom: 0.75rem; @@ -722,6 +731,18 @@ Ensure the default browser behavior of the `hidden` attribute. padding-left: 1.25rem; } +.pb-6 { + padding-bottom: 1.5rem; +} + +.pb-3 { + padding-bottom: 0.75rem; +} + +.text-left { + text-align: left; +} + .text-center { text-align: center; } @@ -748,6 +769,15 @@ Ensure the default browser behavior of the `hidden` attribute. font-size: 0.5rem; } +.text-\[2em\] { + font-size: 2em; +} + +.text-lg { + font-size: 1.125rem; + line-height: 1.75rem; +} + .text-xl { font-size: 1.25rem; line-height: 1.75rem; @@ -788,6 +818,12 @@ Ensure the default browser behavior of the `hidden` attribute. color: rgb(0 0 0 / var(--tw-text-opacity)); } +.shadow { + --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + .outline { outline-style: solid; } @@ -796,6 +832,10 @@ Ensure the default browser behavior of the `hidden` attribute. outline-width: 0px; } +.outline-2 { + outline-width: 2px; +} + .outline-white { outline-color: #fff; } @@ -1016,6 +1056,10 @@ button{ outline: none; } +.shadow{ + box-shadow: 0 12px 16px 0 rgba(0,0,0,0.45), 0 17px 50px 0 rgba(0,0,0,0.40); +} + button:hover{ transform: scale(1.06); } diff --git a/webPage/css/source.css b/webPage/css/source.css index b19e525..4c07621 100644 --- a/webPage/css/source.css +++ b/webPage/css/source.css @@ -122,6 +122,10 @@ button{ outline: none; } +.shadow{ + box-shadow: 0 12px 16px 0 rgba(0,0,0,0.45), 0 17px 50px 0 rgba(0,0,0,0.40); +} + button:hover{ transform: scale(1.06); } diff --git a/webPage/index.html b/webPage/index.html index d85e9cb..67b8a02 100644 --- a/webPage/index.html +++ b/webPage/index.html @@ -19,7 +19,7 @@
- +
diff --git a/webPage/windows/activate/index.html b/webPage/windows/activate/index.html index 3e9aa62..49ec42f 100644 --- a/webPage/windows/activate/index.html +++ b/webPage/windows/activate/index.html @@ -46,10 +46,13 @@ document.getElementById('ok').addEventListener("click", function(){ ipcRenderer.send("activateWindows"); - location.href = "./done.html"; }); + ipcRenderer.on('winkmsdone', function(){ + location.href='./done.html'; + }); + diff --git a/webPage/windows/index.html b/webPage/windows/index.html new file mode 100644 index 0000000..0fff265 --- /dev/null +++ b/webPage/windows/index.html @@ -0,0 +1,87 @@ + + + + + + + Univator + + + +
+
+ +
+
+

Choose Activation Method

+ +
+
+
+ +

- Non-intrusive

+

- Easily Reversible (see options)

+

- Requires connection to e-KMS server every 180 days to refresh

+ Show More + + +
+
+ +

- Requires System Changes

+

- Entirely Permanent, even on full wipe

+

- Fully equivalent to digitally bought Windows, transfers to other PCs with this MS acc

+ Show More + +
+
+ + +
+ +
+
+ + + +
+ + +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/webPage/windows/setKMS/index.html b/webPage/windows/setKMS/index.html index a589a4e..b38f98c 100644 --- a/webPage/windows/setKMS/index.html +++ b/webPage/windows/setKMS/index.html @@ -39,7 +39,7 @@
- +
+
+ +
+ +
+ + +
+ +
+ + + + + + + +
+ + +
+ + + + + +