Skip to content

Commit 51fa15e

Browse files
authored
Merge pull request #20 from lokesh-coder/develop
fix mobile view layout
2 parents 6dcbf6b + a130e65 commit 51fa15e

File tree

10 files changed

+73
-21
lines changed

10 files changed

+73
-21
lines changed

packages/misc/pilot-ui/src/app/components/command/command.component.ts

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class CommandComponent implements OnInit, OnChanges {
2323
shell = "";
2424
questions = [];
2525

26-
@Select(state => state.prompt)
26+
@Select((state) => state.prompt)
2727
prompt$: Observable<PromptModel>;
2828

2929
constructor(
@@ -37,11 +37,11 @@ export class CommandComponent implements OnInit, OnChanges {
3737
this.store.dispatch(new LoadCommands());
3838
this.store.dispatch(new ListenForPrompt());
3939

40-
this.prompt$.subscribe(p => {
40+
this.prompt$.subscribe((p) => {
4141
if (!p.messageId) {
4242
return;
4343
}
44-
p.questions = p.questions.map(q => {
44+
p.questions = p.questions.map((q) => {
4545
if (!q.default) {
4646
q.required = true;
4747
}
@@ -58,10 +58,10 @@ export class CommandComponent implements OnInit, OnChanges {
5858
Object.keys(this.command.args),
5959
Object.keys(this.command.flags),
6060
);
61-
const argCollection = Object.keys(this.command.args).map(a => {
61+
const argCollection = Object.keys(this.command.args).map((a) => {
6262
return { name: a, ...this.command.args[a] };
6363
});
64-
const flagCollection = Object.keys(this.command.flags).map(a => {
64+
const flagCollection = Object.keys(this.command.flags).map((a) => {
6565
return { name: a, ...this.command.flags[a] };
6666
});
6767
this.questions = this.qs.getQuestions([
@@ -85,20 +85,29 @@ export class CommandComponent implements OnInit, OnChanges {
8585
this.store.dispatch(new ToggleConsolePanel());
8686
}
8787

88-
private parseShellCommand(name, args, flags) {
89-
const cmd = `<span class="text-syntax-cmd">${this.config.pilot.cmdName}</span>`;
90-
const cmdName = `<span class="text-syntax-name font-bold">${name}</span>`;
88+
private replaceDefault(name: string) {
89+
return name.replace("default", "");
90+
}
91+
92+
private html(text: string, cls: string, extra: string = "") {
93+
return `<span class="text-syntax-${cls} ${extra}">${text}</span>`;
94+
}
95+
96+
private parseShellCommand(name: string, args: string[], flags: string[]) {
97+
const cmd = this.html(this.config.pilot.cmdName, "cmd");
98+
const newCmdName = this.replaceDefault(name);
99+
const cmdName = this.html(newCmdName, "name", "font-bold");
91100
const cmdArgs = args
92-
.map(arg => {
93-
const openSqBracket = `<span class="text-syntax-bracket">[</span>`;
94-
const closeSqBracket = `<span class="text-syntax-bracket">]</span>`;
95-
const argName = `<span class="text-syntax-arg">${arg}</span>`;
101+
.map((arg: string) => {
102+
const openSqBracket = this.html("[", "bracket");
103+
const closeSqBracket = this.html("]", "bracket");
104+
const argName = this.html(arg, "arg");
96105
return `${openSqBracket}${argName}${closeSqBracket}`;
97106
})
98107
.join(" ");
99108
const cmdFlags = flags
100-
.map(flag => {
101-
return `<span class="text-syntax-flag">--${flag}</span> `;
109+
.map((flag: string) => {
110+
return this.html(`--${flag}`, "flag") + " ";
102111
})
103112
.join("");
104113
return `$ ${cmd} ${cmdName} ${cmdArgs} ${cmdFlags}`;

packages/misc/pilot-ui/src/app/components/header/header.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
class="bg-white flex border-bottom-2 border-b border-gray-300"
33
*ngIf="webConfig$ | async as config"
44
>
5-
<div class="container mx-auto" *ngIf="config.pilot">
5+
<div class="w-full lg:container lg:mx-auto" *ngIf="config.pilot">
66
<div class="flex flex-wrap items-center px-6 py-4">
77
<div class="w-full sm:w-1/3 flex items-center p-5 sm:p-0 justify-start">
88
<i class="ri-dashboard-line mr-3 text-xl text-violet"></i>
99
<a class="font-semibold text-gray-700" href="#"
1010
>{{ config.pilot.appName }}</a
1111
>
1212
<span
13-
class="border border-gray-400 text-gray-600 rounded ml-4 px-3 py-1 text-sm font-semibold"
13+
class="border border-gray-400 text-gray-600 rounded ml-4 px-3 py-1 text-sm font-semibold whitespace-pre"
1414
>v{{config.pilot.appVersion}}</span
1515
>
1616
</div>

packages/misc/pilot-ui/src/app/pages/commands/commands.template.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
<div class="flex flex-wrap flex-1">
1+
<div class="flex flex-col flex-no-wrap lg:flex-row flex-1">
22
<div
3-
class="w-full lg:w-4/12 px-6 md:max-w-sm bg-gray-100"
3+
class="w-full lg:max-w-sm px-6 text-center bg-gray-100"
44
[class.parent]="showMobileMenu"
55
>
66
<div
7-
class="bg-gray-200 rounded-lg border border-gray-400 shadow-inner text-gray-600 p-3 mb-10 text-center cursor-pointer select-none lg:hidden"
7+
class="bg-gray-200 rounded-lg border border-gray-400 shadow-inner text-gray-600 p-3 my-10 text-center cursor-pointer select-none lg:hidden inline-flex items-center"
88
(click)="showMobileMenu=!showMobileMenu"
99
>
1010
View command list
11+
<i class="ri-arrow-{{showMobileMenu?'up':'down'}}-s-line text-xl"></i>
1112
</div>
1213
<pilot-sidemenu
1314
[commands]="commands"
14.9 KB
Loading
13.6 KB
Loading
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<browserconfig>
3+
<msapplication>
4+
<tile>
5+
<TileColor>#A03232</TileColor>
6+
</tile>
7+
</msapplication>
8+
</browserconfig>
750 Bytes
Loading
1.77 KB
Loading
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "",
3+
"short_name": "",
4+
"icons": [
5+
{
6+
"src": "/android-chrome-192x192.png",
7+
"sizes": "192x192",
8+
"type": "image/png"
9+
}
10+
],
11+
"theme_color": "#A03232",
12+
"background_color": "#FFFFFF",
13+
"display": "standalone"
14+
}

packages/misc/pilot-ui/src/index.html

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,31 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>Pilot | Clik Web UI</title>
5+
<title>Pilot UI | Lesy</title>
66
<base href="/" />
77

88
<meta name="viewport" content="width=device-width, initial-scale=1" />
9-
<link rel="icon" type="image/x-icon" href="favicon.ico" />
9+
<link
10+
rel="apple-touch-icon"
11+
sizes="180x180"
12+
href="/assets/apple-touch-icon.png"
13+
/>
14+
<link
15+
rel="icon"
16+
type="image/png"
17+
sizes="32x32"
18+
href="/assets/favicon-32x32.png"
19+
/>
20+
<link
21+
rel="icon"
22+
type="image/png"
23+
sizes="16x16"
24+
href="/assets/favicon-16x16.png"
25+
/>
26+
<link rel="manifest" href="/assets/site.webmanifest" />
27+
<meta name="msapplication-config" content="/assets/browserconfig.xml" />
28+
<meta name="msapplication-TileColor" content="#596aa8" />
29+
<meta name="theme-color" content="#596aa8" />
1030
<link
1131
href="https://fonts.googleapis.com/icon?family=Material+Icons"
1232
rel="stylesheet"

0 commit comments

Comments
 (0)