Merge pull request #73 from dzintars/develop

Develop
dzintars · Jul 25, 2020 · df1e189 · df1e189
2 parents bec8a43 + e17d59d
commit df1e189
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/src/scss/2-base/_forms.scss b/src/scss/2-base/_forms.scss
@@ -1,6 +1,6 @@
 form {
   width: 100%;
-  fieldset {
+  section {
     border: none;
     display: flex;
     flex-direction: column;

diff --git a/src/store/modules/modules/models.ts b/src/store/modules/modules/models.ts
@@ -1,6 +1,7 @@
 export interface Module {
   readonly id: string
   readonly title: string
+  readonly permalink: string
 }
 
 export interface ModulesState {

diff --git a/src/ui/components/app-flyout/component.ts b/src/ui/components/app-flyout/component.ts
@@ -8,7 +8,7 @@ import style from './style'
 export class AppFlyoutElement extends connect(store, LitElement) {
   @property({ type: String }) key: string = ''
   @property({ type: String }) label: string = 'Unspecified label'
-  @property({ type: Array }) modules: Module[] = [{ id: '1', title: 'Flyout' }]
+  @property({ type: Array }) modules: Module[] = [{ id: '1', title: 'Flyout', permalink: 'permalink' }]
 
   mapState(state: RootState) {
     return {

diff --git a/src/ui/components/app-navigation/component.ts b/src/ui/components/app-navigation/component.ts
@@ -12,7 +12,7 @@ export class AppNavigationElement extends LitElement {
 
   @property({ type: String }) pathname: string
   @property({ type: String }) appid: string = ''
-  @property({ type: Array }) modules: Module[] = [{ id: '1', title: 'Module' }]
+  @property({ type: Array }) modules: Module[] = [{ id: '1', title: 'Module', permalink: '' }]
   @property({ type: String }) name: string = 'component'
 
   protected render(): TemplateResult {

diff --git a/src/ui/components/app-navigation/template.ts b/src/ui/components/app-navigation/template.ts
@@ -9,7 +9,7 @@ export default function template(this: AppNavigationElement): TemplateResult {
       module => module.id,
       module => html`
         <div>
-          <a href="${this.pathname}/${module.id}"><p>${module.title}</p></a>
+          <a href="${this.pathname}/${module.permalink}"><p>${module.title}</p></a>
         </div>
       `
     )}

diff --git a/src/ui/components/sign-in/template.ts b/src/ui/components/sign-in/template.ts
@@ -6,17 +6,17 @@ export default function template(): TemplateResult {
     <h1>Sign In</h1>
     <p>Welcome back!</p>
     <form id="signin_form" name="signin" novalidate action="">
-      <fieldset>
+      <section>
         <label for="user_email">Email</label>
         <input id="user_email" name="userEmail" type="email" />
-      </fieldset>
-      <fieldset>
+      </section>
+      <section>
         <label for="password">Password</label>
         <input id="password" autocomplete="off" name="password" type="password" />
-      </fieldset>
-      <fieldset>
+      </section>
+      <section>
         <button class="btn btn--lg btn--block btn--secondary" id="continue">Sign In</button>
-      </fieldset>
+      </section>
       <div>
         <p>
           New to Oswee?

diff --git a/src/ui/components/sign-up/template.ts b/src/ui/components/sign-up/template.ts
@@ -6,18 +6,18 @@ export default function template(): TemplateResult {
       <h1>Create new account</h1>
       <p>Welcome to Oswee</p>
       <form id="signin_form" name="signin" novalidate action="">
-        <fieldset>
+        <section>
           <label for="user_name">Your name</label>
           <input id="user_name" name="userName" type="text" />
-        </fieldset>
-        <fieldset>
+        </section>
+        <section>
           <label for="user_email">Email</label>
           <input id="user_email" name="userEmail" type="email" />
-        </fieldset>
-        <fieldset>
+        </section>
+        <section>
           <label for="password">Password</label>
           <input id="password" autocomplete="off" name="password" type="password" />
-        </fieldset>
+        </section>
         <div>
           <p>By creating an account, you agree to Oswee's</p>
           <p>

diff --git a/src/ui/containers/main-launcher/component.ts b/src/ui/containers/main-launcher/component.ts
@@ -27,7 +27,7 @@ export class MainLauncherElement extends connect(store, LitElement) {
   @property({ type: Object }) wrapperRef: any = this.setWrapperRef.bind(this)
   @property({ type: Array }) applications: Application[]
   @property({ type: String }) activeNavItem: string = ''
-  @property({ type: Array }) modules: Module[] = [{ id: '1', title: 'test' }]
+  @property({ type: Array }) modules: Module[] = [{ id: '1', title: 'test', permalink: 'permalink' }]
   @property({ type: String }) activeView: string = ''
 
   // Map state to props (Connect lib)