Skip to content

Commit

Permalink
fix(update): update components
Browse files Browse the repository at this point in the history
  • Loading branch information
Thorn Walli committed May 1, 2020
1 parent f920791 commit 4c66ccb
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 38 deletions.
3 changes: 0 additions & 3 deletions nuxt.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ module.exports = {
'2g', 'slow-2g'
],
fonts: [
// Font
{
fileExtensions: [
'woff2', 'woff'
Expand All @@ -242,14 +241,12 @@ module.exports = {
}
]
},
// Font
{
fileExtensions: [
'woff2', 'woff'
],
fontFamily: 'Amiga Topaz 13 Console',
fontFaces: [
// Font-Face
{
preload: true,
src: '@/assets/fonts/Amiga-Topaz-13-Console/Amiga-Topaz-13-Console',
Expand Down
6 changes: 5 additions & 1 deletion src/components/environments/Console.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ export default {
},
async mounted () {
if ('console' in this.$parent) {
this.$parent.console = this;
}
consoleCount++;
if (this.showIntroduction) {
await this.createInstruction().then(() => {
Expand Down Expand Up @@ -568,7 +571,8 @@ export default {
line-height: calc(20 / var(--global_fontSizePx));
}
& strong {
& strong,
& b {
font-weight: normal;
color: var(--color__console__typo__strong);
Expand Down
53 changes: 29 additions & 24 deletions src/components/environments/Core.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,42 +279,46 @@ export default {
];
// if (process.env.FIREBASE_API_KEY && process.env.FIREBASE_URL) {
// lines.push(
// 'Headline("Mount Cloud Storages…")',
// `cloudMount "CD0" --apiKey=FIREBASE_API_KEY --url="${process.env.FIREBASE_URL}"`
// );
// }
function sleep (duration = 1000) {
if (withWebDos) {
return 'SLEEP ' + duration;
}
return '';
}
lines.push(
sleep(1000),
'Headline("Mount Disks…")',
sleep(1000),
// 'mountDisk "examples"',
'mountDisk "workbench13"',
sleep(2000),
'mountDisk "extras13"',
'rearrangeIcons -root',
'PRINT ""',
'PRINT "<b>Waiting is user experience ...</b>"'
sleep(1000),
'rearrangeIcons -root'
// 'executeFile "DF1:WebPainting.info"'
// 'executeFile "DF0:Editor.info"'
// 'executeFile "DF0:ColorSettings.info"'
);
if (process.env.FIREBASE_API_KEY && process.env.FIREBASE_URL) {
lines.push(
sleep(1000),
'Headline("Mount Cloud Storages…")',
// sleep(1000),
// `cloudMount "CD0" --api-key="${process.env.FIREBASE_API_KEY}" --url="${process.env.FIREBASE_URL}"`,
sleep(1000),
`cloudMount "CDLAMMPEE" --api-key="${process.env.FIREBASE_API_KEY}" --url="${process.env.FIREBASE_URL}"`
);
}
// `cloudMount "CD0" --apiKey="AIzaSyD7I7ov9cdzeB1Rai1Fi6Y-aUpdCVZiLno" --url="https://web-workbench.firebaseio.com/"`,
// `cloudMount "CDLAMMPEE" --apiKey="AIzaSyD7I7ov9cdzeB1Rai1Fi6Y-aUpdCVZiLno" --url="https://web-workbench.firebaseio.com/"`
// 'Headline("Cloud Storages Authenticationm?")',
// 'IF confirm "Would you like login?" "Login" THEN',
// ' EXECUTE FILE "DF0:Scripts/cloudLogin.bas"',
// 'END IF',
// 'Headline("Examples…")',
//
// 'EXECUTE FILE "DF0:Clock.info"',
// 'EXECUTE FILE "DF0:Calculator.info"',
// 'EXECUTE FILE "DF0:Editor.info"'
lines.push(
sleep(2000),
'PRINT ""',
'PRINT "<b>Waiting is user experience ...</b>"'
);
try {
await this.core.modules.files.fs.createTmpFile('BOOT.basic', {
Expand All @@ -340,7 +344,8 @@ export default {
options: {
scrollX: false,
scrollY: true,
scale: true
scale: false,
embed: true
}
}
, { full: true });
Expand Down
3 changes: 2 additions & 1 deletion src/components/environments/Window.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@ body > #root {
&.js--embed {
& > div {
/* border-top-width: 2px; */
border: none;
/* border: none; */
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/environments/atoms/Button.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ export default {
padding: 6px;
padding-top: 6px;
padding-bottom: 4px;
color: var(--color__button__secondary__label);
background: var(--color__button__secondary__background);
border: solid var(--color__button__secondary__border) 2px;
outline: solid var(--color__button__secondary__outline) 2px;
color: var(--color__button__dialog__label);
background: var(--color__button__dialog__background);
border: solid var(--color__button__dialog__border) 2px;
outline: solid var(--color__button__dialog__outline) 2px;
outline-offset: -6px;
}
}
Expand Down
19 changes: 19 additions & 0 deletions src/components/modules/core/WebDos.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,25 @@ export default {
};
},
// watch: {
// async console (console) {
// if (console) {
// const commands = [].concat(this.rows);
// const run = (commands) => {
// debugger;
// return console.enter(commands.shift(), {
// showCommand: false
// }).then(() => {
// if (commands.length > 0) {
// return run(commands);
// }
// return null;
// });
// };
// await run(commands);
// }
// }
// },
methods: {
onStartCommandsComplete () {
global.setTimeout(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/web-workbench/classes/Core/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export const CONFIG_NAMES = {
export const CONFIG_DEFAULTS = {
[CONFIG_NAMES.SCREEN_1084_FRAME]: true,
[CONFIG_NAMES.SCREEN_SCANLINES]: false,
[CONFIG_NAMES.BOOT_WITH_SEQUENCE]: false,
[CONFIG_NAMES.BOOT_WITH_WEBDOS]: false,
[CONFIG_NAMES.BOOT_WITH_SEQUENCE]: true,
[CONFIG_NAMES.BOOT_WITH_WEBDOS]: true,
[CONFIG_NAMES.THEME]: PALETTE_THEMES[String(DEFAULT_PALETTE_THEME)]
};

Expand Down
1 change: 0 additions & 1 deletion src/web-workbench/classes/FileSystem/ItemContainer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ export default class ItemContainer extends Item {
items.push(await Item.prototype.remove.apply(this, [
options
]));
debugger;
return items;
} else {
const items = await this.getItems();
Expand Down
2 changes: 1 addition & 1 deletion src/web-workbench/classes/FileSystem/items/CloudDisk.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default class CloudDisk extends Storage {
static NAME = 'CloudDisk';
constructor (...args) {
super(...args);
this.meta.set(ITEM_META.SYMBOL, SYMBOL.CLOUD_DISK);
this.meta.set(ITEM_META.SYMBOL, this.meta.get(ITEM_META.SYMBOL) || SYMBOL.CLOUD_DISK);
}

isLogged () {
Expand Down
2 changes: 1 addition & 1 deletion src/web-workbench/classes/FirebaseWrapper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default class FireBaseWrapper {
}

isLogged () {
return !!this.#app && this.apiKey && !!this.#app.auth().currentUser;
return !!this.#app && !!this.#app.auth().currentUser;
}

login (email, password) {
Expand Down
1 change: 1 addition & 0 deletions src/web-workbench/classes/modules/Files/commands/cloud.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export default ({ module, core }) => {
if (!apiKey || !url) {
throw errorMessage.get('bad_args');
}
console.log({ id, apiKey, url });
const executionResolve = core.addExecution();
const storageItem = await fileSystem.connect(FirebaseStorage, { id, apiKey, url });
storages.set(storageItem.id, storageItem);
Expand Down

0 comments on commit 4c66ccb

Please sign in to comment.