v2.1.0

glyphr-studio · Jan 15, 2024 · 16c03f8 · 16c03f8
1 parent 4f19f24
commit 16c03f8
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -2,20 +2,13 @@
 
 Glyphr Studio v2 is a web-based font editor, optimized for typeface design beginners or hobbyists.
 
-While most user scenarios and functionality are the same as v1, the one main
-functionality improvement will be **multi-project editing** that will allow for
-cross-project copy/paste and merging fonts.
-
-The overall goal for v2 is codebase modernization. Much of the v1 code hasn't been
-worked on since 2010, so it was time to do an all-up scrub.
-
 ## Links
 
 | Website     | [glyphrstudio.com](https://www.glyphrstudio.com)                    |
 | :---------- | :------------------------------------------------------------------ |
 | Email       | [[email protected]](mailto:[email protected])               |
-| App         | [glyphrstudio.com/v2/app](https://www.glyphrstudio.com/v2/app)      |
-| Help & Docs | [glyphrstudio.com/v2/help](https://www.glyphrstudio.com/v2/help/)   |
+| App         | [glyphrstudio.com/app](https://www.glyphrstudio.com/app)            |
+| Help & Docs | [glyphrstudio.com/help](https://www.glyphrstudio.com/help/)         |
 | Blog        | [glyphrstudio.com/blog](https://www.glyphrstudio.com/blog/)         |
 | Mastodon    | [@glyphrstudio@typo.social](https://typo.social/@glyphrstudio)      |
 | Reddit      | [reddit.com/r/GlyphrStudio](https://www.reddit.com/r/GlyphrStudio/) |
@@ -35,12 +28,19 @@ So, here at Glyphr Studio, we've always had a very strong DIY attitude - this me
 
 ## Timeline
 
+While most user scenarios and functionality are the same as v1, the one main
+functionality improvement will be **multi-project editing** that will allow for
+cross-project copy/paste and merging fonts.
+
+The overall goal for v2 is codebase modernization. Much of the v1 code hasn't been
+worked on since 2010, so it was time to do an all-up scrub.
+
 Preliminary investigations started in 2019... but Covid slowed things way down.
 Things picked back up in 2021/2022. Alphas and Betas were released in late 2022
 / early 2023, and v2.0.0 was released in December 2023.
 
-V2 will exist along side v1 until January 15th, 2024, when v2 will become the default
-experience and v1 will be deprecated.
+On January 15th, 2024, the default experience was switched from v1 to v2. V1 will continue
+to exist in a /v1/ sub-directory, but it will be deprecated (only very major bugs will be fixed).
 
 ## Contributing
 

diff --git a/dist/assets/index-DO8VfA48.css b/dist/assets/index-DO8VfA48.css
diff --git a/dist/assets/index-fF1kIuIy.js → dist/assets/index-XJitwVDk.js b/dist/assets/index-fF1kIuIy.js → dist/assets/index-XJitwVDk.js
diff --git a/dist/assets/index-gIz_BSqQ.css b/dist/assets/index-gIz_BSqQ.css
diff --git a/dist/index.html b/dist/index.html
@@ -20,7 +20,7 @@
 		<meta charset="utf-8" />
 		<title>Glyphr Studio v2</title>
 		<meta name="viewport" content="width=device-width" />
-		<link rel="shortcut icon" href="/v2/app/assets/logo-icon-color-DQ3f2Gvv.ico" />
+		<link rel="shortcut icon" href="/app/assets/logo-icon-color-DQ3f2Gvv.ico" />
 		<style>
 			:root {
 				--dark-gradient-background: linear-gradient(
@@ -121,8 +121,8 @@
 				user-select: text;
 			}
 		</style>
-		<script type="module" crossorigin src="/v2/app/assets/index-fF1kIuIy.js"></script>
-		<link rel="stylesheet" crossorigin href="/v2/app/assets/index-gIz_BSqQ.css">
+		<script type="module" crossorigin src="/app/assets/index-XJitwVDk.js"></script>
+		<link rel="stylesheet" crossorigin href="/app/assets/index-DO8VfA48.css">
 	</head>
 
 	<body

diff --git a/package.json b/package.json
@@ -1,15 +1,15 @@
 {
 	"name": "glyphr-studio-2",
 	"author": "Matt LaGrandeur",
-	"version": "2.0.0",
+	"version": "2.1",
 	"license": "GPL-3.0-or-later",
 	"homepage": "https://github.com/glyphr-studio/Glyphr-Studio-2#readme",
 	"description": "Glyphr Studio v2 is a web-based font editor, optimized for typeface design beginners or hobbyists.",
 	"type": "module",
 	"scripts": {
 		"dev": "vite serve ./src/",
-		"build": "vite build ./src/ --emptyOutDir --base=/v2/app/",
-		"stage": "vite build ./src/ --emptyOutDir --base=/v2/staged/",
+		"build": "vite build ./src/ --emptyOutDir --base=/app/",
+		"stage": "vite build ./src/ --emptyOutDir --base=/staged/",
 		"test": "vitest watch --dom --silent=true",
 		"coverage": "vitest watch --dom --silent=true --coverage",
 		"lint": "eslint src",

diff --git a/src/app/app.js b/src/app/app.js
@@ -25,7 +25,7 @@ export class GlyphrStudioApp {
 	constructor() {
 		// Version
 		this.versionName = 'Version 2';
-		this.version = '2.0.3';
+		this.version = '2.1.0';
 		this.versionDate = 1705348800000;
 
 		// Project Editors

diff --git a/src/app/cross_project_actions/cross_project_actions.js b/src/app/cross_project_actions/cross_project_actions.js
@@ -55,7 +55,7 @@ export function makePage_CrossProjectActions() {
 						New cross-project actions are easy to add. If you have any ideas for other capabilities,
 						please send us an email: ${emailLink()}
 						<br><br>
-						<a href="https://www.glyphrstudio.com/v2/help/getting-started/working-with-multiple-projects.html" target="_blank">More help about working with multiple projects</a>
+						<a href="https://www.glyphrstudio.com/help/getting-started/working-with-multiple-projects.html" target="_blank">More help about working with multiple projects</a>
 					</div>
 				</div>
 				<div id="cross-project-actions__page-footer">

diff --git a/src/app/menu.js b/src/app/menu.js
@@ -182,7 +182,7 @@ function makeMenu(menuName) {
 						icon: 'command_newTab',
 						onClick: () => {
 							window.open(
-								'https://www.glyphrstudio.com/v2/help/getting-started/working-with-multiple-projects.html',
+								'https://www.glyphrstudio.com/help/getting-started/working-with-multiple-projects.html',
 								'_blank'
 							);
 						},
@@ -194,7 +194,7 @@ function makeMenu(menuName) {
 						name: 'Open a separate project in a new window',
 						icon: 'command_newTab',
 						onClick: () => {
-							window.open('https://glyphrstudio.com/v2/app/', '_blank');
+							window.open('https://glyphrstudio.com/app/', '_blank');
 						},
 					},
 				],
@@ -219,7 +219,7 @@ function makeMenu(menuName) {
 							name: 'External Help & Documentation site',
 							icon: 'command_newTab',
 							onClick: () => {
-								window.open('https://glyphrstudio.com/v2/help/', '_blank');
+								window.open('https://glyphrstudio.com/help/', '_blank');
 							},
 						},
 						{ name: 'hr' },

diff --git a/src/app/open_project.js b/src/app/open_project.js
@@ -33,7 +33,7 @@ export function makePage_OpenProject(secondProjectFlag = false) {
 	let recentMessage = '';
 	const app = getGlyphrStudioApp();
 	if (Date.now() - app.versionDate < recent) {
-		recentMessage = ` - <a href="https://www.glyphrstudio.com/v2/help/about/updates.html" target="_blank">recently updated!</a>`;
+		recentMessage = ` - <a href="https://www.glyphrstudio.com/help/about/updates.html" target="_blank">recently updated!</a>`;
 	}
 
 	const content = makeElement({

diff --git a/src/edit_canvas/events_keyboard.js b/src/edit_canvas/events_keyboard.js
@@ -53,7 +53,7 @@ export function handleKeyPress(event) {
 	// o
 	if (ehd.isCtrlDown && key === 'o') {
 		cancelDefaultEventActions(event);
-		window.open('http://glyphrstudio.com/v2/app', '_blank');
+		window.open('http://glyphrstudio.com/app', '_blank');
 	}
 
 	// q

diff --git a/src/pages/about.js b/src/pages/about.js
@@ -71,7 +71,7 @@ function makeLicenseInfo() {
 		<h2>Fonts you create</h2>
 		<p>
 			Any font you create belongs 100% to you, and you must decide how to license it.<br>
-			You can find out <a href="https://www.glyphrstudio.com/v2/help/about/licensing.html" target="_blank">
+			You can find out <a href="https://www.glyphrstudio.com/help/about/licensing.html" target="_blank">
 			more about licensing on the Help site</a>.
 		</p>
 
@@ -185,9 +185,8 @@ export function makeReleaseNote(showLogo = false) {
 		<br>
 		<h3>Transition from v1 to v2</h3>
 		<p>
-			On January 15th, 2024, Glyphr Studio will make the switch from v1 to v2. This change will
-			encompass the app itself, but also supporting materials like the blog, the main site, and the
-			help and tutorial sites. V2 branding will be used for all of these, and all social media outlets.
+			On January 15th, 2024, the default experience for Glyphr Studio was switched from v1 to v2.
+			This change affected the app itself, and also supporting materials like the blog, the main site, and the help and tutorial sites. 
 			<br>
 			<a href="https://www.glyphrstudio.com/blog/?p=372" target="_blank" style="font-size: 1.2em;">Glyphr Studio Blog: V1 to V2 transition plan</a>
 		</p>
@@ -262,7 +261,7 @@ function makeContactInfo() {
 				${emailLink()}
 
 				<span>Help for Glyphr Studio v2:</span>
-				<a href="https://www.glyphrstudio.com/v2/help" target="_blank">glyphrstudio.com/v2/help</a>
+				<a href="https://www.glyphrstudio.com/help" target="_blank">glyphrstudio.com/help</a>
 
 				<span>Blog:</span>
 				<a href="http://www.glyphrstudio.com/blog/" target="_blank">glyphrstudio.com/blog</a>

diff --git a/src/pages/help.js b/src/pages/help.js
@@ -49,7 +49,7 @@ function makeHelpOverview() {
 		<h1>Help</h1>
 		<p>
 			Help articles for Glyphr Studio v2 will be at
-			<a href="https://www.glyphrstudio.com/v2/help" target="_blank">glyphrstudio.com/v2/help</a>,
+			<a href="https://www.glyphrstudio.com/help" target="_blank">glyphrstudio.com/help</a>,
 			please email us if you find anything missing.
 		</p>
 		<p>