ulivargas/classroomio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve layout.server

Browse Source
This commit is contained in:
Rotimi Best
2023-12-03 16:29:27 +03:00
parent 8a658c89ef
commit d0e90b30e4
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/src/routes/+layout.server.ts
+5 -12
View File
@@ -12,29 +12,22 @@ interface LoadOutput {
orgSiteName: string; orgSiteName: string;
isOrgSite: boolean; isOrgSite: boolean;
skipAuth: boolean; skipAuth: boolean;
org: CurrentOrg; org: CurrentOrg | null;
} }
export const load = async ({ url, cookies }): Promise<LoadOutput> => { export const load = async ({ url, cookies }): Promise<LoadOutput> => {
// if (url.hostname === 'classroomio.com') { const response: LoadOutput = {
// throw redirect(301, 'https://about.classroomio.com');
// }
let response: LoadOutput = {
orgSiteName: '', orgSiteName: '',
isOrgSite: false, isOrgSite: false,
skipAuth: false, skipAuth: false,
org: { org: null
theme: ''
}
}; };
const _orgSiteName = cookies.get('_orgSiteName'); const _orgSiteName = cookies.get('_orgSiteName');
const debugPlay = cookies.get('debugPlay'); const debugPlay = cookies.get('debugPlay');
const debugMode = _orgSiteName && _orgSiteName !== 'false'; const debugMode = _orgSiteName && _orgSiteName !== 'false';
console.log('_orgSiteName', _orgSiteName);
const matches = url.host.match(/([a-z 0-9 \-]+).*classroomio[.]com/); const matches = url.host.match(/([a-z 0-9 -]+).*classroomio[.]com/);
const subdomain = matches?.[1] ?? ''; const subdomain = matches?.[1] ?? '';
if (!blockedSubdomain.includes(subdomain)) { if (!blockedSubdomain.includes(subdomain)) {
@@ -42,7 +35,7 @@ export const load = async ({ url, cookies }): Promise<LoadOutput> => {
response.isOrgSite = debugMode || answer; response.isOrgSite = debugMode || answer;
response.orgSiteName = debugMode ? _orgSiteName : subdomain; response.orgSiteName = debugMode ? _orgSiteName : subdomain;
response.org = await getCurrentOrg(response.orgSiteName, true); response.org = (await getCurrentOrg(response.orgSiteName, true)) || null;
} else if (subdomain === 'play' || debugPlay === 'true') { } else if (subdomain === 'play' || debugPlay === 'true') {
response.skipAuth = true; response.skipAuth = true;
} }