diff --git a/frontend/projects/setup-wizard/src/app/pages/success/success.page.html b/frontend/projects/setup-wizard/src/app/pages/success/success.page.html index 6479fd07d..dbce29073 100644 --- a/frontend/projects/setup-wizard/src/app/pages/success/success.page.html +++ b/frontend/projects/setup-wizard/src/app/pages/success/success.page.html @@ -8,7 +8,7 @@ -
+
Setup Complete!
@@ -32,8 +32,8 @@ -
-
+
+
- - Download permanent address info - + Download address info

start.local was for setup purposes only. It will no longer work.

-
-
-

DOWNLOAD

- -
+
+

Download

+
-
-
-

OPEN

- +
+

Open

+
diff --git a/frontend/projects/setup-wizard/src/app/pages/success/success.page.scss b/frontend/projects/setup-wizard/src/app/pages/success/success.page.scss index 1c3681057..910849788 100644 --- a/frontend/projects/setup-wizard/src/app/pages/success/success.page.scss +++ b/frontend/projects/setup-wizard/src/app/pages/success/success.page.scss @@ -18,28 +18,24 @@ ion-content { ion-grid { max-width: 760px; - height: 100%; } -.login-btn { - --background: var(--color-accent); - --border-radius: 44px; - --box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - --padding-start: 36px; - --padding-end: 36px; - height: 76px; -} - -.grid-center-wrapper { - height: 100%; - width: 100%; +.inline-container { display: flex; justify-content: center; align-items: center; } +.card-container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 1rem; +} + ion-card { - padding: 3rem; + padding: 2.4rem; h1 { color: var(--ion-color-success); @@ -53,14 +49,14 @@ ion-card { margin-bottom: 2rem; } + // download info card ion-card { - max-width: 91%; - min-width: 91%; + min-height: 260px; + width: 80%; background: #615F5F; color: var(--ion-text-color); box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); border-radius: 44px; - margin: auto; text-align: left; cursor: pointer; position: relative; @@ -79,14 +75,6 @@ ion-card { font-size: 1.3rem; } - ion-card-content { - padding-bottom: 4rem; - - p { - padding: 1rem 0; - } - } - ion-footer { position: absolute; bottom: 10px; @@ -109,42 +97,87 @@ ion-card { } } - .container { - display: flex; - justify-content: center; - align-items: center; + .login-button { + --background: var(--color-accent); + --padding-bottom: 2.5rem; + --padding-top: 2.5rem; + --padding-start: 2.5rem; + --padding-end: 2.5rem; + --border-radius: 44px; + font-size: 1.4rem !important; + font-weight: bold; + text-transform: none; + letter-spacing: normal; + transition: all 350ms ease; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + + &:hover { + transition-property: transform; + transform: scale(1.05); + transition-delay: 40ms; + } + + ion-icon { + font-size: 1.7rem; + } + } + + .launch-button { + --background: var(--alt-blue); } - #information:after { + #information:after, #launch:after { content: ''; position: absolute; left: 0; - top: 80%; + top: 79%; width: 100%; height: 100%; background: var(--color-accent); } #launch:after { - content: ''; - position: absolute; - left: 0; - top: 80%; - width: 100%; - height: 100%; background: var(--alt-blue); } + } -.card-container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - gap: 2rem; +.mb-12 { + margin-bottom: 3rem; } -.emphasis-warn { - font-weight: 600; - color: var(--ion-color-warning); +.pb-2 { + padding-bottom: 0.5rem; +} + +.pt-1 { + padding-top: 0.25rem; +} + + +.action-text { + font-variant-caps: all-small-caps; + padding-right: 0.5rem; + font-size: 1.5rem !important; + letter-spacing: 0.03rem; + padding-bottom: 0.1rem; +} + +@media (max-width: 700px) { + .setup { + flex-direction: column; + } + + ion-card { + ion-card { + width: 100%; + padding-bottom: unset; + } + #information:after { + top: 84%; + } + #launch:after { + top: 85%; + } + } } \ No newline at end of file diff --git a/frontend/projects/setup-wizard/src/styles.scss b/frontend/projects/setup-wizard/src/styles.scss index 64550a457..f31e2542c 100644 --- a/frontend/projects/setup-wizard/src/styles.scss +++ b/frontend/projects/setup-wizard/src/styles.scss @@ -218,7 +218,7 @@ ion-toast { * { display: inline-block; vertical-align: middle; - padding: 0.3rem; + padding-left: 0px 0.3rem; } } diff --git a/frontend/projects/ui/src/app/app/enter/enter.directive.ts b/frontend/projects/shared/src/directives/enter/enter.directive.ts similarity index 92% rename from frontend/projects/ui/src/app/app/enter/enter.directive.ts rename to frontend/projects/shared/src/directives/enter/enter.directive.ts index 2a93ad93b..8d3d6a399 100644 --- a/frontend/projects/ui/src/app/app/enter/enter.directive.ts +++ b/frontend/projects/shared/src/directives/enter/enter.directive.ts @@ -1,6 +1,6 @@ import { Directive, HostListener, Inject } from '@angular/core' import { DOCUMENT } from '@angular/common' -import { debounce } from '@start9labs/shared' +import { debounce } from '../../util/misc.util' @Directive({ selector: '[appEnter]', diff --git a/frontend/projects/ui/src/app/app/enter/enter.module.ts b/frontend/projects/shared/src/directives/enter/enter.module.ts similarity index 100% rename from frontend/projects/ui/src/app/app/enter/enter.module.ts rename to frontend/projects/shared/src/directives/enter/enter.module.ts diff --git a/frontend/projects/shared/src/public-api.ts b/frontend/projects/shared/src/public-api.ts index a14ff0110..7b1cd71b8 100644 --- a/frontend/projects/shared/src/public-api.ts +++ b/frontend/projects/shared/src/public-api.ts @@ -24,6 +24,8 @@ export * from './directives/responsive-col/responsive-col.module' export * from './directives/responsive-col/responsive-col-viewport.directive' export * from './directives/safe-links/safe-links.directive' export * from './directives/safe-links/safe-links.module' +export * from './directives/enter/enter.directive' +export * from './directives/enter/enter.module' export * from './pipes/emver/emver.module' export * from './pipes/emver/emver.pipe' diff --git a/frontend/projects/ui/src/app/app.module.ts b/frontend/projects/ui/src/app/app.module.ts index 31dd44da1..324300851 100644 --- a/frontend/projects/ui/src/app/app.module.ts +++ b/frontend/projects/ui/src/app/app.module.ts @@ -10,11 +10,12 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations' import { IonicModule } from '@ionic/angular' import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor' import { - MarkdownModule, DarkThemeModule, + EnterModule, + LightThemeModule, + MarkdownModule, ResponsiveColModule, SharedPipesModule, - LightThemeModule, } from '@start9labs/shared' import { AppComponent } from './app.component' @@ -25,7 +26,6 @@ import { MarketplaceModule } from './marketplace.module' import { PreloaderModule } from './app/preloader/preloader.module' import { FooterModule } from './app/footer/footer.module' import { MenuModule } from './app/menu/menu.module' -import { EnterModule } from './app/enter/enter.module' import { APP_PROVIDERS } from './app.providers' import { PatchDbModule } from './services/patch-db/patch-db.module' import { ToastContainerModule } from './components/toast-container/toast-container.module' diff --git a/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html b/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html index 553bd360a..af471d23e 100644 --- a/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html +++ b/frontend/projects/ui/src/app/pages/login/ca-wizard/ca-wizard.component.html @@ -1,83 +1,99 @@ - +
- -

Trust Your Root CA

-

- Download and trust your server's Root Certificate Authority to establish a - secure ( - HTTPS - ) connection. You will need to repeat this on every device you use to - connect to your server. -

-
    -
  1. - Download your server's Root CA - . Your server uses its Root CA to generate SSL/TLS certificates for - itself and installed services. These certificates are then used to - encrypt network traffic with your client devices. -
    - - Download - - -
  2. -
  3. - Trust your server's Root CA - . Follow instructions for your OS. By trusting your server's Root CA, - your device can verify the authenticity of encrypted communications with - your server. -
    - - View Instructions - - -
  4. -
  5. - Test - . If refreshing the page does not work, you may need to quit the browser - and re-open. - Tip: before quitting, bookmark this page or copy the URL. -
    - - Refresh - - -
  6. -
- - Skip - - + + +

Trust Your Root CA

+

+ Download and trust your server's Root Certificate Authority to establish + a secure (HTTPS) connection. You will need to repeat this on every + device you use to connect to your server. +

+
    +
  1. + Download your server's Root CA + - Your server uses its Root CA to generate SSL/TLS certificates for + itself and installed services. These certificates are then used to + encrypt network traffic with your client devices. +
    + + Download + + +
  2. +
  3. + Trust your server's Root CA + - Follow instructions for your OS. By trusting your server's Root CA, + your device can verify the authenticity of encrypted communications + with your server. +
    + + View Instructions + + +
  4. +
  5. + Test + - If refreshing the page does not work, you may need to quit the + browser and re-open. + Tip: before quitting, bookmark this page or copy the URL. +
    + + Refresh + + +
  6. +
+ + Skip + + +
- -

Root CA Trusted!

-

- You have successfully trusted your server's Root CA and may now log in - securely. -

- - Go to login - - + + +

Root CA Trusted!

+

+ You have successfully trusted your server's Root CA and may now log in + securely. +

+ + Go to login + + +
- +