@anmiles/google-api-wrapper 15.0.0 → 15.2.0

package/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [15.2.0](../../tags/v15.2.0) - 2023-10-26
+### Changed
+- Small visual improvements for auth page
+
+## [15.1.0](../../tags/v15.1.0) - 2023-09-11
+### Changed
+- Visual improvements for auth page
+- Update dependencies (non-breaking)
+
 ## [15.0.0](../../tags/v15.0.0) - 2023-09-11
 ### Changed
 - Update dependencies

package/dist/lib/renderer.d.ts

@@ -2,7 +2,7 @@ export { templates, renderAuth, renderDone };
 declare const templates: {
     readonly page: readonly ["content"];
     readonly auth: readonly ["profile", "authUrl", "scopesList"];
-    readonly scope: readonly ["type", "name"];
+    readonly scope: readonly ["type", "title", "name"];
     readonly done: readonly ["profile"];
 };
 type TemplateName = keyof typeof templates;
@@ -20,7 +20,7 @@ declare const _default: {
     templates: {
         readonly page: readonly ["content"];
         readonly auth: readonly ["profile", "authUrl", "scopesList"];
-        readonly scope: readonly ["type", "name"];
+        readonly scope: readonly ["type", "title", "name"];
         readonly done: readonly ["profile"];
     };
     render: typeof render;

package/dist/lib/renderer.js

@@ -10,7 +10,7 @@ const paths_1 = require("./paths");
 const templates = {
     page: ['content'],
     auth: ['profile', 'authUrl', 'scopesList'],
-    scope: ['type', 'name'],
+    scope: ['type', 'title', 'name'],
     done: ['profile'],
 };
 exports.templates = templates;
@@ -18,6 +18,7 @@ const allHTML = {};
 function renderAuth({ profile, authUrl, scope }) {
     const scopesList = scope.map((s) => render('scope', {
         name: s.split('/').pop(),
+        title: s.endsWith('.readonly') ? 'Readonly (cannot change or delete your data)' : 'Writable (can change or delete your data)',
         type: s.endsWith('.readonly') ? 'readonly' : '',
     })).join('\n');
     const content = render('auth', { profile, authUrl, scopesList });

package/dist/lib/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/lib/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,0DAAkC;AAClC,mCAA0C;AAI1C,MAAM,SAAS,GAAG;IACjB,IAAI,EAAI,CAAE,SAAS,CAAW;IAC9B,IAAI,EAAI,CAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAE;IAC9C,KAAK,EAAG,CAAE,MAAM,EAAE,MAAM,CAAW;IACnC,IAAI,EAAI,CAAE,SAAS,CAAW;CACrB,CAAC;AAPF,8BAAS;AAWlB,MAAM,OAAO,GAAG,EAAkC,CAAC;AAEnD,SAAS,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAyD;IACrG,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;QACnD,IAAI,EAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAY;QACnC,IAAI,EAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;KAChD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEf,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AACpC,CAAC;AArBmB,gCAAU;AAuB9B,SAAS,UAAU,CAAC,EAAE,OAAO,EAAuB;IACnD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AACpC,CAAC;AA1B+B,gCAAU;AA4B1C,kBAAkB;AAClB,SAAS,MAAM,CAAyB,YAAe,EAAE,MAAmD;IAC3G,IAAI,IAAI,GAAU,kBAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,MAAgE,CAAC;IAEnF,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE;QAC/C,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,GAAU,IAAI,CAAC,OAAO,CAAC,MAAM,QAAQ,GAAG,EAAE,KAAK,CAAC,CAAC;KACrD;IAED,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,WAAW,CAAC,YAA0B;IAC9C,IAAI,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,GAAc,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAU,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzD,OAAO,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;KACjC;IAED,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC9B,CAAC;AAED,kBAAe,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/lib/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,0DAAkC;AAClC,mCAA0C;AAI1C,MAAM,SAAS,GAAG;IACjB,IAAI,EAAI,CAAE,SAAS,CAAW;IAC9B,IAAI,EAAI,CAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAE;IAC9C,KAAK,EAAG,CAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAW;IAC5C,IAAI,EAAI,CAAE,SAAS,CAAW;CACrB,CAAC;AAPF,8BAAS;AAWlB,MAAM,OAAO,GAAG,EAAkC,CAAC;AAEnD,SAAS,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAyD;IACrG,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;QACnD,IAAI,EAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAY;QACpC,KAAK,EAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,8CAA8C,CAAC,CAAC,CAAC,2CAA2C;QAC9H,IAAI,EAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;KACjD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEf,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AACpC,CAAC;AAtBmB,gCAAU;AAwB9B,SAAS,UAAU,CAAC,EAAE,OAAO,EAAuB;IACnD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AACpC,CAAC;AA3B+B,gCAAU;AA6B1C,kBAAkB;AAClB,SAAS,MAAM,CAAyB,YAAe,EAAE,MAAmD;IAC3G,IAAI,IAAI,GAAU,kBAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,MAAgE,CAAC;IAEnF,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE;QAC/C,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,GAAU,IAAI,CAAC,OAAO,CAAC,MAAM,QAAQ,GAAG,EAAE,KAAK,CAAC,CAAC;KACrD;IAED,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,WAAW,CAAC,YAA0B;IAC9C,IAAI,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC,EAAE;QAC/B,MAAM,IAAI,GAAc,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAU,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzD,OAAO,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;KACjC;IAED,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC9B,CAAC;AAED,kBAAe,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC"}

package/dist/templates/done.html

@@ -1,3 +1,2 @@
 <h1>Welcome ${profile}!</h1>
-<p>Authorization succeeded.</p>
 <p>Please close this page and return to application.</p>

package/dist/templates/page.html

@@ -23,7 +23,7 @@
 		width: 450px;
 		min-height: 500px;
 		max-height: 100%;
-		padding: 78px 40px 28px 40px;
+		padding: 82px 40px 28px 40px;
 		margin: 1em;
 		border: 1px solid #dadce0;
 		border-radius: 8px;
@@ -43,10 +43,23 @@
 		content: '';
 	}
 
+	h1 {
+		font-size: 24px;
+		line-height: 40px;
+		font-weight: normal;
+		margin: 0;
+	}
+
+	p {
+		line-height: 32px;
+		margin: 0;
+	}
+
 	ul {
 		width: 100%;
-		margin: 23px 0 30px 0;
+		margin: 18px 0 30px 0;
 		padding-left: 0;
+		border-top: 1px solid #dadce0;
 		list-style-type: none;
 		overflow: auto;
 	}
@@ -82,26 +95,17 @@
 
 	a {
 		width: 50%;
-		line-height: 2em;
+		padding: 0 24px;
+		line-height: 36px;
 		margin: auto;
 		color: #ffffff;
-		background: #0057e7;
-		border-radius: 10em;
+		background: #1a73e8;
+		border-radius: 4px;
 		display: block;
 		text-align: center;
 		text-decoration: none;
-	}
-
-	h1 {
-		font-size: 24px;
-		line-height: 48px;
-		font-weight: normal;
-		margin: 0;
-	}
-
-	p {
-		line-height: 24px;
-		margin: 0;
+		font-weight: bold;
+		font-size: 15px;
 	}
 </style>
 <div class="box">

package/dist/templates/scope.html

@@ -1 +1 @@
-<li class="${type}">${name}</li>
+<li class="${type}" title="${title}">${name}</li>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anmiles/google-api-wrapper",
-  "version": "15.0.0",
+  "version": "15.2.0",
   "description": "Provides quick interface for getting google API data",
   "keywords": [
     "google",
@@ -43,8 +43,8 @@
     "@types/event-emitter": "^0.3.3",
     "@types/jest": "^29.5.4",
     "@types/server-destroy": "^1.0.1",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@typescript-eslint/parser": "^6.7.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.49.0",
     "eslint-plugin-align-assignments": "^1.1.2",

package/src/lib/__tests__/renderer.test.ts

@@ -38,7 +38,7 @@ jest.mock<Partial<typeof paths>>('../paths', () => ({
 const mockTemplates: Record<TemplateName, string> = {
 	page  : 'page content = (${content})',
 	auth  : 'auth profile = (${profile}) authUrl = (${authUrl}) scopesList = (${scopesList})',
-	scope : 'scope type = (${type}) name = (${name})',
+	scope : 'scope type = (${type}) title = (${title}) name = (${name})',
 	done  : 'done profile = (${profile})',
 };
 
@@ -50,7 +50,7 @@ describe('src/lib/renderer', () => {
 	describe('renderAuth', () => {
 		it('should return auth page', () => {
 			const result = original.renderAuth({ authUrl, profile, scope });
-			expect(result).toEqual('page content = (auth profile = (username) authUrl = (https://authUrl) scopesList = (scope type = (readonly) name = (scope1.readonly)\nscope type = () name = (scope2)))');
+			expect(result).toEqual('page content = (auth profile = (username) authUrl = (https://authUrl) scopesList = (scope type = (readonly) title = (Readonly (cannot change or delete your data)) name = (scope1.readonly)\nscope type = () title = (Writable (can change or delete your data)) name = (scope2)))');
 		});
 	});
 
@@ -63,11 +63,11 @@ describe('src/lib/renderer', () => {
 
 	describe('render', () => {
 		it('should replace all template variables with their values', () => {
-			const values = { type : 'readonly', name : 'scope.readonly' };
+			const values = { type : 'readonly', title : 'Readonly scope', name : 'scope.readonly' };
 
 			const result = original.render('scope', values);
 
-			expect(result).toEqual('scope type = (readonly) name = (scope.readonly)');
+			expect(result).toEqual('scope type = (readonly) title = (Readonly scope) name = (scope.readonly)');
 		});
 
 		it('should replace non-existing template variable with empty string', () => {
@@ -75,7 +75,7 @@ describe('src/lib/renderer', () => {
 
 			const result = original.render('scope', values as any);
 
-			expect(result).toEqual('scope type = () name = (scope.readonly)');
+			expect(result).toEqual('scope type = () title = () name = (scope.readonly)');
 		});
 	});
 

package/src/lib/renderer.ts

@@ -7,7 +7,7 @@ export { templates, renderAuth, renderDone };
 const templates = {
 	page  : [ 'content' ] as const,
 	auth  : [ 'profile', 'authUrl', 'scopesList' ],
-	scope : [ 'type', 'name' ] as const,
+	scope : [ 'type', 'title', 'name' ] as const,
 	done  : [ 'profile' ] as const,
 } as const;
 
@@ -17,8 +17,9 @@ const allHTML = {} as Record<TemplateName, string>;
 
 function renderAuth({ profile, authUrl, scope }: { profile: string, authUrl: string, scope: string[] }) {
 	const scopesList = scope.map((s) => render('scope', {
-		name : s.split('/').pop() as string,
-		type : s.endsWith('.readonly') ? 'readonly' : '',
+		name  : s.split('/').pop() as string,
+		title : s.endsWith('.readonly') ? 'Readonly (cannot change or delete your data)' : 'Writable (can change or delete your data)',
+		type  : s.endsWith('.readonly') ? 'readonly' : '',
 	})).join('\n');
 
 	const content = render('auth', { profile, authUrl, scopesList });

package/src/templates/done.html

@@ -1,3 +1,2 @@
 <h1>Welcome ${profile}!</h1>
-<p>Authorization succeeded.</p>
 <p>Please close this page and return to application.</p>

package/src/templates/page.html

@@ -23,7 +23,7 @@
 		width: 450px;
 		min-height: 500px;
 		max-height: 100%;
-		padding: 78px 40px 28px 40px;
+		padding: 82px 40px 28px 40px;
 		margin: 1em;
 		border: 1px solid #dadce0;
 		border-radius: 8px;
@@ -43,10 +43,23 @@
 		content: '';
 	}
 
+	h1 {
+		font-size: 24px;
+		line-height: 40px;
+		font-weight: normal;
+		margin: 0;
+	}
+
+	p {
+		line-height: 32px;
+		margin: 0;
+	}
+
 	ul {
 		width: 100%;
-		margin: 23px 0 30px 0;
+		margin: 18px 0 30px 0;
 		padding-left: 0;
+		border-top: 1px solid #dadce0;
 		list-style-type: none;
 		overflow: auto;
 	}
@@ -82,26 +95,17 @@
 
 	a {
 		width: 50%;
-		line-height: 2em;
+		padding: 0 24px;
+		line-height: 36px;
 		margin: auto;
 		color: #ffffff;
-		background: #0057e7;
-		border-radius: 10em;
+		background: #1a73e8;
+		border-radius: 4px;
 		display: block;
 		text-align: center;
 		text-decoration: none;
-	}
-
-	h1 {
-		font-size: 24px;
-		line-height: 48px;
-		font-weight: normal;
-		margin: 0;
-	}
-
-	p {
-		line-height: 24px;
-		margin: 0;
+		font-weight: bold;
+		font-size: 15px;
 	}
 </style>
 <div class="box">

package/src/templates/scope.html

@@ -1 +1 @@
-<li class="${type}">${name}</li>
+<li class="${type}" title="${title}">${name}</li>