diff --git a/.gitlab/gitlabActions.ts b/.gitlab/gitlabActions.ts index 0c4889de..5f52937c 100644 --- a/.gitlab/gitlabActions.ts +++ b/.gitlab/gitlabActions.ts @@ -21,7 +21,7 @@ const cssFiles = glob.sync(`${PROD_DIRECTORY}/**/*.css`); (async () => { const remoteResourceData: RemoteResourceData[] = await uploadAssets(); await relinkUrls(remoteResourceData); - await changeBaseUrlTags(); + await changeMetaBaseUrls(); await fs.remove(localDirectoryPath.join('/')); })(); @@ -41,6 +41,10 @@ async function relinkUrls(remoteResourceData: RemoteResourceData[]) { const cssRegex1 = /(?<=url\(')\/.*?(?='\))/g; const cssRegex2 = /(?<=url\(")\/.*?(?="\))/g; // + const PROD_DIRECTORY = localDirectoryPath[0]; + const BASE_URL = 'hongkong-cuhk'; + const htmlFiles = glob.sync(`${PROD_DIRECTORY}/**/*.html`); + const cssFiles = glob.sync(`${PROD_DIRECTORY}/**/*.css`); await Promise.all([ ...htmlFiles.map(filePath => relinkFileUrls(filePath, [htmlRegex])), ...cssFiles.map(filePath => relinkFileUrls(filePath, [cssRegex1, cssRegex2])) @@ -64,16 +68,14 @@ async function relinkUrls(remoteResourceData: RemoteResourceData[]) { } } -async function changeBaseUrlTags() { - const baseUrlTagRegex = //g; +async function changeMetaBaseUrls() { + const metaBaseUrlRegex = //g; // - await Promise.all(htmlFiles.map(filePath => changeBaseUrlTag(filePath, baseUrlTagRegex))); - return; - // - async function changeBaseUrlTag(filePath: string, regex: RegExp) { + await Promise.all(htmlFiles.map(filePath => changeMetaBaseUrl(filePath))); + async function changeMetaBaseUrl(filePath: string) { + console.log(`Processing ${filePath}`); let fileContent = await fs.readFile(filePath, 'utf8'); - fileContent = fileContent.replace(regex, ``); - console.log(`Changed base-url meta tag in ${filePath} to ${BASE_URL}`); + fileContent = fileContent.replace(metaBaseUrlRegex, ``); await fs.writeFile(filePath, fileContent); } } \ No newline at end of file diff --git a/docs/404.html b/docs/404.html index 47789b0d..2a9f7ac8 100644 --- a/docs/404.html +++ b/docs/404.html @@ -9,9 +9,9 @@ - - - + + + @@ -57,18 +57,18 @@
@@ -107,53 +107,24 @@ autocomplete="off" /> -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-